Ron Anderson
5bb47b7931
Issue #1774 Fix D2D accumulative parameter time ranges
...
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1
Former-commit-id: aee839a85ec68c7eb80ef1e7236af6cb4666372b
2013-03-28 13:37:29 -05:00
Steve Harris
5fcfaf4360
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: 99cd1f52511023794d9dcb21c68720c4e47faec5
2013-03-26 12:47:40 -05:00
Steve Harris
e71c69c383
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Former-commit-id: 741a32d9209897e84da068626d28c7d7af47f9c1
2013-03-26 12:44:24 -05:00
Steve Harris
c77a452f5a
13.3.1-13 baseline
...
Former-commit-id: 9c263e3ffc35677d7015158e06b64f376e7f801d
2013-03-26 12:43:07 -05:00
Steve Harris
fd71e44f0f
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: d0ce26b91945ae5388028c312cbafd314d57c0e6
2013-03-26 10:12:34 -05:00
Mike Duff
5d72795e1b
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: 98d23aed31d7226576943b6da0b1a0bcdc1eef58
2013-03-26 09:19:39 -05:00
Steve Harris
0be473728a
13.3.1-12 baseline
...
Former-commit-id: 1f109861760e5fbc9d7a13cc4f518341cbc31276
2013-03-25 13:27:13 -05:00
Max Schenkelberg
ea26d0de84
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: eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae
2013-03-22 10:54:44 -05:00
David Gillingham
79a1520baf
Issue #1447 : Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
...
localVTECPartners.py to ServiceBackup.
Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3
Former-commit-id: 0b047a505ce4ed442af9de3a3cfeea5bf1e6c872
2013-03-22 10:39:13 -05:00
Steve Harris
e2496455b2
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: 67b25fa95817acafd25818c825656236597b6e09
2013-03-20 16:09:26 -05:00
Steve Harris
fa15f03e1b
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: c789962e3ddb094ca93415864e9f1b8ed0619ba4
2013-03-20 16:06:20 -05:00
Steve Harris
073687d9a9
13.3.1-10 baseline
...
Former-commit-id: b48761e6f964bc7448439c1b69f85d75593ef90d
2013-03-20 15:53:01 -05:00
Steve Harris
b8f0635ad6
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: 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40
2013-03-18 16:52:00 -05:00
Steve Harris
1a999fee5a
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: 5927ff20543395733d9302eba2e6772315730a80
2013-03-18 16:43:22 -05:00
Steve Harris
f97d78994b
13.3.1-8 baseline
...
Former-commit-id: 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6
2013-03-18 15:43:32 -05:00
Dustin Johnson
ecb0d2c826
Issue #1794 Consolidate common filename filters into FilenameFilters class
...
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: 0e4c9f6ef22bf59f18ce3aab6539c52192539106
2013-03-15 11:51:58 -05:00
Nate Jensen
29b4cd2fb5
Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1
...
Former-commit-id: 086546a518276d519aca779d55c160f4f8bcd577
2013-03-14 09:48:16 -05:00
Ben Steffensmeier
22624ba5d3
Issue #1792 Improve performance of gfe parm time weighted average.
...
Change-Id: I139c873175ee1dbe29968c90e193701122abcead
Former-commit-id: 61bdd593778588a18b91be3aa3af07ef28ca2412
2013-03-13 18:52:52 -05:00
Ron Anderson
3b65608373
Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1
...
Former-commit-id: 437a30971b299965540d47f572ad83cd0d7df120
2013-03-13 17:16:37 -05:00
Ben Steffensmeier
4c150b0fd6
Issue #1791 Implement bulk getGrids to improve performance.
...
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74
Former-commit-id: 907f19c70cbfff4f8b266339967cedfbf9907c97
2013-03-13 17:09:20 -05:00
Dave Hladky
38b952a220
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753
2013-03-13 13:56:33 -05:00
Steve Harris
a72254cc75
13.3.1-7 baseline
...
Former-commit-id: aa42eb84d41a7f0577ab8ce8555c0922833f96f1
2013-03-13 09:50:28 -05:00
Steve Harris
d5b80f9225
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: dd9a3152106c5e4eac6fb2de10f27528e5177810
2013-03-05 12:29:44 -06:00
Ron Anderson
fdeb45705b
Issue #1597 Provide valid default settings. Deploy gfe.xml config file.
...
Change-Id: Ic34e231a8f10ba55051b89f6081f081b402a01c8
Former-commit-id: 53a924067c39e7f92b2f3280acf2cb6d15e2af03
2013-03-04 09:30:04 -06:00
Ben Steffensmeier
f46686a6e2
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
...
Former-commit-id: 7c24d10acae9dee7ec03edd471983e0b80d58092
2013-02-28 17:00:56 -06:00
Ron Anderson
c9ca7a2943
Issue #1597 Moved some interpolation messages to Performance Log for consistency.
...
Change-Id: I1bd047ada89b0e9876549c6153d06c82e4dfc5c8
Former-commit-id: 4683ff00b8bc515fc2f802810fc2caba37c282d8
2013-02-27 14:45:30 -06:00
Ron Anderson
36be1c5850
Issue #1708 Clean up error handling for scripts with errors. Remove some verbose logging.
...
Change-Id: Ic05b985cf6cb79299fb55dc9eee4b3205ed3fb27
Former-commit-id: cb612d51394a261d12826d6d3ea9553f399ed2a9
2013-02-27 12:34:40 -06:00
Max Schenkelberg
4ed4ef8d71
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: 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b
2013-02-27 11:50:38 -06:00
Ron Anderson
a5a273c1c2
Issue #1708 Fix redundant excution of evaluateQuery.
...
Change-Id: Ic41ac2b455755a59c189fa5ec0ca63b45bfca80a
Former-commit-id: 2528719c05a9c57ca56a6d6e56ed3ae853d5b860
2013-02-26 19:00:56 -06:00
Ron Anderson
bfe3c684df
Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
...
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765
Former-commit-id: 0b4b49014598aeb94492d0b713afe17732c6e029
2013-02-26 18:44:51 -06:00
Matt Nash
c728f72ea3
Issue #1506 fix deadlock and edit areas showing up from query
...
Change-Id: I1a8f8adbb4a6e737c06a6c906cd4db0926254b49
Former-commit-id: 5fd67088da350141cc97d90346272843dfc7ff5d
2013-02-26 12:20:08 -06:00
Steve Harris
67f090638f
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 52683c1ffba08b80b0d1f2b619161e108ca598b8
2013-02-25 15:58:48 -06:00
Steve Harris
a0573644c4
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: e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c
2013-02-21 15:41:39 -06:00
Matt Nash
2001d916ac
Issue #1506 fix for GFE evaluateRefSet() for non-queries
...
Change-Id: I342ce5c5e0449b7f5f4f81865705ed55aff3c5a7
Former-commit-id: 2f9911c6e28fd3b5617353ec8de80c16f812c508
2013-02-21 09:01:33 -06:00
Steve Harris
71e8990021
13.3.1-1 baseline
...
Former-commit-id: 34684c71436ce4c395ea523eb34ded6792476816
2013-02-20 16:19:40 -06:00
Ron Anderson
f1ad632c3f
Merge "Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default. Change-Id: I48738965df0da9052f810dfc1f312ed032693390" into development
...
Former-commit-id: ec5be70336a0f6bb6874c51b72b67046fbde2c68
2013-02-19 18:46:16 -06:00
Steve Harris
ea50a5db77
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: 819f88fb8b26ec0a83164df82b31e9b824b49da8
2013-02-19 12:22:00 -06:00
Steve Harris
f81b382c04
13.2.1-8 baseline
...
Former-commit-id: f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669
2013-02-18 09:09:41 -06:00
Ron Anderson
e70cfc5825
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: a1e38ed2f2da79028b04589a548b16543700f08f
2013-02-18 08:31:50 -06:00
Richard Peter
51533ccab2
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: 07f3be5e44386a8138556b0269d3e731c6e1ef5f
2013-02-15 16:40:04 -06:00
David Gillingham
871364d630
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: 463af46e64ed667efbc840d85f9babf3449780cc
2013-02-15 12:50:48 -06:00
Ben Steffensmeier
aa4c7526ff
Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
...
Change-Id: I48738965df0da9052f810dfc1f312ed032693390
Former-commit-id: ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970
2013-02-14 15:34:25 -06:00
Matt Nash
bc954889eb
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: f6ef0f0ebc9002caad9a632515402b84280892fc
2013-02-14 11:47:34 -06:00
David Gillingham
5b4de19ebd
Issue #1515 : Better handle notifications received after disposing VCParms.
...
Change-Id: Ia73102329755303b504871ed55f2a294ef390126
Former-commit-id: ef9d97a4d0886df2072672b1cebc9b77e689308b
2013-02-13 11:08:20 -06:00
Steve Harris
d0752de66c
13.2.1-6 baseline
...
Former-commit-id: 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb
2013-02-07 16:00:39 -06:00
Steve Harris
4bc8e9ab5c
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: 30e1ae8f245a60c780fcc79f54795ece0b28088f
2013-02-06 11:12:01 -06:00
Steve Harris
a16ac7819c
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: 873c1773504d6dd9421b92f6193c32e477e4533c
2013-02-06 11:08:53 -06:00
Steve Harris
232734091d
13.2.1-5 baseline
...
Former-commit-id: c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092
2013-02-06 11:02:32 -06:00
Steve Harris
a11ab8f26e
13.2.1-5 baseline
...
Former-commit-id: d117c677ade20193836680bc7905ba7bbf9c67b2
2013-02-04 16:31:26 -06:00
Steve Harris
8f2e7d4437
13.2.1-4 baseline
...
Former-commit-id: d4fd198979dbc5d77a6bf836685cb658e7ac6cfe
2013-01-31 11:40:31 -06:00
