Commit graph

280 commits

Author SHA1 Message Date
Steve Harris
5bb29627dc Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: 4e54025fcd [formerly 5fcfaf4360] [formerly 65df96a419 [formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]
Former-commit-id: 65df96a419
Former-commit-id: 346b97a39a
2013-03-26 12:47:40 -05:00
Steve Harris
02147470db Merge branch 'master_13.3.1' into omaha_13.3.1
Former-commit-id: 85104939ac [formerly e71c69c383] [formerly 9ff8a94193 [formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]
Former-commit-id: 9ff8a94193
Former-commit-id: b926ff60b3
2013-03-26 12:44:24 -05:00
Steve Harris
4f2e9aec0d 13.3.1-13 baseline
Former-commit-id: 792171756f [formerly c77a452f5a] [formerly c65f3e68e5 [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]
Former-commit-id: c65f3e68e5
Former-commit-id: 822d05a709
2013-03-26 12:43:07 -05:00
Steve Harris
02105701a0 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: b0621d90bc [formerly fd71e44f0f] [formerly a23cecdb26 [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]
Former-commit-id: a23cecdb26
Former-commit-id: e96e95b565
2013-03-26 10:12:34 -05:00
Mike Duff
b366778df0 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: c1f7d33bb8 [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]
Former-commit-id: 9ebc7606b1
Former-commit-id: 4c3011edce
2013-03-26 09:19:39 -05:00
Steve Harris
f80f98cee2 13.3.1-12 baseline
Former-commit-id: be96282207 [formerly 0be473728a] [formerly aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: aaac0b51e5
Former-commit-id: bc439aee4f
2013-03-25 13:27:13 -05:00
Max Schenkelberg
850c8995cc Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe.
Amend: Moved Pair class into uf.common.util to reduce amount of duplicate code
Amend: Added hashCode/equals to Pair

Change-Id: I9a390989f6a7a7ee6618a57d0f50ec681a598dc0

Former-commit-id: 07ae94c499 [formerly ea26d0de84] [formerly 126be0cfe5 [formerly eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae]]
Former-commit-id: 126be0cfe5
Former-commit-id: d20958ae92
2013-03-22 10:54:44 -05:00
David Gillingham
c8c7fb4129 Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
localVTECPartners.py to ServiceBackup.

Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3

Former-commit-id: 8438c5af87 [formerly 79a1520baf] [formerly 4aeeb1ce25 [formerly 0b047a505ce4ed442af9de3a3cfeea5bf1e6c872]]
Former-commit-id: 4aeeb1ce25
Former-commit-id: c3ce4058a0
2013-03-22 10:39:13 -05:00
Steve Harris
8db98c2d71 Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: 0055a3213d [formerly e2496455b2] [formerly 0379be06d2 [formerly 67b25fa95817acafd25818c825656236597b6e09]]
Former-commit-id: 0379be06d2
Former-commit-id: 4fc2bb7bba
2013-03-20 16:09:26 -05:00
Steve Harris
f4e26fd94d Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: a9ced3a7ef [formerly fa15f03e1b] [formerly dc419068f0 [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]
Former-commit-id: dc419068f0
Former-commit-id: 31044eabd1
2013-03-20 16:06:20 -05:00
Steve Harris
e9f0328808 13.3.1-10 baseline
Former-commit-id: 57f4676b6c [formerly 073687d9a9] [formerly 7078eec1b1 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]
Former-commit-id: 7078eec1b1
Former-commit-id: 7c2e617d26
2013-03-20 15:53:01 -05:00
Steve Harris
2a26783ba7 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: 28ef804e1b [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 900b9aadde
2013-03-18 16:52:00 -05:00
Steve Harris
ea27f9cd17 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: 27c418812f [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 5927ff20543395733d9302eba2e6772315730a80]]
Former-commit-id: c18b96dc4c
Former-commit-id: 245afb28c8
2013-03-18 16:43:22 -05:00
Steve Harris
81a3f29afc 13.3.1-8 baseline
Former-commit-id: bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]
Former-commit-id: c15b3ffe20
Former-commit-id: 5f492500ea
2013-03-18 15:43:32 -05:00
Dustin Johnson
7adf94e9f6 Issue #1794 Consolidate common filename filters into FilenameFilters class
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36

Former-commit-id: fff7e7983f [formerly ecb0d2c826] [formerly 43a9f608ef [formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]]
Former-commit-id: 43a9f608ef
Former-commit-id: 1b82ad0dc4
2013-03-15 11:51:58 -05:00
Nate Jensen
e2e9a845d5 Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1
Former-commit-id: 9dbb7660a7 [formerly 29b4cd2fb5] [formerly 490ffe2772 [formerly 086546a518276d519aca779d55c160f4f8bcd577]]
Former-commit-id: 490ffe2772
Former-commit-id: a933532ad9
2013-03-14 09:48:16 -05:00
Ben Steffensmeier
2d622e6053 Issue #1792 Improve performance of gfe parm time weighted average.
Change-Id: I139c873175ee1dbe29968c90e193701122abcead

Former-commit-id: a9695abb45 [formerly 22624ba5d3] [formerly 52c167cf00 [formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]]
Former-commit-id: 52c167cf00
Former-commit-id: 8f6a7c0746
2013-03-13 18:52:52 -05:00
Ron Anderson
de14cd0baa Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1
Former-commit-id: 0c881b4a85 [formerly 3b65608373] [formerly 61f74305e2 [formerly 437a30971b299965540d47f572ad83cd0d7df120]]
Former-commit-id: 61f74305e2
Former-commit-id: a7b6e1689b
2013-03-13 17:16:37 -05:00
Ben Steffensmeier
f5680beaa9 Issue #1791 Implement bulk getGrids to improve performance.
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74

Former-commit-id: 37bae0988b [formerly 4c150b0fd6] [formerly 89eb902284 [formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]
Former-commit-id: 89eb902284
Former-commit-id: 7abf3cfb39
2013-03-13 17:09:20 -05:00
Dave Hladky
9e97fc9efe Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 765be278bb [formerly 38b952a220] [formerly 5dc454c7ef [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 160e1594b8
2013-03-13 13:56:33 -05:00
Steve Harris
ed5f1dbab6 13.3.1-7 baseline
Former-commit-id: 97d2f521e4 [formerly a72254cc75] [formerly e12ed113ae [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: e12ed113ae
Former-commit-id: 31c0a97dca
2013-03-13 09:50:28 -05:00
Steve Harris
4a0b8772ec Merge branch 'omaha_13.3.1' into development
Former-commit-id: 6b13492420 [formerly d5b80f9225] [formerly aa0e9acefd [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]
Former-commit-id: aa0e9acefd
Former-commit-id: b9563da8a8
2013-03-05 12:29:44 -06:00
Ron Anderson
fd86a481a7 Issue #1597 Provide valid default settings. Deploy gfe.xml config file.
Change-Id: Ic34e231a8f10ba55051b89f6081f081b402a01c8

Former-commit-id: f1d5ff7c9e [formerly fdeb45705b] [formerly e8f1b460ce [formerly 53a924067c39e7f92b2f3280acf2cb6d15e2af03]]
Former-commit-id: e8f1b460ce
Former-commit-id: 78a8d8f1a1
2013-03-04 09:30:04 -06:00
Ben Steffensmeier
334af0001b Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: d27d30c2db [formerly f46686a6e2] [formerly 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]
Former-commit-id: 2ca86633d6
Former-commit-id: 5068b18c6a
2013-02-28 17:00:56 -06:00
Ron Anderson
b2bffcf0de Issue #1597 Moved some interpolation messages to Performance Log for consistency.
Change-Id: I1bd047ada89b0e9876549c6153d06c82e4dfc5c8

Former-commit-id: f491d7f7c3 [formerly c9ca7a2943] [formerly 079cdbcb29 [formerly 4683ff00b8bc515fc2f802810fc2caba37c282d8]]
Former-commit-id: 079cdbcb29
Former-commit-id: a5195e137e
2013-02-27 14:45:30 -06:00
Ron Anderson
e240568bb9 Issue #1708 Clean up error handling for scripts with errors. Remove some verbose logging.
Change-Id: Ic05b985cf6cb79299fb55dc9eee4b3205ed3fb27

Former-commit-id: 50f5e44b39 [formerly 36be1c5850] [formerly c35e06d82c [formerly cb612d51394a261d12826d6d3ea9553f399ed2a9]]
Former-commit-id: c35e06d82c
Former-commit-id: 5bd0dbcfca
2013-02-27 12:34:40 -06:00
Max Schenkelberg
5617dfaa67 Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
Amend: Accepted ticket for work, again!  Ensured uframe product project was not deleted

Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719

Former-commit-id: 2611980ca4 [formerly 4ed4ef8d71] [formerly e0ba97d547 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]
Former-commit-id: e0ba97d547
Former-commit-id: 6b1426dd34
2013-02-27 11:50:38 -06:00
Ron Anderson
93382aeed8 Issue #1708 Fix redundant excution of evaluateQuery.
Change-Id: Ic41ac2b455755a59c189fa5ec0ca63b45bfca80a

Former-commit-id: 2212f333a3 [formerly a5a273c1c2] [formerly 274ce762d8 [formerly 2528719c05a9c57ca56a6d6e56ed3ae853d5b860]]
Former-commit-id: 274ce762d8
Former-commit-id: 84bd642290
2013-02-26 19:00:56 -06:00
Ron Anderson
541557e0b0 Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765

Former-commit-id: d43afc8c67 [formerly bfe3c684df] [formerly f37999b1eb [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]
Former-commit-id: f37999b1eb
Former-commit-id: 77fbbb6a61
2013-02-26 18:44:51 -06:00
Matt Nash
daea84a1e8 Issue #1506 fix deadlock and edit areas showing up from query
Change-Id: I1a8f8adbb4a6e737c06a6c906cd4db0926254b49

Former-commit-id: 4be89bdd43 [formerly c728f72ea3] [formerly b749edca54 [formerly 5fd67088da350141cc97d90346272843dfc7ff5d]]
Former-commit-id: b749edca54
Former-commit-id: 51e6302178
2013-02-26 12:20:08 -06:00
Steve Harris
e46625f8f2 Merge branch 'development' into omaha_13.3.1
Former-commit-id: 0a4564eb97 [formerly 67f090638f] [formerly 6ec9e73035 [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]
Former-commit-id: 6ec9e73035
Former-commit-id: 0051276ad1
2013-02-25 15:58:48 -06:00
Steve Harris
4f155a183a Merge branch 'development' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: 2641d578e2
Former-commit-id: 33dd2589f1
2013-02-21 15:41:39 -06:00
Matt Nash
84f3da4828 Issue #1506 fix for GFE evaluateRefSet() for non-queries
Change-Id: I342ce5c5e0449b7f5f4f81865705ed55aff3c5a7

Former-commit-id: 6f9621adb2 [formerly 2001d916ac] [formerly 492df9c238 [formerly 2f9911c6e28fd3b5617353ec8de80c16f812c508]]
Former-commit-id: 492df9c238
Former-commit-id: 5d6a7a6140
2013-02-21 09:01:33 -06:00
Steve Harris
e4435815c9 13.3.1-1 baseline
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
2013-02-20 16:19:40 -06:00
Ron Anderson
744391e3f6 Merge "Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default. Change-Id: I48738965df0da9052f810dfc1f312ed032693390" into development
Former-commit-id: 70050ac749 [formerly f1ad632c3f] [formerly 884d9ff787 [formerly ec5be70336a0f6bb6874c51b72b67046fbde2c68]]
Former-commit-id: 884d9ff787
Former-commit-id: 2c8d14406b
2013-02-19 18:46:16 -06:00
Steve Harris
81f1fb83a0 Merge branch 'omaha_13.2.1' (13.2.1-8) into development
Former-commit-id: c2327ce33d [formerly ea50a5db77] [formerly d123c044c3 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]
Former-commit-id: d123c044c3
Former-commit-id: 1c08acab38
2013-02-19 12:22:00 -06:00
Steve Harris
8cffb55371 13.2.1-8 baseline
Former-commit-id: 18da2e93d7 [formerly f81b382c04] [formerly 053156f02e [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]
Former-commit-id: 053156f02e
Former-commit-id: c6d584758f
2013-02-18 09:09:41 -06:00
Ron Anderson
292614bc25 Merge "Issue #1507: Improve responsiveness of menus that list smart tools or procedures by forcing UIControllers to be constructed at startup, not on demand." into development
Former-commit-id: cf0fc8d921 [formerly e70cfc5825] [formerly a6d87cdd7e [formerly a1e38ed2f2da79028b04589a548b16543700f08f]]
Former-commit-id: a6d87cdd7e
Former-commit-id: 999ac02aea
2013-02-18 08:31:50 -06:00
Richard Peter
1b112227a8 Merge "Issue #1506 move away from using QueryScript on the UI thread, except where absolutely necessary we can run a synchronous operation" into development
Former-commit-id: 5bf0e0e999 [formerly 51533ccab2] [formerly 70f270ff16 [formerly 07f3be5e44386a8138556b0269d3e731c6e1ef5f]]
Former-commit-id: 70f270ff16
Former-commit-id: 2299503559
2013-02-15 16:40:04 -06:00
David Gillingham
cc05bdae4e Issue #1507: Improve responsiveness of menus that list smart tools or procedures by forcing
UIControllers to be constructed at startup, not on demand.

Change-Id: Ifb492171ac4720e36f68da082c38d31c1de08132

Former-commit-id: 9fae6695e2 [formerly 871364d630] [formerly da091b723d [formerly 463af46e64ed667efbc840d85f9babf3449780cc]]
Former-commit-id: da091b723d
Former-commit-id: 244bc9b270
2013-02-15 12:50:48 -06:00
Ben Steffensmeier
086f6aabe9 Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
Change-Id: I48738965df0da9052f810dfc1f312ed032693390

Former-commit-id: 1940a92596 [formerly aa4c7526ff] [formerly 8c0e9d3d9e [formerly ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970]]
Former-commit-id: 8c0e9d3d9e
Former-commit-id: 455aa4628f
2013-02-14 15:34:25 -06:00
Matt Nash
126537966c Issue #1506 move away from using QueryScript on the UI thread, except where
absolutely necessary we can run a synchronous operation

Change-Id: I4503d4e18e3f458b7df7c2d187e8880d5a3d2cc7

Former-commit-id: 75f51be7b2 [formerly bc954889eb] [formerly 5b136272a3 [formerly f6ef0f0ebc9002caad9a632515402b84280892fc]]
Former-commit-id: 5b136272a3
Former-commit-id: d29162c654
2013-02-14 11:47:34 -06:00
David Gillingham
a6883700ee Issue #1515: Better handle notifications received after disposing VCParms.
Change-Id: Ia73102329755303b504871ed55f2a294ef390126

Former-commit-id: 02f2539433 [formerly 5b4de19ebd] [formerly ddcc84262a [formerly ef9d97a4d0886df2072672b1cebc9b77e689308b]]
Former-commit-id: ddcc84262a
Former-commit-id: 874434cea9
2013-02-13 11:08:20 -06:00
Steve Harris
bbe92e6824 13.2.1-6 baseline
Former-commit-id: d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: a46e33f06e
Former-commit-id: 30d38334cc
2013-02-07 16:00:39 -06:00
Steve Harris
b119d66cda Merge branch '13.2.1_delivery' into development
Former-commit-id: da43a7a8ca [formerly 4bc8e9ab5c] [formerly 5ee47e098d [formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]
Former-commit-id: 5ee47e098d
Former-commit-id: 3ad515e28f
2013-02-06 11:12:01 -06:00
Steve Harris
48a0ffda4d Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

Former-commit-id: 14f23d4227 [formerly a16ac7819c] [formerly 6c6b53679b [formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]
Former-commit-id: 6c6b53679b
Former-commit-id: 28ddc9bad8
2013-02-06 11:08:53 -06:00
Steve Harris
7497a15e22 13.2.1-5 baseline
Former-commit-id: a6b3cde1ff [formerly 232734091d] [formerly 146fcc6da8 [formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]
Former-commit-id: 146fcc6da8
Former-commit-id: 1c602ec3a7
2013-02-06 11:02:32 -06:00
Steve Harris
72ca459f76 13.2.1-5 baseline
Former-commit-id: d6a9d68c10 [formerly a11ab8f26e] [formerly d26a488ee4 [formerly d117c677ade20193836680bc7905ba7bbf9c67b2]]
Former-commit-id: d26a488ee4
Former-commit-id: 4a745c9483
2013-02-04 16:31:26 -06:00
Steve Harris
3f25b862c8 13.2.1-4 baseline
Former-commit-id: ae2859d5a2 [formerly 8f2e7d4437] [formerly 0d7f53b6f4 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]
Former-commit-id: 0d7f53b6f4
Former-commit-id: 2998f750f4
2013-01-31 11:40:31 -06:00
Steve Harris
73d9455c65 Merge branch '13.2.1_delivery' into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: c218786986 [formerly 658bea377b] [formerly ec56acde81 [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]
Former-commit-id: ec56acde81
Former-commit-id: 6383bf8ed2
2013-01-31 10:19:14 -06:00