Steve Harris
a4bf236cc7
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
Former-commit-id: 9a321b6ac83073951b3d
2013-03-27 22:16:15 -05:00
Steve Harris
2ca160caf0
13.3.1-14 baseline
...
Former-commit-id: 9022c500ce9fba973fd0
2013-03-27 17:59:34 -05:00
Steve Harris
e96e95b565
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.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/internal/ext/mosaic/GLMosaicImageExtension.java
edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: fd71e44f0fa23cecdb26
2013-03-26 10:12:34 -05:00
Mike Duff
4c3011edce
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
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/FFMPDataGenerator.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParm.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.qpid/0.7/build.sh
rpms/awips2.qpid/build.sh
Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb
Former-commit-id: 5d72795e1b9ebc7606b1
2013-03-26 09:19:39 -05:00
Steve Harris
bc439aee4f
13.3.1-12 baseline
...
Former-commit-id: 0be473728aaaac0b51e5
2013-03-25 13:27:13 -05:00
Steve Harris
104e6e79e8
Merge branch 'omaha_13.3.1' into development
...
Conflicts (auto resolved):
cave/com.raytheon.uf.viz.cots.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
Former-commit-id: 36df63be5ccb5ea76f98
2013-03-20 13:45:11 -05:00
Mike Duff
7e66c8e46d
Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen
...
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff
Former-commit-id: b115d3611c058064ce0d
2013-03-19 10:10:01 -05:00
Steve Harris
900b9aadde
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Former-commit-id: b8f0635ad67fcf9f1cb2
2013-03-18 16:52:00 -05:00
Steve Harris
245afb28c8
Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
...
Conflicts (just history comments):
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 1a999fee5ac18b96dc4c
2013-03-18 16:43:22 -05:00
Steve Harris
5f492500ea
13.3.1-8 baseline
...
Former-commit-id: f97d78994bc15b3ffe20
2013-03-18 15:43:32 -05:00
Steve Harris
d5bcdb0015
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java
Former-commit-id: 753a5213ab0cd7e56e65
2013-03-12 16:04:23 -05:00
Dave Hladky
6ea95002de
Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
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/FFMPDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227
Former-commit-id: a1006667e04b08491880
2013-03-12 15:48:34 -05:00
Steve Harris
4ed21b702b
13.3.1-6 baseline
...
Former-commit-id: 3a4c7931e1566b677d09
2013-03-12 08:35:45 -05:00
Ben Steffensmeier
5068b18c6a
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
...
Former-commit-id: f46686a6e22ca86633d6
2013-02-28 17:00:56 -06:00
Ron Anderson
2c8d14406b
Merge "Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default. Change-Id: I48738965df0da9052f810dfc1f312ed032693390" into development
...
Former-commit-id: f1ad632c3f884d9ff787
2013-02-19 18:46:16 -06:00
Steve Harris
1c08acab38
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: ea50a5db77d123c044c3
2013-02-19 12:22:00 -06:00
Steve Harris
c6d584758f
13.2.1-8 baseline
...
Former-commit-id: f81b382c04053156f02e
2013-02-18 09:09:41 -06:00
Ben Steffensmeier
455aa4628f
Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
...
Change-Id: I48738965df0da9052f810dfc1f312ed032693390
Former-commit-id: aa4c7526ff8c0e9d3d9e
2013-02-14 15:34:25 -06:00
Mike Duff
b55adb3cce
Issue #1550 - Add ability for MPE to preload maps on perspective open.
...
Former-commit-id: f9fec9668c5940423ac8
2013-01-29 15:39:40 -06:00
Steve Harris
47cc08ac79
13.2.1-2 baseline
...
Former-commit-id: 83e9157df7328c6dccad
2013-01-23 11:18:44 -05:00
Steve Harris
f6670806bf
13.2.1-1 baseline
...
Former-commit-id: 9771dfae6bc63f9bcae0
2013-01-23 11:13:03 -05:00
Max Schenkelberg
c246f56568
Issue #1457 Initial changes for MPE time refactor. Wrote custom resource that handles multiple times and tailored code to use resource instead of old XmrgResource which was not written to support multiple frames
...
Amend: Cleaned up comments and some bugs in code after review
Amend: Rebased changes
Change-Id: I512b9bb30a08b9a1cfc5e8d9b5008ebc4f352c2d
Former-commit-id: ff72ce0b0cdb3e7bab99
2013-01-15 14:41:19 -06:00
Richard Peter
345dfd2ca9
Merge branch 'ss_builds' (13.2.1-1) into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 3fb7d96ec11dbb34523b
2013-01-14 18:07:17 -06:00
Steve Harris
8713dfc5ca
13.2.1-1 baseline
...
Former-commit-id: e62172c8c781849e3cbb
2013-01-14 18:42:21 -05:00
Richard Peter
6a5a0d7d09
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: 029ebaa63a328be6ac2b
2013-01-09 17:55:05 -06:00
Steve Harris
dbcae57f57
13.1.2-6 baseline
...
Former-commit-id: 8e5f9e0e6c59969775ad
2013-01-06 14:55:11 -06:00
Steve Harris
941337c553
13.1.2-2 baseline
...
Former-commit-id: c0c1d56f3a4ba416aeb3
2013-01-06 14:32:24 -06:00
Max Schenkelberg
b74d788909
Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny
...
Change-Id: Ib12a3a6bb1f20f1e8eeb6dbd170802cf79359cfb
Former-commit-id: 3e128b266a5db71ca943
2012-12-12 11:39:32 -06:00
Steve Harris
6287b32e7d
Merge branch 'ss_builds' (12.12.1-12) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java
Former-commit-id: 43ddfe98c4f6988eefff
2012-12-11 08:45:53 -06:00
Steve Harris
ee06a94735
12.12.1-8 baseline
...
Former-commit-id: 19962f41ba5093a7c442
2012-12-06 09:02:51 -06:00
Max Schenkelberg
b24440cc37
Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins
...
Amend: Added back in TimeMatchBasisCapability. Someday will need to figure out bundle migration since this unused class can never die
Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6
Former-commit-id: b648c5828eed77d56a84
2012-11-29 10:29:36 -06:00
Steve Harris
c8cac52915
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 448dd1c35f00f3d51546
2012-11-13 17:28:50 -06:00
Steve Harris
df89fe9bed
12.12.1-2 baseline
...
Former-commit-id: a8560580f86868eb9b23
2012-11-13 17:14:24 -06:00
Dustin Johnson
4222b24d09
Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
...
Amend:
More peer review comments
Restore PreferencesHandler
Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7
Former-commit-id: 064ef82d1e1dbeb22893
2012-11-08 09:57:16 -06:00
Dustin Johnson
bcf575966b
Issue #1302 Merge branch '5-Data_Delivery' into development
...
Conflicts:
edexOsgi/build.edex/deploy-common/external-rules.xml
edexOsgi/build.edex/deploy-common/plugin-methods.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0
Former-commit-id: 98d7beae5031d7d09c10
2012-11-01 13:36:06 -05:00
Steve Harris
b4d2a0e8dd
12.10.1-4 baseline
...
Former-commit-id: 791ef6cedf92cc2d8605
2012-09-13 12:33:36 -05:00
Steve Harris
2ba58a3576
12.10.1-4 baseline
...
Former-commit-id: fd19ca562449c3861597
2012-09-13 12:08:11 -05:00
Steve Harris
dc08c5a71a
12.9.1-10 baseline
...
Former-commit-id: 3adc50a783cb9b80f3a0
2012-08-30 14:28:27 -05:00
Steve Harris
72824561cb
12.9.1-5 baseline
...
Former-commit-id: 61f269f54cf2fac39428
2012-08-21 15:27:03 -05:00
Steve Harris
9990bf909b
12.9.1-4 baseline
...
Former-commit-id: dcda3a229033b95fb96d
2012-08-15 15:19:10 -05:00
Steve Harris
edbbacfa8a
12.9.1-3 baseline
...
Former-commit-id: 36d80b1f6084bbf2573e
2012-08-15 14:26:10 -05:00
Steve Harris
d5563fc340
12.8.1-10 baseline
...
Former-commit-id: b5e8fee24dca25d508ec
2012-08-06 09:34:26 -05:00
Steve Harris
e0c3722fd1
12.8.1-5 baseline
...
Former-commit-id: fd2abfb6f1cd49ef3eda
2012-08-01 10:45:37 -05:00
Steve Harris
9f97182964
12.7.1-8 baseline
...
Former-commit-id: 16bf591a33c42ae0fa39
2012-07-19 16:20:40 -05:00
Steve Harris
4f7bb90bb0
12.6.1-9 baseline
...
Former-commit-id: 2c0ff851ca27afa60345
2012-07-10 07:53:49 -05:00
Steve Harris
676ea3192f
12.5.1-15 baseline
...
Former-commit-id: b13cbb7e003904c4ccf5
2012-06-08 13:39:48 -05:00
Steve Harris
a28d70b5c5
12.4.1-10 baseline
...
Former-commit-id: 9f8cb727a58485b90ff8
2012-05-01 18:06:13 -05:00
Steve Harris
a4e519f3cd
12.4.1-4 baseline
...
Former-commit-id: 67a5a683002a216f333c
2012-04-18 15:18:16 -05:00
Steve Harris
ce3b74c605
12.3.1-10 baseline
...
Former-commit-id: 4068f5295f22bd792cd9
2012-03-30 08:38:33 -05:00
Matt Nash
82089434e5
Issue #26 fix gage color for hydro to refresh
...
Former-commit-id: f7652d25e3bb4f690393
2012-02-07 16:49:34 -06:00
