Nate Jensen
f88e76c84e
Merge "Issue #1590 Change localization notification observer to send notification to listeners after unlocking file to avoid deadlock" into development
...
Former-commit-id: ffe5dc4f4c
[formerly 139fbac574
] [formerly ef0194872a
] [formerly ffe5dc4f4c
[formerly 139fbac574
] [formerly ef0194872a
] [formerly 1cf73c4426
[formerly ef0194872a
[formerly 6eefd1de088b4b3e334a3c587c371a4028ee09dd]]]]
Former-commit-id: 1cf73c4426
Former-commit-id: cf3e5ee1ac
[formerly cefa4c3901
] [formerly dcebedcbd8f4ef2737b78c7f45a4e379c2ff5942 [formerly 69ebf80213
]]
Former-commit-id: b9de1b3694ca8fa7ad6fd855f08b1d8323be5c20 [formerly f8734bbe6a
]
Former-commit-id: 0f1248abbe
2013-02-11 09:48:42 -06:00
Steve Harris
388a32ea50
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: 5905f0a6ac
[formerly 76b7586da8
] [formerly 89581b175b
] [formerly 5905f0a6ac
[formerly 76b7586da8
] [formerly 89581b175b
] [formerly ffc1f4c75c
[formerly 89581b175b
[formerly bc1132a73a78b9f8c1f92f6ded82335f77ebadf8]]]]
Former-commit-id: ffc1f4c75c
Former-commit-id: 0b632e0f0b
[formerly 2d08f63ded
] [formerly 733626760dd7c43bc1a6b7c7b27948ca970d0979 [formerly 861983a573
]]
Former-commit-id: 1d80a90219ce38e08b077dc41858e6d1ea5734c9 [formerly c96258b515
]
Former-commit-id: c2b93e8b70
2013-02-08 16:14:17 -06:00
Steve Harris
cb303635e3
Merge branch 'ss_builds' (13.2.1-6) into 13.2.1_delivery
...
Former-commit-id: 2dd2ee4de7
[formerly 11fe18edec
] [formerly 51449a651e
] [formerly 2dd2ee4de7
[formerly 11fe18edec
] [formerly 51449a651e
] [formerly 7b788f8e48
[formerly 51449a651e
[formerly bdcffbb263cafbe7ee626b82dfa808a2e2ea58af]]]]
Former-commit-id: 7b788f8e48
Former-commit-id: 834dcd1e87
[formerly 9f3148073c
] [formerly 119d6adab8a6c8834ff1fc50722e8776780fbca1 [formerly a45d9231d6
]]
Former-commit-id: 43071dcce0cdca30db69483e19f345fb29ed431a [formerly 62532d7ab5
]
Former-commit-id: 3772f37cc3
2013-02-08 16:13:38 -06:00
Steve Harris
2f667a1c55
13.2.1-6 baseline
...
Former-commit-id: 8b657f87e4
[formerly d6b32d9d1f
] [formerly 89a698bc02
] [formerly 8b657f87e4
[formerly d6b32d9d1f
] [formerly 89a698bc02
] [formerly bd02b0b1b4
[formerly 89a698bc02
[formerly c5df294c580862d0ac52b44bc473d4512f77cf2e]]]]
Former-commit-id: bd02b0b1b4
Former-commit-id: ae6f1344d8
[formerly dd5d3741b0
] [formerly 594941a49a440fd089f7fb31539f661d46dd2f87 [formerly efe8c4eae4
]]
Former-commit-id: 1f48a05adfcdf7493a4416ccf6f826cf045ce9cb [formerly 3c800ad07e
]
Former-commit-id: cad248b025
2013-02-08 15:59:40 -06:00
Matt Nash
df0b375d10
Issue #1476 workaround for eclipse bug to close all detached non-restorable views on cave close
...
Change-Id: I26b17bf43a08c800df0d89dc67a78d920d04cc74
Former-commit-id: 86e7880e9d
[formerly 023a3d59ce
] [formerly d1070533c2
] [formerly 86e7880e9d
[formerly 023a3d59ce
] [formerly d1070533c2
] [formerly c4fa10e743
[formerly d1070533c2
[formerly d70ffee0df397ca1e5f2f2110fe82d4ca6177f02]]]]
Former-commit-id: c4fa10e743
Former-commit-id: 127f1d1529
[formerly 0d17855ca9
] [formerly da8a90b81f19a229ef1939e93b250c83eb77cb1b [formerly 82f3b3d33a
]]
Former-commit-id: 468455514185d956199c94448a169d7b46af1a6d [formerly b1eb61a356
]
Former-commit-id: 1c2120a848
2013-02-08 10:26:21 -06:00
Max Schenkelberg
202764860e
Issue #1590 Change localization notification observer to send notification to listeners after unlocking file to avoid deadlock
...
Change-Id: I2b5ffa08af98259bdd860feb4cd989be013a05be
Former-commit-id: 237e5b94cc
[formerly 4ba75b9ece
] [formerly 232400965d
] [formerly 237e5b94cc
[formerly 4ba75b9ece
] [formerly 232400965d
] [formerly 3f3359370d
[formerly 232400965d
[formerly 1ebb6aa360c9f916f09a5da95e5d831a021508e1]]]]
Former-commit-id: 3f3359370d
Former-commit-id: 3e843c4218
[formerly 9235c32f9e
] [formerly 0d563e960fcbae97233e2736a535609062fc4166 [formerly 9383d97579
]]
Former-commit-id: 282cef4455c6cb488886e05c2ba19933c6472940 [formerly be6a2a47f1
]
Former-commit-id: 2f28c6a086
2013-02-07 16:36:53 -06:00
Roger Ferrel
49368f5fde
Issue #1578 Changes for non-blocking QuestionableBadDataDlg.
...
Change-Id: I872b351c983a825d646b213bc683f66cc0e13577
Former-commit-id: e674368756
[formerly a798c0df19
] [formerly 81a9bdc034
] [formerly e674368756
[formerly a798c0df19
] [formerly 81a9bdc034
] [formerly 33d9e6a001
[formerly 81a9bdc034
[formerly ed0cfb0fd11a1449d2e2f3e5f316181734a25b84]]]]
Former-commit-id: 33d9e6a001
Former-commit-id: 66cc060b91
[formerly 253c0909b6
] [formerly 03f91965a70ff3c71fb7ecde0295eae32c4034bd [formerly 58c989a3bf
]]
Former-commit-id: cb7e83e66a31cef40497ad604be5cf7c99981ad8 [formerly c486edab44
]
Former-commit-id: b9553a063f
2013-02-07 15:27:55 -06:00
Nate Jensen
271d5096a0
Merge "Issue #1570 add concurrent python functionality, address some comments" into development
...
Former-commit-id: a2c10e40bf
[formerly fa39d675e2
] [formerly f204191837
] [formerly a2c10e40bf
[formerly fa39d675e2
] [formerly f204191837
] [formerly efaa83d708
[formerly f204191837
[formerly ea35d3e1ea8b4d7bf7f532e2e1ee1513888d61ba]]]]
Former-commit-id: efaa83d708
Former-commit-id: 03f24af039
[formerly 017ebf0cd1
] [formerly b0183b45f5f6268542088728f79b3c9dbe0716de [formerly 276b302002
]]
Former-commit-id: 1cd8edf4d250da74bbe16f42a2d66ed9b208e082 [formerly 262c99927e
]
Former-commit-id: 4437d61541
2013-02-07 15:19:05 -06:00
Lee Venable
baafd8b225
Merge "Issue #1578 Changes for non-blocking PDC_SaveDlg." into development
...
Former-commit-id: c21bcef152
[formerly 500cebc029
] [formerly fd97a3d4be
] [formerly c21bcef152
[formerly 500cebc029
] [formerly fd97a3d4be
] [formerly 9fb1bb41d9
[formerly fd97a3d4be
[formerly 6bd655fed2cf39fa465f4f5c4240e1cb8fc86e31]]]]
Former-commit-id: 9fb1bb41d9
Former-commit-id: 01fc3fc48e
[formerly b3c1c2d0ec
] [formerly c5b51fc09d69011ffc07fc086cb3cdbfab59c9d3 [formerly f26a7065ae
]]
Former-commit-id: a16d931fdf76f35798b73b587180c0a4e96064b2 [formerly 1adb799ed8
]
Former-commit-id: eec668d710
2013-02-07 14:30:23 -06:00
Richard Peter
cf0123541d
Merge "Issue #1586 add color to area validation." into development
...
Former-commit-id: 41411713b9
[formerly d26d8bbe31
] [formerly 761b02e93e
] [formerly 41411713b9
[formerly d26d8bbe31
] [formerly 761b02e93e
] [formerly 27ce3e37f2
[formerly 761b02e93e
[formerly f8a90106eef02f27f65a6a0eda5e92a5720adf90]]]]
Former-commit-id: 27ce3e37f2
Former-commit-id: 735644b8c4
[formerly 93eddbbedd
] [formerly 6242aa7e4f0b9548ce8875c2d71c07a157867f9c [formerly 9f6078380a
]]
Former-commit-id: 172edcf47ee4b3fff1f869691ec3826aa3770a34 [formerly 1f3f1ca54a
]
Former-commit-id: 4514e6c41d
2013-02-07 14:22:46 -06:00
Roger Ferrel
d33ce01c43
Issue #1578 Changes for non-blocking PDC_SaveDlg.
...
Change-Id: I29228892970a5349c352a34880087afe48a339da
Former-commit-id: 35e9473494
[formerly ba3fa2a509
] [formerly ad2639601e
] [formerly 35e9473494
[formerly ba3fa2a509
] [formerly ad2639601e
] [formerly d4660004f3
[formerly ad2639601e
[formerly 0ea655d32be4e0e13bdade510bcc6979d6da3799]]]]
Former-commit-id: d4660004f3
Former-commit-id: 183c5e9d65
[formerly 4e773c2c9c
] [formerly 154a4712436955b7c70b14470fe583cc773331e3 [formerly bb84fe5f68
]]
Former-commit-id: 8b84822960e42360924a7e00970aa1d6bcae62e0 [formerly 62eb1a3cdf
]
Former-commit-id: 76974357cf
2013-02-07 14:08:59 -06:00
Lee Venable
d28d5e2d37
Merge "Issue #1560 - Additional fix to HTS page up/down reload problem." into development
...
Former-commit-id: 80311cbba3
[formerly 56ec704522
] [formerly 8d7c0e3b6a
] [formerly 80311cbba3
[formerly 56ec704522
] [formerly 8d7c0e3b6a
] [formerly 1f1b171862
[formerly 8d7c0e3b6a
[formerly d36aa52d8d212aaef3bc68c96a24956696fef513]]]]
Former-commit-id: 1f1b171862
Former-commit-id: e341f9bc06
[formerly c8ddcf394b
] [formerly 515ebc187374550f3e7fb56ecf8f2b38f34dd615 [formerly e70a758f63
]]
Former-commit-id: 8c7450dfcb72b65abe178458cf2d020159ac2ddb [formerly e92666cc43
]
Former-commit-id: dc5ba802ec
2013-02-07 13:06:09 -06:00
Lee Venable
a76a8967f1
Merge "Issue #1578 Slav's fix for disposed cursors in MonitoringAreaConfigDlg." into development
...
Former-commit-id: 411e9fb5e2
[formerly 21792d44f9
] [formerly e4d4743ef7
] [formerly 411e9fb5e2
[formerly 21792d44f9
] [formerly e4d4743ef7
] [formerly 362b851388
[formerly e4d4743ef7
[formerly 4958257a3994d0507b256921cf459fe7f1556c97]]]]
Former-commit-id: 362b851388
Former-commit-id: 60d0094fba
[formerly a833ba8bd7
] [formerly 5d3e0383119ab1533cd0e4bd1525e1c30e2cb964 [formerly 4667c8475c
]]
Former-commit-id: 96b7de44998d8f82b96a2ea260cfcb1f6ffcec47 [formerly 63fdbe619a
]
Former-commit-id: 2fefb4727f
2013-02-07 13:05:13 -06:00
Lee Venable
b8ad5ebb90
Merge "Issue #1578 Changes for non-blocking FilteringDlg and bug fix to TimeSeriesDlg." into development
...
Former-commit-id: bf5766a916
[formerly 758d23cc43
] [formerly 2b63f58269
] [formerly bf5766a916
[formerly 758d23cc43
] [formerly 2b63f58269
] [formerly 3932a3e7c2
[formerly 2b63f58269
[formerly 002f832ca109fdd0df9112d2341aeab038aba0db]]]]
Former-commit-id: 3932a3e7c2
Former-commit-id: e1307c742b
[formerly 1e2fa53f57
] [formerly f8529a27a69ffaf02699ef563f9a5a1cb2b17a1e [formerly a7de993595
]]
Former-commit-id: 40e061bdd7489361afc114f91aeaa9629d426631 [formerly df1d5ee70e
]
Former-commit-id: c74632b003
2013-02-07 12:58:13 -06:00
Roger Ferrel
1384a98c4c
Issue #1578 Slav's fix for disposed cursors in MonitoringAreaConfigDlg.
...
Change-Id: Ia57cfe88e22544260bbc03483b4c852843f67b42
Former-commit-id: 3275e6adfe
[formerly 24c88a1673
] [formerly 130fa3f73d
] [formerly 3275e6adfe
[formerly 24c88a1673
] [formerly 130fa3f73d
] [formerly 873f932f8e
[formerly 130fa3f73d
[formerly 64c6e3b9812dc7232bd36feff181805c4fd504d9]]]]
Former-commit-id: 873f932f8e
Former-commit-id: 26059ae7e0
[formerly 940d442f6f
] [formerly 55ef04696c780948659739ded23b8f7dfe6ff66c [formerly f30b5846c1
]]
Former-commit-id: 3ca8ee1793c0ddeed4459318c7900a91dedca32b [formerly 0f1f4fb42f
]
Former-commit-id: 06db554bbe
2013-02-07 12:46:01 -06:00
Lee Venable
c0f84cc162
Merge "Issue #1578 Changes for non-blocking GageLegend." into development
...
Former-commit-id: ad34019ce3
[formerly 09cb9bbc55
] [formerly 4915d89fb8
] [formerly ad34019ce3
[formerly 09cb9bbc55
] [formerly 4915d89fb8
] [formerly f0cdda345d
[formerly 4915d89fb8
[formerly e00c153669b699e2d2dd63fec85b9f891688a5d9]]]]
Former-commit-id: f0cdda345d
Former-commit-id: a8433ee638
[formerly 77bb92dd26
] [formerly e17e8b1eecb3c6a6732196dd60017ea9a5c3a18b [formerly 6e9094a27e
]]
Former-commit-id: 374871b8e47994eca78a8ee256db73c5c9a9fcb8 [formerly 0371047157
]
Former-commit-id: 026ed72df4
2013-02-07 12:37:22 -06:00
Matt Nash
0cf7339b43
Issue #1570 add concurrent python functionality, address some comments
...
Change-Id: I9d7f5491f0895e252d04979458004e64e39f6805
Former-commit-id: 81a8eb12ea
[formerly f785808ff9
] [formerly 2b84120235
] [formerly 81a8eb12ea
[formerly f785808ff9
] [formerly 2b84120235
] [formerly 53f58684a0
[formerly 2b84120235
[formerly 02a6471f1407593fcf39a724eb19bb4a7bc22626]]]]
Former-commit-id: 53f58684a0
Former-commit-id: 40274ba462
[formerly a4b72307da
] [formerly c11ac1163a87c47808ac3dbaaa33d694f345eacb [formerly e21ada775c
]]
Former-commit-id: d1e9dd28d1258e9142041248ea43e646c8d8c0f1 [formerly d64842f8da
]
Former-commit-id: ff1fbc33a6
2013-02-07 12:01:42 -06:00
Roger Ferrel
91545e74a0
Issue #1578 Changes for non-blocking FilteringDlg and bug fix to TimeSeriesDlg.
...
Change-Id: Ib024fe2051d753c001bbd43079c629cc2cca8e9b
Former-commit-id: e0e27a3a0f
[formerly a87fd5c9f6
] [formerly 2c10f90df0
] [formerly e0e27a3a0f
[formerly a87fd5c9f6
] [formerly 2c10f90df0
] [formerly 0186ec3b68
[formerly 2c10f90df0
[formerly 1994880374ba0fcccedfde60bff6645acbafabae]]]]
Former-commit-id: 0186ec3b68
Former-commit-id: cfe1f28f17
[formerly 27339cbd7f
] [formerly 5de58b070bbc6dae59fcade6741107c449d8280c [formerly 45d3bcb6e9
]]
Former-commit-id: c2cc17bcfb1ec9c7235fa1d1f413180be9c90a51 [formerly 2fc55e62c5
]
Former-commit-id: b221911a63
2013-02-07 11:12:51 -06:00
Nate Jensen
8c527632b2
Merge "Issue #1500 Sped up warngen text creation by calculating hatched polygon and area in Job when polygon or area changes, initializing velocity for template running when warngen starts, only requesting full warning records when they are requested for use from CurrentWarnings, and only requesting partial ActivateTableRecords for determining active watch info." into development
...
Former-commit-id: 5a8883bdff
[formerly d6ff3d9ca8
] [formerly e2593ee0ab
] [formerly 5a8883bdff
[formerly d6ff3d9ca8
] [formerly e2593ee0ab
] [formerly e993b72a39
[formerly e2593ee0ab
[formerly fd8ff178849afdf24c5ff01c9b709a71eb1bee87]]]]
Former-commit-id: e993b72a39
Former-commit-id: c66c52794e
[formerly e9e560e67b
] [formerly c639f940cb29627768f957ae0f9843e0954314d4 [formerly 2088daf6d5
]]
Former-commit-id: e14c4380aa8060bf7b63592143c717084efcd0cb [formerly 7a79f8a365
]
Former-commit-id: 476d495aed
2013-02-07 10:25:57 -06:00
Mike Duff
2471e1e359
Issue #1560 - Additional fix to HTS page up/down reload problem.
...
Former-commit-id: e43648860a
[formerly 307b36486d
] [formerly 11aae8b26f
] [formerly e43648860a
[formerly 307b36486d
] [formerly 11aae8b26f
] [formerly 4f1bdd295a
[formerly 11aae8b26f
[formerly dbc68b231bbf9fda21c7b8faf09aebaa1879143a]]]]
Former-commit-id: 4f1bdd295a
Former-commit-id: 1ee0fa6e77
[formerly 8b8bd8b190
] [formerly 464a678accbc10ea2c9acd8772d152f4d7d23a07 [formerly 159702d551
]]
Former-commit-id: a754b19e117e124d99f50b6dc96fb19788d28f12 [formerly 2e281af27f
]
Former-commit-id: b2ac85eeac
2013-02-07 10:22:40 -06:00
Roger Ferrel
b8a09f0ab6
Issue #1578 Changes for non-blocking DataTashCanDlg and clean up to data managers.
...
Review changes 2.
Change-Id: I4d697ccc5a2e5ab63dfef3e52e88d039adfcdaa0
Former-commit-id: 247d0550b9
[formerly b0d1575727
] [formerly b2dc220bcd
] [formerly 247d0550b9
[formerly b0d1575727
] [formerly b2dc220bcd
] [formerly dd85695eb9
[formerly b2dc220bcd
[formerly 7d2e157d20a009a2192b35f95252bdad895a91c5]]]]
Former-commit-id: dd85695eb9
Former-commit-id: 2321480a4f
[formerly b04dee98c7
] [formerly 33710c8bdfd40b76a059c9d4ddd43fe1ccada227 [formerly 0731398ac7
]]
Former-commit-id: a76eee70cb074132d6002eb99963cef8ec1c4eb0 [formerly 83fc1951f4
]
Former-commit-id: 8c2defd927
2013-02-07 09:12:24 -06:00
Roger Ferrel
1889b51245
Issue #1578 Changes for non-blocking GageLegend.
...
Change-Id: I5ae04e8eaf8ebf33bd6a6466925102cfd12f1550
Former-commit-id: eff002b037
[formerly b2f4b219ac
] [formerly a002b9119d
] [formerly eff002b037
[formerly b2f4b219ac
] [formerly a002b9119d
] [formerly 845e05782c
[formerly a002b9119d
[formerly 7bde6bde475269b700826ce699a2437ea6dc9cad]]]]
Former-commit-id: 845e05782c
Former-commit-id: 2909d1fd40
[formerly 86e8bb60c1
] [formerly afaf62f39fe97152d398b2c7e0d3e3daa9e79de0 [formerly 00b4dc560b
]]
Former-commit-id: a165dc37ce2bedcee276cda382d47e757d7f35a2 [formerly c9285492fd
]
Former-commit-id: e174c75bec
2013-02-07 09:05:51 -06:00
Roger Ferrel
b08deb98cf
Issue #1578 Changes for non-blocking FlashFloodGuidanceDlg.
...
Change-Id: I00efe50ba8e0fe11fcca560ef2d07293c9bdf771
Former-commit-id: 48609202e6
[formerly 0c5e92eb7f
] [formerly bb69390c9b
] [formerly 48609202e6
[formerly 0c5e92eb7f
] [formerly bb69390c9b
] [formerly 78a7d02fd2
[formerly bb69390c9b
[formerly d3fd2d7f0591f6fbe15d522a6c909f4509fede94]]]]
Former-commit-id: 78a7d02fd2
Former-commit-id: 3c2c6f8156
[formerly d9197606ff
] [formerly 3dcd22d561969147753ef1769b030af9913894e1 [formerly c1b45bd6c9
]]
Former-commit-id: a58472e17e107c77ddcd7760a8cd4761c8f98f73 [formerly 7c4114c404
]
Former-commit-id: a802ac6f39
2013-02-07 08:27:18 -06:00
Max Schenkelberg
4ab5280825
Issue #1500 Sped up warngen text creation by calculating hatched polygon and area in Job when polygon or area changes, initializing velocity for template running when warngen starts, only requesting full warning records when they are requested for use from CurrentWarnings, and only requesting partial ActivateTableRecords for determining active watch info.
...
Change-Id: Ia120f2d20b99e4d152554727597b22af762413ac
Former-commit-id: 24386a5765
[formerly f73d55e920
] [formerly bb68c95589
] [formerly 24386a5765
[formerly f73d55e920
] [formerly bb68c95589
] [formerly fdc5759b53
[formerly bb68c95589
[formerly 26af6badfffd930b8051af8e33ff6897d6c87073]]]]
Former-commit-id: fdc5759b53
Former-commit-id: e741978174
[formerly f186c355ac
] [formerly 0a48bbf24b8308ff4bbe27e11de2af957bd338ff [formerly 014eaa1666
]]
Former-commit-id: 0b43580983aed4b29c5b704c9c4422512b558ad9 [formerly e736a5d5b7
]
Former-commit-id: b085fddff2
2013-02-06 17:21:13 -06:00
Ben Steffensmeier
7591e5032e
Issue #1586 add color to area validation.
...
Former-commit-id: d260e22e12
[formerly 80f8dc50f9
] [formerly f073984ce6
] [formerly d260e22e12
[formerly 80f8dc50f9
] [formerly f073984ce6
] [formerly 8a233105bc
[formerly f073984ce6
[formerly 452ba74bb84a2531b617675c4ee80ef4b008cd34]]]]
Former-commit-id: 8a233105bc
Former-commit-id: cf95a2159d
[formerly 45b75823ac
] [formerly 8617b0020084a72df53b21c781d2f609f4483a61 [formerly 6a8bd463a6
]]
Former-commit-id: 8472c2b8bad58b557abe0f851a305fb854c62310 [formerly 4b5ad7c8fb
]
Former-commit-id: d655a54154
2013-02-06 13:43:27 -06:00
Roger Ferrel
419f645d3e
Issue #1578 Code clean up for non-blocking dialogs.
...
Changes from code review.
Change-Id: I9f95dd07736f96af8cb1116030a9fb778fe4b047
Former-commit-id: 1914a16504
[formerly 5e2b33206c
] [formerly 581b04f8f7
] [formerly 1914a16504
[formerly 5e2b33206c
] [formerly 581b04f8f7
] [formerly db818dfd35
[formerly 581b04f8f7
[formerly e3c21436e1186e467daf071bb723a2c31d6d3579]]]]
Former-commit-id: db818dfd35
Former-commit-id: 2b54f7aac4
[formerly fc8537fb12
] [formerly 55193c36669e7a9b900055e5f3aa0567b8ff4e7d [formerly 1029538171
]]
Former-commit-id: 2d334880b7b01c75d2419599faa3a763f21832b2 [formerly 22bc10663c
]
Former-commit-id: 3e5e303037
2013-02-06 13:42:57 -06:00
Bryan Kowal
8844590ca2
Issue #1555 - improve Geometry loop
...
Change-Id: I124b0f41f2acd9dd2a5b4ec16c24d8bcfc64c417
Former-commit-id: eb93162e63
[formerly 9ee71bc226
] [formerly f5c3e20b3a
] [formerly eb93162e63
[formerly 9ee71bc226
] [formerly f5c3e20b3a
] [formerly cdafa71827
[formerly f5c3e20b3a
[formerly a8c222a7bb60ccdd0a431c8781488efc641a26c5]]]]
Former-commit-id: cdafa71827
Former-commit-id: d4b001bfa5
[formerly fc84326815
] [formerly cc7b36ba511e8d1313b6862a99eb2fb16985c43c [formerly 9b572f0eb4
]]
Former-commit-id: ba65c2e403335add0c8c292099ab4d242be91557 [formerly 65b87267d6
]
Former-commit-id: 5fae563f88
2013-02-06 12:32:40 -06:00
Bryan Kowal
23be4cf708
Issue #1555 - initial generic geometry resource
...
- refactored viz data access resources
- updated hydro factory based on existing hydro code
- geometric lines and polygons are now both rendered using wireframe shapes and the same logic
- relocated the data used to render the geometries to the resource
- points are created instead of circles for geometric points
- do not store legend text as a static variable in the abstract data access resource
- addressed peer review comments
Change-Id: Ic7792aede9e24445af541f01631886645a8cf1f0
Former-commit-id: c59d2a990a
[formerly 442a2f8fa4
] [formerly a86d2b5769
] [formerly c59d2a990a
[formerly 442a2f8fa4
] [formerly a86d2b5769
] [formerly 1732e6b4ea
[formerly a86d2b5769
[formerly 04179bd343c3ec976c601e2856a3949e4515b472]]]]
Former-commit-id: 1732e6b4ea
Former-commit-id: af587bebe9
[formerly 9c7d8ca3d3
] [formerly 76f3e45d9e852dd7a50c38042a4ecf16145cd1bc [formerly c8a6b08394
]]
Former-commit-id: efe8be7451fef98d62679a990f0e433d7a872556 [formerly 3b2342193f
]
Former-commit-id: eaccf2d09a
2013-02-06 12:03:40 -06:00
Steve Harris
e91c865ccd
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: 953bec4467
[formerly da43a7a8ca
] [formerly 4bc8e9ab5c
] [formerly 953bec4467
[formerly da43a7a8ca
] [formerly 4bc8e9ab5c
] [formerly 5ee47e098d
[formerly 4bc8e9ab5c
[formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]]]
Former-commit-id: 5ee47e098d
Former-commit-id: 3ee627253f
[formerly b119d66cda
] [formerly 0d3c30007ccec08e7c869bfdb97fef5b71783b3b [formerly 3ad515e28f
]]
Former-commit-id: 57f644770a496fa44b6b32dc022210ab2e19666c [formerly d73efe8e86
]
Former-commit-id: a11c8dff6d
2013-02-06 11:12:01 -06:00
Steve Harris
2ccf38754d
Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: 44a4287812
[formerly 14f23d4227
] [formerly a16ac7819c
] [formerly 44a4287812
[formerly 14f23d4227
] [formerly a16ac7819c
] [formerly 6c6b53679b
[formerly a16ac7819c
[formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]]]
Former-commit-id: 6c6b53679b
Former-commit-id: 63b36d8670
[formerly 48a0ffda4d
] [formerly 5a2f1703799bcf7b130380bb73001e518a88ee6d [formerly 28ddc9bad8
]]
Former-commit-id: 6f45b04bcc29948b273c8b6c0ae71fe396db790a [formerly f028c16f79
]
Former-commit-id: f997ecea38
2013-02-06 11:08:53 -06:00
Steve Harris
6cef082440
13.2.1-5 baseline
...
Former-commit-id: 7e1236c17c
[formerly a6b3cde1ff
] [formerly 232734091d
] [formerly 7e1236c17c
[formerly a6b3cde1ff
] [formerly 232734091d
] [formerly 146fcc6da8
[formerly 232734091d
[formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]]]
Former-commit-id: 146fcc6da8
Former-commit-id: 5d64cfc298
[formerly 7497a15e22
] [formerly 49d71a590915a63b8746aa7ff8b66241cdada3aa [formerly 1c602ec3a7
]]
Former-commit-id: 1b1ed3d8dd018c07b00ccdca9330d598dd62ac67 [formerly bb0759d5ad
]
Former-commit-id: f36867a520
2013-02-06 11:02:32 -06:00
Nate Jensen
fe037e6fd7
Merge "Issue #1553 initial implementation of radar factory Change-Id: I86375a74f96159a9ed32d20ffd38168d9308c574" into development
...
Former-commit-id: 77d5975620
[formerly 3f2aa931db
] [formerly ad4d5d6816
] [formerly 77d5975620
[formerly 3f2aa931db
] [formerly ad4d5d6816
] [formerly 86c14f8275
[formerly ad4d5d6816
[formerly a2c55643fe41a58029089aec2689a4678e7f8f6d]]]]
Former-commit-id: 86c14f8275
Former-commit-id: 9a9330a35e
[formerly 36810f3daa
] [formerly 3eaecd3af0f3cb6a7570b5bb96ebd8b28fc32eab [formerly 7304e763d6
]]
Former-commit-id: a6db51fbe4a4e7dfe725b96213ca495ea1d20128 [formerly dbc0a5137b
]
Former-commit-id: 5004f1a551
2013-02-05 17:37:29 -06:00
Lee Venable
e0ad67df1e
Merge "Issue #1578 Changes for non-blocking CaveHydroSWTDialog, singleton TimeseriesDlg and removal of TimeSeriesconfigAction." into development
...
Former-commit-id: aa568f7711
[formerly b6c943fe47
] [formerly ab300ca0d5
] [formerly aa568f7711
[formerly b6c943fe47
] [formerly ab300ca0d5
] [formerly 8f5f26a058
[formerly ab300ca0d5
[formerly 97bd7f31af2db7dd483d4fe4d7da271d2fe3a915]]]]
Former-commit-id: 8f5f26a058
Former-commit-id: 2342328b57
[formerly 9b9072902f
] [formerly 6416cd2c6c200a98c09ae18faac87aa3fe2c75ae [formerly 2264a66c09
]]
Former-commit-id: 9c08c957a5ad25e4f0230f5e2b12094e94b8a667 [formerly 470b10ddc7
]
Former-commit-id: 5ac2876ddd
2013-02-05 16:39:14 -06:00
Lee Venable
5eccd0b2b4
Merge "Issue #1550 - Add ability for MPE to preload maps on perspective open." into development
...
Former-commit-id: 638ce7795e
[formerly 6e7f552972
] [formerly 42941bb2be
] [formerly 638ce7795e
[formerly 6e7f552972
] [formerly 42941bb2be
] [formerly cc34190c18
[formerly 42941bb2be
[formerly 07a61258f12fe6cf793467af271d060882953adc]]]]
Former-commit-id: cc34190c18
Former-commit-id: 6ee303ab26
[formerly 3444c01cfa
] [formerly 2f3142365d129fddfe692925687c633711d49a5e [formerly 0dd325ed88
]]
Former-commit-id: b0d2cfb8a74f7e6d2f75d2997a327c5f058b9b71 [formerly b807d9085e
]
Former-commit-id: f82afa483c
2013-02-05 16:22:30 -06:00
Roger Ferrel
5fca009311
Issue #1578 Changes for non-blocking CaveHydroSWTDialog, singleton TimeseriesDlg and removal of TimeSeriesconfigAction.
...
Change-Id: Ie249af9dcb2b84db686bca5c0936c2157d40c507
Former-commit-id: 2bf24f97ee
[formerly a558cbc03a
] [formerly eaa3834f6b
] [formerly 2bf24f97ee
[formerly a558cbc03a
] [formerly eaa3834f6b
] [formerly dc965dc82a
[formerly eaa3834f6b
[formerly 413491362e25a08b7e43f86987cc059f794a674b]]]]
Former-commit-id: dc965dc82a
Former-commit-id: 3f715082ec
[formerly 30a1f42557
] [formerly 4a3137039bf4b27fdc3d09ef6745a196568a0bf6 [formerly d9d53340bb
]]
Former-commit-id: cfa6e134c8ac268c358e2f352186162e9c0ac12f [formerly 24ff19dae7
]
Former-commit-id: c4c24e2753
2013-02-05 16:13:08 -06:00
Mike Duff
8bfbb7432a
Issue #1580 - Fix spring config
...
Former-commit-id: 02b0b90b16
[formerly 3f3554a559
] [formerly 6b51c66923
] [formerly 02b0b90b16
[formerly 3f3554a559
] [formerly 6b51c66923
] [formerly 65deb06061
[formerly 6b51c66923
[formerly 020c39ec162e786ebb8b5a9a2feac7ae415e5036]]]]
Former-commit-id: 65deb06061
Former-commit-id: 3bb1855876
[formerly 1fc97f07fe
] [formerly d9af82bfe1ee1a3822927c7d4a87dd9e75455f8e [formerly 62e25af348
]]
Former-commit-id: 3efb6619984d63264da55cfc3a398c36d5d18307 [formerly cc384772b7
]
Former-commit-id: 320c4c7683
2013-02-05 15:49:22 -06:00
Mike Duff
2314c6c187
Issue #1580 - Refactor events framework so EventBus is available from CAVE or EDEX.
...
Change-Id: If8d9c18108ca244b044b1ddc5a80e9e5de623c7a
Former-commit-id: 6f1a03d230
[formerly 06ddb6cce7
] [formerly 1b1d00f8a9
] [formerly 6f1a03d230
[formerly 06ddb6cce7
] [formerly 1b1d00f8a9
] [formerly 36909dd6c0
[formerly 1b1d00f8a9
[formerly 1d3f9e0d5b32f96fc4eff47f040d5eb159a38d3c]]]]
Former-commit-id: 36909dd6c0
Former-commit-id: 77ad5ea58e
[formerly cd52a94032
] [formerly ea3b9db059eaba9fc3581435e18f0a784925da2b [formerly 4400265394
]]
Former-commit-id: 98cae448c2f17401fc8c1450a1b5fda8d453c7bb [formerly 0cb979038b
]
Former-commit-id: 28e854de25
2013-02-05 15:13:51 -06:00
Dustin Johnson
01c5245270
Merge "Issue #1543 Add ability to save/read dods files back to net.dods" into development
...
Former-commit-id: baa843d739
[formerly 7b2adf535e
] [formerly df987e6204
] [formerly baa843d739
[formerly 7b2adf535e
] [formerly df987e6204
] [formerly 0ceb35c131
[formerly df987e6204
[formerly 062ed14d60a8b3d29650ce78fa449f69f40d413b]]]]
Former-commit-id: 0ceb35c131
Former-commit-id: aaa4ea8fba
[formerly 81d0423913
] [formerly b9f41462701bde6c5a7c07d7fa9ea11554562ab2 [formerly d08a9b3b13
]]
Former-commit-id: ae811356abf356c2d92d07ea919eae4017330f3f [formerly f50dd729f5
]
Former-commit-id: 53c04aac63
2013-02-05 14:36:31 -06:00
Dustin Johnson
4f8ad5b3b0
Merge "Issue #1543 Break apart the retrieval process to support SBN capabilities. Made interfaces for various aspects of retrieval that are Spring injectable. Created an initial SBN retrieval task that will watch the /awips2/crawl directory, for proof of concept." into development
...
Former-commit-id: fb8833a764
[formerly 9da65d97bc
] [formerly 39cfcf40a8
] [formerly fb8833a764
[formerly 9da65d97bc
] [formerly 39cfcf40a8
] [formerly 6f95400d1c
[formerly 39cfcf40a8
[formerly b6c403f6c8e22397d1df178ffddc9b8951f7e683]]]]
Former-commit-id: 6f95400d1c
Former-commit-id: 02d0a6e9aa
[formerly 4fecb5f6a7
] [formerly 86bd34c6f89ab215a569535f8407daa747059fe4 [formerly 2f900fb18f
]]
Former-commit-id: fa5412c6ff138bea6e972553b8edcf2282720252 [formerly 0552073c4b
]
Former-commit-id: 01bfa884e5
2013-02-05 14:36:12 -06:00
Greg Armendariz
0a0ed958d8
Merge "Issue #1577 - deploy-install and AWIPS II ant task updates" into development
...
Former-commit-id: 059af7ea7d
[formerly fc246471f1
] [formerly 85d3f17617
] [formerly 059af7ea7d
[formerly fc246471f1
] [formerly 85d3f17617
] [formerly 5bcdb25925
[formerly 85d3f17617
[formerly 3e0d46e342a60f245b1519e1741469d9269ab079]]]]
Former-commit-id: 5bcdb25925
Former-commit-id: 48f02759f3
[formerly 927046da46
] [formerly 7f8987834b75968433bffc4a2c68fe79e699f41b [formerly 9223f40f3f
]]
Former-commit-id: cefc97b65333f749c1193a00694f7e86b720d32a [formerly 19c227a6b8
]
Former-commit-id: 2fd99367c5
2013-02-05 14:07:45 -06:00
Dustin Johnson
31151f3c5a
Issue #1543 Add ability to save/read dods files back to net.dods
...
Change-Id: Icca189f4c3716d4045798d88a6e6ce7d27d46fcf
Former-commit-id: 23449a73bf
[formerly efe1bcc4b5
] [formerly cd381cb819
] [formerly 23449a73bf
[formerly efe1bcc4b5
] [formerly cd381cb819
] [formerly febe492056
[formerly cd381cb819
[formerly d93464273e905ecbb834d7aeaccf477b42e495a3]]]]
Former-commit-id: febe492056
Former-commit-id: 7ad9070600
[formerly c81cb3d60b
] [formerly 8ed6a0d05f4ab5e36a81ae666ed0b62384b8afd6 [formerly fffbb32775
]]
Former-commit-id: 21356a47c76d0ac4674803ca4b53386af099cd4e [formerly 999f3cbcd5
]
Former-commit-id: 547362b6bb
2013-02-05 14:07:30 -06:00
Bryan Kowal
77d006cc5f
Issue #1577 - deploy-install and AWIPS II ant task updates
...
- includegen will now fail if a plugin is included in two or more features
- includegen will no longer prepend component-deploy.xml to the plugins in the list that it generates
- removed a plugin from the ncep feature that was also in the cots feature
- the includegen failure will cause deploy-install to fail
- peer review comments; excluding significant re-factoring
Change-Id: I2e317b1ef0764da3ddd9cd6ef10555ca4bf8bd3f
Former-commit-id: 874d754543
[formerly 81da18f851
] [formerly 7815b651bb
] [formerly 874d754543
[formerly 81da18f851
] [formerly 7815b651bb
] [formerly 5fea87f1dd
[formerly 7815b651bb
[formerly 7659fb8044f3f4715c9ea7c875eda36b7c5dd136]]]]
Former-commit-id: 5fea87f1dd
Former-commit-id: 285e192bd1
[formerly efe288c82c
] [formerly 79a63957141ccebe7c30159fdecdcee461b2f5f5 [formerly 99994d3151
]]
Former-commit-id: 6be7d17634e138e6eac183d671f48db6672cf7f4 [formerly 2fafc6a34b
]
Former-commit-id: 2afa604676
2013-02-05 13:25:15 -06:00
Nate Jensen
7be4994613
Merge "Issue #1567 refactor updates of plots for efficiency/clarity" into development
...
Former-commit-id: d17854e0f3
[formerly 317e225992
] [formerly 532bec2967
] [formerly d17854e0f3
[formerly 317e225992
] [formerly 532bec2967
] [formerly 0a64da0b72
[formerly 532bec2967
[formerly e41fb23e150d4c447823593016a698dabcb8fae5]]]]
Former-commit-id: 0a64da0b72
Former-commit-id: 7e2b43d3eb
[formerly 956b1c57db
] [formerly 3bf7580473e3bd44121bace325e7f06c01f1da7c [formerly d6de86b57b
]]
Former-commit-id: ad845de7ee81029f269d46d32d2b786e43b36d46 [formerly 80b1d80da9
]
Former-commit-id: 32bd4081c5
2013-02-05 13:21:21 -06:00
Dave Hladky
1862096941
Issue #1478 FFMP cache file read/writes overloading NAS, more efficiency
...
Change-Id: Ib5f49d9c1551b72a3620629437386d52c12b0ecf
Former-commit-id: 5bc083f84c
[formerly 7b49430e34
] [formerly c0712160d7
] [formerly 5bc083f84c
[formerly 7b49430e34
] [formerly c0712160d7
] [formerly 7af5aab08a
[formerly c0712160d7
[formerly 9c7d813ee094864e0a7da60d54dee5424c50efba]]]]
Former-commit-id: 7af5aab08a
Former-commit-id: d146d3d22d
[formerly b134741e4c
] [formerly 291393e5c8803d3a23bd216c3d4010eab72c680f [formerly f6bd4ea0fa
]]
Former-commit-id: 63dcd786816ca2c797f983e68e840dd050235651 [formerly 69477ec246
]
Former-commit-id: d8ce48e79d
2013-02-05 12:23:56 -06:00
Nate Jensen
5c7ebc1e4f
Issue #1567 refactor updates of plots for efficiency/clarity
...
Change-Id: Id3d52ef2eb671138c078bc721c690867ba3dada3
Former-commit-id: a073a5826c
[formerly 48a503e3dd
] [formerly b9b730aac5
] [formerly a073a5826c
[formerly 48a503e3dd
] [formerly b9b730aac5
] [formerly 2a3f3e6a40
[formerly b9b730aac5
[formerly b2788eb6bbc807d6fecc8e097e15dfbcb3ff8105]]]]
Former-commit-id: 2a3f3e6a40
Former-commit-id: 9c6c549740
[formerly 029aa60957
] [formerly df189aea3c94329d7e08ada924b8f477914c9f01 [formerly a56d672039
]]
Former-commit-id: 1a0a22d8197191d6bcb27119f57ed814177b00a0 [formerly fce50aaf62
]
Former-commit-id: 353f7f513d
2013-02-05 11:07:21 -06:00
Richard Peter
462d7f4e3c
Merge "Issue #1576 - updated qpid 0.18 rpms" into development
...
Former-commit-id: 1e07d66c7f
[formerly bb317b1acf
] [formerly 221a6e1ca1
] [formerly 1e07d66c7f
[formerly bb317b1acf
] [formerly 221a6e1ca1
] [formerly b774fadb60
[formerly 221a6e1ca1
[formerly 16b20a7f05e0a16ef02881a950bd541f7b4a4a1e]]]]
Former-commit-id: b774fadb60
Former-commit-id: 928aa2cfcc
[formerly 2e02b222f2
] [formerly 247a9d4fe6c3743d5405cc1ae8912c81d4b14a04 [formerly fa4dd004f9
]]
Former-commit-id: 82f2b9bfe531f0692c01403cca357d9bf19a2038 [formerly b4192e72c8
]
Former-commit-id: 7fbd24e723
2013-02-05 09:25:55 -06:00
Richard Peter
2075147d4f
Merge "Issue #1517 Added SPC Prob menu changes." into development
...
Former-commit-id: 8a80d31c13
[formerly e4894a01fd
] [formerly 74b3cc23ff
] [formerly 8a80d31c13
[formerly e4894a01fd
] [formerly 74b3cc23ff
] [formerly 4170ba9558
[formerly 74b3cc23ff
[formerly 153173d6f07aaf135be6e5422c893942deef5371]]]]
Former-commit-id: 4170ba9558
Former-commit-id: 3fa16b992a
[formerly 501e305a66
] [formerly 2dd0fef76d1ae56a21130b5408c18ad785afed21 [formerly a0807f8ecb
]]
Former-commit-id: 4e614dc75a4390c3d5060e61fd9cb25ebb4583cc [formerly a64802277e
]
Former-commit-id: 916d24b076
2013-02-05 09:23:20 -06:00
Steve Harris
41b9b3b9e1
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: df85fb6a91
[formerly 9595fefb4b
] [formerly d997d99f05
] [formerly df85fb6a91
[formerly 9595fefb4b
] [formerly d997d99f05
] [formerly f380667b34
[formerly d997d99f05
[formerly 815e8b741b173044f8f20f537674d685b50ed6af]]]]
Former-commit-id: f380667b34
Former-commit-id: 850ee1cb70
[formerly 24ff063657
] [formerly a90fee98df8fb5092bfc0a8af5b9fc86d1b97a1d [formerly 930f1f13c0
]]
Former-commit-id: 98afe73c07403cee4125fafb32820f163cb60688 [formerly 8470638469
]
Former-commit-id: 8c01240531
2013-02-04 15:26:44 -06:00
Bryan Kowal
762dbdd6f3
Issue #1553 - remove duplicated "image" plugin
...
Change-Id: Ia0328efb3f45dc233118b7ef209e53b1f4ae1f5e
Former-commit-id: 340a0fca5e
[formerly af697a65d1
] [formerly 1b7e268feb
] [formerly 340a0fca5e
[formerly af697a65d1
] [formerly 1b7e268feb
] [formerly dd6abb0ba1
[formerly 1b7e268feb
[formerly a16493410bddeca8982140a3a41922d46ee479b4]]]]
Former-commit-id: dd6abb0ba1
Former-commit-id: fd3e2e7daa
[formerly 32012b9f64
] [formerly d2f9be28416eb43fa010ea933958f793488bd2d8 [formerly 7bb3bef057
]]
Former-commit-id: 052ced5c26b046665d763faf5de1083462a42621 [formerly 45f67cda75
]
Former-commit-id: 0a74b80f23
2013-02-04 13:07:35 -06:00
Bryan Kowal
66a9f439b3
Issue #1576 - updated qpid 0.18 rpms
...
- the broker-plugins/management-jmx module is now built
- the broker-plugins-management-jmx plugins and the common-management plugins are now included in the rpms
Change-Id: I273772b2fb8f339a55cc3e523f90ca3b2398b222
Former-commit-id: e839188ca1
[formerly 145cd06eae
] [formerly 1678618015
] [formerly e839188ca1
[formerly 145cd06eae
] [formerly 1678618015
] [formerly 09523f1e84
[formerly 1678618015
[formerly c43c4268ba13e5758dfb4c504d57dead5ae89d63]]]]
Former-commit-id: 09523f1e84
Former-commit-id: 3d6d5e37b7
[formerly fe70d57c36
] [formerly 86ff68fed5e171beed0483e50df55cec431c39b9 [formerly 513bda11bc
]]
Former-commit-id: cb08005a122e513c75f9e40399cc85c13a1ddd35 [formerly 88d5830873
]
Former-commit-id: c92b997909
2013-02-04 12:31:23 -06:00