Commit graph

199 commits

Author SHA1 Message Date
Roger Ferrel
76011cb3eb Issue #3516 ColorMapTree change listener now only gets colormaps changes.
Change-Id: Id19d0c0e958ec64a19abc064817780d067add023

Former-commit-id: 28347129a1 [formerly bb265611d13e6cb9812aca3966d9fe2a20990a36]
Former-commit-id: fa91c4ac44
2014-09-12 15:03:13 -05:00
Roger Ferrel
fffec40c30 Issue #3516 - Get Color Maps for levels off the dispatch thread.
Change-Id: Icc89f4860eef0b0b404e1e5b66bb0178eedd73dc

Former-commit-id: 246bc4770f [formerly a67a429eb2d266e66a99b6c18916193cd0d20d9d]
Former-commit-id: c885873b25
2014-09-11 14:36:50 -05:00
Ben Steffensmeier
3c4285fea1 Issue #3604 Fix NPE in Imaging Dialog.
Former-commit-id: ed7b816989 [formerly e2043fd8034dde47963a32108b1475ee7db1ea18]
Former-commit-id: 15f35e6dcc
2014-09-10 14:43:23 -05:00
Brian Clements
372a2ba352 Issue #3480 added info logging when procedures are loaded or perspective changes
Change-Id: Ib342ace7c86cf71b0d548dafb7b57b6c9a421624

Former-commit-id: 3bb860eda5 [formerly c3155a4633e8da5f852667a2af5982fb24438623]
Former-commit-id: dd0d6097a5
2014-08-11 11:05:57 -05:00
Brian Clements
b8a0a60df6 Issue #2903 prevent shared display crash from missing point style enum value
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173

Former-commit-id: 5d03048fff [formerly 5d298b39786d37aa365ccfe2c337214d1e46f1a9]
Former-commit-id: 9946f78241
2014-06-17 17:01:23 -05:00
Steve Harris
3de24b7b07 Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml

Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66

Former-commit-id: 3b16bbafb1 [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]
Former-commit-id: 99bc6f990c
2014-05-27 14:48:24 -04:00
brian.dyke
9626317825 Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Former-commit-id: 58683ad040 [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]
Former-commit-id: 011d121e4b
2014-05-19 09:45:37 -04:00
Brian.Dyke
f38d0138e6 Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: d3fa10028c [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]
Former-commit-id: 627541512d
2014-05-14 16:08:16 -04:00
Steve Harris
9e149df799 Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
	edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml

Former-commit-id: 1c8f2f6185 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]
Former-commit-id: 6ef3b9f1e5
2014-05-05 08:21:02 -05:00
Lee Venable
a8ab7f3946 Issue #3053 - added check for selected items.
Change-Id: Iba7dff4291679524b03518790b0e183c3a980934

Former-commit-id: e054a7ab98 [formerly ca47394d9578aac17d1696bd78c0fbcee5fe3f8f]
Former-commit-id: 573465f316
2014-04-28 15:24:26 -05:00
Brian.Dyke
eff27f5504 Merged 13.5.5 -2 and -3 into 1412
Former-commit-id: e82fc8f89c [formerly 4e921dbeab89e61635144b441ae0015155376c59]
Former-commit-id: a19f01c620
2014-04-24 13:01:50 -04:00
Lee Venable
41cd3242f5 Issue #3053 - updated list selection dialog to be more configurable and fixed subset action.
Change-Id: Ib65472679cf5c04f8c11b8fe3fe552058d9e6986

Former-commit-id: 765d2e80bc [formerly 4554f647e0f6de78f5ade64e1371fc8d9ba6a65c]
Former-commit-id: 331dc3397f
2014-04-23 14:07:29 -05:00
brian.dyke
c7d785d503 Merge branch 'master_14.3.1' into asm_14.3.1
Conflicts:
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java

Former-commit-id: 24316a7f66 [formerly 3f3c0a55218af9f27abce65c0ec3e8704485c36e]
Former-commit-id: 805af72ef8
2014-04-22 16:50:57 -04:00
Lee Venable
6b0468f07e Issue #3037 - Add dispose check in runAsync call.
Change-Id: I13c7475f8c56f677f3dbdfab8d6000061db86f9f

Former-commit-id: 7386d4b318 [formerly c511ef6d5566f0e1d9ae3d5ea886abbf1159d41a]
Former-commit-id: 33fc376f33
2014-04-16 15:40:46 -05:00
Qinglu.Lin
6741deb3c2 ASM #505 - Color table editor does not allow enough significant digits
Change-Id: I2b98ec0de0ebef7b585574d063ddf87834edd44a

Former-commit-id: 18804fe98e [formerly 2b9cb3e46fbd1598e95a4ea3a866741fed6603d9]
Former-commit-id: 3bae853360
2014-04-11 12:22:44 -04:00
Mike Duff
a58f279b54 Issue #2864 - Change how saved subset files are stored.
Change-Id: I57c68196a633a55a6f9c1548eff7ad449fadb88c

Former-commit-id: 890faf2d73 [formerly 3052e5f92f4150fa82bfd93f512bb1670f926ec1]
Former-commit-id: 82cf444d6f
2014-04-11 08:27:42 -05:00
Nate Jensen
0da28c9c7a Merge "Issue #2950 Add option to interpolate image colors." into development
Former-commit-id: d729cc70af [formerly 1db00446a00b6cd268b169871eadd1bef407e268]
Former-commit-id: 1f2809ced0
2014-04-09 11:20:59 -05:00
Ben Steffensmeier
9d7504e2c3 Issue #2950 Support dynamic color counts for color map editing.
Former-commit-id: c805a5fed7 [formerly 85528bf2bbdbbaacc9631b76ef710e9fd0210110]
Former-commit-id: c5a48642eb
2014-04-08 15:27:57 -05:00
Ben Steffensmeier
c2e028f178 Issue #2950 Add option to interpolate image colors.
Former-commit-id: 525cf4053f [formerly 5bb0c1e3cc65fc86b48565603f2f78a4ad1e1be7]
Former-commit-id: bd3ad2a477
2014-04-08 15:19:00 -05:00
Brian.Dyke
3186434368 Merge branch 'omaha_14.2.2' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.2 into master_14.2.2
Former-commit-id: 1f5c6139e3 [formerly 5dbe50379db1558323dff2ffdc541cd81adfea4b]
Former-commit-id: 6e515eb334
2014-04-01 14:29:33 -04:00
Steve Harris
29f4f53d27 Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development
Former-commit-id: 656ae897c1 [formerly eeb50c8acbe727769ed7f14b63b94af5b14bbf3f]
Former-commit-id: a70710b467
2014-03-26 16:19:26 -05:00
Steve Harris
d940427408 Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: e5910b6c60 [formerly b0b18895aa445ee9b29674443529558b2141c042]
Former-commit-id: 53f91fdeea
2014-03-26 16:13:59 -05:00
Brian.Dyke
027cca8673 Fixed comment merge conflicts added .gitignore
Former-commit-id: a0e7cb624a [formerly 6093428342170b9fd8deb741a5721375e80bc955]
Former-commit-id: 7cc471a9c9
2014-03-25 15:41:58 -04:00
Brian.Dyke
c085bc6879 OB_14.1.1-25 baseline
Former-commit-id: 074abeb0fa [formerly dd2417b58b33005985f80cc83b45134132b3e5a1]
Former-commit-id: c67833407c
2014-03-25 13:55:54 -04:00
Lee Venable
75504da2bc Issue #1426 - fixed arrow buttons and simplified the code.
Former-commit-id: 4c80552979 [formerly fc55337ba9768a7b9e6ecde11f8c8ddfd32c4859]
Former-commit-id: 702ebe6881
2014-03-24 14:08:49 -05:00
Max Schenkelberg
59434c8a60 Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
Amend: Added comments and cleaned up preference store

Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d

Former-commit-id: cbf8b9249c [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]
Former-commit-id: a01a6d68d0
2014-03-04 09:23:36 -06:00
Mike Duff
7d14383bed Issue #2842 - Fix MPE tearoff menu issues, add next/prev hr toolbar buttons
Change-Id: Ic16bc87680918a1a462bcd5373e8f92faf6d905d

Former-commit-id: 42982306ab [formerly 048b3ab40864d13baa7bcd9c8aef04564ec8a5f9]
Former-commit-id: 801abc37a2
2014-02-27 12:01:30 -06:00
Ben Steffensmeier
27fbb0f870 Issue #2312 Java 6 compatibility, fix legend menus.
Former-commit-id: fe5f0118da [formerly 2853536477d39459de3cbb4eef7670734cfad5f8]
Former-commit-id: 7ab61aaa23
2014-01-30 16:12:10 -06:00
Ben Steffensmeier
b70faf1f7d Issue #2312 Add ability to export gif and image export dialog.
Change-Id: I10aaeba20a4acc7888cd566107ffff3e6a4fad05

Former-commit-id: 4ad4b4a859 [formerly e2159c422ca93aa76c6ba7a30a09234e8f9da4ce]
Former-commit-id: fc1c56f9cb
2014-01-21 18:09:13 -06:00
Max Schenkelberg
1256748c42 Issue #2620 Fixed manifest issues for baseline p2 export
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3

Former-commit-id: 87a6db7853 [formerly aaf90365b8855551b0cc22a8a95ae7e0b55f52ff]
Former-commit-id: 68aa666045
2014-01-20 13:54:27 -06:00
Ben Steffensmeier
76414243ba Issue #2313 Image canvas rendering.
Change-Id: I121b61c954a27249c29f3d34c8674193af8c2417

Former-commit-id: 16c350f0c6 [formerly 0f8d0c52093a14d16a36ce353c2587633474007d]
Former-commit-id: 625aac3ed3
2014-01-16 17:05:16 -06:00
Brian Clements
c63c8e2fc6 Issue #2594 added low memory warning job
UiPlugin starts and stops job
job notifies perspective manager of low memory
Viz perspective manager has default alert implementation
D2D and GFE override alert message
added memory threshold property to product files


Former-commit-id: 0076ec9aaf [formerly 4af42d405d3bf24b00c027f5dab8faf500a9e5b7]
Former-commit-id: f9a8b68da5
2014-01-14 17:05:28 -06:00
Ben Steffensmeier
13da8899de Issue #2647 Fix window focus problems.
Former-commit-id: 488d5e45b1 [formerly 4b0053b20060ead87b34895ee7d03a4b6317c8fc]
Former-commit-id: 2b9e9a41db
2014-01-09 15:14:38 -06:00
Richard Peter
b3b23647b4 Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	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/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs

Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a

Former-commit-id: a0b6ea8bb2 [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]
Former-commit-id: 0c4ae068ad
2013-12-05 12:12:27 -06:00
Steve Harris
337b138200 14.1.1-11 baseline
Former-commit-id: 71ae71c850 [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]
Former-commit-id: 70a6f1936e
2013-12-02 17:10:10 -05:00
Ben Steffensmeier
8a7d3ceab1 Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0

Former-commit-id: 3696896b49 [formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]
Former-commit-id: 927801985a
2013-11-25 11:31:57 -06:00
Nate Jensen
2c0c20f01e Issue #2361 remove using SerializationUtil for processing XML colormaps
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7

Former-commit-id: 7a73c65430 [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]
Former-commit-id: b52bdb1cec
2013-11-12 10:37:54 -06:00
Max Schenkelberg
2f794486e3 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: bd903f6641 [formerly 58ccc575973ea9a1778659e17daff8577747dec5]
Former-commit-id: e58a5df04b
2013-11-11 11:09:00 -06:00
Nate Jensen
b17891ba0e Merge "Issue #2491 Bug fixes and clean up all remaining resource datas. Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6" into development
Former-commit-id: de50a9214b [formerly fc3adf193a8afacfec4c36feae4a3f1384119922]
Former-commit-id: ccf3d5b1e9
2013-10-31 12:24:23 -05:00
David Gillingham
c58160c9a9 Issue #1843: Return status back to client when contacting one of the
configured ETN partners fails.

Change-Id: I5bd49f6930c317ba21725ff53f6ab65d548f037c

Former-commit-id: b7b29a1fdb [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]
Former-commit-id: 297fd6c3d4
2013-10-30 11:34:46 -05:00
Ben Steffensmeier
e15fecc459 Issue #2491 Bug fixes and clean up all remaining resource datas.
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6

Former-commit-id: 27a392f90e [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]
Former-commit-id: 5b395f7417
2013-10-29 17:35:55 -05:00
Mike Duff
2d7c38290e Issue #2430 - Implement the percent used bandwidth utilization graph.
Change-Id: Iad1d750ec1bb0a66a833f8358e27a80d0d6b42c5

Former-commit-id: 25e4a4741c [formerly 5b628ac782fc8b76729c74fe8bf995a7fc634aaa]
Former-commit-id: 6d5f697300
2013-10-29 13:49:47 -05:00
Ben Steffensmeier
a935ffadf7 Issue #2491 Use reflections to build Procedure JAXB context.
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b

Former-commit-id: fa0a0619bc [formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]
Former-commit-id: bfc3faf08f
2013-10-24 11:28:06 -05:00
Richard Peter
1f772816de Merge "Issue #2386 - Implement the front end for multiple data type overlap rules Peer review comments" into development
Former-commit-id: c056c93104 [formerly 581cc8e7319216c910e71936820f7414d2281fed]
Former-commit-id: d8b49516dc
2013-10-14 11:15:40 -05:00
Mike Duff
c4e501aaf9 Issue #2386 - Implement the front end for multiple data type overlap rules
Peer review comments

Change-Id: I1f0186b3e08f3013a6dc4dc3dbf7c2e0a19404bf

Former-commit-id: a69120c623 [formerly 69a5242579fdeacceba5ed2ce73be01e671328ae]
Former-commit-id: a220ff05b0
2013-10-11 18:18:18 -05:00
Max Schenkelberg
b64050ff1e Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104.
Amend: Accepted ticket, cleanup, comments

Change-Id: I78649dd0268b030624888544740a8d7af3e83e97

Former-commit-id: 01c0e022d5 [formerly fb196f5b8659e568ea1406cc5c5e01aa82525a76]
Former-commit-id: 7a66a3c995
2013-10-11 10:21:37 -05:00
Lee Venable
f94bcf4776 Merge "Issue #2421 optimize color map loading. Change-Id: I871ddf0f3eabee0e27d858e2cfa897563875c304" into development
Former-commit-id: c01eb85e53 [formerly 7139b6fe32b6de8c87c96e3b55d6ad83f11b149a]
Former-commit-id: eeee5c7948
2013-10-07 13:56:50 -05:00
Ben Steffensmeier
bae5c951d4 Issue #2421 optimize color map loading.
Change-Id: I871ddf0f3eabee0e27d858e2cfa897563875c304

Former-commit-id: 4e998f2576 [formerly ce15657bc794afe819d729121bc202b4f43b97d6]
Former-commit-id: f4c616fbff
2013-10-07 12:04:19 -05:00
Lee Venable
ae23948831 Issue #2419 - fixed issue with DualList and how it was being used.
Former-commit-id: 9c02d45802 [formerly 7020ca52e6e22a68013de74bc9891ad44942c48a]
Former-commit-id: 0758d67964
2013-09-27 15:07:02 -05:00
Ben Steffensmeier
ecf667fce9 Issue #2310 Switch awipstools to load using bundles.
Change-Id: I9a24e6359bd43bfb7c8f84686348f532748503c4

Former-commit-id: 87b6474106 [formerly afc80cb00cce9b22f1ecd730b60da1de1afbfb2e]
Former-commit-id: d75fdcb916
2013-09-04 16:05:09 -05:00