Bryan Kowal
|
18bb3ef947
|
Issue #2297 - fix 14.2.1 merge
Former-commit-id: e2a02ca247 [formerly e2a02ca247 [formerly e5b298f51871ab2ed8be9e70cd1de5a4f8ce7f2b]]
Former-commit-id: 411e0fa7c4
Former-commit-id: e937ba954b
|
2013-11-11 13:04:21 -06:00 |
|
Steve Harris
|
49b0919cf0
|
13.5.3-6 baseline
Former-commit-id: 77a45660d5 [formerly 77a45660d5 [formerly 1324512098c1b95d023de932c6fbe872cfeb68f8]]
Former-commit-id: 5fa893d37b
Former-commit-id: f31112871c
|
2013-11-11 12:34:10 -05:00 |
|
Max Schenkelberg
|
60616f7ef0
|
Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing.
Change-Id: Ic82f45447113425a08909be4c5229502882db022
Former-commit-id: e58a5df04b [formerly e58a5df04b [formerly 58ccc575973ea9a1778659e17daff8577747dec5]]
Former-commit-id: bd903f6641
Former-commit-id: c85532a180
|
2013-11-11 11:09:00 -06:00 |
|
Bryan Kowal
|
dfba50bf2e
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.uf.viz.archive.feature/feature.xml
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ICaseCopy.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
cots/edu.uci.ics.crawler4j/.classpath
cots/edu.uci.ics.crawler4j/META-INF/MANIFEST.MF
cots/edu.uci.ics.crawler4j/build.properties
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/build.edex/esb/conf/spring/cron.properties
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/com.raytheon.edex.plugin.airep/src/com/raytheon/edex/plugin/airep/AirepDecoder.java
edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java
edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpRecord.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
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/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
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/GridToGribConverter.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/CPCoutlookGribPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/GFSProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/Nam80PostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/SixHrPrecipGridProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/ThreeHrPrecipGridProcessor.java
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
edexOsgi/com.raytheon.edex.plugin.pirep/src/com/raytheon/edex/plugin/pirep/PirepDecoder.java
edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingDecoder.java
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
edexOsgi/com.raytheon.edex.plugin.shef/unit-test/test/edex/transform/shef/TestMetarToShefTransformer.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/src/com/raytheon/uf/common/dataplugin/acarssounding/ACARSSoundingRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/BUFRncwf.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/src/com/raytheon/uf/common/dataplugin/goessounding/GOESSounding.java
edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/src/com/raytheon/uf/common/dataplugin/ldadhydro/HydroLdadRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java
edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/src/com/raytheon/uf/common/dataplugin/npp/crimss/CrimssRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.pirep/src/com/raytheon/uf/common/dataplugin/pirep/PirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.profiler/src/com/raytheon/uf/common/dataplugin/profiler/ProfilerObs.java
edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java
edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java
edexOsgi/com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/VAARecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/header/WMOHeaderFinder.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
edexOsgi/com.raytheon.uf.edex.plugin.acars/src/com/raytheon/uf/edex/plugin/acars/decoder/ACARSDataAdapter.java
edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/MESOWestDecoder.java
edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/common/MESOWestRecord.java
edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoder.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepPointDataTransform.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/src/gov/noaa/nws/ncep/common/dataplugin/ncccfp/NcccfpRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/GeoMagDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/NcAirepDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/src/gov/noaa/nws/ncep/edex/plugin/ncccfp/decoder/NcccfpDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/NcgribDecoder.py
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgridAssembler.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/src/gov/noaa/nws/ncep/edex/plugin/ncpirep/NcPirepDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackDecoder.java
ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/ObservedSoundingQuery.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/src/gov/noaa/nws/ost/edex/plugin/regionalsat/decoder/RegionalSatDecoder.java
rpms/awips2.ade/Installer.eclipse/component.spec.3.6.1
Former-commit-id: c3eb4e9af9 [formerly c3eb4e9af9 [formerly c56c91c7b000b4302ad5e2bac391fd627673cc97]]
Former-commit-id: f1cd2f2e5a
Former-commit-id: 1909193f0c
|
2013-11-08 14:51:47 -06:00 |
|
Nate Jensen
|
7a70c5ecce
|
Issue #2361 fix saving hydro table objects
Change-Id: I38e6cd44359c60e88132b297beee66cede0437de
Former-commit-id: 7a27264094 [formerly 7a27264094 [formerly 0f406375b030a87d3fa12e46255897bfa469119d]]
Former-commit-id: 08441efbb7
Former-commit-id: 4958732cb2
|
2013-11-08 12:37:26 -06:00 |
|
Nate Jensen
|
f836fe065e
|
Issue #2361 fix map style preferences
Change-Id: I34f4dd16a1c10196e4d8b0e32aab9fd3cefe7049
Former-commit-id: ec319b7dd0 [formerly ec319b7dd0 [formerly 4a3ae6311f17e56d9ba095f80f5c6b6c2529c5ae]]
Former-commit-id: 43bbf31347
Former-commit-id: 5ecde78b02
|
2013-11-08 10:38:11 -06:00 |
|
Richard Peter
|
7725d0ee3e
|
Merge "Issue #2361 remove viz.grid ISerializableObjects" into development
Former-commit-id: 214a72ac69 [formerly 214a72ac69 [formerly a227c2dcb2598f82756c3f6a9ac7999c06202177]]
Former-commit-id: bb0dcf6d4a
Former-commit-id: 1909b0d06b
|
2013-11-08 10:35:41 -06:00 |
|
Slav Korolev
|
52807d248b
|
Issue #2291. Fixed Shared Subscription Dialog.
Former-commit-id: 59d1de165d [formerly 59d1de165d [formerly f04678733c2368ca05b7b8fdbcfeb096940854df]]
Former-commit-id: 7b7754982c
Former-commit-id: c4a633acde
|
2013-11-08 11:09:21 -05:00 |
|
Nate Jensen
|
fc79c7053d
|
Issue #2361 remove viz.grid ISerializableObjects
Change-Id: I76be90f90dedf5d5d5e3656d23bd1180de9014b8
Former-commit-id: 88eb0aab5c [formerly 88eb0aab5c [formerly 6dde4cfe4f7669cd3d3ca15bbb7f4ab2a1a50e92]]
Former-commit-id: 10548cd1c7
Former-commit-id: 48a479d2dc
|
2013-11-08 09:42:09 -06:00 |
|
Ron Anderson
|
4e8df8ea5b
|
Merge "Issue #2361 speed up map initialization by moving field queries off UI thread" into development
Former-commit-id: 12192b633f [formerly 12192b633f [formerly c5da4c8a79432aab321d42f94b9cff04866671aa]]
Former-commit-id: c1bda09fd9
Former-commit-id: d2cd7c1257
|
2013-11-07 14:39:06 -06:00 |
|
Ron Anderson
|
298f4abbae
|
Merge "Issue #2476: Fix indent error in SmartScript._getGridsResult()." into development
Former-commit-id: a5bc64473a [formerly a5bc64473a [formerly 60bcc1509f4f748bcfecd3f6f0a7d36b6d4faf2b]]
Former-commit-id: 42229b8eee
Former-commit-id: 6442e2e933
|
2013-11-07 14:38:39 -06:00 |
|
Richard Peter
|
910464ea6a
|
Merge branch 'omaha_13.5.3' (13.5.3-5) into development
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9
Former-commit-id: fa7d77ae97 [formerly fa7d77ae97 [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]
Former-commit-id: 93c776022a
Former-commit-id: 520dd57f02
|
2013-11-07 14:25:45 -06:00 |
|
Greg Armendariz
|
390d3b57e1
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: da16b623e1 [formerly da16b623e1 [formerly d12afc98a3fda9c186e87368c53ddc100d4bf2c1]]
Former-commit-id: 6456b3a17b
Former-commit-id: 009c5771fd
|
2013-11-07 12:25:24 -06:00 |
|
Nate Jensen
|
57f237693e
|
Issue #2361 speed up map initialization by moving field queries off UI
thread
Change-Id: Ia7d72842723435cc93fe22a1d3266b80dcfe5ab5
Former-commit-id: d4b6ad1eee [formerly d4b6ad1eee [formerly 75c1037145b0aec9cd5e0c0707f0904f4b703bc3]]
Former-commit-id: cc2998b487
Former-commit-id: ce583a88fb
|
2013-11-07 11:44:07 -06:00 |
|
David Gillingham
|
50f9ad420b
|
Issue #2476: Fix indent error in SmartScript._getGridsResult().
Change-Id: I625d9f0c6c47d51b0ec99bcdb1d8dadeeaddfe67
Former-commit-id: e1df69e312 [formerly e1df69e312 [formerly 9e190cf63a11fa641a60f13f8f93baec649d4893]]
Former-commit-id: 0e74638eb2
Former-commit-id: d0b188d577
|
2013-11-07 11:36:49 -06:00 |
|
Nate Jensen
|
acec588299
|
Merge "Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common" into development
Former-commit-id: f5feb9330f [formerly f5feb9330f [formerly 3f1ac5ed48b694da9dc1cd0067db9e584d4520e1]]
Former-commit-id: 38a5ae5e5f
Former-commit-id: 1b7ac545f8
|
2013-11-07 10:21:42 -06:00 |
|
Steve Harris
|
930b6ddb77
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 108a4d908d [formerly 108a4d908d [formerly b0aa5782ea932919ad3e67d460c4809a664b1e08]]
Former-commit-id: 1b3d4c8f67
Former-commit-id: 50d60d8101
|
2013-11-06 18:31:05 -06:00 |
|
Bryan Kowal
|
b04aa07437
|
13.5.3 build "fix"
Former-commit-id: 6692b985f3 [formerly 6692b985f3 [formerly 084e906e9f85ebd11cabf6e14e94ac75d25a0af2]]
Former-commit-id: a28133117c
Former-commit-id: ce6d80409d
|
2013-11-06 18:25:10 -06:00 |
|
Nate Jensen
|
0ae0e070c9
|
Merge "Issue #2493 remove mesowest." into development
Former-commit-id: 0f4ba6f90e [formerly 0f4ba6f90e [formerly 2c506552014e60344c5b2014bed32edab2630f47]]
Former-commit-id: 1da0e31b88
Former-commit-id: aef895c447
|
2013-11-06 17:07:10 -06:00 |
|
Bryan Kowal
|
46616c32eb
|
Fix 13.5.3 build; eliminate mix of EDEX and CAVE features
Former-commit-id: 4f1c083032 [formerly 4f1c083032 [formerly 8a1605e74c716ae070028df42d61953a19ffefd6]]
Former-commit-id: bb15605aa2
Former-commit-id: 0bc8cdc9be
|
2013-11-06 15:57:14 -06:00 |
|
Lee Venable
|
5627ef0cc8
|
Merge "Issue #2358 - Move config file management code to the subscription manager dialog." into development
Former-commit-id: 8585080cd1 [formerly 8585080cd1 [formerly 13672783e6a5e452cb4105669a98708329b35541]]
Former-commit-id: 20726d4e7c
Former-commit-id: 0c4566c411
|
2013-11-06 15:42:40 -06:00 |
|
Max Schenkelberg
|
751b8f2315
|
Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common
Amend: Fixed precision issue with float comparison, made factory better synchronized.
Change-Id: Ie72d8d26ca5dc5ee1a0b5c14ca726edbee3bc1a2
Former-commit-id: 3369fbec2d [formerly 3369fbec2d [formerly ae724ecce3d4c65f8845f3278f9b5eeb5b04908a]]
Former-commit-id: c28fd2b38d
Former-commit-id: d53db3ddb6
|
2013-11-06 15:07:18 -06:00 |
|
Richard Peter
|
b52c9482ea
|
Merge "Issue #2499: Fix build" into omaha_13.5.3
Former-commit-id: 27aa0dd6ba [formerly 27aa0dd6ba [formerly 5dce49310b5a78e9895bade2ba3ebd48320593a0]]
Former-commit-id: 6ccb444219
Former-commit-id: f4bdb0caea
|
2013-11-06 13:44:11 -06:00 |
|
Ben Steffensmeier
|
afe014af99
|
Issue #2493 remove mesowest.
Former-commit-id: d0b7966458 [formerly d0b7966458 [formerly 9a2fe6fa13d424c254b4ed071b743837dfb2e702]]
Former-commit-id: 36916fedcd
Former-commit-id: baebe37ba6
|
2013-11-06 13:42:38 -06:00 |
|
Slav Korolev
|
b8ebc9ac63
|
Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects.
Former-commit-id: 076865bb61 [formerly 076865bb61 [formerly 04a119deb8248366e9efe9b5ac19c76e60a925e2]]
Former-commit-id: c25204d75b
Former-commit-id: 3223cd19cd
|
2013-11-06 14:38:55 -05:00 |
|
Steve Harris
|
647b908fed
|
14.1.1-7 baseline
Former-commit-id: 3328e2dd1d [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]
Former-commit-id: 4fff87723f
Former-commit-id: 48df058653
|
2013-11-06 14:16:14 -05:00 |
|
Roger Ferrel
|
df1dc51d0d
|
Issue #2478 Add debug infromation.
Change-Id: I830a760e2505a744da4962299bf97f46462f4784
Former-commit-id: 07a7dd63c3 [formerly 07a7dd63c3 [formerly db0434a66ca415554d1ab0c90586dc7358fd730d]]
Former-commit-id: e01b524542
Former-commit-id: 274d52a694
|
2013-11-06 13:13:02 -06:00 |
|
Richard Peter
|
3c129fb138
|
Issue #2499: Fix build
Change-Id: I6f5269e3fe424f1c7c77225f9b8aa70218c1845c
Former-commit-id: f3d8768b94 [formerly f3d8768b94 [formerly 037b2730e59d52f13d3cb3b50490a57b9befb2c1]]
Former-commit-id: c09f68615c
Former-commit-id: a653f9625a
|
2013-11-06 13:09:32 -06:00 |
|
Steve Harris
|
270c5f1a2d
|
14.1.1-6 baseline
Former-commit-id: 0cb2978c13 [formerly 0cb2978c13 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]
Former-commit-id: 6067af4252
Former-commit-id: 26da1ce793
|
2013-11-06 14:08:33 -05:00 |
|
Mike Duff
|
39dda9d18c
|
Issue #2358 - Move config file management code to the subscription manager dialog.
Change-Id: I61b8093b1306404006c5d01b73874997054c4f2f
Former-commit-id: e1180868e7 [formerly e1180868e7 [formerly 100fe3e61e5156dba32419005da4473bcd6d1e8b]]
Former-commit-id: 35c4911e7e
Former-commit-id: 7e28ffcaad
|
2013-11-06 12:00:04 -06:00 |
|
Bryan Kowal
|
748ab480fb
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.csh
rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.sh
rpms/awips2.core/Installer.tools/component.spec
rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh
rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh
Former-commit-id: 4bad21e6cd [formerly 4bad21e6cd [formerly 4ad10d4cc3b189c65352f0c205fe8664a52bf407]]
Former-commit-id: 3255bf3861
Former-commit-id: 76726372e5
|
2013-11-05 19:03:22 -06:00 |
|
Ben Steffensmeier
|
a97ec9b8e5
|
Issue #2485 Remove ncccfp
Change-Id: Ida05b2c7e1a3541603822b8b91bb635f9af3fa64
Former-commit-id: 5b53cb4c98 [formerly 5b53cb4c98 [formerly 619f054e44fe9689d178e9aa6fd6455915d7e99e]]
Former-commit-id: 1d35086e8d
Former-commit-id: 8aefe5ff02
|
2013-11-05 17:33:41 -06:00 |
|
Steve Harris
|
999fd5433c
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 2e0db025f3 [formerly 2e0db025f3 [formerly 1e8e1f73bdbb02ee2f8c91d4a2128ea0d77cf084]]
Former-commit-id: a956fd7f4d
Former-commit-id: 6d20cd89ff
|
2013-11-04 20:29:07 -06:00 |
|
Nate Jensen
|
27b1f123f0
|
Issue #2361 remove ISerializableObject from redbook and hydro
Change-Id: Ib48dea5d734f19a9919da9fea752b5e0f38a2141
Former-commit-id: 6064000389 [formerly 6064000389 [formerly 2626a79c976ac016352a091bdf66890e929edc85]]
Former-commit-id: b36d28c9fd
Former-commit-id: 3e3400dc7c
|
2013-11-04 14:30:00 -06:00 |
|
Ben Steffensmeier
|
a0f4c08cfd
|
Issue #2491 Clean a few more procedure only objects from ISerializableObject files.
Former-commit-id: ff5f08d23a [formerly ff5f08d23a [formerly 047e4cd82846adaf8fc3dcdfe087209bd57e210c]]
Former-commit-id: 5a928e6ad5
Former-commit-id: 08e73de883
|
2013-11-04 13:01:49 -06:00 |
|
Lee Venable
|
52da34fc55
|
Merge "Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler." into development
Former-commit-id: 0b3346d699 [formerly 0b3346d699 [formerly 325439c2d4243f775d3ccb8af7f332bf13d4aad0]]
Former-commit-id: 3e7b7cec8f
Former-commit-id: f6f1b16c0c
|
2013-11-02 10:43:48 -05:00 |
|
Slav Korolev
|
f8e429a1b9
|
Issue #2431. Changed labels on the table.
Former-commit-id: dd1ff63737 [formerly dd1ff63737 [formerly 5599d13b9cbac3806c636b629d502aacc1f621b4]]
Former-commit-id: 0801f8dedd
Former-commit-id: 7d0198b356
|
2013-11-01 15:06:19 -04:00 |
|
Steve Harris
|
8f9b121f90
|
13.5.3-4 baseline
Former-commit-id: 8aeae1c481 [formerly 8aeae1c481 [formerly 103d478433e8d0aad0599511c30ef0792f854d13]]
Former-commit-id: da7d1ce05e
Former-commit-id: b8d3fd62d0
|
2013-11-01 14:20:00 -04:00 |
|
Ron Anderson
|
84adff8e96
|
Merge "Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product." into development
Former-commit-id: 9e9dd04bfd [formerly 9e9dd04bfd [formerly 6346ae61d0639325fa199db525f4e34402b39224]]
Former-commit-id: cc991ed528
Former-commit-id: deb89a88f5
|
2013-11-01 11:07:39 -05:00 |
|
Slav Korolev
|
57fc9a2183
|
Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler.
Former-commit-id: 7ca47690af [formerly 7ca47690af [formerly 7d16b7dd07d83975366505140d7a8df2c5c89cf2]]
Former-commit-id: f7d1939b36
Former-commit-id: 386db59985
|
2013-11-01 11:03:06 -04:00 |
|
Nate Jensen
|
6164feb2da
|
Merge "Issue #2491 Fix collaboration Xml." into development
Former-commit-id: 43b2f50a0a [formerly 43b2f50a0a [formerly 311f84bcd1e10f9fd52df836673c9bb6012ee8a0]]
Former-commit-id: 0270e6bde3
Former-commit-id: 47fc100053
|
2013-10-31 18:11:13 -05:00 |
|
Bryan Kowal
|
70d4374ce8
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cots/org.jep.linux64/libjep.so
Former-commit-id: 49422aea62 [formerly 49422aea62 [formerly ecb1c0da101c986ef21bb8514660605926303a71]]
Former-commit-id: d08a652e23
Former-commit-id: adb62df96a
|
2013-10-31 15:43:29 -05:00 |
|
Bryan Kowal
|
eaaa3d022c
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/bundles/StationPlot.xml
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
nativeLib/ncep_grib2module/.cproject
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: feaacd9356 [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]
Former-commit-id: c8d7a32e2e
Former-commit-id: d366e70934
|
2013-10-31 15:34:46 -05:00 |
|
David Gillingham
|
5df42898ad
|
Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product.
Change-Id: Id5aede1ba07019150b3a43b45f067a5740d657af
Former-commit-id: 6e1cca2966 [formerly 6e1cca2966 [formerly 194799b7d3fb719987523a77ba9b3c69a11bb69f]]
Former-commit-id: c4f5cc53bb
Former-commit-id: 3bac577a31
|
2013-10-31 14:07:20 -05:00 |
|
Ben Steffensmeier
|
a0e805ded6
|
Issue #2491 Fix collaboration Xml.
Former-commit-id: 3d36cec7be [formerly 3d36cec7be [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]]
Former-commit-id: fdeff81da2
Former-commit-id: 49ffb7e92c
|
2013-10-31 14:06:37 -05:00 |
|
Ron Anderson
|
e3a0440825
|
Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c
Former-commit-id: 38e33092a2 [formerly 38e33092a2 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]]
Former-commit-id: 42e924e021
Former-commit-id: eef9d2dfb0
|
2013-10-31 14:04:55 -05:00 |
|
Nate Jensen
|
c24d8c63cd
|
Merge "Issue #2491 Bug fixes and clean up all remaining resource datas. Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6" into development
Former-commit-id: ccf3d5b1e9 [formerly ccf3d5b1e9 [formerly fc3adf193a8afacfec4c36feae4a3f1384119922]]
Former-commit-id: de50a9214b
Former-commit-id: d6fcc98e76
|
2013-10-31 12:24:23 -05:00 |
|
Steve Harris
|
5be6e21405
|
13.5.3-3 baseline
Former-commit-id: baa036cd62 [formerly baa036cd62 [formerly c261e0753eb106a2912314056a1b4903695750c5]]
Former-commit-id: 1503847a4b
Former-commit-id: 6b879b2465
|
2013-10-31 12:52:07 -04:00 |
|
Richard Peter
|
300f907c46
|
Merge "Issue #2292 - refactor and move overlap/duplicate checks to edex. Peer review comments" into development
Former-commit-id: 3139055873 [formerly 3139055873 [formerly 1f07e88f442c0426a9006a2f139d6eef9395ad51]]
Former-commit-id: b482eb2b48
Former-commit-id: 73462fa134
|
2013-10-31 11:46:25 -05:00 |
|
Mike Duff
|
26ca1b4d72
|
Issue #2292 - refactor and move overlap/duplicate checks to edex.
Peer review comments
Change-Id: I33df9cc7e368778943e25420d18b343781304c7a
Former-commit-id: f123fa11f5 [formerly f123fa11f5 [formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]]
Former-commit-id: 3fc811102e
Former-commit-id: 4da0648461
|
2013-10-31 09:22:50 -05:00 |
|