Steve Harris
02105701a0
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: b0621d90bcfd71e44f0fa23cecdb26a23cecdb26e96e95b565
2013-03-26 10:12:34 -05:00
Mike Duff
b366778df0
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: c1f7d33bb85d72795e1b9ebc7606b19ebc7606b14c3011edce
2013-03-26 09:19:39 -05:00
Ron Anderson
e4c4862938
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: 6ab9303526f4f180face73678261b673678261b67e6b601a09
2013-03-25 17:53:46 -05:00
Lee Venable
b1ce5603a0
Merge "Issue #1605 Check if storm location is over an urban bound area." into omaha_13.3.1
...
Former-commit-id: a84ef2d2c3e467daec0c05b4c2f91305b4c2f913d73b44fa67
2013-03-25 17:20:25 -05:00
Mike Duff
fc0b126eee
Issue #1781 - Constrain the tabular TS query by time.
...
Change-Id: I648913c157585283cdc96793d18d36933589b3e9
Former-commit-id: 3d783c54beafd0de8b5b88e75f4a9088e75f4a90b517ce9a9f
2013-03-25 16:03:18 -05:00
Jonathan Sanchez
cd1095fb29
Issue #1605 Check if storm location is over an urban bound area.
...
Former-commit-id: 3ca4cc9dcf06cd161d0eddcb4f3451ddcb4f3451c9295e6762
2013-03-25 14:41:55 -05:00
Lee Venable
4caa21aa69
Merge "Issue #1810 Accepted other values/types for useDirs." into omaha_13.3.1
...
Former-commit-id: 5d7055ad5325cf1cacfdd1c84de620d1c84de620fc41aa82ca
2013-03-25 14:08:39 -05:00
Steve Harris
f80f98cee2
13.3.1-12 baseline
...
Former-commit-id: be962822070be473728aaaac0b51e5aaac0b51e5bc439aee4f
2013-03-25 13:27:13 -05:00
Jonathan Sanchez
e01d47acfa
Issue #1810 Accepted other values/types for useDirs.
...
Former-commit-id: 2d6be3d3dad00c88a38cb77ed18eb4b77ed18eb4539c4dfa8e
2013-03-25 12:23:51 -05:00
Mike Duff
fcb46897e3
Issue #1818 - Added an isDisposed check to the Attributes Dialog open action
...
Change-Id: Icb0c6fd5112cc11b796aaa74c8afc9b10760f2dc
Former-commit-id: 86e0184414593cb668bf7118f048437118f04843c682fb2e9a
2013-03-24 12:21:51 -05:00
Richard Peter
d1b4d899be
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: bb2be2d6a71b7e9e41ce3de04009693de040096950254dc8d1
2013-03-22 16:26:52 -05:00
Dustin Johnson
c55f2ce559
Merge "Issue #1815 Move DD phase3 code to 5-Data_Delivery" into development
...
Former-commit-id: f5cc517f9adcfbb43eb38651ca3d768651ca3d760596d43d99
2013-03-22 15:28:57 -05:00
Dustin Johnson
f274b8cd5b
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: ec42bd63ad11478e870ded017996a0ed017996a09e63142576
2013-03-22 15:28:20 -05:00
Max Schenkelberg
850c8995cc
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: 07ae94c499ea26d0de84126be0cfe5126be0cfe5d20958ae92
2013-03-22 10:54:44 -05:00
David Gillingham
c8c7fb4129
Issue #1447 : Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
...
localVTECPartners.py to ServiceBackup.
Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3
Former-commit-id: 8438c5af8779a1520baf4aeeb1ce254aeeb1ce25c3ce4058a0
2013-03-22 10:39:13 -05:00
Dustin Johnson
53291f7130
Issue #1815 Move DD phase3 code to 5-Data_Delivery
...
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425
Former-commit-id: 6fc42b07918956d1ac1704cbd3a24e04cbd3a24e1b1bd69b89
2013-03-22 10:04:21 -05:00
Lee Venable
a2e5e18810
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: 5c8230662d489e04c235c8523e9108c8523e91080d1cba8eae
2013-03-21 19:27:02 -05:00
Nate Jensen
fa0d772221
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: 5728a3e5b6e4c1e86d5544f8ba894344f8ba894384e8a30ad7
2013-03-21 17:06:37 -05:00
Dustin Johnson
09d1d7b6cf
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: bd58534855f8870c8946c4d4e37cadc4d4e37cadd58306a92e
2013-03-21 16:14:49 -05:00
Nate Jensen
7ce724d4fd
Merge "Issue #1808 perspective specific actions take priority" into development
...
Former-commit-id: 113da23467d6d7b081cf255b2dbd29255b2dbd297821b86e87
2013-03-21 15:07:57 -05:00
Mike Duff
524dfa985f
Issue #1812 - Scan/DMD trend graphs and trend sets graphs update on threshold changes.
...
Change-Id: I1150f365ef7b67a198f57cca85859f6767eb0234
Former-commit-id: 540524941de4ffefa64909feff70e009feff70e0a45389f735
2013-03-21 12:23:56 -05:00
Ben Steffensmeier
4323ea54d2
Issue #1806 Update GL mosaicing to use dynamic data format for offscreen textures.
...
Change-Id: Ib756f4ce978ace6fae41dd407ab9187cd6b70d51
Former-commit-id: 3cc175f373e69011cdd8de02fe7922de02fe79226ce135a80a
2013-03-21 11:09:23 -05:00
Max Schenkelberg
9aa8f9dd9e
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: 3bda2ba497b2e374c7fb5109641194510964119421b8c130c2
2013-03-20 17:38:02 -05:00
Bryan Kowal
63f7abc798
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: 820518ffb90479eb0cc13baebb684b3baebb684b374bd51fb0
2013-03-20 16:53:18 -05:00
Nate Jensen
5acc1d6835
Issue #1808 perspective specific actions take priority
...
Change-Id: I21f5515fe0c2a480dee9950bacbc2b06fd084072
Former-commit-id: 00f750ae06c1ddc02b10de3aea9afbde3aea9afba5f4b4f0ad
2013-03-20 16:27:31 -05:00
Steve Harris
8db98c2d71
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: 0055a3213de2496455b20379be06d20379be06d24fc2bb7bba
2013-03-20 16:09:26 -05:00
Steve Harris
f4e26fd94d
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: a9ced3a7effa15f03e1bdc419068f0dc419068f031044eabd1
2013-03-20 16:06:20 -05:00
Steve Harris
e9f0328808
13.3.1-10 baseline
...
Former-commit-id: 57f4676b6c073687d9a97078eec1b17078eec1b17c2e617d26
2013-03-20 15:53:01 -05:00
Max Schenkelberg
ec27a16858
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: 43341e7ad3c6db3ce43b26cfcd2af526cfcd2af52e10fd83f6
2013-03-20 14:10:52 -05:00
Steve Harris
d00dc0d174
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: 310474ae9b36df63be5ccb5ea76f98cb5ea76f98104e6e79e8
2013-03-20 13:45:11 -05:00
Richard Peter
53d8ef7ed1
Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1
...
Former-commit-id: d1e37c78033b8e2ff0d3adbe7b91ccadbe7b91cc3bad342dca
2013-03-20 13:32:33 -05:00
Ben Steffensmeier
1b363a547c
Issue #1804 Remove empty data structures from radar hdf5.
...
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d
Former-commit-id: 1203b7cee4ee7204c05c82499f839d82499f839d3e2a41d1d2
2013-03-20 13:26:33 -05:00
Ben Steffensmeier
b201d9dee2
Issue #1804 Switch bzip2 cots package to jbzip2.
...
Former-commit-id: 0d9119a1c72b6aa86371ed544fc17ced544fc17c646b61f653
2013-03-20 13:05:54 -05:00
Dave Hladky
01c6ff12a0
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: dc7b231bf090f7f2110b3cdbfa3f253cdbfa3f25bd17b99bd1
2013-03-20 12:41:33 -05:00
Steve Harris
7e96d841d9
13.3.1-9 baseline
...
Former-commit-id: c7b2ef2d8c468ae82305f2b3fddfe2f2b3fddfe20375805e79
2013-03-19 14:22:56 -05:00
Richard Peter
eebd930070
Merge "Issue #1804 Remove AlphanumericValues from radar HDF5." into omaha_13.3.1
...
Former-commit-id: 2fdbc963424ce10bced93a927475183a92747518c955b3b640
2013-03-19 13:24:28 -05:00
Dustin Johnson
3c8e14edc7
Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development
...
Former-commit-id: bc323d3f255b4035fb118363eba4098363eba409e0b6e6187e
2013-03-19 13:09:48 -05:00
Dave Hladky
618f737fab
Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
...
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d
Former-commit-id: d7e8709cdeddb23ae59f81ad1ce2ed81ad1ce2edf0244f54a4
2013-03-19 13:08:14 -05:00
Mike Duff
3e1b4ba54b
Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen
...
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff
Former-commit-id: 70efff8f0ab115d3611c058064ce0d058064ce0d7e66c8e46d
2013-03-19 10:10:01 -05:00
Bryan Kowal
fd68cd7a04
Issue #1805 - slightly modified viz feature build order
...
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569
Former-commit-id: 6106369d4cf325038538f0eb7d3285f0eb7d328554113e9b29
2013-03-18 18:15:26 -05:00
Ben Steffensmeier
160b6a7040
Issue #1804 Remove AlphanumericValues from radar HDF5.
...
Former-commit-id: 7b7b708eee6c741a9ab386dffab17d86dffab17ddfe8de96f2
2013-03-18 17:16:44 -05:00
Steve Harris
2a26783ba7
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
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/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Former-commit-id: 28ef804e1bb8f0635ad67fcf9f1cb27fcf9f1cb2900b9aadde
2013-03-18 16:52:00 -05:00
Steve Harris
ea27f9cd17
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: 27c418812f1a999fee5ac18b96dc4cc18b96dc4c245afb28c8
2013-03-18 16:43:22 -05:00
Bryan Kowal
3e8d5449fc
Issue #1741 - what was once two is now one
...
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts
Former-commit-id: a93dcff1b5b954bc17bf7fd035256d7fd035256d66e2ed79ec
2013-03-18 16:36:33 -05:00
Steve Harris
81a3f29afc
13.3.1-8 baseline
...
Former-commit-id: bc9df0a8f9f97d78994bc15b3ffe20c15b3ffe205f492500ea
2013-03-18 15:43:32 -05:00
Dustin Johnson
7afc4a083b
Merge "Issue #1794 Consolidate common filename filters into FilenameFilters class" into development
...
Former-commit-id: 36cc80590cb7a5311dde7fe3c254fd7fe3c254fd55095f0041
2013-03-15 16:14:17 -05:00
Dustin Johnson
7adf94e9f6
Issue #1794 Consolidate common filename filters into FilenameFilters class
...
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: fff7e7983fecb0d2c82643a9f608ef43a9f608ef1b82ad0dc4
2013-03-15 11:51:58 -05:00
Roger Ferrel
382bb7c16b
Issue #1790 changes for non-blocking StationLegendDlg.
...
Change-Id: Ie3d632cf8f1a6f0e85b3b4758afe236f3022e91d
Former-commit-id: dadf8a9e4c0089e24579b01bb935c3b01bb935c308990f97f8
2013-03-15 10:26:30 -05:00
Roger Ferrel
e88e52e406
Issue #1790 changes for non-blocking StaffGageDlg.
...
Change-Id: I37d1d2358a91b1f8720888543fb5e05d9ce55092
Former-commit-id: fcbda4e0de4230e1a9b817a41bf06317a41bf063006062502e
2013-03-15 09:00:00 -05:00
Roger Ferrel
60e7b4be62
Issue #1790 changes for non-blocking PointPrecipAccumDlg and RiverSummaryDlg.
...
Change-Id: I96e958225b32ba818743d69d77e6bb5cbdc5a13c
Former-commit-id: 76507ebcc5015fc9b8f834ea46099e34ea46099e7eae71038f
2013-03-15 08:17:50 -05:00
