Steve Harris
8080ea523b
12.6.1-10 baseline
...
Former-commit-id: a9742f306eedac4d827c8dc4a774e2a9742f306eedac4d827c8dc4a774e23cd0902b498dc4a774e23cd0902b497550311ef6efe25edfadeacd5aeb7fdf59dc7c4456f8cf00a8
2012-06-21 08:58:00 -05:00
Bryan Kowal
07ac1a35a1
Issue #708 - ensure that spring and other resources are packaged in the edex jars created by the pde build. Updated the edex pde build to handle foss dependencies correctly.
...
Former-commit-id: d25012ee75cb16805e7e95a5887b06d25012ee75cb16805e7e95a5887b0625e20ad89c95a5887b0625e20ad89c181cd0b0245db24885bafd8be91fedf390151c0b96e82f60e5
2012-06-19 13:15:53 -05:00
Bryan Kowal
550aeb21e9
Issue #762 - removing extra com.raytheon.uf.viz.ncep.displays.feature added by collaboration.
...
Former-commit-id: 7facb16ff166a412e16c8735d101d57facb16ff166a412e16c8735d101d5f522cf8a4f8735d101d5f522cf8a4f26a7f1e54ddd07c2ac13a045e729f75f59af1e012a43ab83cb
2012-06-18 13:32:31 -05:00
Bryan Kowal
fff0ad3727
Issue #762 - Remove all plugins specific to the 11-Collaboration Work Assignment.
...
Former-commit-id: 4d7c909f5dec395ae13496f987631c4d7c909f5dec395ae13496f987631c966c50ed0696f987631c966c50ed067ff1e3ec1e07b8c70b1bff0c86f8576d4946e75389ab662ecf
2012-06-18 11:51:47 -05:00
Bryan Kowal
14f81556c3
Merge branch '11-Collaboration' into development
...
Conflicts:
cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
Former-commit-id: 9e7907ecd79361f3eb94f528e103919e7907ecd79361f3eb94f528e10391f0e3b957e3f528e10391f0e3b957e3ac72941bf021e86188521ee59eac71cbc8964e5ba6d1f97dec
2012-06-18 11:16:28 -05:00
Bryan Kowal
3d94c3e332
Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository.
...
Former-commit-id: 175cbf318d5e80c45a03dcc5675564175cbf318d5e80c45a03dcc5675564c0aaac4a07dcc5675564c0aaac4a0781fa46c01aa9c2cf4faec608fc959c720a152a45eca1d3d525
2012-06-14 11:35:15 -05:00
Nate Jensen
5bd5e7e8ab
Issue #716 fix lots of minor issues, fix merge problem
...
Change-Id: I5a43ad089766b5f2a9a3ea6901d8f6761983b575
Former-commit-id: 653dca2e66eedc68c32c619d3062c2653dca2e66eedc68c32c619d3062c247e8561dd0619d3062c247e8561dd0f6e823019d3b8b89fc842cf220ff0c1a8935e86dda2ab4d95b
2012-06-13 09:39:19 -05:00
Steve Harris
ec9204fa94
Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
...
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java
Former-commit-id: 03383359f3af6c0529ad2f20a86a3003383359f3af6c0529ad2f20a86a3048860df6902f20a86a3048860df6906c0d8be39ed7a485309127b50c57bd2838ca117f70a928d039
2012-06-12 14:37:12 -05:00
Steve Harris
b54ad5af66
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
...
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: 975053c3dcc7024992a337793c86b1975053c3dcc7024992a337793c86b1d325d496f537793c86b1d325d496f55e0e2d2c4823c34c469acf3c7682133dd5b84aa2c01b096242
2012-06-11 15:24:03 -05:00
Steve Harris
46068c6716
12.5.1-15 baseline
...
Former-commit-id: 2f10c7a1e48552902906b13cbb7e002f10c7a1e48552902906b13cbb7e003904c4ccf5b13cbb7e003904c4ccf51f521a70b397c4db937e676ea3192f9054c5ab6c39ff9954f8
2012-06-08 13:39:48 -05:00
Steve Harris
17403e71d1
12.5.1-9 baseline
...
Former-commit-id: 45773fbee0b8de76b45e8f3c9ebfb745773fbee0b8de76b45e8f3c9ebfb71f542697cb8f3c9ebfb71f542697cbdbedcc229cd23b0e4d60ce0422a34a399c00d295ee7b53c7c4
2012-05-21 17:48:55 -05:00
Steve Harris
e460104ec9
12.5.1-6 baseline
...
Former-commit-id: ba6d779949df80148db624474489f9ba6d779949df80148db624474489f9fa87dc6cf124474489f9fa87dc6cf1bc695ee0254792884ab2c452cce6332738af201926ed02c3dc
2012-05-16 16:41:22 -05:00
Brad Gonzales
0e95b9fd42
Issue #628 Backing out PGEN changes with remote target checking
...
Former-commit-id: e1a73f505b6e170a377f4e629cc7e4e1a73f505b6e170a377f4e629cc7e40db325a1cd4e629cc7e40db325a1cdcb2a54249400935dded7aeaf7d922b6a7397b0f6b47ae13f47
2012-05-16 14:43:53 -05:00
Brad Gonzales
d29ff44f8c
Issue #628 changed NCEP PGEN PgenStaticDataProder.java to cause the staticdataprovider Activator to be loaded. in PgenResource.drawGhost() check for dispatch target before drawing.
...
Former-commit-id: bbce83bc0ad44a07d33fb732df5f1cbbce83bc0ad44a07d33fb732df5f1c11b93412bfb732df5f1c11b93412bf61532c6c9caa731cc32964774ccf32bb04dccd7b7af3b1e16c
2012-05-16 13:09:52 -05:00
Brad Gonzales
b6bdcceef1
Issue #628 Nate's additional ncep pgen changes including PGEN's SymbolSetElement.java
...
Former-commit-id: 9f2101cafc85f331b8b050eba2317a9f2101cafc85f331b8b050eba2317ad7babbaebd50eba2317ad7babbaebdc1bd5e5d97e8a5c38fa74b30085d9d6c9898e98a34d055ea22
2012-05-16 10:12:27 -05:00
Brad Gonzales
e10f446518
Issue #628 Nate's ncep pgen feature.xml.
...
Former-commit-id: 3a00952cdadd0192fef21a763575ed3a00952cdadd0192fef21a763575ed877b13b79b1a763575ed877b13b79bd062622541d0953dd11ac909b32d0b66d5bb6d4b8d46ba706c
2012-05-11 10:12:47 -05:00
Brad Gonzales
3ba1c365c7
Issue #628 committing more PGEN code received from Plummer on 4-19-2012.
...
Former-commit-id: dcfb950cfb22a29b98b2a90d64e1fcdcfb950cfb22a29b98b2a90d64e1fc0df0aa8663a90d64e1fc0df0aa8663634def5162af92e8d329e1f03d9369998c7b3174cb1ff65e77
2012-05-10 17:02:18 -05:00
Brad Gonzales
55112a5de9
Issue #628 committing PGEN code received from Plummer on 4-19-2012.
...
Former-commit-id: 1d576ac27dfda897d2d0253e8bc9481d576ac27dfda897d2d0253e8bc948295cbf95e5253e8bc948295cbf95e56df38c98de2a3bf4ec32ae3d17c698a610dcde73632020195a
2012-05-10 16:50:45 -05:00
Steve Harris
2f6ae50479
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
...
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: fc70139990d7f7c26582092efd6072fc70139990d7f7c26582092efd607231b3e87ffa092efd607231b3e87ffafe7ac9662553d282232998447412f87ee04eb560d040b14742
2012-05-09 13:19:47 -05:00
Steve Harris
c76fddc7e4
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
...
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: bcc12e03ed572e1bb47627bc369818bcc12e03ed572e1bb47627bc36981858037cb5d127bc36981858037cb5d143f936900c9c9e01dbda63ea8599d77978d3b6401d2ad9224a
2012-05-09 13:14:00 -05:00
Steve Harris
6715112613
12.5.1-2 baseline
...
Former-commit-id: c1bc408f84ac708c050d84d191e7b6c1bc408f84ac708c050d84d191e7b6b36c69cc6784d191e7b6b36c69cc678025cc609ef6300cd995a821111fbf377ae76413ef49f63d8d
2012-05-03 19:17:13 -05:00
Steve Harris
3419f72215
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
...
used git cherry-pick -m 1 879a2e0
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Conflicts:
ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java
Former-commit-id: fe946166ed4ec294b5252ed7249613fe946166ed4ec294b5252ed72496137b75b781ad2ed72496137b75b781ad3992b18e287c7fc971316dd3ee8809fd9e226b35491aa53a0c
2012-05-01 18:31:09 -05:00
Steve Harris
7f90924706
12.4.1-10 baseline
...
Former-commit-id: 7fa9dbd5fb4bfbdad17d9f8cb727a57fa9dbd5fb4bfbdad17d9f8cb727a58485b90ff89f8cb727a58485b90ff840aa780b3d33a67cdd82a28d70b5c5e5543a0e860c25458510
2012-05-01 18:06:13 -05:00
Dave Hladky
8f500ff6d6
Issue #15 Re-wrote SimDate integration for menus, alert observers after
...
merge headache.
Former-commit-id: 37da8763eb42a12fa7a51b7473572f37da8763eb42a12fa7a51b7473572f5b7ecea8661b7473572f5b7ecea8669ae2445f9fa1a3a361dd61e31c62ffd2e16d486b7fc0c65ef4
2012-04-30 13:43:34 -05:00
Richard Peter
b7c5a834b5
Issue #538 : Fix Serialization Annotations and Serialization Issues
...
Change-Id: I436997106438ab283e987cb7e3055fcee009b608
Former-commit-id: 231d98b79ec33a392a8c349adaeedd231d98b79ec33a392a8c349adaeeddb11df888d3349adaeeddb11df888d351e9a72371ae35c2f27ce3323febc50212d3108f83564a4dde
2012-04-27 12:08:29 -05:00
Steve Harris
ad3bb08978
12.4.1-10 baseline
...
Former-commit-id: 931087306f418489e726704b75e1a1931087306f418489e726704b75e1a101457fbbde704b75e1a101457fbbdecaab7c1fbb97caaa0327aabc3842ac3ed3a665cbf1eb6efb23
2012-04-24 15:38:29 -05:00
Steve Harris
8d58af7bb2
12.4.1-7 baseline
...
Former-commit-id: 98c92073b56d585942fe90ae4bbb3698c92073b56d585942fe90ae4bbb36cca73b3c6290ae4bbb36cca73b3c6255b2a4df324c88c0ae6cd9f966008c5a3a53936f989dd653f2
2012-04-24 15:24:39 -05:00
Steve Harris
0cf19dc505
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
...
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Former-commit-id: 634d40a15663f11892e84d7572a632634d40a15663f11892e84d7572a632625cd4262c4d7572a632625cd4262c6aa0898aaee86dc647bedef458753d19657ae52d9b8c6e395d
2012-04-19 11:11:02 -05:00
Steve Harris
5b35d8a6e0
12.4.1-4 baseline
...
Former-commit-id: 4767b0e069750b7543dd67a5a683004767b0e069750b7543dd67a5a683002a216f333c67a5a683002a216f333c98d8b3f188a2a6a18faea4e519f3cd8cd5974f4c74b66d9683
2012-04-18 15:18:16 -05:00
Max Schenkelberg
0e28862552
Issue #239 Refactored Collaboration rendering so it looks up renderes by
...
extension point so radar renderer can be injected by a radar
collaboration project
Former-commit-id: a9864fa590490c75f6849b018ea151a9864fa590490c75f6849b018ea1517d2a7d987d9b018ea1517d2a7d987d652dc33e7ffcb459e91dfa3d39c5e2ab943462246f1c372790
2012-04-16 17:29:59 -05:00
Steve Harris
80108c0af9
Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
...
Conflicts:
edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
Former-commit-id: 6a1f2160bdc90ce9d54eed26e06df26a1f2160bdc90ce9d54eed26e06df2fee53dea94ed26e06df2fee53dea94a4eb467a3451bb9ebb46dcdd7f064858cb18d860f51d290333
2012-04-10 12:50:03 -05:00
Bryan Kowal
db5981d4cd
Merge branch '9-Wes2Bridge' of ssh://lightning:29418/thunder into 9-Wes2Bridge
...
Former-commit-id: 4d73e617c821ff4bf657f1e81b1a954d73e617c821ff4bf657f1e81b1a95dcc3c7bb59f1e81b1a95dcc3c7bb590591ab00cc774d05de1b240c3a180664c328e15158a8ef45c0
2012-04-09 09:19:02 -05:00
David Gillingham
e188aaa21b
Issue #435 : Prevent NullPointerExceptions from being thrown when
...
serializing AirepRecords and NcAirepRecords.
Issue #435 : Address peer review comments on previous change.
Change-Id: I7af20fd0d0d12c819c8df8aaba12318dcba574ac
Former-commit-id: 3b47db95415193184abf87142f9f4e3b47db95415193184abf87142f9f4ee0e57577ff87142f9f4ee0e57577ffc39ee5a3c0bef6e3d50484f0765dba3c0c8de495963a44fec9
2012-04-05 15:49:23 -05:00
Bryan Kowal
ad3d889f82
Issue #18 - fix port conflicts that prevented multiple instances of edex request from starting; fix a problem that prevented the selected http port in setup.env from propogating throughout the edex instances.
...
Former-commit-id: 5f9463bc573e039dc79fe792b2a16f5f9463bc573e039dc79fe792b2a16f2ed20e107de792b2a16f2ed20e107df24e7a4d31edb7431d0a5f4d6f600a3db4653b1efaefa46212
2012-04-04 18:29:13 -05:00
Steve Harris
095b190063
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
...
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Former-commit-id: b4846ce8a8a4e4792bb5d3ad6095b7b4846ce8a8a4e4792bb5d3ad6095b75cdda77afbd3ad6095b75cdda77afbc6071e24c59845ef53f96aa18f74f69fee09c9e41556e72eeb
2012-03-30 09:50:48 -05:00
Max Schenkelberg
42696fd296
Issue #358 Cleaned up mesh extension and API to use geotools for
...
defining a mesh. This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.
Former-commit-id: 5a61f3ae238fb7eccb736e5964df9d5a61f3ae238fb7eccb736e5964df9d50765e8a346e5964df9d50765e8a34458f5970aa8f08fab0a7cf440b38846378e8c4ee9366a5f308
2012-03-14 09:49:32 -05:00
Max Schenkelberg
67b1edb767
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: fe1811c167e2cd95d3f4ae47d9683efe1811c167e2cd95d3f4ae47d9683e48b6d45f00ae47d9683e48b6d45f0052c7dec2e80554abdde03212cc6ebb585e979c76ae389f0b57
2012-03-01 16:59:40 -06:00
Nate Jensen
4debf7bdc5
Integrating Richard's changes with 12.2.1
...
Change-Id: I774e69f166dbc48c7cb31d066cb8bf5dd626520c
Former-commit-id: 43538daf06a22448c3d52515d56c9f43538daf06a22448c3d52515d56c9fc5ba181cd82515d56c9fc5ba181cd888d65bde01414785ee0e699e417731a0d01a57d025a134cc57
2012-02-28 09:42:47 -06:00
Nate Jensen
b7a2e728d1
Integrating Richard's changes with 12.2.1
...
Change-Id: I1831502d72bed7b804287bb7c3e4ea501514ada4
Former-commit-id: 8106ba956f94ae63b740d18a15535a8106ba956f94ae63b740d18a15535aafe3c5db9cd18a15535aafe3c5db9c87691e4627a65f8d824274b6e7b3895c1aae46e18bf1058be3
2012-02-28 09:37:45 -06:00
Steve Harris
85d3d96d4c
Merge branch 'ss_sync' into 9-Wes2Bridge
...
Conflicts:
.gitignore
ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
deleted h5 files
using ss_sync version of java files
Former-commit-id: 6d0178411524059a5b4e9b67525e956d0178411524059a5b4e9b67525e95e5b56c99ab9b67525e95e5b56c99ab2dbdc945bf73a337bc3140d735716521f12bae82f8ae79c35c
2012-02-27 15:58:49 -06:00
Nate Jensen
cc42feebbd
Merge "Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder." into 4-Thin_Client
...
Former-commit-id: b07575c5b3a914aa38c8e3e44707a4b07575c5b3a914aa38c8e3e44707a4fef3fcb60ce3e44707a4fef3fcb60c2db5dbe305e0e2a82d83d03ff9824e57c46aa9e1a9a165f471
2012-02-23 11:50:39 -06:00
Ben Steffensmeier
33bb5f50fd
Issue #176 update merged ncep plot classes to use new plot interface.
...
Change-Id: I345a970aa0d292fcd05ba4c19e77536e03057f72
Former-commit-id: 41ca3213a40b0047e29d703d59a96841ca3213a40b0047e29d703d59a96803d9230879703d59a96803d9230879d1b9b4bc84f048713c316db9a03560af545548a1c77d5e6d98
2012-02-23 11:23:01 -06:00
Ben Steffensmeier
bfd03c9f39
Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder.
...
Change-Id: I343e4e61d5f96938e84709392c32f6d94b244b17
Former-commit-id: 127dde9454a2db6975c94dedc8b30d127dde9454a2db6975c94dedc8b30d73a08e9d4e4dedc8b30d73a08e9d4e3f86d825d5d937284ab2d5d8697d9f92962fdd2c70cf1d2ad5
2012-02-23 10:49:56 -06:00
Steve Harris
e5abab44f9
Revert PlotResource2.java to ss_sync version for merge into 4-Thin_Client
...
Former-commit-id: 909a19606ca5f8708b6adb065fcd50909a19606ca5f8708b6adb065fcd50e94b322dc3db065fcd50e94b322dc3391451e14b97184f1dc478ea2de6d391ffb88ac7321a11e44c
2012-02-23 10:16:02 -06:00
Steve Harris
43ff909553
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 5a96582f1692084b3f20d0bbbfefcc5a96582f1692084b3f20d0bbbfefcc7a10ca9766d0bbbfefcc7a10ca97662d02f819be92b7072b823d511fe719ae9c52b0123aef320ffd
2012-02-23 10:06:18 -06:00
Bryan Kowal
f1b84ddcb3
Issue #34 - recompiled the nsharp dll with the latest ncep code.
...
Former-commit-id: 573356d5742ce7c520b3c8dba08a9d573356d5742ce7c520b3c8dba08a9d4888756560c8dba08a9d4888756560134afd329ce4da2bcb9c71fe94b32282513080ba6d311633c4
2012-02-16 12:51:24 -06:00
Ben Steffensmeier
a1c5350f5e
Issue #235 Added ability to capture multiple frames to NSharp
...
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc
Former-commit-id: 8a5a87c2b108e8343d985cdcd5a2618a5a87c2b108e8343d985cdcd5a2616bfd8ccfee5cdcd5a2616bfd8ccfee34c03d78d09d442083a1512e0f1bd5e1eeef7827e50ddeed23
2012-02-09 10:54:02 -06:00
Ben Steffensmeier
92eabd5c49
Issue #237 revert Silver Spring changes to nsharp activator which break windows. Fix grib decoder to handle grib files with lo1 on the dateline.
...
Change-Id: I4991e7f02c8cdcfd608c3c6d987f4d0ea8593f40
Former-commit-id: 2960e33fbd1e0bd549a4324b358c442960e33fbd1e0bd549a4324b358c44851046ccf3324b358c44851046ccf3c704c716f66da56f59fc56c1b70d03954313476212e294d9e7
2012-02-06 16:55:48 -06:00
Ben Steffensmeier
f0e595338e
Issue #230 fix scaling problems with printing to high dpi printers
...
Change-Id: I64e609d3b01a839d3b8927eedfd85f81ffc0301f
Former-commit-id: 15afb5b8bd89b327974ad35d365b7f15afb5b8bd89b327974ad35d365b7ff78fa301a8d35d365b7ff78fa301a8460820bac925adbef6ab55689025ffffe5d42a03b338fc07e7
2012-02-03 12:49:59 -06:00
Ben Steffensmeier
e15eb35dc0
Issue #176 Change plots to no longer require id in updates. Change thin client updates to request pdo's instead of redoTimeMatching, which grabs any updates, not just new resource times.
...
Change-Id: I23763bae287d5c49d3973707228e78144cc83ab1
Former-commit-id: 539ebd56d36194dc82109cc983549d539ebd56d36194dc82109cc983549d9254b762ff9cc983549d9254b762ff174dd81c5775f49627c8484a0f64f80c4a26a41ca7bc0dc8f3
2012-01-30 17:04:47 -06:00
