Commit graph

3696 commits

Author SHA1 Message Date
Chip Gobs
e37cf3ecf7 Merge "VLab Issue #4602 Fixes MPE Gage Table Data Reading problem introduced in a earlier 14.3.1 build, a.k.a Redmine O&M DR 16699" into ohd_14.3.1
Former-commit-id: bc2962c9ce [formerly 780f484a56] [formerly bc2962c9ce [formerly 780f484a56] [formerly cf0816edce [formerly 57614e9869d5a36c80b8d988e8fea4136045a982]]]
Former-commit-id: cf0816edce
Former-commit-id: b41aef6d84 [formerly edef86ba43]
Former-commit-id: d00048b40f
2014-09-08 14:28:33 -04:00
Chip Gobs
07ce013d2c VLab Issue #4612
Fix for Redmine O&M DR 283 concerning the faulty ability of a user to select filtered out stations when
performing quality code operations in MPE in GroupEdit Mode.

Change-Id: Ib8da13cfa2085aeb6efba96e7a1789912534bddd

Former-commit-id: a06a4667a3 [formerly f7624b0609] [formerly a06a4667a3 [formerly f7624b0609] [formerly 874db74c54 [formerly 7df28e4d5c1d8a03db5500939b0af2905d11a4aa]]]
Former-commit-id: 874db74c54
Former-commit-id: 7bda177305 [formerly ee70ab2956]
Former-commit-id: b2319cd60a
2014-09-08 12:37:20 -04:00
Chip Gobs
b2f957c4d4 VLab Issue #4611
Fixes O&M Redmine DR 14448 - which concerns displaying changes to a color set just after the changes are saved,
instead of after the ColorScaleManager is closed.

Change-Id: I0156612302853141392c263eab8b54a16c3be7a3

Former-commit-id: 69450976c8 [formerly 8c6e70ccab] [formerly 69450976c8 [formerly 8c6e70ccab] [formerly 25e4ed8d51 [formerly 44f6bf08a72b5450d6d0db40ff49dd5123cf811c]]]
Former-commit-id: 25e4ed8d51
Former-commit-id: 689ccd9fcf [formerly 215f1dfaa1]
Former-commit-id: 9bf30e3dbd
2014-09-08 12:06:45 -04:00
Chip Gobs
3e23c79eea VLab Issue #4602
Fixes MPE Gage Table Data Reading problem introduced in a earlier 14.3.1 build, a.k.a Redmine O&M DR 16699

Change-Id: I12b879fb873f66d43d7f735165fa4f303c026174

Former-commit-id: da10a7b4ac [formerly fc8a7d48ca] [formerly da10a7b4ac [formerly fc8a7d48ca] [formerly 4911ac1917 [formerly 4d87ebeef93e561a303566853fd2616316c568ca]]]
Former-commit-id: 4911ac1917
Former-commit-id: 6d5926df35 [formerly 7c6f9b3ad9]
Former-commit-id: f50b09855f
2014-09-08 11:44:48 -04:00
Baoyu Yin
7ee5c5a36c VLab Issue #4623 - AWIPS2_DR_17363 LAPS freezing level height not computed prevents display of hail product; fixes #4623
Change-Id: I3b608e9024dbe70e08a549b5469c2fb09e448a9a

Former-commit-id: db7c16b305 [formerly 3e39cd9bb5] [formerly db7c16b305 [formerly 3e39cd9bb5] [formerly 7008216976 [formerly 61838d538f73adb6279ba55d5fe3c5b02d3a28f4]]]
Former-commit-id: 7008216976
Former-commit-id: aaffd08d53 [formerly 340e242ee8]
Former-commit-id: b1d682a92e
2014-09-05 11:18:54 -04:00
Chris Cody
97d6b67891 Omaha #3365 Removing and realigning AWIPS2 Baseline tests
Change-Id: Iba40d0b074df500c52b7302ab59a688680153f48

Former-commit-id: 39887a4b9c [formerly f4445d24cd] [formerly 39887a4b9c [formerly f4445d24cd] [formerly 9e823a47d6 [formerly 97000cc70e8d826b3e8828a1731278673e0ac635]]]
Former-commit-id: 9e823a47d6
Former-commit-id: 62780e001b [formerly 57c689eee6]
Former-commit-id: 0564fa8bf9
2014-09-05 10:14:14 -05:00
Brian.Dyke
9f0254ee22 Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 4220590613 [formerly 9e1ee22146] [formerly 4220590613 [formerly 9e1ee22146] [formerly 702dd65aa7 [formerly 876c6fc4db3901fdcd8dd9a6fb343d2f65254569]]]
Former-commit-id: 702dd65aa7
Former-commit-id: 901ed0dca8 [formerly ebf9ad1299]
Former-commit-id: c868172449
2014-09-05 11:13:12 -04:00
Baoyu Yin
ca85c05530 VLab Issue #4613 - AWIPS2_DR_14755 Thin Client synchronize misspelled ; fixes #4613
Change-Id: I5cf6380bd73f500298d6b1644238abc4d51efdef

Former-commit-id: 0ac99fce21 [formerly dc58405bf6] [formerly 0ac99fce21 [formerly dc58405bf6] [formerly ebe548d860 [formerly b5ec42cbbc7c064098075e347b90e4f22045f66d]]]
Former-commit-id: ebe548d860
Former-commit-id: 246e34403d [formerly 9432625cba]
Former-commit-id: fa32be88c0
2014-09-05 10:37:27 -04:00
Baoyu Yin
fd793f2514 VLab Issue #4609 - AWIPS2_DR_15762 Spelling error Upper Air Menu - Tallahassee ; fixes #4609
Change-Id: Iab5a67594a0fe20e5e7326e3f25ae426326f1ab3

Former-commit-id: 8c7954d245 [formerly 15de59d02f] [formerly 8c7954d245 [formerly 15de59d02f] [formerly d6e2e21683 [formerly 5c311cc979052e214129f77150daad2cdfbd17fc]]]
Former-commit-id: d6e2e21683
Former-commit-id: 25263c3a9d [formerly 1e806ca6a1]
Former-commit-id: af4c4cd610
2014-09-05 10:21:32 -04:00
Brian.Dyke
116aa56b02 Merge branch 'asm_14.2.3' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.3
Former-commit-id: 15381f5e9f [formerly 7b7ef56b04] [formerly 15381f5e9f [formerly 7b7ef56b04] [formerly a610fe6475 [formerly a77577595da1e2dcc8057c5a8b8643a612780339]]]
Former-commit-id: a610fe6475
Former-commit-id: f3b51b9187 [formerly e64fe3875e]
Former-commit-id: a8f49dd627
2014-09-04 15:59:00 -04:00
Nate Jensen
064d75be69 Merge "Omaha #3467 Error occurs when loading/editing the Range Rings tool multiple times" into omaha_14.4.1
Former-commit-id: 2f0554097a [formerly 51d910af00] [formerly 2f0554097a [formerly 51d910af00] [formerly cf41d7e3a3 [formerly 03fc1d04092135970a6c7089bcbbf11d5c584dd1]]]
Former-commit-id: cf41d7e3a3
Former-commit-id: 3ae925ce87 [formerly 96b3c08bd1]
Former-commit-id: 165b5fd49b
2014-09-04 13:49:36 -05:00
Brian.Dyke
d6ef2b6737 Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: c586c26447 [formerly e762271240] [formerly c586c26447 [formerly e762271240] [formerly e5227e90de [formerly ad120a9357402fbdedb350cabe88d2becf5d7361]]]
Former-commit-id: e5227e90de
Former-commit-id: 1ee7743b8b [formerly c48196cd33]
Former-commit-id: 108d0bfc77
2014-09-04 14:18:34 -04:00
Qinglu.Lin
ec9b3fa971 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I0438af111b0db290373c7553006002edec2b2110

Former-commit-id: 62bcefb9e1 [formerly 8c28597210] [formerly 62bcefb9e1 [formerly 8c28597210] [formerly 902b6c55bd [formerly 33adaf353c6a4b7dc418dc86428257dae260c4c5]]]
Former-commit-id: 902b6c55bd
Former-commit-id: 920b6bb53b [formerly 9c67b89df7]
Former-commit-id: c746dbabad
2014-09-04 14:09:24 -04:00
Nate Jensen
680fa77b9d Issue #3574 Properly dispose radar graphics graphics objects.
Change-Id: Ica8c630325bada6fd508eeb6b1b4d881a5169320

Former-commit-id: a1bccdc57f [formerly 2cfbfc1dc4] [formerly a1bccdc57f [formerly 2cfbfc1dc4] [formerly 87d507313b [formerly 78172a4ac0b9ece26cdc07da3a8f9a70bbc11782]]]
Former-commit-id: 87d507313b
Former-commit-id: 6d47c3c987 [formerly b1619c055a]
Former-commit-id: 0e6c455b42
2014-09-04 10:10:37 -05:00
Baoyu Yin
6a427f968c VLab Issue #4608 - AWIPS2_DR_16259 Minor Typo in Volume Menu of D2D 4-PanelFamilies ; fixes #4608
Change-Id: I73a3f5a441e33dffe3dc7f3962c3fceec930ce3a

Former-commit-id: 5ad996e60e [formerly 9e110936e8] [formerly 5ad996e60e [formerly 9e110936e8] [formerly 73f7935f46 [formerly cb4e2e652ba3763725b8ec7e6d528748d2472a6b]]]
Former-commit-id: 73f7935f46
Former-commit-id: 83de62e506 [formerly 17268bb5dd]
Former-commit-id: 8a9ec04c80
2014-09-04 08:23:53 -04:00
Baoyu Yin
3ce032aa35 VLab Issue #4567 - AWIPS2_DR_16933: Text Script Editor Edit Menu Delete Line Option; fixes #4567
Change-Id: I10e1dbdd6352adcfa39ae8980230a95afdc8cec1

Former-commit-id: 7f80279179 [formerly fd229c716d] [formerly 7f80279179 [formerly fd229c716d] [formerly 309e1bc684 [formerly d9f69c85c6432a937f70c16053f45d5214ce5147]]]
Former-commit-id: 309e1bc684
Former-commit-id: cbd1062ca8 [formerly ba01db8d69]
Former-commit-id: beb0b09e77
2014-09-04 07:53:38 -04:00
Nate Jensen
364295639c Omaha #3356 remove unnecessary register buddy to uf.viz.core
Change-Id: I95915b6f1d458a5bb581eec79d40af8bc94122f4

Former-commit-id: 0967e25c67 [formerly 20251fc3e3] [formerly 0967e25c67 [formerly 20251fc3e3] [formerly b332434b49 [formerly a46d5914ae58ad1c3410cdf8d7e67cf856e4c2bd]]]
Former-commit-id: b332434b49
Former-commit-id: ccb7d4a797 [formerly 6285cc9893]
Former-commit-id: 9e1336de40
2014-09-03 16:10:53 -05:00
Steve Harris
67969a5118 Merge branch 'master_14.2.4' (14.2.4-7) into omaha_14.2.4
Former-commit-id: 0ea6b72088 [formerly 0e869fa6c1] [formerly 0ea6b72088 [formerly 0e869fa6c1] [formerly afa45bf919 [formerly 2391bc928e8798f022c3ca5ad8a1d5619ae4e2a4]]]
Former-commit-id: afa45bf919
Former-commit-id: 550eb6e3ac [formerly e3d99832ec]
Former-commit-id: 49a48c4874
2014-09-03 15:22:00 -05:00
Nate Jensen
3188cd0af2 Omaha #3356 remove more unnecessary register buddies and policies
Change-Id: I3e39f9b8274b2b9104f3b3d037601c1553c43e13

Former-commit-id: 2c74d90cc4 [formerly c0dab26b92] [formerly 2c74d90cc4 [formerly c0dab26b92] [formerly 9d462e1dd9 [formerly b535d54c52c3e38bb9fa083ba911ad49c090f214]]]
Former-commit-id: 9d462e1dd9
Former-commit-id: d5e948b7e2 [formerly 05a73b1e4b]
Former-commit-id: d87cfb8131
2014-09-03 11:34:10 -05:00
Nate Jensen
64c23a487d Omaha #3356 remove unnecessary dependency
Change-Id: I59503f01e8c7ec451c7dcb725bf9fecd0209fba2

Former-commit-id: a7984f6dde [formerly 4b5d5ab6cc] [formerly a7984f6dde [formerly 4b5d5ab6cc] [formerly 362fee1984 [formerly c60ca3a16e348216c582f30bc95d8d35ef81e312]]]
Former-commit-id: 362fee1984
Former-commit-id: 9e5c92de45 [formerly de4472f76b]
Former-commit-id: 5a2a700085
2014-09-03 10:53:30 -05:00
Nate Jensen
22fa9cc6d9 Omaha #3356 remove OBE register buddies from collaboration
Change-Id: I49099386a48b650c9e6ea1a96b519fbc178f769f

Former-commit-id: b690c360ac [formerly 8e74892cd6] [formerly b690c360ac [formerly 8e74892cd6] [formerly 40d4abe4cd [formerly 89de611bd1abdd016ae8a96db4c820004c52b406]]]
Former-commit-id: 40d4abe4cd
Former-commit-id: f78e7fe79c [formerly 5b2e410c6c]
Former-commit-id: 54e9b04c3d
2014-09-03 10:00:11 -05:00
Mark Peters
72184dbcaf Omaha #3467 Error occurs when loading/editing the Range Rings tool multiple times
Change-Id: I68642e05ce970545a516d4fab1492a860c530032

Former-commit-id: 447986eed3 [formerly 06b98bb48a] [formerly 447986eed3 [formerly 06b98bb48a] [formerly ee36d09cb0 [formerly 725354074d54112c8658dc34a8ac564739acbebb]]]
Former-commit-id: ee36d09cb0
Former-commit-id: 8ace5b852c [formerly a3feb0de78]
Former-commit-id: e7e58b4e78
2014-09-02 16:31:44 -05:00
Ben Steffensmeier
5b35e526f4 Omaha #3390 Remove references to deprecated API.
Former-commit-id: 950075dc59 [formerly 1d2144e840] [formerly 950075dc59 [formerly 1d2144e840] [formerly e32037b42a [formerly ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3]]]
Former-commit-id: e32037b42a
Former-commit-id: 068653ac95 [formerly b77166c26e]
Former-commit-id: 6e1981d6f6
2014-09-02 15:39:45 -05:00
Brian.Dyke
e8143081cb Merge branch 'master_14.2.3' into master_14.2.4 CM-MERGE:14.2.3-1 (14.2.2-30,-31) into 14.2.4
Former-commit-id: 9e156775e5 [formerly fd8ad016ef] [formerly 9e156775e5 [formerly fd8ad016ef] [formerly 14e64881a1 [formerly bc9f03426304e3bb194fbf7f356d8dd3816cd836]]]
Former-commit-id: 14e64881a1
Former-commit-id: 75fccb7361 [formerly 43c9dfa397]
Former-commit-id: 2d9a8a8b40
2014-09-02 16:32:54 -04:00
Brian.Dyke
0d6ef0345d Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: e425e5bf8c [formerly f0875e724f] [formerly e425e5bf8c [formerly f0875e724f] [formerly 611e036e75 [formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]]]
Former-commit-id: 611e036e75
Former-commit-id: 3b9653ef00 [formerly caf5f778e9]
Former-commit-id: 4425e3db61
2014-09-02 16:30:51 -04:00
Brian.Dyke
cd6bf05d34 Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: 65f8fc89f0 [formerly 368f80f220] [formerly 65f8fc89f0 [formerly 368f80f220] [formerly b1dbaa0b50 [formerly f9daf7d6e906904e96438fabc510e24ff66536d4]]]
Former-commit-id: b1dbaa0b50
Former-commit-id: 045647bb37 [formerly a1889cd15e]
Former-commit-id: efb7dcb397
2014-09-02 15:09:06 -04:00
Qinglu.Lin
7ec0ec8877 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05

Former-commit-id: b32ea40289 [formerly 2374673f8d] [formerly b32ea40289 [formerly 2374673f8d] [formerly ae13ea419e [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]]]
Former-commit-id: ae13ea419e
Former-commit-id: 3fcdc279ea [formerly 075df9d234]
Former-commit-id: 415af39911
2014-09-02 14:37:19 -04:00
Ron Anderson
699fe1637e Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce

Former-commit-id: c7fbca0298 [formerly 46c62a1db6] [formerly c7fbca0298 [formerly 46c62a1db6] [formerly 434d412882 [formerly e2ecb91569c2f622d45f7301c1eb4e058a2ab641]]]
Former-commit-id: 434d412882
Former-commit-id: 19ce2bb34e [formerly 24fba5cc20]
Former-commit-id: cad80d1060
2014-09-02 12:21:42 -05:00
Ron Anderson
c13e748b6c Merge "Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective" into omaha_14.4.1
Former-commit-id: 8d9741bd83 [formerly 6a5d4acf7c] [formerly 8d9741bd83 [formerly 6a5d4acf7c] [formerly aa6835147b [formerly 31578a50044053da2ecf14697764bfac2ee8ac8d]]]
Former-commit-id: aa6835147b
Former-commit-id: f27986f541 [formerly 017378f646]
Former-commit-id: 8ab30a7e02
2014-09-02 12:08:44 -05:00
Nate Jensen
0c55719688 Merge "Omaha #3356 fix cave startup" into omaha_14.4.1
Former-commit-id: 3258b9a2b2 [formerly 5247f4833f] [formerly 3258b9a2b2 [formerly 5247f4833f] [formerly 653d594382 [formerly e3c3d979ba7dcb46d2af716aa73e05c67f0dd2ba]]]
Former-commit-id: 653d594382
Former-commit-id: 9067556a0e [formerly a63f5ee67b]
Former-commit-id: 8078915092
2014-09-02 10:14:08 -05:00
Nate Jensen
070ef331b9 Merge "Omaha #3569 Split Volume Browser planes menus into multiple reusable components." into omaha_14.4.1
Former-commit-id: e673ed62bd [formerly 2c209af1fa] [formerly e673ed62bd [formerly 2c209af1fa] [formerly fe457e89a7 [formerly 09d7406f13949cf6a90164b06742c80ba2e18110]]]
Former-commit-id: fe457e89a7
Former-commit-id: 675bf92355 [formerly 5661124038]
Former-commit-id: 84a107c8fa
2014-09-02 09:53:25 -05:00
Nate Jensen
037859fb38 Merge "Omaha #3459 Ensure font is initialized before queryJob runs, Additional refactoring to someday allow ZoneSelectorResource to use more common code." into omaha_14.4.1
Former-commit-id: 3efe4cf3b0 [formerly c4333e030c] [formerly 3efe4cf3b0 [formerly c4333e030c] [formerly 13f1a5a8ab [formerly 172d733902e6430de4f776eed3ad4cd6a94164a5]]]
Former-commit-id: 13f1a5a8ab
Former-commit-id: ce408af16d [formerly d7a2ff8336]
Former-commit-id: f913771eb0
2014-09-02 09:52:38 -05:00
Nate Jensen
9f908d764c Omaha #3356 fix cave startup
Change-Id: Id05d1439ba4f3b5064887b46256f4ade4523f595

Former-commit-id: 9bf9e3a658 [formerly 4395ab6f11] [formerly 9bf9e3a658 [formerly 4395ab6f11] [formerly ef99d43451 [formerly d326ee1a73a852e5534e76bf2148afd7646adb7e]]]
Former-commit-id: ef99d43451
Former-commit-id: b2d1d16230 [formerly fe789cce26]
Former-commit-id: 20aa52b2ed
2014-09-02 09:50:08 -05:00
Richard Peter
5496419cc9 Merge "Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml." into omaha_14.4.1
Former-commit-id: 5db143cd92 [formerly 6f66071eca] [formerly 5db143cd92 [formerly 6f66071eca] [formerly 40917b6118 [formerly f7aa38e6092e59e314fedad22829eed9e5c22ad2]]]
Former-commit-id: 40917b6118
Former-commit-id: 0f7e216834 [formerly 59ad20bac3]
Former-commit-id: c1fcdcfde2
2014-09-02 09:23:58 -05:00
Steve Harris
f1c77c42ed Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4
Former-commit-id: f7e39c9d6f [formerly 3b6a003884] [formerly f7e39c9d6f [formerly 3b6a003884] [formerly e7705c328e [formerly 09b94266f1f3aeaaa7fcf622487d751097d271a4]]]
Former-commit-id: e7705c328e
Former-commit-id: 79c7e0b492 [formerly 92a45c76fb]
Former-commit-id: 6279cdb55c
2014-09-02 08:12:49 -05:00
Mark Peters
aa58dab103 Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective
Change-Id: Ie029b1aff905b57b5a353e0acf60c5137014c473

Former-commit-id: 966879b8a1 [formerly e35a7451c6] [formerly 966879b8a1 [formerly e35a7451c6] [formerly 045746ec21 [formerly 8099cbe2359334d6718761046a1475fca687af35]]]
Former-commit-id: 045746ec21
Former-commit-id: c850f6b6cd [formerly cc96e1fb1f]
Former-commit-id: 264c5afa15
2014-08-29 16:17:22 -05:00
Ben Steffensmeier
7476405193 Issue #3543 Fix gl datamapping of data with NaN conversions.
Former-commit-id: 9c2c00c71e [formerly 22f93b6905] [formerly 9c2c00c71e [formerly 22f93b6905] [formerly 190893e807 [formerly bc12be9bb6e8c7f63550602f51bca3448c21d4c6]]]
Former-commit-id: 190893e807
Former-commit-id: cb95c6ee3a [formerly 6f9dca57e8]
Former-commit-id: 16561bb4c7
2014-08-29 15:08:03 -05:00
Mark Peters
9cab14d5b6 Omaha #3569 Split Volume Browser planes menus into multiple reusable components.
Change-Id: Idb7fa5d1b5cd5a53db38545c942c4c0bae19c3c9

Former-commit-id: 86b9016338 [formerly 097ce54969] [formerly 86b9016338 [formerly 097ce54969] [formerly 91f2b365a1 [formerly a0864eff6efa679cdc0f58cd408102e32145f22c]]]
Former-commit-id: 91f2b365a1
Former-commit-id: abd256ab93 [formerly 54f9a37e6c]
Former-commit-id: a3c382c0f7
2014-08-29 15:05:29 -05:00
Kiran.Shrestha
df635b2a58 ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I969cd9ddaa9adc83d5e65571fbb4f45ea89002a6

Former-commit-id: 3abf28f856 [formerly a285439c08] [formerly 3abf28f856 [formerly a285439c08] [formerly d8bd6a9c70 [formerly 1681bea10870df58b3f2cc0d0a59f21c596e9e95]]]
Former-commit-id: d8bd6a9c70
Former-commit-id: f278d7edbf [formerly 2687526cec]
Former-commit-id: 022a4dc4dc
2014-08-29 13:50:55 -04:00
Ron Anderson
4a821c89b7 Omaha #3459 Ensure font is initialized before queryJob runs,
Additional refactoring to someday allow ZoneSelectorResource to use more common code.

Change-Id: I87e4d1a16b6086f4241e67bb1058bb096eb5e062

Former-commit-id: f3f2ec8843 [formerly 8583386e5f] [formerly f3f2ec8843 [formerly 8583386e5f] [formerly de490ea582 [formerly a1896437f432bcb360365d28a0ee7377cec565af]]]
Former-commit-id: de490ea582
Former-commit-id: ae69665e50 [formerly 338672c03f]
Former-commit-id: 3954787487
2014-08-29 12:04:52 -05:00
Nate Jensen
5e78fb700b Merge "Omaha #3561 Yet another attempt to fix combinations file updating" into omaha_14.4.1
Former-commit-id: 47261a4ac4 [formerly 16191b10ab] [formerly 47261a4ac4 [formerly 16191b10ab] [formerly c60dfb889c [formerly 3482282527df3ffd13c93d1a5d63d52ce79f8b2b]]]
Former-commit-id: c60dfb889c
Former-commit-id: 6647ce3111 [formerly b61f93a2e4]
Former-commit-id: 08a9210cce
2014-08-29 11:16:16 -05:00
Steve Harris
a7e18342d9 Omaha #3132 - removing duplicated com.raytheon.uf.viz.core
Former-commit-id: f51ceee718 [formerly aedf89c00b] [formerly f51ceee718 [formerly aedf89c00b] [formerly c49eabbb45 [formerly 94468f09bd626bd2ff26e7312ceede154f427664]]]
Former-commit-id: c49eabbb45
Former-commit-id: 113bcace66 [formerly d24b29f7b2]
Former-commit-id: aed5540042
2014-08-29 11:05:34 -05:00
Ron Anderson
acc6079444 Omaha #3561 Yet another attempt to fix combinations file updating
Change-Id: I4131ed6043e4bbfa2955024b5e3ce4508734585f

Former-commit-id: 89cde78ea6 [formerly bd52b5a924] [formerly 89cde78ea6 [formerly bd52b5a924] [formerly 9f37d7914a [formerly b1c067fe33d1fe09f89e981b03ef178bcc3a5f93]]]
Former-commit-id: 9f37d7914a
Former-commit-id: b58479dc0b [formerly b489928744]
Former-commit-id: 7158207736
2014-08-29 10:45:54 -05:00
Steve Harris
ecf26b3ac5 Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: bddf9c0f27 [formerly 793064063b] [formerly bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]
Former-commit-id: 5d58625abc
Former-commit-id: 66b485c000 [formerly d984dd538f]
Former-commit-id: e681e0a457
2014-08-29 10:17:52 -05:00
Brian.Dyke
85d763def5 Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: a5519a28d9 [formerly 37c926973c] [formerly a5519a28d9 [formerly 37c926973c] [formerly a2f66c8d97 [formerly cff9bfd2697a73ccc18642d8dc057b6a27aa2991]]]
Former-commit-id: a2f66c8d97
Former-commit-id: d14d2b9a30 [formerly f3eba57747]
Former-commit-id: 24a0b8457e
2014-08-29 10:07:14 -04:00
Brian Clements
e9eb97a8fb Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040

Former-commit-id: 981390eb22 [formerly b352bd3944] [formerly 981390eb22 [formerly b352bd3944] [formerly cfeb16eff8 [formerly b3482522860408c2d052261e845899cf73c2ce96]]]
Former-commit-id: cfeb16eff8
Former-commit-id: c337087043 [formerly a2010c729a]
Former-commit-id: 139466b9ef
2014-08-29 08:55:58 -05:00
Juliya Dynina
95f1799dc6 Merge "ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired" into asm_14.2.3
Former-commit-id: 5f001b7ad7 [formerly 169dc0ba43] [formerly 5f001b7ad7 [formerly 169dc0ba43] [formerly 58a3df78a8 [formerly bb260c4003b477ca51cf5fd9c8d54275af906772]]]
Former-commit-id: 58a3df78a8
Former-commit-id: 62d2e61a75 [formerly 07b6109b5f]
Former-commit-id: 9a5eb28213
2014-08-28 15:52:11 -05:00
Ana Rivera
aec8eba1a7 VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1

Former-commit-id: e033ed5546 [formerly 160dabc4d1] [formerly e033ed5546 [formerly 160dabc4d1] [formerly 9af77831a6 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]]]
Former-commit-id: 9af77831a6
Former-commit-id: 2045699212 [formerly fbe4d57f6b]
Former-commit-id: dee335f370
2014-08-28 18:38:26 +00:00
Roger Ferrel
89f66db462 Issue #3553 - Force redisplay of data set table after all labels are generated.
Change-Id: Ie8c0195414102d046e5348e778ba8d5e1053e5ec

Former-commit-id: 15c73be56c [formerly 6f8c6d6aa1] [formerly 15c73be56c [formerly 6f8c6d6aa1] [formerly ef5dfb1f93 [formerly bcc9b0a6352151dfdf3ba75063bb87308cb162b4]]]
Former-commit-id: ef5dfb1f93
Former-commit-id: ffa95bce90 [formerly fe50853adb]
Former-commit-id: 86d4730538
2014-08-28 13:10:11 -05:00
David Friedman
e42ffa0ad4 ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired
Change-Id: I3a29b5b0bb5c75dd5ac5f508391f5806cabf47fa

Former-commit-id: 9c2545ed64 [formerly de6e79f9e3] [formerly 9c2545ed64 [formerly de6e79f9e3] [formerly d5c086a022 [formerly aca832a81bc18d954eadb51755ce04597cd264df]]]
Former-commit-id: d5c086a022
Former-commit-id: b2cc41f3de [formerly 6209bbc36f]
Former-commit-id: 41b4886743
2014-08-28 18:08:23 +00:00