Ben Steffensmeier
542aca681b
Issue #1151 move alert parsing into the resource data so that it can clear the time cache for derived alerts.
...
Change-Id: Iba5b641fbd6e8fa3657a7dd2311ae18cf63456f8
Former-commit-id: 42ae490a50
[formerly 42ae490a50
[formerly 4f648f3ea23cd2d300bb92228e20d7f2678718fd]]
Former-commit-id: b6e124f830
Former-commit-id: 2cdb3553e9
2012-10-05 14:28:35 -05:00
Mike Duff
6163f14f6b
Issue #1162 - Fix the NCEP/Hydro RFC FFG Mosaic displays.
...
Fixed the grid resource and created FFGVizGroupResource.
Change-Id: I4e90fb77c9a27da049e6c06d091076961e7f304c
Former-commit-id: 643eaea29d
[formerly 643eaea29d
[formerly d99d895daeaa049c6b4e683b7fbd37186f5ef1dc]]
Former-commit-id: 9fe028c438
Former-commit-id: ff2bb36d39
2012-09-20 10:19:46 -05:00
Mike Duff
45e84531a6
Issue #1162 - Fix for NCEP/Hydro menu RFC mosaic displays.
...
Former-commit-id: bcafd807c5
[formerly bcafd807c5
[formerly 5504abfd272649dad36357ae7fdce83c75b3e3fa]]
Former-commit-id: 7825863940
Former-commit-id: db6ac1594e
2012-09-11 08:50:55 -05:00
root
1792158ef8
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: cb46f57879
[formerly cb46f57879
[formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]
Former-commit-id: 5a453ee984
Former-commit-id: 8a66b2f209
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
e0561a1a35
Issue #1058 fix reprojection of wind vectors
...
Former-commit-id: c25c08c8e7
[formerly c25c08c8e7
[formerly 315965383123120bffe1faa1d63fdfb7b633bc97]]
Former-commit-id: 09c412d754
Former-commit-id: ea551d3866
2012-08-14 13:44:21 -05:00
Steve Harris
d507458b9b
Merge branch 'development' into development_on_ss_builds
...
Former-commit-id: 24799cd93d
[formerly 24799cd93d
[formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]
Former-commit-id: a1071e3204
Former-commit-id: 8f4ddad22c
2012-08-06 08:23:04 -05:00
Ben Steffensmeier
42e01d8b1b
Issue #978 GChange GridResource to use its own times rather than descriptor times.
...
Former-commit-id: 8346805ed2
[formerly 8346805ed2
[formerly 1481f818fed5ff9f18387d8fcbd9c30da37a9dd7]]
Former-commit-id: 090b9f5ccb
Former-commit-id: 942b0e5315
2012-08-03 15:52:47 -05:00
Steve Harris
e892eb4628
Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
rpms/awips2.64/Installer.h5py/component.spec
rpms/awips2.64/Installer.python/component.spec
rpms/awips2.64/Installer.python/src/lapack.patch1
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/python.site-packages/Installer.pupynere/component.spec
Former-commit-id: 6d77b94217
[formerly 6d77b94217
[formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]
Former-commit-id: 51e38ca887
Former-commit-id: 3476fe755b
2012-08-01 12:43:12 -05:00
Steve Harris
e86949a8d3
12.8.1-5 baseline
...
Former-commit-id: fd2abfb6f1
[formerly fd2abfb6f1
[formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: cd49ef3eda
Former-commit-id: e0c3722fd1
2012-08-01 10:45:37 -05:00
Nate Jensen
04a7e5a8c0
Issue #882 improved use of SimulatedTime
...
Change-Id: I624427fe42f0d74bc62900216596e724857830fc
Former-commit-id: a65e9608fd
[formerly a65e9608fd
[formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]
Former-commit-id: 4a2841b287
Former-commit-id: 8fa0eb70db
2012-07-31 08:57:54 -05:00
Steve Harris
acfc6eff55
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: de9034c96c
[formerly de9034c96c
[formerly d2a398126648eaf391ddf39f99a77c0f40d08618]]
Former-commit-id: 4688ac304f
Former-commit-id: b82d6772c3
2012-07-27 14:50:45 -05:00
Steve Harris
d7540c958f
Merge branch 'master' (OB12.7.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
cave/com.raytheon.uf.viz.points/.classpath
cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
deltaScripts/.pydevproject
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.climo/.classpath
edexOsgi/com.raytheon.uf.common.climo/.project
edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
edexOsgi/com.raytheon.uf.common.hlstopo/.project
edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
edexOsgi/com.raytheon.uf.common.tafqueue/.project
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
edexOsgi/com.raytheon.uf.edex.tafqueue/.project
edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
rpms/awips2-rpm.db
rpms/awips2.core/Installer.gfe/component.spec
rpms/awips2.core/Installer.ldm/component.spec
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
rpms/awips2.core/Installer.rcm/scripts/conf/start-config
rpms/awips2.edex/deploy.builder/build.sh
rpms/build/release/buildCoreRPMs.sh
rpms/common/yum/arch.x86/comps.xml
tools/devAutoDeploy/devAutoDeploy.ecl
Former-commit-id: 56249c2611
[formerly 56249c2611
[formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]
Former-commit-id: 587bb6a274
Former-commit-id: 2aa4114e4d
2012-07-27 14:44:44 -05:00
Ben Steffensmeier
9713295486
Issue #924 fix some concurrency issues for GridResource
...
Former-commit-id: e18782687c
[formerly e18782687c
[formerly 312361f3bacf9ed935ee7cd69be90192af34b3fd]]
Former-commit-id: de742a4b8c
Former-commit-id: 3e9abe8682
2012-07-25 17:33:24 -05:00
Ben Steffensmeier
bd6bb5fd43
Issue #924 fix concurrency issues for Grid products
...
Former-commit-id: 0b951d425d
[formerly 0b951d425d
[formerly 767173dc95dc811bc94081415a214803403985f5]]
Former-commit-id: 9abd645758
Former-commit-id: cb08c202ef
2012-07-19 17:37:15 -05:00
Steve Harris
9aabe438b9
12.7.1-8 baseline
...
Former-commit-id: 16bf591a33
[formerly 16bf591a33
[formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: c42ae0fa39
Former-commit-id: 9f97182964
2012-07-19 16:20:40 -05:00
Roger Ferrel
d6d4222e24
Issue #875 - Create com.raytheon.uf.viz.points
...
Amend: fixing code per review comments
Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627
Former-commit-id: 0cf7d64cf4
[formerly 0cf7d64cf4
[formerly f3d38c3b1ea1b8118f90ce38937a689a9581b2bb]]
Former-commit-id: 9071334fe9
Former-commit-id: b3df932794
2012-07-12 11:32:03 -05:00
Steve Harris
d5fa61041b
12.6.1-9 baseline
...
Former-commit-id: 2c0ff851ca
[formerly 2c0ff851ca
[formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 27afa60345
Former-commit-id: 4f7bb90bb0
2012-07-10 07:53:49 -05:00
Bryan Kowal
611925412d
Merge branch 'ss_sync' (OB12.6.1-10) into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
rpms/awips2-rpm.db
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: a33740e915
[formerly a33740e915
[formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]
Former-commit-id: b87b66abc5
Former-commit-id: 9a7d0492fe
2012-06-27 17:21:48 -05:00
Ben Steffensmeier
b2ce12e3a7
Issue #704 modify grid reprojection/interpolation code to be more thread safe and dynamic.
...
Former-commit-id: 682edec2cf
[formerly 682edec2cf
[formerly 308f0e8c03ab4237830a91c96c500b6860c6fd36]]
Former-commit-id: 603d48a017
Former-commit-id: 7ea36122f2
2012-06-25 15:22:35 -05:00
Steve Harris
75f77df418
Revert "12.6.1-10 baseline"
...
This reverts commit aecc6a8474
[formerly b33c5bdfcf
] [formerly a2c0893d1a
] [formerly ddde63eee0
[formerly ddde63eee0
[formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]].
Former-commit-id: b4b1f6975f
[formerly b4b1f6975f
[formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]
Former-commit-id: 25198a5cd6
Former-commit-id: 8367fb50f5
2012-06-21 08:51:08 -05:00
Steve Harris
aecc6a8474
12.6.1-10 baseline
...
Former-commit-id: ddde63eee0
[formerly ddde63eee0
[formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]
Former-commit-id: a2c0893d1a
Former-commit-id: b33c5bdfcf
2012-06-21 08:38:48 -05:00
Ben Steffensmeier
63b55f454f
Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later
...
Former-commit-id: d317777ee6
[formerly d317777ee6
[formerly 65e7e8b2c891d1938f0b98c3c8737f18517fe27f]]
Former-commit-id: 0c69731e18
Former-commit-id: b55a4f026c
2012-06-20 14:13:37 -05:00
Bryan Kowal
cbc8964e5b
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: f528e10391
[formerly f528e10391
[formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]
Former-commit-id: f0e3b957e3
Former-commit-id: 1ee59eac71
2012-06-18 11:16:28 -05:00
Steve Harris
2838ca117f
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: 2f20a86a30
[formerly 2f20a86a30
[formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]
Former-commit-id: 48860df690
Former-commit-id: 27b50c57bd
2012-06-12 14:37:12 -05:00
Steve Harris
91e65230ad
12.6.1-5 baseline
...
Former-commit-id: c99afab05f
[formerly c99afab05f
[formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]
Former-commit-id: 8947efbc7f
Former-commit-id: a945ed8e6d
2012-06-11 16:23:47 -05:00
Steve Harris
3dd5b84aa2
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: 37793c86b1
[formerly 37793c86b1
[formerly a435e6464a78345b5036e3060430375dc53e4faf]]
Former-commit-id: d325d496f5
Former-commit-id: cf3c768213
2012-06-11 15:24:03 -05:00
Steve Harris
9054c5ab6c
12.5.1-15 baseline
...
Former-commit-id: b13cbb7e00
[formerly b13cbb7e00
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 676ea3192f
2012-06-08 13:39:48 -05:00
Max Schenkelberg
8ef6ad5ad6
Issue #697 Fixed recycling of grid vector resource, and made cursor change when drawing and only send clear_all if session leader
...
Change-Id: I78fbb17c7513e881ddf47d0bcd0ce8333e5740ff
Former-commit-id: e10ece6081
[formerly e10ece6081
[formerly 08d8389ea3b23e7fe209d12ff45275f86d3c5883]]
Former-commit-id: 048484f689
Former-commit-id: 7df41dbc88
2012-06-07 10:25:03 -05:00
Steve Harris
399c00d295
12.5.1-9 baseline
...
Former-commit-id: 8f3c9ebfb7
[formerly 8f3c9ebfb7
[formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]]
Former-commit-id: 1f542697cb
Former-commit-id: ce0422a34a
2012-05-21 17:48:55 -05:00
Steve Harris
2738af2019
12.5.1-6 baseline
...
Former-commit-id: 24474489f9
[formerly 24474489f9
[formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]
Former-commit-id: fa87dc6cf1
Former-commit-id: c452cce633
2012-05-16 16:41:22 -05:00
Steve Harris
7ee04eb560
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: 092efd6072
[formerly 092efd6072
[formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 98447412f8
2012-05-09 13:19:47 -05:00
Steve Harris
377ae76413
12.5.1-2 baseline
...
Former-commit-id: 84d191e7b6
[formerly 84d191e7b6
[formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]
Former-commit-id: b36c69cc67
Former-commit-id: a821111fbf
2012-05-03 19:17:13 -05:00
Steve Harris
fd9e226b35
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: 2ed7249613
[formerly 2ed7249613
[formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]
Former-commit-id: 7b75b781ad
Former-commit-id: 6dd3ee8809
2012-05-01 18:31:09 -05:00
Steve Harris
e5543a0e86
12.4.1-10 baseline
...
Former-commit-id: 9f8cb727a5
[formerly 9f8cb727a5
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 8485b90ff8
Former-commit-id: a28d70b5c5
2012-05-01 18:06:13 -05:00
Dave Hladky
d2e16d486b
Issue #15 Re-wrote SimDate integration for menus, alert observers after
...
merge headache.
Former-commit-id: 1b7473572f
[formerly 1b7473572f
[formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]
Former-commit-id: 5b7ecea866
Former-commit-id: 61e31c62ff
2012-04-30 13:43:34 -05:00
Steve Harris
19657ae52d
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: 4d7572a632
[formerly 4d7572a632
[formerly 5e1b9319941eed516a08a135a2049c14bad77863]]
Former-commit-id: 625cd4262c
Former-commit-id: def458753d
2012-04-19 11:11:02 -05:00
Steve Harris
8cd5974f4c
12.4.1-4 baseline
...
Former-commit-id: 67a5a68300
[formerly 67a5a68300
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
Steve Harris
9fee09c9e4
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: d3ad6095b7
[formerly d3ad6095b7
[formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]
Former-commit-id: 5cdda77afb
Former-commit-id: 6aa18f74f6
2012-03-30 09:50:48 -05:00
Steve Harris
2e0f4b241b
12.3.1-10 baseline
...
Former-commit-id: 4068f5295f
[formerly 4068f5295f
[formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 22bd792cd9
Former-commit-id: ce3b74c605
2012-03-30 08:38:33 -05:00
Max Schenkelberg
6378e8c4ee
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: 6e5964df9d
[formerly 6e5964df9d
[formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]
Former-commit-id: 50765e8a34
Former-commit-id: cf440b3884
2012-03-14 09:49:32 -05:00
Max Schenkelberg
585e979c76
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: ae47d9683e
[formerly ae47d9683e
[formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]
Former-commit-id: 48b6d45f00
Former-commit-id: 3212cc6ebb
2012-03-01 16:59:40 -06:00
Steve Harris
ae9c52b012
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: d0bbbfefcc
[formerly d0bbbfefcc
[formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]
Former-commit-id: 7a10ca9766
Former-commit-id: 3d511fe719
2012-02-23 10:06:18 -06:00
Steve Harris
15c56d11bc
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: c8aae98741
[formerly c8aae98741
[formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: 54be9660f1
Former-commit-id: 4450cf8963
2012-02-22 11:14:43 -06:00
Ben Steffensmeier
70e38a4506
Issue #228 change plots, grid icons, and radar icons
...
to use a new PointImageExtension which provides an
interface for drawing images at a single point,
which kml can use to extract plot images.
Change-Id: I29b07ed4f9e8ea95ed131ab1eb3ca27efadaf0e2
Former-commit-id: d976603262
[formerly d976603262
[formerly 0f56c76ab830ef088a9576301c795dca7c855033]]
Former-commit-id: 13a99abe7b
Former-commit-id: 63ef103145
2012-02-01 12:45:56 -06:00
Ben Steffensmeier
713811bb95
Issue #185 change LevelFactory to throw exceptions when there is no network connection so that everything can be reinitialized when the connection is restored..
...
Change-Id: Id5c82e7d01e7f229bc99366b1339bc38333ffa5a
Former-commit-id: b3463d27fc
[formerly b3463d27fc
[formerly 1b2496a6db33fc65efecfdffb380d8b4e07ec590]]
Former-commit-id: 0d75fbf942
Former-commit-id: c22f135dbc
2012-01-30 16:39:57 -06:00
Ben Steffensmeier
7335f90bfb
Issue #183 change grib data catalog to use bulk requests to retrieve all coverages at once.
...
Change-Id: I99f3dfc7900b57b074062155a4e7a65851f70170
Former-commit-id: 113722a596
[formerly 113722a596
[formerly 3cdfc8f73cce96c00b7ac37a1e34e9d051b628b6]]
Former-commit-id: dfd869c1c1
Former-commit-id: f082727112
2012-01-27 14:48:40 -06:00
Matt Nash
21d2361f00
Moving 12.1.1 into ss_sync
...
Former-commit-id: 66be3bec40
[formerly 66be3bec40
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
2012-01-19 11:53:12 -06:00
root
377dcd10b9
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 9f19e3f712
[formerly 9f19e3f712
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
2012-01-06 08:55:05 -06:00