Commit graph

1463 commits

Author SHA1 Message Date
Nate Jensen
55572918b3 Merge "Issue #1791 Fix problems in SmartScript when there is no data." into omaha_13.3.1
Former-commit-id: d612495967 [formerly 807d8773ad] [formerly f3fd91c311] [formerly c895ee60fa [formerly f3fd91c311 [formerly a12ccd946a59dae45a4b5b754655d8eef7a56a29]]]
Former-commit-id: c895ee60fa
Former-commit-id: d25e380bfd45fba9e5ddfb52706b916c9ca113fd [formerly 5701030750]
Former-commit-id: 30bd797879
2013-03-26 16:15:27 -05:00
Lee Venable
84c0e0646f Merge "Issue #1799 Fix pan/zoom when in views." into omaha_13.3.1
Former-commit-id: 48ad5b71b7 [formerly ad1983ff8d] [formerly 1a59204892] [formerly 049e955db9 [formerly 1a59204892 [formerly 69ec257d3a90ffcaa81d92f34ff545d4c49bb1d3]]]
Former-commit-id: 049e955db9
Former-commit-id: 8033bef0cab6c2d4a5d319f4cbe92e628918c084 [formerly f8d2fdacea]
Former-commit-id: cb683bec2a
2013-03-26 15:01:51 -05:00
Ben Steffensmeier
2429a1bfe6 Issue #1791 Fix problems in SmartScript when there is no data.
Former-commit-id: 92f0268a14 [formerly 9d9443644c] [formerly 6870045005] [formerly 18311b0d18 [formerly 6870045005 [formerly 39d0a9f0cc71f3dbbde69e6d1dac14ef93a78984]]]
Former-commit-id: 18311b0d18
Former-commit-id: 82ebfcf0bec3c1a3cc3ba64906816bbfe0a2f369 [formerly 69879c51df]
Former-commit-id: 6d17d01f8c
2013-03-26 14:46:11 -05:00
Lee Venable
caf01174bb Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1
Former-commit-id: 954db8db28 [formerly 68e767daaa] [formerly c86daf885b] [formerly c1adce3a11 [formerly c86daf885b [formerly 8753aa9e648778c2eabbf959c1b270ebe5add67c]]]
Former-commit-id: c1adce3a11
Former-commit-id: 4d0bced50facefee11d7f7c6479d9607164529af [formerly 393e6d9ca1]
Former-commit-id: 013748405d
2013-03-26 14:33:24 -05:00
Steve Harris
072b1bf35e Merge branch 'master_13.3.1' into omaha_13.3.1
Former-commit-id: 8d1903034b [formerly 85104939ac] [formerly b2bd9214d65cc3e496eea474a3c067a766511a95 [formerly e71c69c383]] [formerly 9ff8a94193 [formerly e71c69c383 [formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]]
Former-commit-id: 9ff8a94193
Former-commit-id: 9cd89cdae60b1bb313162de31e0e2c592984280a [formerly b926ff60b3]
Former-commit-id: 02147470db
2013-03-26 12:44:24 -05:00
Steve Harris
b49c1b0fa8 13.3.1-13 baseline
Former-commit-id: 0f2ebb8f10 [formerly 792171756f] [formerly c77a452f5a] [formerly c65f3e68e5 [formerly c77a452f5a [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]]
Former-commit-id: c65f3e68e5
Former-commit-id: 24c9dcc4807f8692b6eb63ba5946c346d7126d11 [formerly 822d05a709]
Former-commit-id: 4f2e9aec0d
2013-03-26 12:43:07 -05:00
Jonathan Sanchez
4236ca46f5 Issue #1819 Added precision fields for point source configuration.
Former-commit-id: 6b85338835 [formerly a0a0199266] [formerly 79d87a96e7] [formerly b0f61cf86c [formerly 79d87a96e7 [formerly b250ff50f8a2ac6ad8ec91e14735edcd6f053343]]]
Former-commit-id: b0f61cf86c
Former-commit-id: 329fc238b833ee77ae27cbf2f25470dc6acf6e48 [formerly eb13af2f50]
Former-commit-id: a579da7646
2013-03-26 12:29:18 -05:00
Ben Steffensmeier
5b117b6f62 Issue #1799 Fix pan/zoom when in views.
Former-commit-id: adfbe0e726 [formerly d06f011de0] [formerly 643c1c77d0] [formerly 78fdea2ba1 [formerly 643c1c77d0 [formerly 2061956526bdc3da43280e6c829de1deb0a098ba]]]
Former-commit-id: 78fdea2ba1
Former-commit-id: 59088a1c026ae5ed7b1d9a4153223fbd1576dba5 [formerly 5a1171f111]
Former-commit-id: e79778366c
2013-03-26 11:44:23 -05:00
Mike Duff
1314976753 Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	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
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParm.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.qpid/0.7/build.sh
	rpms/awips2.qpid/build.sh

Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb

Former-commit-id: f767014e9a [formerly c1f7d33bb8] [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 5d72795e1b [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]]
Former-commit-id: 9ebc7606b1
Former-commit-id: 66366ecca6a9baeda295e8caa2bd45103113d7ee [formerly 4c3011edce]
Former-commit-id: b366778df0
2013-03-26 09:19:39 -05:00
Ron Anderson
8bf2b31f8e Merge "Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for localVTECPartners.py to ServiceBackup." into omaha_13.3.1
Former-commit-id: 4c5005ffb9 [formerly 6ab9303526] [formerly f4f180face] [formerly 73678261b6 [formerly f4f180face [formerly 8394ce66975f5915fd82dbc950ce43e5db3cfbe3]]]
Former-commit-id: 73678261b6
Former-commit-id: 32aeedbcfe97a863092752841be20ed818c5c741 [formerly 7e6b601a09]
Former-commit-id: e4c4862938
2013-03-25 17:53:46 -05:00
Lee Venable
a6a431a20b Merge "Issue #1605 Check if storm location is over an urban bound area." into omaha_13.3.1
Former-commit-id: 3e0e19ac42 [formerly a84ef2d2c3] [formerly e467daec0c] [formerly 05b4c2f913 [formerly e467daec0c [formerly 65989516cda62a95cb7b6d67bea8aa20138def2a]]]
Former-commit-id: 05b4c2f913
Former-commit-id: 29ce5b07df9351fe829c6342326979e9ac25ddc4 [formerly d73b44fa67]
Former-commit-id: b1ce5603a0
2013-03-25 17:20:25 -05:00
Mike Duff
0c3527a58c Issue #1781 - Constrain the tabular TS query by time.
Change-Id: I648913c157585283cdc96793d18d36933589b3e9

Former-commit-id: 896ad0ff63 [formerly 3d783c54be] [formerly afd0de8b5b] [formerly 88e75f4a90 [formerly afd0de8b5b [formerly 027807d7e4ac171498f267759a4e34f75e1e4d46]]]
Former-commit-id: 88e75f4a90
Former-commit-id: 0265f807aa71c3ad5de9c0f866b4c6f9d30d772c [formerly b517ce9a9f]
Former-commit-id: fc0b126eee
2013-03-25 16:03:18 -05:00
Jonathan Sanchez
de39c398f1 Issue #1605 Check if storm location is over an urban bound area.
Former-commit-id: f4bb8f1f84 [formerly 3ca4cc9dcf] [formerly 06cd161d0e] [formerly ddcb4f3451 [formerly 06cd161d0e [formerly 2d58fc8149587bdc089db2b8a69f2a176c24ba23]]]
Former-commit-id: ddcb4f3451
Former-commit-id: 754ef39c309a748adb8063b8b937a6a19b5bd89c [formerly c9295e6762]
Former-commit-id: cd1095fb29
2013-03-25 14:41:55 -05:00
Lee Venable
8b01a775e9 Merge "Issue #1810 Accepted other values/types for useDirs." into omaha_13.3.1
Former-commit-id: 1e99eceb62 [formerly 5d7055ad53] [formerly 25cf1cacfd] [formerly d1c84de620 [formerly 25cf1cacfd [formerly 2e5dbf15665e3c1229604f2ae7cbfd76dacd3903]]]
Former-commit-id: d1c84de620
Former-commit-id: b5aa6af106e2733245abbd54fa5e8d0b37332c11 [formerly fc41aa82ca]
Former-commit-id: 4caa21aa69
2013-03-25 14:08:39 -05:00
Steve Harris
bb30a41300 13.3.1-12 baseline
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]
Former-commit-id: aaac0b51e5
Former-commit-id: 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]
Former-commit-id: f80f98cee2
2013-03-25 13:27:13 -05:00
Jonathan Sanchez
43435c33e5 Issue #1810 Accepted other values/types for useDirs.
Former-commit-id: 135c1a1fce [formerly 2d6be3d3da] [formerly d00c88a38c] [formerly b77ed18eb4 [formerly d00c88a38c [formerly 7492d4e2ceea99c71f8040237610d95e45c1e78a]]]
Former-commit-id: b77ed18eb4
Former-commit-id: ab25164008201e73cdd8c75fd057496bcfd40937 [formerly 539c4dfa8e]
Former-commit-id: e01d47acfa
2013-03-25 12:23:51 -05:00
Mike Duff
9ec1b05c27 Issue #1818 - Added an isDisposed check to the Attributes Dialog open action
Change-Id: Icb0c6fd5112cc11b796aaa74c8afc9b10760f2dc

Former-commit-id: dddf5d8210 [formerly 86e0184414] [formerly 593cb668bf] [formerly 7118f04843 [formerly 593cb668bf [formerly c0e79f8fa9cfd55a86d48130fa7ff448ae5231b0]]]
Former-commit-id: 7118f04843
Former-commit-id: 827d31242f9064d6e8560408c9a9b79ef351dad1 [formerly c682fb2e9a]
Former-commit-id: fcb46897e3
2013-03-24 12:21:51 -05:00
David Gillingham
3fdecaec6e Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
localVTECPartners.py to ServiceBackup.

Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3

Former-commit-id: 1f44720008 [formerly 8438c5af87] [formerly 79a1520baf] [formerly 4aeeb1ce25 [formerly 79a1520baf [formerly 0b047a505ce4ed442af9de3a3cfeea5bf1e6c872]]]
Former-commit-id: 4aeeb1ce25
Former-commit-id: 0957f6a5eec508c235f5324a4ce32b5064183a23 [formerly c3ce4058a0]
Former-commit-id: c8c7fb4129
2013-03-22 10:39:13 -05:00
Lee Venable
da4f91d1d1 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: e022c03a4e [formerly 5c8230662d] [formerly 489e04c235] [formerly c8523e9108 [formerly 489e04c235 [formerly d5231f950c637b8a094b0a60b25a629f0b3644fa]]]
Former-commit-id: c8523e9108
Former-commit-id: a38c0aaf0d81c02c132fbf7d895fb2ae03642b5b [formerly 0d1cba8eae]
Former-commit-id: a2e5e18810
2013-03-21 19:27:02 -05:00
Mike Duff
01374e2b4e Issue #1812 - Scan/DMD trend graphs and trend sets graphs update on threshold changes.
Change-Id: I1150f365ef7b67a198f57cca85859f6767eb0234

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

Former-commit-id: 6cbdf5beda [formerly 3cc175f373] [formerly e69011cdd8] [formerly de02fe7922 [formerly e69011cdd8 [formerly 26baf1550ad70417a68bd0a36ea99ac83c6d39cd]]]
Former-commit-id: de02fe7922
Former-commit-id: 53fc7d83e457d86a8b95d9126ec3adbb8909a627 [formerly 6ce135a80a]
Former-commit-id: 4323ea54d2
2013-03-21 11:09:23 -05:00
Steve Harris
2cbd2a1bc9 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: ea052b14bb [formerly a9ced3a7ef] [formerly fa15f03e1b] [formerly dc419068f0 [formerly fa15f03e1b [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]]
Former-commit-id: dc419068f0
Former-commit-id: 64b470b4de5f62b27c8e9b8b00161d778a7472ba [formerly 31044eabd1]
Former-commit-id: f4e26fd94d
2013-03-20 16:06:20 -05:00
Steve Harris
dbeb388d72 13.3.1-10 baseline
Former-commit-id: 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 7078eec1b1 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]
Former-commit-id: 7078eec1b1
Former-commit-id: 023f42cbdef7d2df7347dbb273b58245adbc07be [formerly 7c2e617d26]
Former-commit-id: e9f0328808
2013-03-20 15:53:01 -05:00
Richard Peter
8805c42d14 Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1
Former-commit-id: 0d35db042e [formerly d1e37c7803] [formerly 3b8e2ff0d3] [formerly adbe7b91cc [formerly 3b8e2ff0d3 [formerly 186e08826a1a9860bd38c5dd10465b38721218f2]]]
Former-commit-id: adbe7b91cc
Former-commit-id: 377061882220d7ca7878a9f6095ebe2307dd7ab4 [formerly 3bad342dca]
Former-commit-id: 53d8ef7ed1
2013-03-20 13:32:33 -05:00
Ben Steffensmeier
d67d0ec674 Issue #1804 Remove empty data structures from radar hdf5.
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d

Former-commit-id: 41372ac122 [formerly 1203b7cee4] [formerly ee7204c05c] [formerly 82499f839d [formerly ee7204c05c [formerly 31528bbb403ec0fd6ee792f4451ac209fb272dcd]]]
Former-commit-id: 82499f839d
Former-commit-id: 048a16f2b52da3414fc5d576059d5543b43f69f9 [formerly 3e2a41d1d2]
Former-commit-id: 1b363a547c
2013-03-20 13:26:33 -05:00
Ben Steffensmeier
4b0e7e77d3 Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: 0d765a2fcf [formerly 0d9119a1c7] [formerly 2b6aa86371] [formerly ed544fc17c [formerly 2b6aa86371 [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]]
Former-commit-id: ed544fc17c
Former-commit-id: b850b70906a6763277fa77ce5a2f3e638139e35a [formerly 646b61f653]
Former-commit-id: b201d9dee2
2013-03-20 13:05:54 -05:00
Dave Hladky
a7462a5125 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: 2cfb8f5ee0 [formerly dc7b231bf0] [formerly 90f7f2110b] [formerly 3cdbfa3f25 [formerly 90f7f2110b [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: d8061685e48c132d552a31fbc1071360f10159ed [formerly bd17b99bd1]
Former-commit-id: 01c6ff12a0
2013-03-20 12:41:33 -05:00
Steve Harris
3c492badbc 13.3.1-9 baseline
Former-commit-id: 6ebecda008 [formerly c7b2ef2d8c] [formerly 468ae82305] [formerly f2b3fddfe2 [formerly 468ae82305 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 3bbb9bbab1edbb030bd2a4d290990d7cda8a756f [formerly 0375805e79]
Former-commit-id: 7e96d841d9
2013-03-19 14:22:56 -05:00
Richard Peter
26e2d62e99 Merge "Issue #1804 Remove AlphanumericValues from radar HDF5." into omaha_13.3.1
Former-commit-id: 47a74b9867 [formerly 2fdbc96342] [formerly 4ce10bced9] [formerly 3a92747518 [formerly 4ce10bced9 [formerly ea39cfcb15ca583ac43f5d101b9364f52900128d]]]
Former-commit-id: 3a92747518
Former-commit-id: 7532765e0a4316f68ebd2971adf3566334c5a08c [formerly c955b3b640]
Former-commit-id: eebd930070
2013-03-19 13:24:28 -05:00
Mike Duff
e205993cba Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff

Former-commit-id: 361434a64f [formerly 70efff8f0a] [formerly 5c76f2ebae6e51589fb570fe3c25d5a3d3b57560 [formerly b115d3611c]] [formerly 058064ce0d [formerly b115d3611c [formerly 7fc127dfaacc36b4051fa5a46774c2823b1d42b2]]]
Former-commit-id: 058064ce0d
Former-commit-id: f1784284db525c1ae3413ff04b935577969880b1 [formerly 7e66c8e46d]
Former-commit-id: 3e1b4ba54b
2013-03-19 10:10:01 -05:00
Ben Steffensmeier
89ec3e9ce7 Issue #1804 Remove AlphanumericValues from radar HDF5.
Former-commit-id: be721b7da0 [formerly 7b7b708eee] [formerly 6c741a9ab3] [formerly 86dffab17d [formerly 6c741a9ab3 [formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]]]
Former-commit-id: 86dffab17d
Former-commit-id: 3a15f3575a0d243b59b8d728d08f437b3b036330 [formerly dfe8de96f2]
Former-commit-id: 160b6a7040
2013-03-18 17:16:44 -05:00
Steve Harris
0e9919f6be 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: 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 1a999fee5a [formerly 5927ff20543395733d9302eba2e6772315730a80]]]
Former-commit-id: c18b96dc4c
Former-commit-id: e2239b3a3593dcd59bcf723bcb944913f4da1785 [formerly 245afb28c8]
Former-commit-id: ea27f9cd17
2013-03-18 16:43:22 -05:00
Steve Harris
2fd4ac9397 13.3.1-8 baseline
Former-commit-id: dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly c15b3ffe20 [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 6578eddad397d44d5b9e9908233734077c464b81 [formerly 5f492500ea]
Former-commit-id: 81a3f29afc
2013-03-18 15:43:32 -05:00
Lee Venable
a0298d4199 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: a1ea0d020c [formerly 57d7559797] [formerly 456fd056f4] [formerly 93e99b64a6 [formerly 456fd056f4 [formerly 9c65cd9c24baee752320ed21a60f6444ff3d9b5c]]]
Former-commit-id: 93e99b64a6
Former-commit-id: db8baa1a7f8057094afd75e9aeaf6f46c5dd6820 [formerly 3a1dc41b50]
Former-commit-id: ba4673b99a
2013-03-14 17:19:38 -05:00
Dave Hladky
19117f1851 Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1

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

Former-commit-id: 3f0030521d [formerly 7335a2336e] [formerly 7aa8b2d3eb] [formerly 45a5cffdf3 [formerly 7aa8b2d3eb [formerly 055873318a368301fc966501b27001f5ace0bcae]]]
Former-commit-id: 45a5cffdf3
Former-commit-id: 628065abbf3e3e03dedca4f091459d9085169d1c [formerly 364d6fd9ee]
Former-commit-id: e5b9e0ca46
2013-03-14 13:26:08 -05:00
Greg Armendariz
ef59159bb9 Removed merge code from the source code
Former-commit-id: 05d7892c3b [formerly 2bb407ea8b] [formerly 5511f0b3a6] [formerly 2f9136843b [formerly 5511f0b3a6 [formerly 9652fe27ae424cba83296a714a720e554390550a]]]
Former-commit-id: 2f9136843b
Former-commit-id: 486130740373c00d6c7a8808665421ce577a9b77 [formerly 3a3486b0b7]
Former-commit-id: b79ecc28e3
2013-03-14 11:15:08 -05:00
Nate Jensen
b74d6315a6 Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1
Former-commit-id: 14da2b6cc3 [formerly 9dbb7660a7] [formerly 29b4cd2fb5] [formerly 490ffe2772 [formerly 29b4cd2fb5 [formerly 086546a518276d519aca779d55c160f4f8bcd577]]]
Former-commit-id: 490ffe2772
Former-commit-id: bb1674d56d5f72528a3f2eb6ea51452dfd9a36b1 [formerly a933532ad9]
Former-commit-id: e2e9a845d5
2013-03-14 09:48:16 -05:00
Ben Steffensmeier
a440445437 Issue #1792 Improve performance of gfe parm time weighted average.
Change-Id: I139c873175ee1dbe29968c90e193701122abcead

Former-commit-id: dcf02199ea [formerly a9695abb45] [formerly 22624ba5d3] [formerly 52c167cf00 [formerly 22624ba5d3 [formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]]]
Former-commit-id: 52c167cf00
Former-commit-id: 48609b58bd2286f625bd7a23b14b9741685a71df [formerly 8f6a7c0746]
Former-commit-id: 2d622e6053
2013-03-13 18:52:52 -05:00
Ron Anderson
87cd340e38 Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1
Former-commit-id: f9c7fa9613 [formerly 0c881b4a85] [formerly 3b65608373] [formerly 61f74305e2 [formerly 3b65608373 [formerly 437a30971b299965540d47f572ad83cd0d7df120]]]
Former-commit-id: 61f74305e2
Former-commit-id: f55bb3e367547583c32d5cc1463941491ec9c6b6 [formerly a7b6e1689b]
Former-commit-id: de14cd0baa
2013-03-13 17:16:37 -05:00
Ben Steffensmeier
7e998aa197 Issue #1791 Implement bulk getGrids to improve performance.
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74

Former-commit-id: a6a1d9bec7 [formerly 37bae0988b] [formerly 4c150b0fd6] [formerly 89eb902284 [formerly 4c150b0fd6 [formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]]
Former-commit-id: 89eb902284
Former-commit-id: 10a52ad4fbe4cb9ea324302c2ac6a32c3b3fad23 [formerly 7abf3cfb39]
Former-commit-id: f5680beaa9
2013-03-13 17:09:20 -05:00
Dave Hladky
68114535f2 Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 5dc454c7ef [formerly 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: b6128220fe67cb5d5fd130270ec6ca785e2ef6af [formerly 160e1594b8]
Former-commit-id: 9e97fc9efe
2013-03-13 13:56:33 -05:00
Steve Harris
45a2d0501d 13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]
Former-commit-id: e12ed113ae
Former-commit-id: d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]
Former-commit-id: ed5f1dbab6
2013-03-13 09:50:28 -05:00
Dave Hladky
eefd544e4b 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: e17f8e0511 [formerly 5c65862b8f] [formerly a1006667e0] [formerly 4b08491880 [formerly a1006667e0 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]
Former-commit-id: 4b08491880
Former-commit-id: ad56918be504d78eeaaedaf28f186a5531e74b1f [formerly 6ea95002de]
Former-commit-id: 155903d135
2013-03-12 15:48:34 -05:00
Lee Venable
da5ff93f57 Merge "Issue #1781 - Fix Hydro Time Series slow table loads" into omaha_13.3.1
Former-commit-id: 13d13428b7 [formerly 9a69cd3524] [formerly d5af1f02c5] [formerly 28d74d91b0 [formerly d5af1f02c5 [formerly 1df2884be78544697f629fca8c7fd0d09ce78aac]]]
Former-commit-id: 28d74d91b0
Former-commit-id: 6cbbc7b35f1af06bc44a23c6f7846a7c829b25b7 [formerly e080fb5106]
Former-commit-id: b471e3807f
2013-03-12 09:08:44 -05:00
Mike Duff
848f7982d6 Issue #1781 - Fix Hydro Time Series slow table loads
Change-Id: Icc0b916459a6636d9571417d102c8ac0226fb93d

Former-commit-id: 5704b2689e [formerly 492cf0f7e6] [formerly 6a6844fdaf] [formerly cac9bd6119 [formerly 6a6844fdaf [formerly acb0a63e9bc71e815c321b6a5aacf8ac339a752a]]]
Former-commit-id: cac9bd6119
Former-commit-id: b852cff98c7943089d4fa9240397aef285faa297 [formerly caed059e23]
Former-commit-id: 2df046d409
2013-03-12 09:03:08 -05:00
Steve Harris
0cec06c171 13.3.1-6 baseline
Former-commit-id: 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]
Former-commit-id: 566b677d09
Former-commit-id: d7e03fcb3e7009a23e58cf48707fadfffebfe3d0 [formerly 4ed21b702b]
Former-commit-id: 6fe4b16924
2013-03-12 08:35:45 -05:00
Roger Ferrel
7c6bd5aeb0 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: 0982485efe [formerly 70bd9aafa7] [formerly 4deb731bd0] [formerly b421c97d86 [formerly 4deb731bd0 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]]
Former-commit-id: b421c97d86
Former-commit-id: bfbd6592633352c9799a573f7b550fe350361788 [formerly 334f2c4a57]
Former-commit-id: 0deb290c24
2013-03-11 13:00:44 -05:00
Dave Hladky
f3c5756522 Issue #1769 Crashing FFMP caused by thread wait
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611

Former-commit-id: b064d868db [formerly 50696bee89] [formerly 2a854d7c30] [formerly bb4c54eff0 [formerly 2a854d7c30 [formerly 6ad5dcd3f980677a9120633f043887527cbe0eda]]]
Former-commit-id: bb4c54eff0
Former-commit-id: 0d693e1163a146ba4b75d08a7448f53b6d3a905b [formerly 73c21a6ead]
Former-commit-id: dd446abd03
2013-03-08 09:58:17 -06:00