Mark Peters
0411b26ec6
Omaha #3412 Replace drawCircle calls
...
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca
Former-commit-id: d04f7dd252b5a25e7372e638d2f41bd04f7dd252b5a25e7372e638d2f41be4c455f5c0e638d2f41be4c455f5c066fafe363b30a6e96d7ce48c2b71163aee17fbb5969c6a4685
2014-07-21 17:07:02 -05:00
Richard Peter
0b0b58e89c
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: ed38bf23726636b301e593bbd98cbced38bf23726636b301e593bbd98cbc8ecc27f71493bbd98cbc8ecc27f714948e0cd011552ac6d640fc27824dbc0fefdc7cd6342192e967
2014-07-01 15:34:39 -05:00
Steve Harris
1bbbdc9c62
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: 741dc31fcb2f2958df37d4dc1723c1741dc31fcb2f2958df37d4dc1723c17acd9ab2ddd4dc1723c17acd9ab2ddd70da4127e7fb4663d75dcbab5621f71357da9d28fb747ad27
2014-07-01 11:08:46 -04:00
Steve Harris
7e7529e482
CM-MERGE:14.1.3-2,-3 into 14.2.2
...
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: 869235c02a16f5ff0979b84dda5930869235c02a16f5ff0979b84dda5930419c5f4abab84dda5930419c5f4ababab435f286af06c5a89066d30e59a3935542914d196f53e609
2014-06-20 14:01:55 -04:00
Brian.Dyke
71ca3ae180
CM-MERGE:OB13.5.6-4 into 14.1.3
...
Former-commit-id: e3dc97e246be589ceb9b399c06820ae3dc97e246be589ceb9b399c06820a8ecdd9a192399c06820a8ecdd9a192f09000ec64e28febcf279031f58d023e10995d87b602d29456
2014-06-18 08:55:49 -04:00
Ben Steffensmeier
ed865c330a
Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings.
...
Former-commit-id: db668f8b635a4f7a1fd4f292f204c9db668f8b635a4f7a1fd4f292f204c9fc25774506f292f204c9fc25774506c9b474afb9217734a2ba94b465fa153c8b94e08a2aebff4f06
2014-06-11 13:45:42 -05:00
Ben Steffensmeier
82f3aaa41e
Omaha #3263 Synchronize dataTimes of storm track resources.
...
Former-commit-id: e7128150f98783e9e23ceff1921f70e7128150f98783e9e23ceff1921f70cad15768cceff1921f70cad15768cc814cabbcfce4ac81c0e9b02383f878f60667703fc0b8a49ee9
2014-06-10 16:34:44 -05:00
Brian.Dyke
f5befd7116
Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 7056d79f700f07e14bf1f72380ad607056d79f700f07e14bf1f72380ad609ab17ddecbf72380ad609ab17ddecb5893782ec3816dcf74e449cd9574d9a4b39dfca51ae1410e46
2014-06-10 13:56:03 -04:00
Brian.Dyke
7caa757318
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
...
Former-commit-id: 64a10ce12def5c74decec1b3f9d18064a10ce12def5c74decec1b3f9d1808874d41872c1b3f9d1808874d41872d6ebcad87e4f0fc67b1ff568b5606a81d732477ea39afc1dfa
2014-06-10 12:52:59 -04:00
Michael Gamazaychikov
b3afeb981b
ASM #114 - Problem with Distance Speed Tool.
...
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: efd0fb50b8e5a9fa0827c07bcacbf8efd0fb50b8e5a9fa0827c07bcacbf850ab77046bc07bcacbf850ab77046bfc5acb6bcba2423cfadc5efb82ea3e29e197404f94595e6af4
2014-06-05 13:43:04 +01:00
Michael Gamazaychikov
a8672786bf
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
...
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: b3d76892d18ae5d535de63409ef272b3d76892d18ae5d535de63409ef2725bff9f2ac863409ef2725bff9f2ac8b499ee28280d38d04dad134f48606955d44735ef0217549622
2014-05-21 15:12:08 +01:00
brian.dyke
5c9495ee04
Merge branch 'master_14.3.1-4' into asm_14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 4d161aaf909626317825011d121e4b4d161aaf909626317825011d121e4b58683ad040011d121e4b58683ad040a2add518802e105c1d5dbc4649765ab42011fc76b2e3c50ec0
2014-05-19 09:45:37 -04:00
Qinglu.Lin
db716647bb
ASM #514 - Line of Storms functionality behaving oddly in WarnGen
...
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39
Former-commit-id: d3220c8e715f0e0bda6918e92f03c1d3220c8e715f0e0bda6918e92f03c1d8753a414518e92f03c1d8753a4145153128e11e580d7e3ba78de2d2f7186ba15bd00c03f7862321
2014-05-05 11:54:56 -04:00
Richard Peter
e748b7c1e5
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 8b1a17711067683dd89144b17824618b1a17711067683dd89144b178246132957285fc44b178246132957285fc0dfa8cc4c66966b7924680d415387824a3fe1466938e39a0fc
2014-04-28 16:27:40 -05:00
Brian.Dyke
19b4bb7dcc
Merge branch 'master_14.2.2' into master_14.3.1
...
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: 362d882b40f0b8ea5822fb1f5aa593362d882b40f0b8ea5822fb1f5aa5933524838f9ffb1f5aa5933524838f9f14a63a19e1bf3758efa3029f5753adc6d3fe6952f31d8cc8cf
2014-04-25 11:06:11 -04:00
Lee Venable
69a239a78a
Issue #3041 - added dispose check to runAsync call and cleaned up code.
...
Change-Id: I50e6ce1a214a884221fbc256a133e57e579862da
Former-commit-id: ed407b11c6ac914e72e73c45a24efbed407b11c6ac914e72e73c45a24efbdcb7e697e83c45a24efbdcb7e697e8e5d73f64ac91d37d783c20764b1d97294d8ff917d6e34a221f
2014-04-21 13:47:31 -05:00
Brian.Dyke
143d9a143a
Merged 14.2.1 -17, -18 into 1422-3
...
Former-commit-id: 735801a7e79df6fb2d4d12a482e1d7735801a7e79df6fb2d4d12a482e1d7b8829139a212a482e1d7b8829139a29c4385efbe6f358189170ea7c51ad7a925ba6219de500c093f
2014-04-17 14:42:35 -04:00
Richard Peter
626ab0bd58
Merge branch 'omaha_14.2.2' (14.2.2-3) into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Former-commit-id: 9b12d9ddafcd51f3fa873575d6586f9b12d9ddafcd51f3fa873575d6586f21ae3b5fcd3575d6586f21ae3b5fcd56089894f2d65b11d404a7ec0bcf66b6482f2e54a22345ea6b
2014-04-11 16:23:09 -05:00
Richard Peter
52a54f5e9f
Merge branch 'master_14.1.2' into master_14.2.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: efd1003a50567609044395eba8dcf6efd1003a50567609044395eba8dcf6b15d28853095eba8dcf6b15d28853047795836f2f1b85f696473aab15d85b667e0509f421b2716a4
2014-04-09 16:00:54 -05:00
Brian.Dyke
38a8f60a43
Merged 1354 -7 and -8 into 1412
...
Former-commit-id: 7de936dfbae4136f79dd947194c9987de936dfbae4136f79dd947194c998929b736038947194c998929b736038a6ebdbfc3ad76d3a26cb5163a31a66462952ce658ef50f023b
2014-04-09 11:39:07 -04:00
Everett Kladstrup
f815fbcb60
Issue #2725 Move derived parameters logic to common
...
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
to the common hierarchy
* Move data cube classes that don't depend on derived parameters
to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
viz.core to viz.datacube
Former-commit-id: eab13586028b19b3601a06d6961c0feab13586028b19b3601a06d6961c0f069904151806d6961c0f069904151829ce7781c986bf2b5ea0260d0beddcd96b56c91a7b2683532a
2014-04-09 09:31:12 -05:00
Brian.Dyke
ae3f5dbff6
Merged 1354 -5 and -6 into 1412 based on 1411-25
...
Former-commit-id: 2eec862ebb17477e7db16a28fcb1562eec862ebb17477e7db16a28fcb156dd98c213c76a28fcb156dd98c213c78ba2694d8e47d90952119f37f61cf8be574897cc39b5e7fe67
2014-04-04 12:57:32 -04:00
David Friedman
8ea6e0b064
Merge branch 'master_14.2.2' into asm_14.2.2
...
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: ee37afaf7b32a7adbe4bfd900e38c2ee37afaf7b32a7adbe4bfd900e38c2f146c7bcd0fd900e38c2f146c7bcd01e4ac84f991168a3eae5533d15c863dde12b4fc38f8f55dd3c
2014-03-27 19:17:03 +00:00
Max Schenkelberg
bee18f29d0
Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done.
...
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada
Former-commit-id: 4bcdc9f85b6edfb8965fdbcbd1b5604bcdc9f85b6edfb8965fdbcbd1b5601854bbb477dbcbd1b5601854bbb477c37910a689bff80c3ee96658c94e6e96bdc0072883103254e7
2014-03-03 17:59:48 -06:00
Juliya Dynina
f5a8116a91
Merge "ASM #114 " into asm_14.2.2
...
Former-commit-id: dd71746c6f3edd73f78c575ed3610ddd71746c6f3edd73f78c575ed3610dc6253811e8575ed3610dc6253811e8d191fb83aff54454f8f1430b9a1aceeb96dc613f05ad2e4da5
2014-02-05 10:42:30 -05:00
David Friedman
226093833d
ASM #110
...
Change-Id: I9df0f0491fa96ecb4c8f46125d987179f3aefc2f
Former-commit-id: 0372fdd6ccd36cbb2ca9769086c0b70372fdd6ccd36cbb2ca9769086c0b7e18c49ea72769086c0b7e18c49ea72b5ae8c70c90ce67592ac052e12b7775a5c72df2fe73e546582
2014-01-29 20:23:55 +00:00
Michael Gamazaychikov
4888397de8
ASM #114
...
Change-Id: I6308422a99e66701852e3b6de6c89b756513ef02
Former-commit-id: 73deca037f297d1cffc697f9c2ea9273deca037f297d1cffc697f9c2ea928f90c0dee297f9c2ea928f90c0dee2b117e710a80198607fe07d7cf7cfabe478ff7fdc01e92945cc
2014-01-29 10:58:18 -05:00
brian.dyke
4744c64069
merge 14.2.1-3 into asm-14.2.2
...
Former-commit-id: becf6322c64a62e838352294c81a57becf6322c64a62e838352294c81a57f10f6d4e8a2294c81a57f10f6d4e8aac37e2ea2e621464ac0de9e2eb3be0dcf5f25ed1ca9263003a
2014-01-27 15:27:49 -05:00
David Friedman
7dbf0d3618
Issue #114
...
Change-Id: I7fd218b0120fe8d8eb6ab535d6d07b40c6c0773d
Former-commit-id: 846bc471006c1b1f33ee01d657fd50846bc471006c1b1f33ee01d657fd50fe5096716301d657fd50fe509671638685594a4e1eae25014b0975f982f26fadfec65791e52302b0
2013-12-20 20:33:18 +00:00
Ben Steffensmeier
fed726dd48
Issue #2491 Remove uneeded ISerializableObject files.
...
Former-commit-id: 230309c25ff34bfc1e5bc14cc609a8230309c25ff34bfc1e5bc14cc609a8cac1f07cbbc14cc609a8cac1f07cbbe03a1c1202ce9653ab15a06bdc56d63955ac729f7f38aac48c
2013-10-25 15:31:39 -05:00
Nate Jensen
344dfd805b
Issue #2400 fix so active map editor is used if applicable
...
Change-Id: I642edc1bdc94eac871a07c26e900c2431f567ab1
Former-commit-id: 6f44e0c9e358c9aced4e8e9e4951496f44e0c9e358c9aced4e8e9e495149c1dd4b40fb8e9e495149c1dd4b40fb3a4fc0977781f5ecb21a136ea71235726f38c27f8b62ea092a
2013-09-30 11:47:26 -05:00
Nate Jensen
9f6248831e
Issue #2360 don't allow mouse actions on layer if layer is invisible
...
Change-Id: Id8e169d4af96902e72b2509d2f53e39ac6cc0a8a
Former-commit-id: 9b3101dd50906e9ad7e908bd2c02419b3101dd50906e9ad7e908bd2c0241ce457b5be408bd2c0241ce457b5be40773241c7e450f5d063d11c1fa94ae1150d848e41c84ac6a75
2013-09-18 17:33:20 -05:00
Max Schenkelberg
76be1e8862
Issue #2277 Switched DataCubeContainer calls to not use ScriptCreator
...
Amend: Added comments as requested
Change-Id: Ib787d43638f20babfc7f89ce2eac958e31d21c3c
Former-commit-id: 3509baaa748a500677d3b633f9987a3509baaa748a500677d3b633f9987a2d1db7d0e2b633f9987a2d1db7d0e270c91ed24b1bdef4ddd361e6dd131666d023227d1a466db041
2013-09-09 10:10:11 -05:00
Ben Steffensmeier
d868f36b2b
Issue #2310 Switch awipstools to load using bundles.
...
Change-Id: I9a24e6359bd43bfb7c8f84686348f532748503c4
Former-commit-id: 6f29122c14ecf667fce9d75fdcb9166f29122c14ecf667fce9d75fdcb91687b6474106d75fdcb91687b64741065998b5aa0219cc13d9bfa6661a883104f5cd8f2ae8ab7969a9
2013-09-04 16:05:09 -05:00
Ben Steffensmeier
b9be2137d4
Issue #2281 Fix shear click distance calculations.
...
Change-Id: I67980264723512a4167cf90cfc3adac2c9ba1d08
Former-commit-id: c3d7a13d82ed989ef777bf8dba768ac3d7a13d82ed989ef777bf8dba768a057d7b9381bf8dba768a057d7b9381db3eae719a6da772b60f96d9c53cc99749a982dd25175b982c
2013-08-29 13:20:56 -05:00
Richard Peter
e6a36eb12a
Merge branch 'omaha_13.5.1' (13.5.1-15) into development
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
Former-commit-id: 181df35afc1f32ef9c7a5e5047cc4f181df35afc1f32ef9c7a5e5047cc4f2a9276c7285e5047cc4f2a9276c72884bef1f2ecc0b0eef331db7c941f6f9cf5e247ab42c78326f1
2013-08-14 15:23:18 -05:00
Steve Harris
a338706fa4
13.5.1-14 baseline
...
Former-commit-id: c6465a3398b848317203d695e5debec6465a3398b848317203d695e5debe80e5f7fbd4d695e5debe80e5f7fbd44e753331559bd983e2fecd5b1e9e2f0f3ffc3892f4262380d6
2013-08-14 10:07:41 -04:00
Richard Peter
1d08e54d43
Merge branch 'omaha_13.5.1' (13.5.1-7) into development
...
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
rpms/awips2.cave/deploy.builder/build.sh
Former-commit-id: 19dacc32c1401ed88e4415d1a6eab019dacc32c1401ed88e4415d1a6eab0c6386e306f15d1a6eab0c6386e306f4c53471f8ee7ec068c7e12993d953985fc9c773b2a9cfe51af
2013-07-22 09:40:18 -05:00
Steve Harris
adf2f89d57
13.5.1-7 baseline
...
Former-commit-id: 67299457b1630705aa3fbf58a81b3867299457b1630705aa3fbf58a81b3886ce1248c2bf58a81b3886ce1248c20fe8173b7bcb50a0028df9c9aecba5eff4fb29dd513c089375
2013-07-18 12:07:22 -04:00
Nate Jensen
c6b9b2dd7f
Issue #2142 clean up dependencies and dead code
...
Change-Id: I30f94c9afb01cdd1b7bef98c6ba40f79c3acea59
Former-commit-id: 8838a7ee75c4bc1ef034a6368462958838a7ee75c4bc1ef034a636846295f28420dac4a636846295f28420dac4d39a1755838b070975aa65dbc62b59428d0c73dc5a0dd6f037
2013-07-17 16:30:08 -05:00
Roger Ferrel
1928fea36e
Issue #2145 Verify movable ring coordinates prior to saving.
...
Change-Id: I4772e180d0af394985dbd1bdc65007a8c02feed0
Former-commit-id: c5b3bd54d0f31f880a19f279672f6fc5b3bd54d0f31f880a19f279672f6f26ffb4d885f279672f6f26ffb4d885e2b92d0f6ecd63b071db9e195e546973fd01fa515d1d211890
2013-07-09 14:05:35 -05:00
Roger Ferrel
1667335d31
Issue #2145 Added slection indicator and verificaton of lat, lon and radius.
...
Change-Id: I10492bdd2e74b5ea8fd9386528019665185ae584
Former-commit-id: 42739e0b9ca438c9ff2ac44c11279d42739e0b9ca438c9ff2ac44c11279d5224ab80f0c44c11279d5224ab80f0db35f1e599b057f27a94895d0dc8232a40a9230787b937b6d9
2013-07-05 13:33:53 -05:00
Roger Ferrel
25ebc33066
Issue #2145 Changes to RangeRingDialog so it doesn't double the movable range rings when a point is modified.
...
Change-Id: I229ce3e40769961c9c1b296c7c42d919a21cfd0b
Former-commit-id: 8cab528dc8ebb76daf14fab96d28f28cab528dc8ebb76daf14fab96d28f2752933c7fefab96d28f2752933c7fe2f5994b297477d8b03173c24739b720fb0ff7a5a9f8b831148
2013-07-02 17:27:22 -05:00
Steve Harris
d3517d7c1d
13.5.1-3 baseline
...
Former-commit-id: a0ff6c20ead8176d4a4c63803c1424a0ff6c20ead8176d4a4c63803c142472d22a30c963803c142472d22a30c9e1a5587dd0deebdb874a810388f00a1e939939b550d4376af7
2013-06-24 09:29:43 -04:00
Steve Harris
97a4c59662
13.5.1-1 baseline
...
Former-commit-id: 5d99df99696384018950998961612c5d99df99696384018950998961612cfe872355a7998961612cfe872355a743b7a9b4100aab285b8a30ba1d634e146c5e8940859965fc9d
2013-06-10 15:17:17 -04:00
Steve Harris
0b9bf76434
13.4.1-10 baseline
...
Former-commit-id: 294c127b0a68fe2134b89a403b3615294c127b0a68fe2134b89a403b361592152778b99a403b361592152778b9ac83fff2447e04d8cd13b1fc4e625b322036ea82b41118326c
2013-05-20 10:52:47 -04:00
Steve Harris
f04a1e8fc0
13.4.1-6 baseline
...
Former-commit-id: 5544c4a0726fcbb5ae6b83799776735544c4a0726fcbb5ae6b837997767316fe8cc5a2837997767316fe8cc5a25568ada76b5be793f2f9979700c3022e835dc5915e54a425fb
2013-05-07 08:47:39 -04:00
Steve Harris
dc6ffe2ccf
13.4.1-2 baseline
...
Former-commit-id: 4533276dd59212be8b7452f0ae47584533276dd59212be8b7452f0ae47585ebd58a0b352f0ae47585ebd58a0b39f9d623cb76880107d3299bc8c8072c0481dcdf2b2b9dac313
2013-04-24 17:22:10 -05:00
Steve Harris
b0fb1f49be
13.4.1-1 baseline
...
Former-commit-id: 79567aac51f95e0ad10b2f517b771379567aac51f95e0ad10b2f517b771300332e63052f517b771300332e6305aecc3cfd890e950655f14accbb80db4001e050e7722e428c74
2013-04-24 17:15:55 -05:00
Steve Harris
99d89adc2e
13.3.1-20 baseline
...
Former-commit-id: 9e73c3f1ed07f7e6e2b425432cc3889e73c3f1ed07f7e6e2b425432cc388446bec6f4925432cc388446bec6f491749ff8a3c8535bceb4c4b7113138644cd8d47fb953ffdab87
2013-04-15 08:58:59 -05:00
