Dustin Johnson
2896b034a7
Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development
...
Former-commit-id: d1789b5141bc323d3f255b4035fb118363eba4095b4035fb118363eba409e0b6e6187e3c8e14edc7
2013-03-19 13:09:48 -05:00
Dave Hladky
e0d90738ad
Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
...
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d
Former-commit-id: 77472f704fd7e8709cdeddb23ae59f81ad1ce2edddb23ae59f81ad1ce2edf0244f54a4618f737fab
2013-03-19 13:08:14 -05:00
Bryan Kowal
dc2dc31f7e
Issue #1805 - slightly modified viz feature build order
...
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569
Former-commit-id: 72bdbbb7f66106369d4cf325038538f0eb7d3285f325038538f0eb7d328554113e9b29fd68cd7a04
2013-03-18 18:15:26 -05:00
Steve Harris
027eda5dce
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: b64fbe549a28ef804e1bb8f0635ad67fcf9f1cb2b8f0635ad67fcf9f1cb2900b9aadde2a26783ba7
2013-03-18 16:52:00 -05:00
Steve Harris
0e9919f6be
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: 3e69490ab227c418812f1a999fee5ac18b96dc4c1a999fee5ac18b96dc4c245afb28c8ea27f9cd17
2013-03-18 16:43:22 -05:00
Bryan Kowal
9d8b41c8c7
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: 4f808edba3a93dcff1b5b954bc17bf7fd035256db954bc17bf7fd035256d66e2ed79ec3e8d5449fc
2013-03-18 16:36:33 -05:00
Steve Harris
2fd4ac9397
13.3.1-8 baseline
...
Former-commit-id: dd30a5f940bc9df0a8f9f97d78994bc15b3ffe20f97d78994bc15b3ffe205f492500ea81a3f29afc
2013-03-18 15:43:32 -05:00
Dustin Johnson
b4c83331db
Merge "Issue #1794 Consolidate common filename filters into FilenameFilters class" into development
...
Former-commit-id: 1fb27b205a36cc80590cb7a5311dde7fe3c254fdb7a5311dde7fe3c254fd55095f00417afc4a083b
2013-03-15 16:14:17 -05:00
Dustin Johnson
d8880e29b6
Issue #1794 Consolidate common filename filters into FilenameFilters class
...
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: 65f87506b7fff7e7983fecb0d2c82643a9f608efecb0d2c82643a9f608ef1b82ad0dc47adf94e9f6
2013-03-15 11:51:58 -05:00
Roger Ferrel
dfbd824211
Issue #1790 changes for non-blocking StationLegendDlg.
...
Change-Id: Ie3d632cf8f1a6f0e85b3b4758afe236f3022e91d
Former-commit-id: 24868f7ed5dadf8a9e4c0089e24579b01bb935c30089e24579b01bb935c308990f97f8382bb7c16b
2013-03-15 10:26:30 -05:00
Roger Ferrel
3693e9dfeb
Issue #1790 changes for non-blocking StaffGageDlg.
...
Change-Id: I37d1d2358a91b1f8720888543fb5e05d9ce55092
Former-commit-id: 32ba1814f5fcbda4e0de4230e1a9b817a41bf0634230e1a9b817a41bf063006062502ee88e52e406
2013-03-15 09:00:00 -05:00
Roger Ferrel
269127174c
Issue #1790 changes for non-blocking PointPrecipAccumDlg and RiverSummaryDlg.
...
Change-Id: I96e958225b32ba818743d69d77e6bb5cbdc5a13c
Former-commit-id: b6a18b2d9676507ebcc5015fc9b8f834ea46099e015fc9b8f834ea46099e7eae71038f60e7b4be62
2013-03-15 08:17:50 -05:00
Lee Venable
a0298d4199
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: a1ea0d020c57d7559797456fd056f493e99b64a6456fd056f493e99b64a63a1dc41b50ba4673b99a
2013-03-14 17:19:38 -05:00
Dave Hladky
19117f1851
Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table
...
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1
Former-commit-id: f7ccf2e765a1c41489189b495681ecc57d5574ef9b495681ecc57d5574efdb207a732c3ba473351b
2013-03-14 15:59:39 -05:00
Roger Ferrel
cec76b08bf
Issue #1790 Changes for non-blocking TabularDisplayDlg.
...
Change-Id: I38505da2d1c5a79e7b45579893845cc356a59a5d
Former-commit-id: a19092d5c2818b856f97c43b7777e1ebe57f1cbcc43b7777e1ebe57f1cbcff944b476846428ed944
2013-03-14 15:38:08 -05:00
Ron Anderson
c6598f3869
Merge "Issue #1793 Performance improvements for TCMWindTool Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e" into omaha_13.3.1
...
Former-commit-id: 1864ba24e560af3ad63e16d93dab84fc749ff3eb16d93dab84fc749ff3eb7087e1ebe797a38fd3c5
2013-03-14 14:55:31 -05:00
Ben Steffensmeier
55d80d760f
Issue #1793 Performance improvements for TCMWindTool
...
Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e
Former-commit-id: 3f0030521d7335a2336e7aa8b2d3eb45a5cffdf37aa8b2d3eb45a5cffdf3364d6fd9eee5b9e0ca46
2013-03-14 13:26:08 -05:00
Greg Armendariz
ef59159bb9
Removed merge code from the source code
...
Former-commit-id: 05d7892c3b2bb407ea8b5511f0b3a62f9136843b5511f0b3a62f9136843b3a3486b0b7b79ecc28e3
2013-03-14 11:15:08 -05:00
Nate Jensen
b74d6315a6
Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1
...
Former-commit-id: 14da2b6cc39dbb7660a729b4cd2fb5490ffe277229b4cd2fb5490ffe2772a933532ad9e2e9a845d5
2013-03-14 09:48:16 -05:00
Roger Ferrel
463545471a
Issue #1790 Changes for non-blocking PointDataControlDlg dialog.
...
Change-Id: Icf7a2f8f890d20c8b92fa2ed82331cdfe3e23908
Former-commit-id: c6b64c828cc556928998dae3fb593862b241a548dae3fb593862b241a54809f4c18b5c3baa2e9220
2013-03-14 08:22:05 -05:00
Ben Steffensmeier
a440445437
Issue #1792 Improve performance of gfe parm time weighted average.
...
Change-Id: I139c873175ee1dbe29968c90e193701122abcead
Former-commit-id: dcf02199eaa9695abb4522624ba5d352c167cf0022624ba5d352c167cf008f6a7c07462d622e6053
2013-03-13 18:52:52 -05:00
Ron Anderson
87cd340e38
Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1
...
Former-commit-id: f9c7fa96130c881b4a853b6560837361f74305e23b6560837361f74305e2a7b6e1689bde14cd0baa
2013-03-13 17:16:37 -05:00
Ben Steffensmeier
7e998aa197
Issue #1791 Implement bulk getGrids to improve performance.
...
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74
Former-commit-id: a6a1d9bec737bae0988b4c150b0fd689eb9022844c150b0fd689eb9022847abf3cfb39f5680beaa9
2013-03-13 17:09:20 -05:00
Dave Hladky
68114535f2
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 7d2c1bc4d5765be278bb38b952a2205dc454c7ef38b952a2205dc454c7ef160e1594b89e97fc9efe
2013-03-13 13:56:33 -05:00
Steve Harris
45a2d0501d
13.3.1-7 baseline
...
Former-commit-id: 23faf8445597d2f521e4a72254cc75e12ed113aea72254cc75e12ed113ae31c0a97dcaed5f1dbab6
2013-03-13 09:50:28 -05:00
Greg Armendariz
065fb32918
Merge "Issue #1638 fix build" into development
...
Former-commit-id: 4f29b438ac28eec498f3cc168cb94ca06a730696cc168cb94ca06a73069612e912c548f121df7e86
2013-03-13 08:56:00 -05:00
Nate Jensen
58cc71f75d
Issue #1638 fix build
...
Change-Id: I2c96c708c30050befc6f87fca41fb306da7ecc5e
Former-commit-id: 84ea117d75975d044ba6192fe9a7241cbc7bbfdc192fe9a7241cbc7bbfdc733186900f5067a7b372
2013-03-13 08:50:26 -05:00
Dustin Johnson
fdaa9b5ce7
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: 2676e08fdd2983ed29e471365cd945193018303671365cd945193018303648a96911c8f5a3b57107
2013-03-13 08:39:08 -05:00
Nate Jensen
8778e9f945
Merge "Issue #1638 fix velocity on windows" into development
...
Former-commit-id: 33b73b008f37d996c64c4486bd9941676b3c9d114486bd9941676b3c9d1133f185d021a4a5a1e94f
2013-03-12 16:43:13 -05:00
Nate Jensen
f4b80d4b15
Issue #1638 fix velocity on windows
...
Change-Id: Iacac3c6a76c5d05840606c301fa640b607cb741a
Former-commit-id: 48170212cb5e545cc9c4863d4cf3dfcbf0343d72863d4cf3dfcbf0343d72b00ccd2b7735d0187e3d
2013-03-12 16:04:59 -05:00
Steve Harris
47cde9bd09
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: 4c4c79036c36261cb095753a5213ab0cd7e56e65753a5213ab0cd7e56e65d5bcdb0015bca46a1354
2013-03-12 16:04:23 -05:00
Dave Hladky
eefd544e4b
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: e17f8e05115c65862b8fa1006667e04b08491880a1006667e04b084918806ea95002de155903d135
2013-03-12 15:48:34 -05:00
Mike Duff
7f42fb1818
Issue #1760 - fix minutes on the y axis of 3 hour graph
...
Change-Id: I4f5f77d4307f69015ceade195270434e49198c69
Former-commit-id: f5d8ba8b0fa6eea1874b714de645d57040daf472714de645d57040daf472b5bccd0bb2a712efa614
2013-03-12 11:25:05 -05:00
Lee Venable
da5ff93f57
Merge "Issue #1781 - Fix Hydro Time Series slow table loads" into omaha_13.3.1
...
Former-commit-id: 13d13428b79a69cd3524d5af1f02c528d74d91b0d5af1f02c528d74d91b0e080fb5106b471e3807f
2013-03-12 09:08:44 -05:00
Mike Duff
848f7982d6
Issue #1781 - Fix Hydro Time Series slow table loads
...
Change-Id: Icc0b916459a6636d9571417d102c8ac0226fb93d
Former-commit-id: 5704b2689e492cf0f7e66a6844fdafcac9bd61196a6844fdafcac9bd6119caed059e232df046d409
2013-03-12 09:03:08 -05:00
Steve Harris
0cec06c171
13.3.1-6 baseline
...
Former-commit-id: 4eef6862d62e110bd1513a4c7931e1566b677d093a4c7931e1566b677d094ed21b702b6fe4b16924
2013-03-12 08:35:45 -05:00
Roger Ferrel
7c6bd5aeb0
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: 0982485efe70bd9aafa74deb731bd0b421c97d864deb731bd0b421c97d86334f2c4a570deb290c24
2013-03-11 13:00:44 -05:00
Roger Ferrel
47fa3496fb
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: c0ee394e9ca73687c1b86744238fce9e8472bab66744238fce9e8472bab63684c7efed7e5bb824d9
2013-03-11 11:16:22 -05:00
Dave Hladky
f3c5756522
Issue #1769 Crashing FFMP caused by thread wait
...
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611
Former-commit-id: b064d868db50696bee892a854d7c30bb4c54eff02a854d7c30bb4c54eff073c21a6eaddd446abd03
2013-03-08 09:58:17 -06:00
Nate Jensen
97172b7466
Issue #1753 log on user shutdown
...
Change-Id: Iff63204ed84809111215588ead2b6447e1b2a549
Former-commit-id: 2a34c5757af101934a30a7e9cfdb39163f93019ba7e9cfdb39163f93019bd6c3c84d30c4175c161f
2013-03-06 09:36:00 -06:00
Jonathan Sanchez
a5478559bc
Issue #1600 Created a utility class for adjust angles.
...
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3
Former-commit-id: edd4d9e02b80ea3e1ec28f70214f666a3281c8788f70214f666a3281c878c2b021427b234d73c905
2013-03-05 16:02:47 -06:00
Jonathan Sanchez
0917628d1a
Issue #1600 Created a utility class for adjust angles.
...
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3
Former-commit-id: f79907bf9f3fface264c1a91fe52e71f2db324481a91fe52e71f2db3244842bcef0be040f52ab049
2013-03-05 15:05:19 -06:00
Steve Harris
1709c34b8f
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: afd934db356b13492420d5b80f9225aa0e9acefdd5b80f9225aa0e9acefdb9563da8a84a0b8772ec
2013-03-05 12:29:44 -06:00
Steve Harris
7ff64bf8cc
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 3ec20c168961a19a460b305dd7296957f42761d7305dd7296957f42761d7a8e1557c62b423579e4a
2013-03-05 12:27:49 -06:00
Steve Harris
aabd5cd51f
13.3.1-5 baseline
...
Former-commit-id: e4a1c61ad58123d5ac45a89221c75be26f7eb151a89221c75be26f7eb151a40c9136fea240379588
2013-03-05 10:47:06 -06:00
Steve Harris
4bfbb518c0
13.3.1-4 baseline
...
Former-commit-id: 9066d511fed79303de138c0b90f2922edca909028c0b90f2922edca909025e55ded3a93e0614b43a
2013-03-05 10:39:59 -06:00
Nate Jensen
790eb9ef79
Merge "Issue #1628 move xmx settings to linux so windows can override." into omaha_13.3.1
...
Former-commit-id: d7bc5750aeb393674ef3b803ae3801a952d48b3eb803ae3801a952d48b3ee3db522be43c5ca0546f
2013-03-05 09:10:52 -06:00
Richard Peter
c7a4dcede6
Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
...
Former-commit-id: 3cc3648b9be74f6074e7070f62d08e784cd2145f070f62d08e784cd2145f180540eb47a4bf42628a
2013-03-04 17:48:05 -06:00
Dave Hladky
f47935a03c
Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
...
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4
Former-commit-id: d0cfd0920922ebfe0ecb680317d9c4fc36146f48680317d9c4fc36146f481260b403070f3c9ba997
2013-03-04 17:41:11 -06:00
Ben Steffensmeier
3a92dd3b6d
Issue #1628 move xmx settings to linux so windows can override.
...
Former-commit-id: 9a8b5857205a88604ed6fad56e32ccc1c5ac7926fad56e32ccc1c5ac7926b16399cfdbc99a17709e
2013-03-04 16:47:11 -06:00
