Dustin Johnson
e0b6e6187e
Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development
...
Former-commit-id: 5b4035fb118363eba409
2013-03-19 13:09:48 -05:00
Dave Hladky
f0244f54a4
Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
...
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d
Former-commit-id: ddb23ae59f81ad1ce2ed
2013-03-19 13:08:14 -05:00
Bryan Kowal
54113e9b29
Issue #1805 - slightly modified viz feature build order
...
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569
Former-commit-id: f325038538f0eb7d3285
2013-03-18 18:15:26 -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
Bryan Kowal
66e2ed79ec
Issue #1741 - what was once two is now one
...
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts
Former-commit-id: b954bc17bf7fd035256d
2013-03-18 16:36:33 -05:00
Steve Harris
5f492500ea
13.3.1-8 baseline
...
Former-commit-id: f97d78994bc15b3ffe20
2013-03-18 15:43:32 -05:00
Dustin Johnson
55095f0041
Merge "Issue #1794 Consolidate common filename filters into FilenameFilters class" into development
...
Former-commit-id: b7a5311dde7fe3c254fd
2013-03-15 16:14:17 -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
Roger Ferrel
08990f97f8
Issue #1790 changes for non-blocking StationLegendDlg.
...
Change-Id: Ie3d632cf8f1a6f0e85b3b4758afe236f3022e91d
Former-commit-id: 0089e24579b01bb935c3
2013-03-15 10:26:30 -05:00
Roger Ferrel
006062502e
Issue #1790 changes for non-blocking StaffGageDlg.
...
Change-Id: I37d1d2358a91b1f8720888543fb5e05d9ce55092
Former-commit-id: 4230e1a9b817a41bf063
2013-03-15 09:00:00 -05:00
Roger Ferrel
7eae71038f
Issue #1790 changes for non-blocking PointPrecipAccumDlg and RiverSummaryDlg.
...
Change-Id: I96e958225b32ba818743d69d77e6bb5cbdc5a13c
Former-commit-id: 015fc9b8f834ea46099e
2013-03-15 08:17:50 -05:00
Lee Venable
3a1dc41b50
Merge "Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table" into omaha_13.3.1
...
Former-commit-id: 456fd056f493e99b64a6
2013-03-14 17:19:38 -05:00
Dave Hladky
db207a732c
Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table
...
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1
Former-commit-id: 9b495681ecc57d5574ef
2013-03-14 15:59:39 -05:00
Roger Ferrel
ff944b4768
Issue #1790 Changes for non-blocking TabularDisplayDlg.
...
Change-Id: I38505da2d1c5a79e7b45579893845cc356a59a5d
Former-commit-id: c43b7777e1ebe57f1cbc
2013-03-14 15:38:08 -05:00
Ron Anderson
7087e1ebe7
Merge "Issue #1793 Performance improvements for TCMWindTool Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e" into omaha_13.3.1
...
Former-commit-id: 16d93dab84fc749ff3eb
2013-03-14 14:55:31 -05:00
Ben Steffensmeier
364d6fd9ee
Issue #1793 Performance improvements for TCMWindTool
...
Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e
Former-commit-id: 7aa8b2d3eb45a5cffdf3
2013-03-14 13:26:08 -05:00
Greg Armendariz
3a3486b0b7
Removed merge code from the source code
...
Former-commit-id: 5511f0b3a62f9136843b
2013-03-14 11:15:08 -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
Roger Ferrel
09f4c18b5c
Issue #1790 Changes for non-blocking PointDataControlDlg dialog.
...
Change-Id: Icf7a2f8f890d20c8b92fa2ed82331cdfe3e23908
Former-commit-id: dae3fb593862b241a548
2013-03-14 08:22:05 -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
Greg Armendariz
12e912c548
Merge "Issue #1638 fix build" into development
...
Former-commit-id: cc168cb94ca06a730696
2013-03-13 08:56:00 -05:00
Nate Jensen
733186900f
Issue #1638 fix build
...
Change-Id: I2c96c708c30050befc6f87fca41fb306da7ecc5e
Former-commit-id: 192fe9a7241cbc7bbfdc
2013-03-13 08:50:26 -05:00
Dustin Johnson
48a96911c8
Issue #1784 Move NCF bandwidth manager code to data delivery repo
...
Amend:
Publish JUnit test reports as XML, in support of Jenkins.
Fix build/merge of 13.3.1 code so it compiles.
Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4
Former-commit-id: 71365cd9451930183036
2013-03-13 08:39:08 -05:00
Nate Jensen
33f185d021
Merge "Issue #1638 fix velocity on windows" into development
...
Former-commit-id: 4486bd9941676b3c9d11
2013-03-12 16:43:13 -05:00
Nate Jensen
b00ccd2b77
Issue #1638 fix velocity on windows
...
Change-Id: Iacac3c6a76c5d05840606c301fa640b607cb741a
Former-commit-id: 863d4cf3dfcbf0343d72
2013-03-12 16:04:59 -05:00
Steve Harris
d5bcdb0015
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java
Former-commit-id: 753a5213ab0cd7e56e65
2013-03-12 16:04:23 -05:00
Dave Hladky
6ea95002de
Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
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
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227
Former-commit-id: a1006667e04b08491880
2013-03-12 15:48:34 -05:00
Mike Duff
b5bccd0bb2
Issue #1760 - fix minutes on the y axis of 3 hour graph
...
Change-Id: I4f5f77d4307f69015ceade195270434e49198c69
Former-commit-id: 714de645d57040daf472
2013-03-12 11:25:05 -05:00
Lee Venable
e080fb5106
Merge "Issue #1781 - Fix Hydro Time Series slow table loads" into omaha_13.3.1
...
Former-commit-id: d5af1f02c528d74d91b0
2013-03-12 09:08:44 -05:00
Mike Duff
caed059e23
Issue #1781 - Fix Hydro Time Series slow table loads
...
Change-Id: Icc0b916459a6636d9571417d102c8ac0226fb93d
Former-commit-id: 6a6844fdafcac9bd6119
2013-03-12 09:03:08 -05:00
Steve Harris
4ed21b702b
13.3.1-6 baseline
...
Former-commit-id: 3a4c7931e1566b677d09
2013-03-12 08:35:45 -05:00
Roger Ferrel
334f2c4a57
Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
...
Code review changes 3.
Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c
Former-commit-id: 4deb731bd0b421c97d86
2013-03-11 13:00:44 -05:00
Roger Ferrel
3684c7efed
Issue #1735 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
...
Code review changes 3.
Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c
Former-commit-id: 6744238fce9e8472bab6
2013-03-11 11:16:22 -05:00
Dave Hladky
73c21a6ead
Issue #1769 Crashing FFMP caused by thread wait
...
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611
Former-commit-id: 2a854d7c30bb4c54eff0
2013-03-08 09:58:17 -06:00
Nate Jensen
d6c3c84d30
Issue #1753 log on user shutdown
...
Change-Id: Iff63204ed84809111215588ead2b6447e1b2a549
Former-commit-id: a7e9cfdb39163f93019b
2013-03-06 09:36:00 -06:00
Jonathan Sanchez
c2b021427b
Issue #1600 Created a utility class for adjust angles.
...
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3
Former-commit-id: 8f70214f666a3281c878
2013-03-05 16:02:47 -06:00
Jonathan Sanchez
42bcef0be0
Issue #1600 Created a utility class for adjust angles.
...
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3
Former-commit-id: 1a91fe52e71f2db32448
2013-03-05 15:05:19 -06:00
Steve Harris
b9563da8a8
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: d5b80f9225aa0e9acefd
2013-03-05 12:29:44 -06:00
Steve Harris
a8e1557c62
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 305dd7296957f42761d7
2013-03-05 12:27:49 -06:00
Steve Harris
a40c9136fe
13.3.1-5 baseline
...
Former-commit-id: a89221c75be26f7eb151
2013-03-05 10:47:06 -06:00
Steve Harris
5e55ded3a9
13.3.1-4 baseline
...
Former-commit-id: 8c0b90f2922edca90902
2013-03-05 10:39:59 -06:00
Nate Jensen
e3db522be4
Merge "Issue #1628 move xmx settings to linux so windows can override." into omaha_13.3.1
...
Former-commit-id: b803ae3801a952d48b3e
2013-03-05 09:10:52 -06:00
Richard Peter
180540eb47
Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
...
Former-commit-id: 070f62d08e784cd2145f
2013-03-04 17:48:05 -06:00
Dave Hladky
1260b40307
Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
...
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4
Former-commit-id: 680317d9c4fc36146f48
2013-03-04 17:41:11 -06:00
Ben Steffensmeier
b16399cfdb
Issue #1628 move xmx settings to linux so windows can override.
...
Former-commit-id: fad56e32ccc1c5ac7926
2013-03-04 16:47:11 -06:00
