Roger Ferrel
d504643687
Issue #1790 Fix dialog in current phase.
...
Change-Id: I7289fbef264d68b70b606d120cde8daf5fc41e7b
Former-commit-id: d69674d595d69674d5951093c020e668ba7cab75
2013-03-27 14:11:36 -05:00
Nate Jensen
9c7466b8e9
Merge "Issue #1638 Made Map scales more generalized for use outside of D2D" into development
...
Former-commit-id: faf937d3b0faf937d3b0f8e5534417a7548df695
2013-03-27 11:32:19 -05:00
Nate Jensen
9353bd7d8b
Merge "Issue #1735 Performance improvments for LLWSData." into development
...
Former-commit-id: ff7631d847ff7631d847b44db0bc2c314c5dcb2e
2013-03-26 16:28:38 -05:00
Steve Harris
fdd07bd72c
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 5fcfaf43605fcfaf436065df96a419346b97a39a
2013-03-26 12:47:40 -05:00
Steve Harris
779adedea9
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Former-commit-id: e71c69c383e71c69c3839ff8a94193b926ff60b3
2013-03-26 12:44:24 -05:00
Steve Harris
7aa4f7b265
13.3.1-13 baseline
...
Former-commit-id: c77a452f5ac77a452f5ac65f3e68e5822d05a709
2013-03-26 12:43:07 -05:00
Ben Steffensmeier
3dbd9580c5
Issue #1782 fix merge problems related to graphics API.
...
Former-commit-id: 2b898e58c72b898e58c76edee13cdd76a6213807
2013-03-26 12:06:45 -05:00
Steve Harris
e6ab1deba2
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: fd71e44f0ffd71e44f0fa23cecdb26e96e95b565
2013-03-26 10:12:34 -05:00
Mike Duff
efec4d0365
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: 5d72795e1b5d72795e1b9ebc7606b14c3011edce
2013-03-26 09:19:39 -05:00
Ron Anderson
60c1c27225
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: f4f180facef4f180face73678261b67e6b601a09
2013-03-25 17:53:46 -05:00
Lee Venable
b329abb111
Merge "Issue #1605 Check if storm location is over an urban bound area." into omaha_13.3.1
...
Former-commit-id: e467daec0ce467daec0c05b4c2f913d73b44fa67
2013-03-25 17:20:25 -05:00
Mike Duff
9a9d8f0503
Issue #1781 - Constrain the tabular TS query by time.
...
Change-Id: I648913c157585283cdc96793d18d36933589b3e9
Former-commit-id: afd0de8b5bafd0de8b5b88e75f4a90b517ce9a9f
2013-03-25 16:03:18 -05:00
Roger Ferrel
7259166afe
Issue #1735 Performance improvments for LLWSData.
...
Change-Id: I146250873a90e1a7378a3e910416e03b6d3bf17f
Former-commit-id: feadd01ad9feadd01ad9549650c05cdaecc7b7f4
2013-03-25 15:41:01 -05:00
Max Schenkelberg
237c742d44
Issue #1638 Made Map scales more generalized for use outside of D2D
...
Amend: Added generalization to JaxbManager
Change-Id: Ic210b8b0d50b4f362321855268570147c439cc2a
Former-commit-id: fd375314cdfd375314cde17d69140036e80c267e
2013-03-25 15:38:36 -05:00
Jonathan Sanchez
dad851857d
Issue #1605 Check if storm location is over an urban bound area.
...
Former-commit-id: 06cd161d0e06cd161d0eddcb4f3451c9295e6762
2013-03-25 14:41:55 -05:00
Lee Venable
cc0debe027
Merge "Issue #1810 Accepted other values/types for useDirs." into omaha_13.3.1
...
Former-commit-id: 25cf1cacfd25cf1cacfdd1c84de620fc41aa82ca
2013-03-25 14:08:39 -05:00
Steve Harris
f1d156779a
13.3.1-12 baseline
...
Former-commit-id: 0be473728a0be473728aaaac0b51e5bc439aee4f
2013-03-25 13:27:13 -05:00
Jonathan Sanchez
6e02206355
Issue #1810 Accepted other values/types for useDirs.
...
Former-commit-id: d00c88a38cd00c88a38cb77ed18eb4539c4dfa8e
2013-03-25 12:23:51 -05:00
Mike Duff
516965bea3
Issue #1818 - Added an isDisposed check to the Attributes Dialog open action
...
Change-Id: Icb0c6fd5112cc11b796aaa74c8afc9b10760f2dc
Former-commit-id: 593cb668bf593cb668bf7118f04843c682fb2e9a
2013-03-24 12:21:51 -05:00
Richard Peter
66a28e9315
Merge "Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe." into development
...
Former-commit-id: 1b7e9e41ce1b7e9e41ce3de040096950254dc8d1
2013-03-22 16:26:52 -05:00
Dustin Johnson
dcc7e44250
Merge "Issue #1815 Move DD phase3 code to 5-Data_Delivery" into development
...
Former-commit-id: dcfbb43eb3dcfbb43eb38651ca3d760596d43d99
2013-03-22 15:28:57 -05:00
Dustin Johnson
e4c51bad63
Merge "Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription" into development
...
Former-commit-id: 11478e870d11478e870ded017996a09e63142576
2013-03-22 15:28:20 -05:00
Max Schenkelberg
34134b3c62
Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe.
...
Amend: Moved Pair class into uf.common.util to reduce amount of duplicate code
Amend: Added hashCode/equals to Pair
Change-Id: I9a390989f6a7a7ee6618a57d0f50ec681a598dc0
Former-commit-id: ea26d0de84ea26d0de84126be0cfe5d20958ae92
2013-03-22 10:54:44 -05:00
David Gillingham
7a2c92efc7
Issue #1447 : Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
...
localVTECPartners.py to ServiceBackup.
Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3
Former-commit-id: 79a1520baf79a1520baf4aeeb1ce25c3ce4058a0
2013-03-22 10:39:13 -05:00
Dustin Johnson
e39187c0ce
Issue #1815 Move DD phase3 code to 5-Data_Delivery
...
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425
Former-commit-id: 8956d1ac178956d1ac1704cbd3a24e1b1bd69b89
2013-03-22 10:04:21 -05:00
Lee Venable
c733749c9f
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: 489e04c235489e04c235c8523e91080d1cba8eae
2013-03-21 19:27:02 -05:00
Nate Jensen
4a8974e6a0
Merge "Issue #1638 Created AWIPSWorkbenchAdvisor which sends MenuCreation request to run so core cave applications will not depend on uf.edex.menus being deployed in EDEX. Changed DbQuery to use DbQueryRequest under the hood to remove dependency on ScriptCreator." into development
...
Former-commit-id: e4c1e86d55e4c1e86d5544f8ba894384e8a30ad7
2013-03-21 17:06:37 -05:00
Dustin Johnson
0f4ec00790
Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription
...
Amend:
Add constant for "CAVE".
Add preconditions on creating a subscription.
Change-Id: Icdd2bc0ebd1613724cea3a89d335415995e18cae
Former-commit-id: f8870c8946f8870c8946c4d4e37cadd58306a92e
2013-03-21 16:14:49 -05:00
Nate Jensen
5d0194d7a3
Merge "Issue #1808 perspective specific actions take priority" into development
...
Former-commit-id: d6d7b081cfd6d7b081cf255b2dbd297821b86e87
2013-03-21 15:07:57 -05:00
Mike Duff
8c1b60bae9
Issue #1812 - Scan/DMD trend graphs and trend sets graphs update on threshold changes.
...
Change-Id: I1150f365ef7b67a198f57cca85859f6767eb0234
Former-commit-id: e4ffefa649e4ffefa64909feff70e0a45389f735
2013-03-21 12:23:56 -05:00
Ben Steffensmeier
9feaaa1961
Issue #1806 Update GL mosaicing to use dynamic data format for offscreen textures.
...
Change-Id: Ib756f4ce978ace6fae41dd407ab9187cd6b70d51
Former-commit-id: e69011cdd8e69011cdd8de02fe79226ce135a80a
2013-03-21 11:09:23 -05:00
Max Schenkelberg
5175c821bd
Issue #1638 Created AWIPSWorkbenchAdvisor which sends MenuCreation request to run so core cave applications will not depend on uf.edex.menus being deployed in EDEX. Changed DbQuery to use DbQueryRequest under the hood to remove dependency on ScriptCreator.
...
Amend: Added header comments and more unused code
Change-Id: Ib9285d0472e41473ba79bbada8ea2bf57b55d686
Former-commit-id: b2e374c7fbb2e374c7fb510964119421b8c130c2
2013-03-20 17:38:02 -05:00
Bryan Kowal
5eae24b949
Merge "Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE." into development
...
Former-commit-id: 0479eb0cc10479eb0cc13baebb684b374bd51fb0
2013-03-20 16:53:18 -05:00
Nate Jensen
54e7989366
Issue #1808 perspective specific actions take priority
...
Change-Id: I21f5515fe0c2a480dee9950bacbc2b06fd084072
Former-commit-id: c1ddc02b10c1ddc02b10de3aea9afba5f4b4f0ad
2013-03-20 16:27:31 -05:00
Steve Harris
a91fcf98a2
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: e2496455b2e2496455b20379be06d24fc2bb7bba
2013-03-20 16:09:26 -05:00
Steve Harris
8065161896
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: fa15f03e1bfa15f03e1bdc419068f031044eabd1
2013-03-20 16:06:20 -05:00
Steve Harris
f2cc967a4f
13.3.1-10 baseline
...
Former-commit-id: 073687d9a9073687d9a97078eec1b17c2e617d26
2013-03-20 15:53:01 -05:00
Max Schenkelberg
924e27f51f
Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE.
...
Change-Id: I177804512c34603bae0027edfa420de47d23138e
Former-commit-id: c6db3ce43bc6db3ce43b26cfcd2af52e10fd83f6
2013-03-20 14:10:52 -05:00
Steve Harris
6d4512fa3a
Merge branch 'omaha_13.3.1' into development
...
Conflicts (auto resolved):
cave/com.raytheon.uf.viz.cots.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
Former-commit-id: 36df63be5c36df63be5ccb5ea76f98104e6e79e8
2013-03-20 13:45:11 -05:00
Richard Peter
ff1b1598e6
Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1
...
Former-commit-id: 3b8e2ff0d33b8e2ff0d3adbe7b91cc3bad342dca
2013-03-20 13:32:33 -05:00
Ben Steffensmeier
57d19b0d66
Issue #1804 Remove empty data structures from radar hdf5.
...
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d
Former-commit-id: ee7204c05cee7204c05c82499f839d3e2a41d1d2
2013-03-20 13:26:33 -05:00
Ben Steffensmeier
498d153e40
Issue #1804 Switch bzip2 cots package to jbzip2.
...
Former-commit-id: 2b6aa863712b6aa86371ed544fc17c646b61f653
2013-03-20 13:05:54 -05:00
Dave Hladky
8299b2872a
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: 90f7f2110b90f7f2110b3cdbfa3f25bd17b99bd1
2013-03-20 12:41:33 -05:00
Steve Harris
65f522fc87
13.3.1-9 baseline
...
Former-commit-id: 468ae82305468ae82305f2b3fddfe20375805e79
2013-03-19 14:22:56 -05:00
Richard Peter
1bf2c48011
Merge "Issue #1804 Remove AlphanumericValues from radar HDF5." into omaha_13.3.1
...
Former-commit-id: 4ce10bced94ce10bced93a92747518c955b3b640
2013-03-19 13:24:28 -05:00
Dustin Johnson
889953c712
Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development
...
Former-commit-id: 5b4035fb115b4035fb118363eba409e0b6e6187e
2013-03-19 13:09:48 -05:00
Dave Hladky
64f8c46e64
Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
...
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d
Former-commit-id: ddb23ae59fddb23ae59f81ad1ce2edf0244f54a4
2013-03-19 13:08:14 -05:00
Mike Duff
144223ed9b
Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen
...
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff
Former-commit-id: b115d3611cb115d3611c058064ce0d7e66c8e46d
2013-03-19 10:10:01 -05:00
Bryan Kowal
959e8b717f
Issue #1805 - slightly modified viz feature build order
...
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569
Former-commit-id: f325038538f325038538f0eb7d328554113e9b29
2013-03-18 18:15:26 -05:00
Ben Steffensmeier
e176478c7a
Issue #1804 Remove AlphanumericValues from radar HDF5.
...
Former-commit-id: 6c741a9ab36c741a9ab386dffab17ddfe8de96f2
2013-03-18 17:16:44 -05:00
