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
Max Schenkelberg
d20958ae92
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: ea26d0de84126be0cfe5
2013-03-22 10:54:44 -05:00
David Gillingham
c3ce4058a0
Issue #1447 : Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
...
localVTECPartners.py to ServiceBackup.
Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3
Former-commit-id: 79a1520baf4aeeb1ce25
2013-03-22 10:39:13 -05:00
Steve Harris
4fc2bb7bba
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: e2496455b20379be06d2
2013-03-20 16:09:26 -05:00
Steve Harris
31044eabd1
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: fa15f03e1bdc419068f0
2013-03-20 16:06:20 -05:00
Steve Harris
7c2e617d26
13.3.1-10 baseline
...
Former-commit-id: 073687d9a97078eec1b1
2013-03-20 15:53: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
Dustin Johnson
1b82ad0dc4
Issue #1794 Consolidate common filename filters into FilenameFilters class
...
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: ecb0d2c82643a9f608ef
2013-03-15 11:51:58 -05:00
Nate Jensen
a933532ad9
Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1
...
Former-commit-id: 29b4cd2fb5490ffe2772
2013-03-14 09:48:16 -05:00
Ben Steffensmeier
8f6a7c0746
Issue #1792 Improve performance of gfe parm time weighted average.
...
Change-Id: I139c873175ee1dbe29968c90e193701122abcead
Former-commit-id: 22624ba5d352c167cf00
2013-03-13 18:52:52 -05:00
Ron Anderson
a7b6e1689b
Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1
...
Former-commit-id: 3b6560837361f74305e2
2013-03-13 17:16:37 -05:00
Ben Steffensmeier
7abf3cfb39
Issue #1791 Implement bulk getGrids to improve performance.
...
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74
Former-commit-id: 4c150b0fd689eb902284
2013-03-13 17:09:20 -05:00
Dave Hladky
160e1594b8
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 38b952a2205dc454c7ef
2013-03-13 13:56:33 -05:00
Steve Harris
31c0a97dca
13.3.1-7 baseline
...
Former-commit-id: a72254cc75e12ed113ae
2013-03-13 09:50:28 -05:00
Steve Harris
b9563da8a8
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: d5b80f9225aa0e9acefd
2013-03-05 12:29:44 -06:00
Ron Anderson
78a8d8f1a1
Issue #1597 Provide valid default settings. Deploy gfe.xml config file.
...
Change-Id: Ic34e231a8f10ba55051b89f6081f081b402a01c8
Former-commit-id: fdeb45705be8f1b460ce
2013-03-04 09:30:04 -06: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
a5195e137e
Issue #1597 Moved some interpolation messages to Performance Log for consistency.
...
Change-Id: I1bd047ada89b0e9876549c6153d06c82e4dfc5c8
Former-commit-id: c9ca7a2943079cdbcb29
2013-02-27 14:45:30 -06:00
Ron Anderson
5bd0dbcfca
Issue #1708 Clean up error handling for scripts with errors. Remove some verbose logging.
...
Change-Id: Ic05b985cf6cb79299fb55dc9eee4b3205ed3fb27
Former-commit-id: 36be1c5850c35e06d82c
2013-02-27 12:34:40 -06:00
Max Schenkelberg
6b1426dd34
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: 4ed4ef8d71e0ba97d547
2013-02-27 11:50:38 -06:00
Ron Anderson
84bd642290
Issue #1708 Fix redundant excution of evaluateQuery.
...
Change-Id: Ic41ac2b455755a59c189fa5ec0ca63b45bfca80a
Former-commit-id: a5a273c1c2274ce762d8
2013-02-26 19:00:56 -06:00
Ron Anderson
77fbbb6a61
Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
...
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765
Former-commit-id: bfe3c684dff37999b1eb
2013-02-26 18:44:51 -06:00
Matt Nash
51e6302178
Issue #1506 fix deadlock and edit areas showing up from query
...
Change-Id: I1a8f8adbb4a6e737c06a6c906cd4db0926254b49
Former-commit-id: c728f72ea3b749edca54
2013-02-26 12:20:08 -06:00
Steve Harris
0051276ad1
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 67f090638f6ec9e73035
2013-02-25 15:58:48 -06:00
Steve Harris
33dd2589f1
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: a0573644c42641d578e2
2013-02-21 15:41:39 -06:00
Matt Nash
5d6a7a6140
Issue #1506 fix for GFE evaluateRefSet() for non-queries
...
Change-Id: I342ce5c5e0449b7f5f4f81865705ed55aff3c5a7
Former-commit-id: 2001d916ac492df9c238
2013-02-21 09:01:33 -06:00
Steve Harris
46d28be4a4
13.3.1-1 baseline
...
Former-commit-id: 71e8990021d2a654625f
2013-02-20 16:19:40 -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
Ron Anderson
999ac02aea
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: e70cfc5825a6d87cdd7e
2013-02-18 08:31:50 -06:00
Richard Peter
2299503559
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: 51533ccab270f270ff16
2013-02-15 16:40:04 -06:00
David Gillingham
244bc9b270
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: 871364d630da091b723d
2013-02-15 12:50:48 -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
Matt Nash
d29162c654
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: bc954889eb5b136272a3
2013-02-14 11:47:34 -06:00
David Gillingham
874434cea9
Issue #1515 : Better handle notifications received after disposing VCParms.
...
Change-Id: Ia73102329755303b504871ed55f2a294ef390126
Former-commit-id: 5b4de19ebdddcc84262a
2013-02-13 11:08:20 -06:00
Steve Harris
30d38334cc
13.2.1-6 baseline
...
Former-commit-id: d0752de66ca46e33f06e
2013-02-07 16:00:39 -06:00
Steve Harris
3ad515e28f
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: 4bc8e9ab5c5ee47e098d
2013-02-06 11:12:01 -06:00
Steve Harris
28ddc9bad8
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: a16ac7819c6c6b53679b
2013-02-06 11:08:53 -06:00
Steve Harris
1c602ec3a7
13.2.1-5 baseline
...
Former-commit-id: 232734091d146fcc6da8
2013-02-06 11:02:32 -06:00
Steve Harris
4a745c9483
13.2.1-5 baseline
...
Former-commit-id: a11ab8f26ed26a488ee4
2013-02-04 16:31:26 -06:00
Steve Harris
2998f750f4
13.2.1-4 baseline
...
Former-commit-id: 8f2e7d44370d7f53b6f4
2013-01-31 11:40:31 -06:00
Steve Harris
6383bf8ed2
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: 658bea377bec56acde81
2013-01-31 10:19:14 -06:00
Steve Harris
513d49939f
Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
...
Former-commit-id: 0505ed0a726040272573
2013-01-29 15:57:21 -06:00
Steve Harris
3edfa1e0be
13.2.1-3 baseline
...
Former-commit-id: f45120a1f47a739c6a5b
2013-01-29 15:52:43 -06:00
Ron Anderson
d61a24410a
Issue #1535 Fix GFE saving last block of grids twice
...
Change-Id: I3411e27c96b5f0dd79c24e7ba75361582cb6652c
Former-commit-id: aa2c0ffb605738910b71
2013-01-28 19:23:23 -06:00
Steve Harris
25fecb8b4f
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: f673583915827611474f
2013-01-25 10:54:51 -06:00
