Commit graph

11122 commits

Author SHA1 Message Date
Mark Ruebens
23db8536a4 Merge "ASM #18733 - Remove GFS360 (381km GFS) from VB menu" into asm_16.2.2
Former-commit-id: 8182349c338ad7d54a4b701ef07df92cddc78655
2016-04-01 14:50:03 -05: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
Matthew Howard
a175faf925 Merge "ASM #18729 CAVE: Increase java heap space from 4096M to 6144M in cave.ini and wfo.ini files" into asm_16.2.2
Former-commit-id: 38d8aa5ba45535f69501020573fc7c534354756f
2016-04-01 11:42:12 -05:00
Zhidong.Hao
308766b567 ASM #18729 CAVE: Increase java heap space from 4096M to 6144M in cave.ini and wfo.ini files
Change-Id: Ib2b62836ca8e6f56fd4e14f62a65cff8bc47b84e

Former-commit-id: fc68ddc9750e7d1f9b42aa699923ebe7f8bc7c16
2016-04-01 12:29:41 -04: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
Rici.Yu
8c65f847d7 ASM #18777 - Remove IP addresses from serverConfig.py
Change-Id: I132b648afb3cef6dc0c26b1d4517c9835f4daf2c

Former-commit-id: 4c19cda4574f866285b659f7d4fbf8e41f2f5bd9
2016-04-01 10:19:22 -04: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
Tom Gurney
241b9cb6f4 Omaha #4677 Remove NGM references from bufrmos PK update script
Change-Id: I0fd7365fc6cf11aab19b4e4b2780efcb2ccd72b2

Former-commit-id: 4051eb4d121dbcc1ba4cf2b483a99debd2455136
2016-03-31 09:51: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
Shawn.Hooper
04b6aa0440 Merge remote-tracking branch 'asm/asm_16.2.1' into master_16.2.1
Former-commit-id: 18ebc16997c9b4447368af92cfbd35dd0ae7ac49
2016-03-30 17:21:24 -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
Matthew Howard
2f549c147a Merge "ASM #18804 ISC_Discrepancies Tool not working in 16.2.1" into asm_16.2.1
Former-commit-id: 4100c24b9217e7b4b6d0d34e1e24dc5bcce00fcc
2016-03-30 12:33:50 -05:00
Bruce.Hundermark
164436cf25 ASM #18804 ISC_Discrepancies Tool not working in 16.2.1
Change-Id: I6324ecda15098914d9d95da5611db9ad408024ed

Former-commit-id: 801ba1ec4dd55678beb0e6b481d4ee5a68f8b718
2016-03-30 16:37:47 +00:00
Ben Steffensmeier
07e388c55c Omaha #5535 Seperate handling of thin client radar updates and radar-as-grid updates.
Former-commit-id: be4ad48c32da97dc55c6e6fbb8152b9493d63f29
2016-03-30 11:37:24 -05:00
David Lovely
451d7c5efc Omaha #5088 Moved mping out of baseline viz feature.
Former-commit-id: b42b7a5401e79d3a41b41d25da34686c34b49438
2016-03-30 11:18:34 -05:00
Shawn.Hooper
77dc4e9183 ASM #18748 - Updates to allow for proper storage and display of some PQPF/PPQPF data
Change-Id: I552b828b40375d4a3c571e11ca0cfd424d90e4f6

Former-commit-id: 4fa957c1378fcf11845095319aa9c5dfb9253312
2016-03-30 10:36:43 -04:00
Tim Jensen
ba4d46c41d Omaha #5463: Fix display of guidance selection
Change-Id: I3c2bc43b4fd25ce1700f052b84617609dead070a

Former-commit-id: 96111b98fc7d9e958ba6a9f79ad412b4f1978803
2016-03-30 09:30:15 -05:00
Steve Harris
a5630ce465 Omaha #5229 - Revert Omaha #4716
Revert "Omaha #4716 Delta script to update stdtextproducts table."
This reverts commit d4f70ae9a0 [formerly 3ea23877757542c60932838efebd30f43cd6addb].

Revert "Omaha #4716 Use IcaoMap to determine a site's ICAO Id."
This reverts commit 47aedb4641 [formerly 7a3312b61227798136e962305a1439d2f47fc468].

Revert "Omaha #4716 Fix NPE."
This reverts commit 63a431de8d [formerly e46413899b050022d47e0294d2749a99274c6e56].

Revert "Omaha #4716 Triggers for ingest StdTextProducts now check for AWIPS PILs."
This reverts commit 235eea9437 [formerly 74c32b7cb7abc0036995228eb0d0a427e661026d].

Revert "Omaha #4716 Changes to textWS and textdb to support AWIPS ID."
This reverts commit 2227c881bd [formerly 882063e694dc8f36fee23598904a27a25e09a258].

 Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: fdf099dc4bef3411e435de3a67f82e15826d8073
2016-03-29 17:15:25 -05:00
Ron Anderson
6c78854b57 Merge "Omaha #5511: Rewrite RPS List Editor dialog based on CaveSWTDialog." into omaha_16.2.1-lx
Former-commit-id: abb5864eb4587f0c25161ec750d31f3abc8024d1
2016-03-29 16:39:09 -05:00
David Gillingham
91f0c71c33 Omaha #5511: Rewrite RPS List Editor dialog based on CaveSWTDialog.
Change-Id: I6c8c190fcf41f52a8915ee109a2ceb56de25f0c6

Former-commit-id: 4eba21cfdd12f2cbe05668798d535c3870639b64
2016-03-29 16:38:21 -05:00
Tim Jensen
d23b1f4f17 Omaha #5491: Add additional special case for QPFSCAN
Change-Id: I9c4e84314054a6913f7b067eab3808e5acadab94

Former-commit-id: 375ce5c253a37d6b5fce19ce4802e0186a07282c
2016-03-29 15:47:37 -05:00
Shawn.Hooper
1cf2f19e65 Merge tag 'OB_16.2.1-17' into asm_16.2.2
16.2.1-17

Change-Id: I3cb4abf93fd7729ea54cbe4c8ecea781579c5db7

Former-commit-id: 17fb0b31a7377334925e852db6fabb7b223594dd
2016-03-29 16:43:12 -04:00
Greg Armendariz
fb41e495b2 Merge "Omaha #4716 Delta script to update stdtextproducts table." into omaha_16.2.2
Former-commit-id: b025645c2d4b6809627f71e53b5901dc514ce267
2016-03-29 10:00:16 -05:00
Nate Jensen
701606e48b Merge "Omaha #5493 Removed code that prevents 12 and 24 hour FFG" into omaha_16.2.1
Former-commit-id: 4a9bed12f521341fba30aef132fc58ed33183841
2016-03-29 09:10:55 -05:00
Steve Harris
385401f9ae Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/flashfloodguidance/FlashFloodGuidanceDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: 445a3ae3da804f366c1162104640d8459ab650d0
2016-03-28 17:31:59 -05:00
Steve Harris
29adcc65b4 Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: 3b7825bf9015097ce3be0a82c7f0a117475fd3e8
2016-03-28 17:13:12 -05:00
Steve Harris
68c9c4cbeb Merge tag 'OB_16.2.1-17' into omaha_16.2.1
16.2.1-17


Former-commit-id: 941159f28d89ce6f37844f2183c29d1593797968
2016-03-28 16:58:04 -05:00
Dave Hladky
e572e50427 Omaha #5493 Removed code that prevents 12 and 24 hour FFG
Former-commit-id: a529e4e5bb00f0401967808e4369c58c966aa385
2016-03-28 16:13:42 -05:00
Rici.Yu
06f5343b02 ASM #18773 - additional changes
Change-Id: I52a0386d069174f6f1ca5fcfd5bf60ddaf659e79
(cherry picked from commit 5a7d67fd7f [formerly 0f686d1ddd18c55a40e9f6aa57f4bbf55387d717])

Former-commit-id: 65b7ccc390c97d0d5d7f71806468abcae183cc5e
2016-03-28 16:44:30 -04:00
Shawn.Hooper
850ec358bf ASM #18528 - "Merge tag 'OB_16.2.2-1' into DCS-18528"
16.2.2-1

Change-Id: I7ac65cae4efe4e38b2c059aec6d4808f97f1bf77

Former-commit-id: 8173420a5e472738d4c9255d2ed32e55927c8d07
2016-03-28 15:47:44 -04:00
Brian Rapp
3c10e7d354 ASM #18765 - Increased retrans table arrays sizes in retrans.h
Change-Id: Icc29fc74b82a2c31b1bbac57474ea6185e9689fe

Former-commit-id: 314380a01ec11e0fd0f429c721715b058a0e4e54
2016-03-28 11:59:14 -04:00
Rici.Yu
5a7d67fd7f ASM #18773 - additional changes
Change-Id: I52a0386d069174f6f1ca5fcfd5bf60ddaf659e79

Former-commit-id: 0f686d1ddd18c55a40e9f6aa57f4bbf55387d717
2016-03-28 11:05:56 -04:00
Mark Ruebens
4dba3693fe Merge "ASM #18727 - Products can transmit in Mixed Case while using Tools -> Text Window (corrected check-in)" into asm_16.2.1
Former-commit-id: bc02018e41dfcdb78bcfe7673d6cde514ebd3bd1
2016-03-25 12:33:21 -05:00
Ron Anderson
2194870ee3 Omaha #4751 Fix errors in NDFD_QPF_Checks and BOIVerifyInfo
Change-Id: I77a82aef4c329bfe668f7516af94c112de002213

Former-commit-id: 820305de9be0454294914f3cc883f576659d52cb
2016-03-25 09:22:11 -05:00
Mark Ruebens
76b751e635 Merge "ASM #18719 - WarnGen Polygons: Look into ways to improve exclusions of zones close to coast" into asm_16.2.1
Former-commit-id: cb15e111553ca226e39208717c60f0c9e76873c3
2016-03-25 09:10:46 -05:00
David Friedman
90862239ac ASM #18727 - Products can transmit in Mixed Case while using Tools -> Text Window (corrected check-in)
Change-Id: Ib30edbadd813f479dd0f1a586704bfd4db8fbdd9

Former-commit-id: 283b3e3c4570194dbdec7b01fca653b4e5be90b3
2016-03-24 21:01:47 +00:00