Commit graph

11516 commits

Author SHA1 Message Date
Steve Harris
5419e1a273 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: a1bc44e359360b9718945f9db2f435e267a15730
2016-05-04 21:13:12 -05:00
Steve Harris
4951edcdd6 Merge tag 'OB_16.2.1-28' into omaha_16.2.1
16.2.1-28


Former-commit-id: ae0f7da6907879dd437bcbc25b7cb50e8ba3c9ab
2016-05-04 20:58:32 -05:00
David Gillingham
76be4503c9 Omaha #5483 - Fix hi-dpi issues in hydro Station Reporting Status dialog.
Change-Id: I1cf30ffbf13c4245207b88a0118f9b1015126a8d

Former-commit-id: 82fe2885ed305c62d8b550d386c270ff5f8755bf
2016-05-04 18:02:44 -05:00
David Gillingham
12a0735bb5 Omaha #5054 - Fix dialog parenting of SaveLevel2Data dialog when closing MPE daily QC dialog.
Change-Id: Ic4a60bb56d00f506d063e5137a70a627c4f0c7a9

Former-commit-id: 830f1ef6cad1bb9104d459f5bac2acbad98bc89c
2016-05-04 12:38:57 -05:00
Penghai Wang
87fda2aad8 Merge "VLab Issue #18075 - DR 18336 fix. All keep-alives were being treated as NLDN. Get source from WMO header instead; fixes #18075" into asdt_16.2.2
Former-commit-id: 6b10f777d56029f04826d0789b1dd3aa3969bc3d
2016-05-04 13:11:05 +00:00
Shawn.Hooper
6dd7d6e445 Merge branch 'master_16.2.1' into master_16.2.1-lx
Former-commit-id: c2912e8f8c98c1e7a4b97fc431db7f054452425a
2016-05-03 13:51:27 -04:00
Shawn.Hooper
2104f21b18 Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
Former-commit-id: 0b4194e31947218d89150aaa8001d8ce206887dc
2016-05-03 13:50:58 -04:00
Andrew Moore
de50a8ac01 VLab Issue #18075 - DR 18336 fix. All keep-alives were being treated as NLDN. Get source from WMO header instead; fixes #18075
Change-Id: I53a392780148de85de9c25fff05c313737137b57

Former-commit-id: 3cf025add9b0c2636a442784bb977601ed7b434e
2016-05-03 17:04:25 +00:00
Ana Rivera
3a3da7aa68 Merge "VLab Issue #17882 - Fixes to DCS18425 per DR 18886; fixes #17882" into field_16.2.2
Former-commit-id: 30f0c54c15061d0229bdd291cd0d4222792d94b7
2016-05-03 14:12:45 +00:00
Matthew Foster
432d75d807 VLab Issue #17882 - Fixes to DCS18425 per DR 18886; fixes #17882
Change-Id: I2787bef9456db1ef05796402bb9b95a2aa172d36

Former-commit-id: 760f6aa3052890cd7f0f3759a952b2bd8ae821cc
2016-05-03 13:59:14 +00:00
Mark Ruebens
569b3dcadb Merge "ASM #18947 - Text Workstation: QC Error if enough UGCs are listed, sending one to 2nd line (additional check-in)" into asm_16.2.1
Former-commit-id: 7f65c72fb7f17a38f6afc4c053718aa2e539f792
2016-05-02 15:24:14 -05:00
Penghai Wang
3464ad6b11 Merge branch 'master_16.2.2' into asdt_16.2.2
Former-commit-id: 02133bf406abe2ba96c7037cbb30675de2e02918
2016-05-02 19:52:55 +00:00
Ron Anderson
bb08c5e6b9 Omaha #5616 Fix parsing of duration value
Change-Id: I1ad094740deb327b6c7efaad00037e0c7db8ddf5

Former-commit-id: 7bae19442034047b26b52debef3903841bf60fdc
2016-05-02 13:13:05 -05:00
Nate Jensen
95a8fb4eea Merge changes I06189460,Ide604398 into omaha_16.2.2
* changes:
  Omaha #5316 Fix zoom and label menu item selection states in GHG Monitor
  Omaha #5618 Fix ifpClient to work with "chunked" grid requests.


Former-commit-id: 77cb25d6a507267b95808b32f0fdaeff635c07ba
2016-05-02 12:26:36 -05:00
Bryan Kowal
23e9be55bb Omaha #5609 - remove duplicate vmarg arguments
Change-Id: I4cb43dc7fcb6cb25061cfa0080d3419a484c968b

Former-commit-id: 2c79ddae43a0eab32af25ceb176600810ddf61a0
2016-05-02 11:15:37 -05:00
Shawn.Hooper
1ce68eb048 Merge tag 'OB_16.2.1-28' into asm_16.2.1
16.2.1-28


Former-commit-id: 49fd444b3c80223b587c5a75bc7e5ecb98247c09
2016-05-02 11:13:58 -04:00
Wen Kwock
ee1815802e VLab Issue #18043 - DR18896 NationBlend Version 2; fixes #18043
Change-Id: I90eb370ef148b93d0ac4e08dadcb8749015bf827

Former-commit-id: c519d651b10750d372b63b0dafb6ad924ac18f3d
2016-05-02 15:02:15 +00:00
Ron Anderson
411fcddf74 Omaha #5316 Fix zoom and label menu item selection states in GHG Monitor
Change-Id: I06189460bbc236af6dcddb514a6be15fd45fc851

Former-commit-id: 6c840f5956ee45ab8781b57c29fa6e2adb8fabe9
2016-05-02 09:55:32 -05:00
David Friedman
9946e63f96 ASM #18947 - Text Workstation: QC Error if enough UGCs are listed, sending one to 2nd line (additional check-in)
Change-Id: Ia11f9b283a38c73b128f77b71c1d07165ef8f742

Former-commit-id: 6dfae7cdd2f000a06001928dad3ad28857769620
2016-05-02 14:06:07 +00:00
Ron Anderson
c0c0999d90 Omaha #5618 Fix ifpClient to work with "chunked" grid requests.
Change-Id: Ide6043980fb2053de112d552f9421b4405f97364

Former-commit-id: 19345ec42d194026fe7019792f7dd280124a026d
2016-05-02 08:44:03 -05:00
Shawn.Hooper
600d805bcb ASM #16970 - AWIPS2: LAPS 1500m Pressure D-2D display incorrect
Change-Id: Ide56356b8d814b7b93c6de0946e92c1923561012

Former-commit-id: cccb6dee7bcfebe47d773c89bc2a1f08ca73627a
2016-04-29 17:23:24 -04:00
Richard Peter
2973150900 Merge "Omaha #5606 - set java.io.tmpdir for yajsw as the destination for jna executables" into omaha_16.2.2
Former-commit-id: 9b63f283ec83ea64657e79aa812ca5948c8a4d10
2016-04-29 15:22:57 -05:00
Richard Peter
88a58d1410 Merge "Omaha #5609 - specify java.io.tmpdir as a jvm arg for CAVE." into omaha_16.2.2
Former-commit-id: eb5032a0d117747e77a8012a3f8321bbcf0282c7
2016-04-29 15:22:49 -05:00
Tim Jensen
f3da954c2b Omaha #5617 - Fix incorrect Regions for HiResW grib models
Change-Id: I0f310d174319005c90e71c596c6f9d2f8df7b368

Former-commit-id: 1ec20f1beac049d5fa290713bd8ac1fd51e96484
2016-04-29 14:42:31 -05:00
Steve Harris
2dbf6c5246 Omaha #5229 - removed merge markings
Former-commit-id: e7b2f343af9e341265240e7694dc5252656a9b99
2016-04-28 15:53:08 -05:00
Bryan Kowal
c6d0b0509a Omaha #5609 - specify java.io.tmpdir as a jvm arg for CAVE.
Change-Id: Id9151b275806110b85f825b9e6c8b2becd4cbad1

Former-commit-id: b798c4fe551d9f258e4c9ded0452cab45ee3a498
2016-04-28 14:59:24 -05:00
Steve Harris
679e9a532a Merge tag 'OB_16.2.2-6' into omaha_16.2.2
16.2.2-6


Former-commit-id: c7a74d6200c5d04f652f7ebe16f70d7c2050398d
2016-04-28 13:34:33 -05:00
Ben Steffensmeier
8322325583 Omaha #5597 Fix GLD 1 min plot.
Former-commit-id: 489f3c6a5a9e0e1ff034fc6ae6df81110397f6ab
2016-04-28 12:52:34 -05:00
Bryan Kowal
63c79206f0 Omaha #5606 - set java.io.tmpdir for yajsw as the destination for jna executables
Former-commit-id: 7560f5d4f9932d56946fc37111556ac94e0a0e3a
2016-04-28 12:23:19 -05:00
David Friedman
68c7652173 ASM #18947 - Text Workstation: QC Error if enough UGCs are listed, sending one to 2nd line
Change-Id: I44ae34edbae66b55b13f572ee9250373cec785ab

Former-commit-id: c2b8f0de6490546bfbc3b23541b682c766d95668
2016-04-28 15:31:35 +00:00
Ana Rivera
1fb3098e7d Merge branch 'master_16.2.2'(OB_16.2.2-6) into field_16.2.2
Change-Id: Ice1e88f00a0086b3a2605d57774235e922d4e5d1

Former-commit-id: 893fb74603714c565eff4dd68227ff9978e29f09
2016-04-28 14:05:27 +00:00
Mark Ruebens
d9b283404b Merge "ASM #14803 - TextWS: WMO Header not being added to Record Event Report products." into asm_16.2.2
Former-commit-id: f47af2726d0673bedb5be48cccf5632bb77d672b
2016-04-28 06:34:31 -05:00
Ron Anderson
3997588f6b Omaha #5483 Fix GUI sizing issues in Hydro Alert and Alarm dialog
Change-Id: I0f9d02d7947e467e8d2730b6c0a15e6560551b73

Former-commit-id: 24c10c8daad0959f34b2543cdbdf60edf06b1318
2016-04-27 18:00:27 -05:00
Shawn.Hooper
5cb5bc2668 Merge tag 'OB_16.2.2-6' into asm_16.2.2
16.2.2-6


Former-commit-id: 43fe366b0d9b47509e67333e7c1795e7ac695b41
2016-04-27 17:55:47 -04:00
Ana Rivera
9d9b062d92 Merge branch 'master_16.2.2'(OB_16.2.2-5) into field_16.2.2
Change-Id: I078a3ea61368fd6b26131fd19fb718def2bcfbf6

Former-commit-id: df84daf8cbbc493d60a1e08c04556af36230673c
2016-04-27 16:43:13 +00:00
Ron Anderson
1119367060 Omaha #5483 Fix GUI sizing issues in Hydro Rating Curve dialog
Change-Id: Ibc96bf5e1784fc8a118d1c758e8deef91aaf93ad

Former-commit-id: f80487db3986e834b1ea1a008ac5236e3f9e2aa8
2016-04-27 11:12:00 -05:00
Shawn.Hooper
abfc5fd6f7 Merge remote-tracking branch 'omaha/omaha_16.2.1-lx' into master_16.2.1-lx
Former-commit-id: c6bdfe2356abea7a913b06c03b165620b3416b47
2016-04-27 11:08:57 -04:00
Ron Anderson
9b08575a41 Merge "Omaha #5483 - Fix hi-dpi issues in hydro Data Sources dialog." into omaha_16.2.1-lx
Former-commit-id: 16bed3bd4b49a02e12f8411bdb02b4b2cc2e4678
2016-04-27 08:49:28 -05:00
Shawn.Hooper
7a678147db Merge branch 'master_16.2.1' into master_16.2.1-lx
Conflicts:
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java

Change-Id: Id20e97bd2a76af3b3e04f084d9fa2c1fcc344af3

Former-commit-id: 2c2db68086fceaa3e0608f2a8b88d03522690daa
2016-04-27 09:26:33 -04:00
Shawn.Hooper
44ce4653a9 Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
Former-commit-id: df25676a15669106caff3fdc1d1b3c6c926720f5
2016-04-27 09:21:07 -04:00
Steve Harris
7faad794f1 Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Conflicts:
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java


Former-commit-id: 8a69fb3ce7c65b73e4f7bc760400cf064a72d40e
2016-04-26 16:10:22 -05:00
cmadmin
16e2652090 Merge "Omaha #5217 - Fixed the code so the basin polygon is reprojected into the HRAP coordinate reference system." into omaha_16.2.1
Former-commit-id: e979c8212099acbb05a86ed772889414ee2daf46
2016-04-26 15:58:53 -05:00
cmadmin
29fa258919 Merge "Omaha #5217 - Fixed an issue calculating column number" into omaha_16.2.1
Former-commit-id: 52802baf174a89dcda9b2e3bf462e17517bffc30
2016-04-26 15:58:38 -05:00
Shawn.Hooper
823fbb149f Merge branch 'master_16.2.1' into master_16.2.1-lx
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Change-Id: I28eb117b8319f9eaa701f484e968eacff9d605d6

Former-commit-id: 169839ccdcd367f6bf8e2ece958890df3506f98d
2016-04-26 14:02:25 -04:00
Mike Duff
ffffe0f529 Omaha #5217 - Fixed the code so the basin polygon is reprojected into the HRAP coordinate reference system.
(cherry picked from commit ab4f83692917d1ffc43b8c3bd89512521d140a22)


Former-commit-id: a1e43d84143651c18abd1743dc959a577d28c9a8
2016-04-26 12:11:51 -05:00
Mike Duff
0c6b6450ef Omaha #5217 - Fixed an issue calculating column number
(cherry picked from commit ce24655216866322bffd53d79f4a84968cbb348d)


Former-commit-id: 55a4472f8923b61bd12df02314f031529fc48702
2016-04-26 12:11:41 -05:00
Ben Steffensmeier
3b6a0ddfd3 Omaha #5597 Include update interval in lightning legend.
Former-commit-id: cd91988db55ace2d0f993a657d1f17338507b778
2016-04-26 12:02:26 -05:00
Michael Gamazaychikov
f4448200b8 ASM #14803 - TextWS: WMO Header not being added to Record Event Report products.
Change-Id: I27d1bb8608230e69903c912a1b9c9be176eaf971

Former-commit-id: 8f9ac3376f2cc527660d17617177c600d8412ec9
2016-04-26 07:53:51 -04:00
Shawn.Hooper
73c187a579 Merge remote-tracking branch 'vlab/asdt_16.2.1' into master_16.2.1
Former-commit-id: f43dfb4ec16a96fa73f2c80ad393218732646cc1
2016-04-26 07:22:06 -04:00
Shawn.Hooper
44c2a22f93 Merge remote-tracking branch 'asm/asm_16.2.1' into master_16.2.1
Former-commit-id: 70338bff91bc02d5b0e2b2286164073afd85ed3c
2016-04-26 07:21:57 -04:00