Commit graph

2151 commits

Author SHA1 Message Date
Mike Duff
e126320f82 Issue #1818 - Added an isDisposed check to the Attributes Dialog open action
Change-Id: Icb0c6fd5112cc11b796aaa74c8afc9b10760f2dc

Former-commit-id: 86e0184414 [formerly 593cb668bf] [formerly 86e0184414 [formerly 593cb668bf] [formerly 7118f04843 [formerly c0e79f8fa9cfd55a86d48130fa7ff448ae5231b0]]]
Former-commit-id: 7118f04843
Former-commit-id: fcb46897e3 [formerly c682fb2e9a]
Former-commit-id: 516965bea3
2013-03-24 12:21:51 -05:00
Lee Venable
9af40169f9 Merge "Issue #1806 Update GL mosaicing to use dynamic data format for offscreen textures. Change-Id: Ib756f4ce978ace6fae41dd407ab9187cd6b70d51" into omaha_13.3.1
Former-commit-id: 5c8230662d [formerly 489e04c235] [formerly 5c8230662d [formerly 489e04c235] [formerly c8523e9108 [formerly d5231f950c637b8a094b0a60b25a629f0b3644fa]]]
Former-commit-id: c8523e9108
Former-commit-id: a2e5e18810 [formerly 0d1cba8eae]
Former-commit-id: c733749c9f
2013-03-21 19:27:02 -05:00
Richard Peter
155cafe8d2 Merge "Issue #1785 Adding performance logging for bufrua, grib, obs, radar, redbook, sfcobs, and satellite." into omaha_13.3.1
Former-commit-id: b7081a7ccb [formerly d2b176ba76] [formerly b7081a7ccb [formerly d2b176ba76] [formerly f803dcaf46 [formerly 0ca3a30d5b43d0168ac3e6bc22d64daaf0c432ed]]]
Former-commit-id: f803dcaf46
Former-commit-id: 71405932fd [formerly d185c10b8e]
Former-commit-id: 8531ba2a4a
2013-03-21 12:50:06 -05:00
Mike Duff
31657d334c Issue #1812 - Scan/DMD trend graphs and trend sets graphs update on threshold changes.
Change-Id: I1150f365ef7b67a198f57cca85859f6767eb0234

Former-commit-id: 540524941d [formerly e4ffefa649] [formerly 540524941d [formerly e4ffefa649] [formerly 09feff70e0 [formerly 8ddcbfac38c225c6771e97de738125a1149ae1c4]]]
Former-commit-id: 09feff70e0
Former-commit-id: 524dfa985f [formerly a45389f735]
Former-commit-id: 8c1b60bae9
2013-03-21 12:23:56 -05:00
Ben Steffensmeier
96fe46d7a3 Issue #1806 Update GL mosaicing to use dynamic data format for offscreen textures.
Change-Id: Ib756f4ce978ace6fae41dd407ab9187cd6b70d51

Former-commit-id: 3cc175f373 [formerly e69011cdd8] [formerly 3cc175f373 [formerly e69011cdd8] [formerly de02fe7922 [formerly 26baf1550ad70417a68bd0a36ea99ac83c6d39cd]]]
Former-commit-id: de02fe7922
Former-commit-id: 4323ea54d2 [formerly 6ce135a80a]
Former-commit-id: 9feaaa1961
2013-03-21 11:09:23 -05:00
Brad Gonzales
4b93b146fd Issue #1785 Adding performance logging for bufrua, grib, obs, radar,
redbook, sfcobs, and satellite.

Amend: Made decoder performance logging consistent.  Cleaned up other logging.

Change-Id: I1f404583240a9427cfa3dbb82f9ba3f760b3a8d4

Former-commit-id: f7debfc55f [formerly cd39fcf122] [formerly f7debfc55f [formerly cd39fcf122] [formerly 8c309840a3 [formerly 871b2ceb2a6745369c1dc6e88d711e5e3a13cc37]]]
Former-commit-id: 8c309840a3
Former-commit-id: 2de2221a35 [formerly 9f9248bcd9]
Former-commit-id: 9503aa5a60
2013-03-21 10:58:26 -05:00
Richard Peter
b6beaff67a Merge "Issue #1809 - update for yajsw compatibility" into omaha_13.3.1
Former-commit-id: 93c44c94cb [formerly 13d063234a] [formerly 93c44c94cb [formerly 13d063234a] [formerly 0ec6fc8870 [formerly 655d80f004cfcdb5de6ba46d3d6272e6e5373abe]]]
Former-commit-id: 0ec6fc8870
Former-commit-id: b24027301d [formerly 5f45bbf005]
Former-commit-id: 02c8bd2538
2013-03-20 17:27:20 -05:00
Richard Peter
4b0c9c10d6 Merge "Issue #1804 Switch all radar decompressing to be in memory. Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221" into omaha_13.3.1
Former-commit-id: 510e56c67f [formerly d747686fa1] [formerly 510e56c67f [formerly d747686fa1] [formerly bcf676f5dd [formerly 855f05b2121c17c71d13495c9aacb12878757af6]]]
Former-commit-id: bcf676f5dd
Former-commit-id: 855dd1a664 [formerly ac58a04170]
Former-commit-id: d46fbf9f2a
2013-03-20 17:26:31 -05:00
Bryan Kowal
ecf8436e50 Issue #1809 - update for yajsw compatibility
Former-commit-id: 2411a400f4 [formerly dd8d462790] [formerly 2411a400f4 [formerly dd8d462790] [formerly 0e46dc35e2 [formerly ef772adffd15534b79ac36ac55ca0f8ac8b62677]]]
Former-commit-id: 0e46dc35e2
Former-commit-id: 1f5e019852 [formerly 585f7858bd]
Former-commit-id: 5933b30f81
2013-03-20 16:46:03 -05:00
Ben Steffensmeier
f84059441c Issue #1804 Switch all radar decompressing to be in memory.
Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221

Former-commit-id: ecf93b40cc [formerly 4c3438e160] [formerly ecf93b40cc [formerly 4c3438e160] [formerly 85b509b13e [formerly cc5b81c2b25b00def81d2e6656a7d2c615f118c0]]]
Former-commit-id: 85b509b13e
Former-commit-id: 5261f1f567 [formerly 5cb197eebd]
Former-commit-id: 7bf75df8fd
2013-03-20 16:37:47 -05:00
Steve Harris
c129fed15e Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: a9ced3a7ef [formerly fa15f03e1b] [formerly a9ced3a7ef [formerly fa15f03e1b] [formerly dc419068f0 [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]]
Former-commit-id: dc419068f0
Former-commit-id: f4e26fd94d [formerly 31044eabd1]
Former-commit-id: 8065161896
2013-03-20 16:06:20 -05:00
Steve Harris
e6ab10cc26 13.3.1-10 baseline
Former-commit-id: 57f4676b6c [formerly 073687d9a9] [formerly 57f4676b6c [formerly 073687d9a9] [formerly 7078eec1b1 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]
Former-commit-id: 7078eec1b1
Former-commit-id: e9f0328808 [formerly 7c2e617d26]
Former-commit-id: f2cc967a4f
2013-03-20 15:53:01 -05:00
Richard Peter
403879b5cf Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1
Former-commit-id: d1e37c7803 [formerly 3b8e2ff0d3] [formerly d1e37c7803 [formerly 3b8e2ff0d3] [formerly adbe7b91cc [formerly 186e08826a1a9860bd38c5dd10465b38721218f2]]]
Former-commit-id: adbe7b91cc
Former-commit-id: 53d8ef7ed1 [formerly 3bad342dca]
Former-commit-id: ff1b1598e6
2013-03-20 13:32:33 -05:00
Ben Steffensmeier
a01b552f89 Issue #1804 Remove empty data structures from radar hdf5.
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d

Former-commit-id: 1203b7cee4 [formerly ee7204c05c] [formerly 1203b7cee4 [formerly ee7204c05c] [formerly 82499f839d [formerly 31528bbb403ec0fd6ee792f4451ac209fb272dcd]]]
Former-commit-id: 82499f839d
Former-commit-id: 1b363a547c [formerly 3e2a41d1d2]
Former-commit-id: 57d19b0d66
2013-03-20 13:26:33 -05:00
Ben Steffensmeier
4cde2bd826 Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: 0d9119a1c7 [formerly 2b6aa86371] [formerly 0d9119a1c7 [formerly 2b6aa86371] [formerly ed544fc17c [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]]
Former-commit-id: ed544fc17c
Former-commit-id: b201d9dee2 [formerly 646b61f653]
Former-commit-id: 498d153e40
2013-03-20 13:05:54 -05:00
Dave Hladky
1aef08f449 Issue #1782 Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb

Former-commit-id: dc7b231bf0 [formerly 90f7f2110b] [formerly dc7b231bf0 [formerly 90f7f2110b] [formerly 3cdbfa3f25 [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: 01c6ff12a0 [formerly bd17b99bd1]
Former-commit-id: 8299b2872a
2013-03-20 12:41:33 -05:00
David Gillingham
3a70a07654 Issue #1447: Update MergeVTEC.py to be current with A1 DR 21434.
Change-Id: Ib4a7c76f2e75df875c3cac1716a4a99019edcec9

Former-commit-id: ab6944650a [formerly 843f474af8] [formerly ab6944650a [formerly 843f474af8] [formerly 8ea6d7227b [formerly 54d3c1e6f1359c36ef73798ec6d3a2d24c97d31c]]]
Former-commit-id: 8ea6d7227b
Former-commit-id: a8ed519915 [formerly 5f8c8a80f8]
Former-commit-id: 2e57b9f262
2013-03-19 16:06:25 -05:00
Richard Peter
3c37f0f171 Merge "Issue #1804 Cache db queries in radar decoder. Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be" into omaha_13.3.1
Former-commit-id: 26aa93a6f4 [formerly 6046872ab5] [formerly 26aa93a6f4 [formerly 6046872ab5] [formerly a421cfe73e [formerly d17f8b4df74b52f703636d253c25aa4db73dfc6d]]]
Former-commit-id: a421cfe73e
Former-commit-id: 845a04fd54 [formerly cf395cfb39]
Former-commit-id: 6852771ec6
2013-03-19 15:34:36 -05:00
Steve Harris
37beeaab69 13.3.1-9 baseline
Former-commit-id: c7b2ef2d8c [formerly 468ae82305] [formerly c7b2ef2d8c [formerly 468ae82305] [formerly f2b3fddfe2 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 7e96d841d9 [formerly 0375805e79]
Former-commit-id: 65f522fc87
2013-03-19 14:22:56 -05:00
Ben Steffensmeier
87b21c053d Issue #1804 Cache db queries in radar decoder.
Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be

Former-commit-id: 337e450f94 [formerly 7b83f6bdfa] [formerly 337e450f94 [formerly 7b83f6bdfa] [formerly 5d2d834cf7 [formerly 2c8945b6ccf64f2110b7ee7057eabc9583da1efa]]]
Former-commit-id: 5d2d834cf7
Former-commit-id: 489a180622 [formerly ff0e5696e8]
Former-commit-id: 044eeebe97
2013-03-19 14:11:36 -05:00
Richard Peter
5f09e66d4e Merge "Issue #1804 Remove AlphanumericValues from radar HDF5." into omaha_13.3.1
Former-commit-id: 2fdbc96342 [formerly 4ce10bced9] [formerly 2fdbc96342 [formerly 4ce10bced9] [formerly 3a92747518 [formerly ea39cfcb15ca583ac43f5d101b9364f52900128d]]]
Former-commit-id: 3a92747518
Former-commit-id: eebd930070 [formerly c955b3b640]
Former-commit-id: 1bf2c48011
2013-03-19 13:24:28 -05:00
Mike Duff
c22d1962de Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff

Former-commit-id: 70efff8f0a [formerly b115d3611c] [formerly 70efff8f0a [formerly b115d3611c] [formerly 058064ce0d [formerly 7fc127dfaacc36b4051fa5a46774c2823b1d42b2]]]
Former-commit-id: 058064ce0d
Former-commit-id: 3e1b4ba54b [formerly 7e66c8e46d]
Former-commit-id: 144223ed9b
2013-03-19 10:10:01 -05:00
Ben Steffensmeier
f2466d6066 Issue #1804 Remove AlphanumericValues from radar HDF5.
Former-commit-id: 7b7b708eee [formerly 6c741a9ab3] [formerly 7b7b708eee [formerly 6c741a9ab3] [formerly 86dffab17d [formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]]]
Former-commit-id: 86dffab17d
Former-commit-id: 160b6a7040 [formerly dfe8de96f2]
Former-commit-id: e176478c7a
2013-03-18 17:16:44 -05:00
Steve Harris
9d4d1baefe Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 27c418812f [formerly 1a999fee5a] [formerly 27c418812f [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 5927ff20543395733d9302eba2e6772315730a80]]]
Former-commit-id: c18b96dc4c
Former-commit-id: ea27f9cd17 [formerly 245afb28c8]
Former-commit-id: fc6748cb3e
2013-03-18 16:43:22 -05:00
Steve Harris
1c2dffd66d 13.3.1-8 baseline
Former-commit-id: bc9df0a8f9 [formerly f97d78994b] [formerly bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 81a3f29afc [formerly 5f492500ea]
Former-commit-id: 0c94cc97fb
2013-03-18 15:43:32 -05:00
Nate Jensen
499209754a Issue #1795 speed up publish by optimizing publish time updates in grid histories
Change-Id: I43c3f63d60832c49c6d02dab97c47d2b1f12f1c8

Former-commit-id: 30ddd909bf [formerly e65267d5f3] [formerly 30ddd909bf [formerly e65267d5f3] [formerly 235952a115 [formerly 788242460621edfffaf2a2c62c0c5b01da6c0e09]]]
Former-commit-id: 235952a115
Former-commit-id: 4ea1508baa [formerly dad08657aa]
Former-commit-id: d622b8c12e
2013-03-15 16:10:11 -05:00
Lee Venable
0449fe84a6 Merge "Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table" into omaha_13.3.1
Former-commit-id: 57d7559797 [formerly 456fd056f4] [formerly 57d7559797 [formerly 456fd056f4] [formerly 93e99b64a6 [formerly 9c65cd9c24baee752320ed21a60f6444ff3d9b5c]]]
Former-commit-id: 93e99b64a6
Former-commit-id: ba4673b99a [formerly 3a1dc41b50]
Former-commit-id: cac220879d
2013-03-14 17:19:38 -05:00
Dave Hladky
871c4718ab Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1

Former-commit-id: a1c4148918 [formerly 9b495681ec] [formerly a1c4148918 [formerly 9b495681ec] [formerly c57d5574ef [formerly 8b498ee96ab7309bc3cb70a4f93e05c0af60c824]]]
Former-commit-id: c57d5574ef
Former-commit-id: 3ba473351b [formerly db207a732c]
Former-commit-id: 5bf3f5f89f
2013-03-14 15:59:39 -05:00
Ron Anderson
bd0618d53f Merge "Issue #1793 Performance improvements for TCMWindTool Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e" into omaha_13.3.1
Former-commit-id: 60af3ad63e [formerly 16d93dab84] [formerly 60af3ad63e [formerly 16d93dab84] [formerly fc749ff3eb [formerly 7abfd751fee0519c607e40d8188cefeb76061df5]]]
Former-commit-id: fc749ff3eb
Former-commit-id: 97a38fd3c5 [formerly 7087e1ebe7]
Former-commit-id: e6ba869694
2013-03-14 14:55:31 -05:00
Ben Steffensmeier
41e3ac3923 Issue #1793 Performance improvements for TCMWindTool
Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e

Former-commit-id: 7335a2336e [formerly 7aa8b2d3eb] [formerly 7335a2336e [formerly 7aa8b2d3eb] [formerly 45a5cffdf3 [formerly 055873318a368301fc966501b27001f5ace0bcae]]]
Former-commit-id: 45a5cffdf3
Former-commit-id: e5b9e0ca46 [formerly 364d6fd9ee]
Former-commit-id: 153a7dbd7d
2013-03-14 13:26:08 -05:00
Greg Armendariz
cfc53af85e Removed merge code from the source code
Former-commit-id: 2bb407ea8b [formerly 5511f0b3a6] [formerly 2bb407ea8b [formerly 5511f0b3a6] [formerly 2f9136843b [formerly 9652fe27ae424cba83296a714a720e554390550a]]]
Former-commit-id: 2f9136843b
Former-commit-id: b79ecc28e3 [formerly 3a3486b0b7]
Former-commit-id: 8ea2042456
2013-03-14 11:15:08 -05:00
Ben Steffensmeier
24b97d7625 Issue #1777 fix subgridding range problems
Former-commit-id: 5e81f2154d [formerly 5bd20414eb] [formerly 5e81f2154d [formerly 5bd20414eb] [formerly 0daa5817d0 [formerly bb518596c4b9ce06279e4b1e7fb841c63514ce62]]]
Former-commit-id: 0daa5817d0
Former-commit-id: d22cbc7ce9 [formerly a6140145a4]
Former-commit-id: bc92e1be6b
2013-03-14 09:56:00 -05:00
Nate Jensen
c710def06d Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1
Former-commit-id: 9dbb7660a7 [formerly 29b4cd2fb5] [formerly 9dbb7660a7 [formerly 29b4cd2fb5] [formerly 490ffe2772 [formerly 086546a518276d519aca779d55c160f4f8bcd577]]]
Former-commit-id: 490ffe2772
Former-commit-id: e2e9a845d5 [formerly a933532ad9]
Former-commit-id: 363efaec00
2013-03-14 09:48:16 -05:00
Ben Steffensmeier
7266a995f9 Issue #1792 Improve performance of gfe parm time weighted average.
Change-Id: I139c873175ee1dbe29968c90e193701122abcead

Former-commit-id: a9695abb45 [formerly 22624ba5d3] [formerly a9695abb45 [formerly 22624ba5d3] [formerly 52c167cf00 [formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]]]
Former-commit-id: 52c167cf00
Former-commit-id: 2d622e6053 [formerly 8f6a7c0746]
Former-commit-id: 60bb04a055
2013-03-13 18:52:52 -05:00
Ron Anderson
39e2d27a89 Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1
Former-commit-id: 0c881b4a85 [formerly 3b65608373] [formerly 0c881b4a85 [formerly 3b65608373] [formerly 61f74305e2 [formerly 437a30971b299965540d47f572ad83cd0d7df120]]]
Former-commit-id: 61f74305e2
Former-commit-id: de14cd0baa [formerly a7b6e1689b]
Former-commit-id: b1088415cd
2013-03-13 17:16:37 -05:00
Ben Steffensmeier
f012dd8b0a Issue #1791 Implement bulk getGrids to improve performance.
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74

Former-commit-id: 37bae0988b [formerly 4c150b0fd6] [formerly 37bae0988b [formerly 4c150b0fd6] [formerly 89eb902284 [formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]]
Former-commit-id: 89eb902284
Former-commit-id: f5680beaa9 [formerly 7abf3cfb39]
Former-commit-id: 6d699f7713
2013-03-13 17:09:20 -05:00
Nate Jensen
165fbf3646 Merge "Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing." into omaha_13.3.1
Former-commit-id: d0db96df45 [formerly dbd2729336] [formerly d0db96df45 [formerly dbd2729336] [formerly eaef235e8e [formerly c9dc9e2a55f835e450b35cfe3408e03ab6ab8754]]]
Former-commit-id: eaef235e8e
Former-commit-id: 15b3d5add6 [formerly d881ab1442]
Former-commit-id: 4539ef8b58
2013-03-13 16:17:44 -05:00
Dave Hladky
b85e19282b Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 765be278bb [formerly 38b952a220] [formerly 765be278bb [formerly 38b952a220] [formerly 5dc454c7ef [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 9e97fc9efe [formerly 160e1594b8]
Former-commit-id: cb5ee4a7b8
2013-03-13 13:56:33 -05:00
Ben Steffensmeier
15a16c8d81 Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing.
Former-commit-id: 51955a719a [formerly 36b3c16a42] [formerly 51955a719a [formerly 36b3c16a42] [formerly ddf2092bde [formerly 9491a90efdb389372e3ff3c988eb19aac9d508b6]]]
Former-commit-id: ddf2092bde
Former-commit-id: a1ca2ae2d7 [formerly 247c9f6c1f]
Former-commit-id: 04882c798f
2013-03-13 13:21:16 -05:00
Steve Harris
88b28c39c1 13.3.1-7 baseline
Former-commit-id: 97d2f521e4 [formerly a72254cc75] [formerly 97d2f521e4 [formerly a72254cc75] [formerly e12ed113ae [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]
Former-commit-id: e12ed113ae
Former-commit-id: ed5f1dbab6 [formerly 31c0a97dca]
Former-commit-id: 3084a860cd
2013-03-13 09:50:28 -05:00
Steve Harris
a5b96e0c3c 13.3.1-6.1 baseline
Former-commit-id: 6d96471b9b [formerly fa9d260c2b] [formerly 6d96471b9b [formerly fa9d260c2b] [formerly a062803c8c [formerly 0ad794c98700f44b15933de48224ed2a822fd78f]]]
Former-commit-id: a062803c8c
Former-commit-id: 2e1dbdc10d [formerly bfa25f3330]
Former-commit-id: c038384685
2013-03-13 08:28:26 -05:00
Roger Ferrel
cf7b0e99f7 Issue #1783 Modified DefaultPluginArchiveFileNameFormatter to use LinkList instead of ArrayList.
Change-Id: I156fc0f335320489923ae31f6e790f5e86ac26f4

Former-commit-id: f912d9ece3 [formerly c5a2786c84] [formerly f912d9ece3 [formerly c5a2786c84] [formerly b5743e8f9b [formerly 8ec4ac592389af736c45a11d9c6f6613fd9da504]]]
Former-commit-id: b5743e8f9b
Former-commit-id: a9a0a471f9 [formerly 8bb9044e3a]
Former-commit-id: 5546691fd6
2013-03-12 16:58:06 -05:00
Dave Hladky
cdfbcc7136 Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227

Former-commit-id: 5c65862b8f [formerly a1006667e0] [formerly 5c65862b8f [formerly a1006667e0] [formerly 4b08491880 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]
Former-commit-id: 4b08491880
Former-commit-id: 155903d135 [formerly 6ea95002de]
Former-commit-id: 29ed641a13
2013-03-12 15:48:34 -05:00
Lee Venable
ca95cb0fce Merge "Issue #1781 - Fix Hydro Time Series slow table loads" into omaha_13.3.1
Former-commit-id: 9a69cd3524 [formerly d5af1f02c5] [formerly 9a69cd3524 [formerly d5af1f02c5] [formerly 28d74d91b0 [formerly 1df2884be78544697f629fca8c7fd0d09ce78aac]]]
Former-commit-id: 28d74d91b0
Former-commit-id: b471e3807f [formerly e080fb5106]
Former-commit-id: b0e9ea9157
2013-03-12 09:08:44 -05:00
Mike Duff
3eef80b3d1 Issue #1781 - Fix Hydro Time Series slow table loads
Change-Id: Icc0b916459a6636d9571417d102c8ac0226fb93d

Former-commit-id: 492cf0f7e6 [formerly 6a6844fdaf] [formerly 492cf0f7e6 [formerly 6a6844fdaf] [formerly cac9bd6119 [formerly acb0a63e9bc71e815c321b6a5aacf8ac339a752a]]]
Former-commit-id: cac9bd6119
Former-commit-id: 2df046d409 [formerly caed059e23]
Former-commit-id: 659a2a4f4c
2013-03-12 09:03:08 -05:00
Steve Harris
c28f3aeb02 13.3.1-6 baseline
Former-commit-id: 2e110bd151 [formerly 3a4c7931e1] [formerly 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]
Former-commit-id: 566b677d09
Former-commit-id: 6fe4b16924 [formerly 4ed21b702b]
Former-commit-id: c6f379f59a
2013-03-12 08:35:45 -05:00
Roger Ferrel
241dfb9451 Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: 70bd9aafa7 [formerly 4deb731bd0] [formerly 70bd9aafa7 [formerly 4deb731bd0] [formerly b421c97d86 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]]
Former-commit-id: b421c97d86
Former-commit-id: 0deb290c24 [formerly 334f2c4a57]
Former-commit-id: 0bbe51355e
2013-03-11 13:00:44 -05:00
Lee Venable
8feb08beec Merge "Issue #1769 Crashing FFMP caused by thread wait" into omaha_13.3.1
Former-commit-id: 483e2813ac [formerly ea6731947e] [formerly 483e2813ac [formerly ea6731947e] [formerly 41c7be5267 [formerly 784852cf5045a32f94ba1923e9fadcd952d45dbb]]]
Former-commit-id: 41c7be5267
Former-commit-id: be87f2adc3 [formerly 32221a7a7a]
Former-commit-id: 330f2e0dd7
2013-03-08 13:04:28 -06:00
Dave Hladky
a24150df56 Issue #1769 Crashing FFMP caused by thread wait
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611

Former-commit-id: 50696bee89 [formerly 2a854d7c30] [formerly 50696bee89 [formerly 2a854d7c30] [formerly bb4c54eff0 [formerly 6ad5dcd3f980677a9120633f043887527cbe0eda]]]
Former-commit-id: bb4c54eff0
Former-commit-id: dd446abd03 [formerly 73c21a6ead]
Former-commit-id: 6fe48593f0
2013-03-08 09:58:17 -06:00
Nate Jensen
d0bed867b0 Issue #1773 log publish times
Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85

Former-commit-id: 5d9778a8d6 [formerly 5e3d6df7e0] [formerly 5d9778a8d6 [formerly 5e3d6df7e0] [formerly 5c59a61cef [formerly 392feade3f36680edcdb135f7c061be172210c26]]]
Former-commit-id: 5c59a61cef
Former-commit-id: 21863c5db5 [formerly d7902aba68]
Former-commit-id: a2f804350a
2013-03-07 16:49:40 -06:00