Commit graph

6080 commits

Author SHA1 Message Date
Shawn.Hooper
1b186554b7 Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2
Conflicts:
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java

Change-Id: I6cd12190f57f25ea433ce578559444c9f9a27965

Former-commit-id: 86ef513f00aaa0c06f66088cf2e67f25da788e57
2016-04-13 13:37:34 -04:00
David Gillingham
af2424d37e Omaha #5568 : More lenient handling of ScreenList attribute for GFE smart tools.
Change-Id: Ib0d53bac7c01a8efdf588e168e90b6fcdc4e9983

Former-commit-id: 7d36b2608534b4daad27177c52ad279c1d3af444
2016-04-13 11:04:35 -05:00
Bryan Kowal
7020a56e1c Omaha #5512 - mpe qc dialog updates.
Change-Id: If0e85e8cba0963353ff70aeb3619c364a5dbe051

Former-commit-id: 065559d328bb0b9e517d75bc66bb9975a44a150b
2016-04-13 09:36:05 -05:00
Ron Anderson
05cd627d8b Merge "Omaha #5512 - Minimal updates to fix GUI sizing issues." into omaha_16.2.1-lx
Former-commit-id: 08e68d51ed17e060ff677594b9c3abc572c85c23
2016-04-12 19:21:10 -05:00
David Gillingham
efb7f860b9 Omaha #5483: Fix hi-dpi issues in Hydro Product Viewer dialog.
Change-Id: I50c65760e6ce35b6662264f0444a5d8d24055a20

Former-commit-id: f6c2e97c2fc2c2dd636110738b9829ee82a5b784
2016-04-12 16:36:48 -05:00
Steve Harris
abaa61769f Merge tag 'OB_16.2.2-3' into omaha_16.2.2
16.2.2-3

 Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java


Former-commit-id: 55bc369bddace873c371d0b5b51c383b33c6ca3d
2016-04-12 16:14:15 -05:00
Nate Jensen
0e33d69a95 Merge "Omaha #5537 Update PWPF param names to include time period." into omaha_16.2.2
Former-commit-id: 6e117f539de5adf75e8577ab90cc5410dcc4203d
2016-04-12 14:02:08 -05:00
Shawn.Hooper
449307b46c Merge tag 'OB_16.2.1-22' into master_16.2.2
16.2.1-22


Former-commit-id: 102f706a27808f2627f3d9ed8c6be11e0dc978ee
2016-04-12 14:28:16 -04:00
Mark Peters
806cd7c3ab Omaha #4946 Fix localization delete action when prompt == false (for moving files)
Change-Id: I89ad497a727dc65fb3ef3c830c8ab681d23c3a3b

Former-commit-id: f60a607c78e1583aa3289412fb7923d963389a82
2016-04-12 13:13:43 -05:00
Penghai Wang
1ff00e7088 Merge branch 'master_16.2.2' into asdt_16.2.2
Conflicts:
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/DataIngestFilterDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicFunctions.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml

Former-commit-id: 51bcd1df67c24bce021a89b8708e48306dd0691e
2016-04-12 16:45:34 +00:00
Ben Steffensmeier
e86b60dccb Omaha #5567 Fix cross section image sampling unit conversion.
Former-commit-id: 6fa5a665aa122c75f5bad45a642c50aebee7e0b6
2016-04-12 11:24:54 -05:00
Nathan Bowler
5649628591 Omaha #5537 Update PWPF param names to include time period.
Change-Id: Ia6f6dc90706a3f85fc25be2fd7a45803b2c22839

Former-commit-id: b4582dc65b830df3f22d25b1052d4c59287262c3
2016-04-12 11:27:00 -04:00
David Gillingham
18559f1c83 Omaha #5483: Fix hi-dpi issues in hydro Show SHEF Tokens dialog.
Change-Id: I08c6ff9ebba368ed3f28ddf9388271dd590ab6bc

Former-commit-id: 007dcb8f348e1d6b820fad42cb0dbc32eff580f2
2016-04-11 14:47:03 -05:00
Shawn.Hooper
672be59626 Merge branch 'master_16.2.1' into master_16.2.1-lx
Former-commit-id: c7c025042c718217242254e2b3d3049931ca99f9
2016-04-11 15:23:45 -04:00
David Gillingham
90e40add1c Omaha #5483: Fix hi-dpi issues with Hydro River Summary dialog.
Change-Id: Id89feac47a5912a4070b2c29140d5b63fdd238a9

Former-commit-id: 4caf4bc2d1c8a8d1fe0100ac31a5aef8c1263706
2016-04-08 14:15:04 -05:00
Bryan Kowal
ac1e507324 Omaha #5512 - Minimal updates to fix GUI sizing issues.
Former-commit-id: 5c63ba7a73021f30f0b02879470f1411ffaa4d31
2016-04-08 13:31:58 -05:00
Shawn.Hooper
8a618519ec Merge remote-tracking branch 'vlab/ohd_16.2.2' into master_16.2.2
Former-commit-id: c3a9e71a1dd7a971701ac3c157a8a7b2eb1f3182
2016-04-07 16:02:01 -04:00
Shawn.Hooper
563e2fbb4a Merge remote-tracking branch 'vlab/mdl_16.2.2' into master_16.2.2
Former-commit-id: c849fcfe6bbb76fcf17632e9ae9539211766111d
2016-04-07 16:01:56 -04:00
Shawn.Hooper
0c2ce7faae Merge remote-tracking branch 'vlab/field_16.2.2' into master_16.2.2
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: I0c91cd064aff06397abc6445837ef1be2610d740

Former-commit-id: 1f5a13ead40804f458617b9506236d819d97d54f
2016-04-07 16:01:19 -04:00
Ana Rivera
c4ffd03399 VLab Issue #17650 - Run_NWPS updates; fixes #17650
Change-Id: Ia6f793c6c11038ba74b5dd8655ba0ab64ff112b4

Former-commit-id: cea23eef8a09b6d6138878f71a18f9042ef8286d
2016-04-07 19:50:28 +00:00
steve.naples
7814a0b807 ASM #18350 MPE: DailyQC Temp stations will not display in Daily QC.
Change-Id: I6cd6d9cebdbcf7faddcfb03b7658142872eb9798

Former-commit-id: 7d73b1b6993473a17f8175516cedae2a847e003d
2016-04-07 19:27:15 +00:00
Ron Anderson
68250139fa Merge "Omaha #5559: Fix directory creation bug in ProductFileUtil.writeFile." into omaha_16.2.2
Former-commit-id: 9f044086b93b8020f923f7391c2dea534658a722
2016-04-07 13:04:42 -05:00
David Gillingham
81b98af568 Omaha #5559: Fix directory creation bug in ProductFileUtil.writeFile.
Change-Id: Ibd27d86423fd54c6b8f1cd0ab8a20a3a3d72160f

Former-commit-id: 9a1599b7746fd353e752b8fa120b1268b915ccdf
2016-04-07 12:20:32 -05:00
Tim Jensen
7312d01c79 Omaha #5281: Fix JMS validation if no prompt
Change-Id: Ia85576a8b5762e97fe672386127feefc3350299d

Former-commit-id: 2bb919189d313fe51da61aa9f6e8257af8bc1b0c
2016-04-06 17:07:15 -05:00
Daniel.Huffman
58b1c1d0ee ASM #11919 NIMNAT message should be on as default.
Change-Id: Ib72d3608d42dbb3ee466ac060436fc3cc75e4a02

Former-commit-id: ec5c9bf913b8809135300ed0a7202ff773498b0a
2016-04-06 20:06:54 +00:00
Steve Harris
2ba0e17ff0 Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Former-commit-id: 23382d06b2bea731deef5b0a01b1b27bb187fb95
2016-04-05 23:14:48 -05:00
Steve Harris
e2719ac948 Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Former-commit-id: 5e8f5c6bc014369458edb5adccd98f1940c77b41
2016-04-05 23:06:41 -05:00
Bryan Kowal
e728380be7 Omaha #5512 - no changes. apply AWIPS II code formatter.
Former-commit-id: 041f9bdcaaaae79875eae37fcc329a086a8c6a4d
2016-04-05 16:12:22 -05:00
Ron Anderson
cec8fbcb3b Omaha #5483 Fix Time Series displayed from right click of gage
Change-Id: I38ed17947c0b8dcee1db85eadaf6f2f3ae5ea069

Former-commit-id: 9f1818fdaa92141dcc7b5cb918427225f3014a51
2016-04-04 16:25:05 -05:00
Shawn.Hooper
0bc42475e7 Merge remote-tracking branch 'asm/asm_16.2.1' into master_16.2.1
Former-commit-id: 084fe2964431a0db70ab3c7a46a10a603fab8361
2016-04-04 14:43:27 -04:00
Bruce.Hundermark
6455ae61ad ASM #18804 - ISC_Discrepancies Tool not working in 16.2.1
Change-Id: I6be501f29f0c9249dfa633b99bac4c066f2df888

Former-commit-id: f7d495ad53c58d06ba5826acb3ae8b20648feb58
2016-04-04 16:40:48 +00:00
Steve Harris
16c8aea8ab Omaha #5229 - Another curly brace problem. I really should get a compiler.
Former-commit-id: db91169953c0089567d9a0b78566765483ac582c
2016-04-01 13:21:37 -05:00
Steve Harris
5024bdf13d Omaha #5229 - rearrangements for merge fix
Former-commit-id: c8005c68c65ada701113e5b5f5c5ee70371a1cd1
2016-04-01 12:58:49 -05:00
Steve Harris
7e54629216 Omaha #5229 - Added missing line for merge fix
Former-commit-id: b628921b8759bd8de066234a38838b36eb594c74
2016-04-01 11:15:38 -05:00
Melissa Porricel
a39523279c ASM #18733 - Remove GFS360 (381km GFS) from VB menu
Change-Id: Icf21d10ed3f03e936055264c498c908297f7e24b

Former-commit-id: 2e1aa4c227792579b0a915dd3347a47b53a6a1d6
2016-04-01 11:53:17 -04:00
Steve Harris
7622c74e43 Omaha #5229 - Removed curly brace from line 503 as a shot at a merge fix
Change-Id: Ibc38cf8052a7fdef03f9c88008f85b595bd0bb05

Former-commit-id: ee0a6dd6cd6602309aed316fc5bdc41fdff8c7ca
2016-04-01 10:35:43 -05:00
Shawn.Hooper
3e5559bf6d Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
Former-commit-id: 2d01487eb412cc66fdbd9b29dac7ce89d4152a84
2016-03-31 17:33:36 -04:00
Shawn.Hooper
f1a75179bf ASM #18748 - Rename Populate_QPF_With_WPCHiRes_QPF.py to Populate_WPC_PQPF.py
Change-Id: Ic027e62a99d6a18a5e995a698bef0ba5a0f2d8d7

Former-commit-id: eadcfa0407f7b3dbaa7e73df0bc067c6c9eb987b
2016-03-31 16:19:32 -04:00
Steve Harris
9b151020b3 Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.uf.viz.radarapps.rps/src/com/raytheon/uf/viz/radarapps/rps/RpsListEditorDlg.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java


Former-commit-id: 781bddc3e581ba0f9bdaf7fe5b218fd688dbafeb
2016-03-31 15:04:17 -05:00
Michael Gamazaychikov
035df6cb7d ASM #18528 - 16.2.2 Build and Merge Support.
Change-Id: Id78819962c2defa1dc9e519efb08ac7bd4b92b44

Former-commit-id: 909cbbb8da3edc6a6917c9ef68377b08de2195ba
2016-03-31 15:45:25 -04:00
Shawn.Hooper
4568d3df6d Merge tag 'OB_16.2.1-20' into asm_16.2.1
16.2.1-20


Former-commit-id: 6a7c50e637365c041490e4a628b06f1c629be11c
2016-03-31 15:38:36 -04:00
Ron Anderson
141327ee9a Omaha #5483 Fix issue with Hydro Time Series Graph display
Change-Id: I5ae3bc4b767a625fd02582c397e8b0e4b9af68e2

Former-commit-id: fc55a5533c57dd90496e7c08370d0ef80ee037ab
2016-03-31 14:22:49 -05:00
Ron Anderson
fb62976c22 Merge "Omaha #5513 Fix TextWS GUIs opening on the wrong monitor" into omaha_16.2.1-lx
Former-commit-id: 1e9ff3fd1bca3a909d7b463567d11118a560cb38
2016-03-31 13:31:17 -05:00
Mike Duff
b475dd13af ASM #18746 - Cherry-pick Omaha #5217 from 16.1.2-p to 16.2.1
Calculated interior longitudes are now always > 0.

Change-Id: I408eb04aa8ca344910a5e3d7773dbb0cb7277902
(cherry picked from commit b6eaf35398bf6126d7ee8ca140cd05880504a184)
(cherry picked from commit 6c8d7863e8d9dc8df3c983ec0de657c9fdc2a13d [formerly 85832fb048cc36b8d3baa66595585b906d686fdc])

Former-commit-id: 5c77638d0e2ef792a66e86cddfafb5a626450f46
2016-03-31 12:34:03 -04:00
Ron Anderson
a8233481db Omaha #5513 Fix TextWS GUIs opening on the wrong monitor
Change-Id: Iac43fd6381267e2dac0009930318e22280a447f8

Former-commit-id: 5e56023bbf2aaf6a89254faeeb440d814782c391
2016-03-31 10:43:50 -05:00
Steve Harris
69d059ba44 Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Former-commit-id: 3985f2738292d7dc6ed61ab699d3633e837e9cc7
2016-03-30 20:57:38 -05:00
Steve Harris
4d49cc34e3 Merge tag 'OB_16.2.1-19' into omaha_16.2.1
16.2.1-19


Former-commit-id: 2244a58be5ffc002562984784f7a5912db7c455b
2016-03-30 20:50:27 -05:00
steve.naples
8ca7209a39 ASM #18528 MPE: - Fixed merge issue with Daily QC Temperature Options dialog.
Change-Id: Ia39542f9e5c87670d7ea5636ffde6efbbc6f8952

Former-commit-id: b5ebc6c478a275c12e8e578dc75877eeb7782f7a
2016-03-30 22:06:58 +00:00
Shawn.Hooper
3dfbcd2d48 Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
Former-commit-id: 2bff69680159705f82c91292bc9a14a698b2edc1
2016-03-30 17:21:28 -04:00
Ben Steffensmeier
b570e48f88 Omaha #5514 Include DPI in plot model size calculations.
Former-commit-id: 70e24d2180b6abe4f3b551be3db119dd543fbabf
2016-03-30 13:05:05 -05:00