Matthew Howard
c0a43b73ce
Merge "ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool" into asm_14.3.1
...
Former-commit-id: 7121e2e6e16e0dbf4fb5
2014-09-11 08:56:49 -05:00
Qinglu.Lin
517f0c9d0c
ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool
...
Change-Id: I68c2b4b336a5145de20f70cb0967c9dc484f3b09
Former-commit-id: 3f666817e051d48a6fdc
2014-09-09 08:07:46 -04:00
Brian.Dyke
a08db8d73d
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: aa83bf804fe654318431
2014-08-27 11:19:19 -04:00
Qinglu.Lin
3cc94603a2
ASM #15700 - Warngen issues an error and toggles off on Radar update
...
Change-Id: I51085cd1bb9c7286719f1bff4e04abe5a7a2363b
Former-commit-id: 2157a4aa3bfb92838427
2014-08-21 10:43:22 -04:00
Steve Harris
2f2958df37
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: 7acd9ab2ddd4dc1723c1
2014-07-01 11:08:46 -04:00
Qinglu.Lin
e71e54b5da
ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool
...
Change-Id: I73ca64048b00338b82ee13c5958d6b823cc4a43d
Former-commit-id: 30bc1b7450edb9dd1ff2
2014-06-25 08:28:55 -04:00
Steve Harris
16f5ff0979
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: 419c5f4abab84dda5930
2014-06-20 14:01:55 -04:00
Brian.Dyke
be589ceb9b
CM-MERGE:OB13.5.6-4 into 14.1.3
...
Former-commit-id: 8ecdd9a192399c06820a
2014-06-18 08:55:49 -04:00
Brian.Dyke
0f07e14bf1
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: 9ab17ddecbf72380ad60
2014-06-10 13:56:03 -04:00
Brian.Dyke
ef5c74dece
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
...
Former-commit-id: 8874d41872c1b3f9d180
2014-06-10 12:52:59 -04:00
Michael Gamazaychikov
e5a9fa0827
ASM #114 - Problem with Distance Speed Tool.
...
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: 50ab77046bc07bcacbf8
2014-06-05 13:43:04 +01:00
Michael Gamazaychikov
8ae5d535de
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
...
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: 5bff9f2ac863409ef272
2014-05-21 15:12:08 +01:00
brian.dyke
9626317825
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: 58683ad040011d121e4b
2014-05-19 09:45:37 -04:00
Qinglu.Lin
5f0e0bda69
ASM #514 - Line of Storms functionality behaving oddly in WarnGen
...
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39
Former-commit-id: d8753a414518e92f03c1
2014-05-05 11:54:56 -04:00
Richard Peter
67683dd891
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: 32957285fc44b1782461
2014-04-28 16:27:40 -05:00
Brian.Dyke
f0b8ea5822
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: 3524838f9ffb1f5aa593
2014-04-25 11:06:11 -04:00
Lee Venable
ac914e72e7
Issue #3041 - added dispose check to runAsync call and cleaned up code.
...
Change-Id: I50e6ce1a214a884221fbc256a133e57e579862da
Former-commit-id: dcb7e697e83c45a24efb
2014-04-21 13:47:31 -05:00
Brian.Dyke
9df6fb2d4d
Merged 14.2.1 -17, -18 into 1422-3
...
Former-commit-id: b8829139a212a482e1d7
2014-04-17 14:42:35 -04:00
Richard Peter
cd51f3fa87
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: 21ae3b5fcd3575d6586f
2014-04-11 16:23:09 -05:00
Richard Peter
5676090443
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: b15d28853095eba8dcf6
2014-04-09 16:00:54 -05:00
Brian.Dyke
e4136f79dd
Merged 1354 -7 and -8 into 1412
...
Former-commit-id: 929b736038947194c998
2014-04-09 11:39:07 -04:00
Everett Kladstrup
8b19b3601a
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: 069904151806d6961c0f
2014-04-09 09:31:12 -05:00
Brian.Dyke
17477e7db1
Merged 1354 -5 and -6 into 1412 based on 1411-25
...
Former-commit-id: dd98c213c76a28fcb156
2014-04-04 12:57:32 -04:00
David Friedman
32a7adbe4b
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: f146c7bcd0fd900e38c2
2014-03-27 19:17:03 +00:00
Max Schenkelberg
6edfb8965f
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: 1854bbb477dbcbd1b560
2014-03-03 17:59:48 -06:00
Juliya Dynina
3edd73f78c
Merge "ASM #114 " into asm_14.2.2
...
Former-commit-id: c6253811e8575ed3610d
2014-02-05 10:42:30 -05:00
David Friedman
d36cbb2ca9
ASM #110
...
Change-Id: I9df0f0491fa96ecb4c8f46125d987179f3aefc2f
Former-commit-id: e18c49ea72769086c0b7
2014-01-29 20:23:55 +00:00
Michael Gamazaychikov
297d1cffc6
ASM #114
...
Change-Id: I6308422a99e66701852e3b6de6c89b756513ef02
Former-commit-id: 8f90c0dee297f9c2ea92
2014-01-29 10:58:18 -05:00
brian.dyke
4a62e83835
merge 14.2.1-3 into asm-14.2.2
...
Former-commit-id: f10f6d4e8a2294c81a57
2014-01-27 15:27:49 -05:00
David Friedman
6c1b1f33ee
Issue #114
...
Change-Id: I7fd218b0120fe8d8eb6ab535d6d07b40c6c0773d
Former-commit-id: fe5096716301d657fd50
2013-12-20 20:33:18 +00:00
Ben Steffensmeier
f34bfc1e5b
Issue #2491 Remove uneeded ISerializableObject files.
...
Former-commit-id: cac1f07cbbc14cc609a8
2013-10-25 15:31:39 -05:00
Nate Jensen
58c9aced4e
Issue #2400 fix so active map editor is used if applicable
...
Change-Id: I642edc1bdc94eac871a07c26e900c2431f567ab1
Former-commit-id: c1dd4b40fb8e9e495149
2013-09-30 11:47:26 -05:00
Nate Jensen
906e9ad7e9
Issue #2360 don't allow mouse actions on layer if layer is invisible
...
Change-Id: Id8e169d4af96902e72b2509d2f53e39ac6cc0a8a
Former-commit-id: ce457b5be408bd2c0241
2013-09-18 17:33:20 -05:00
Max Schenkelberg
8a500677d3
Issue #2277 Switched DataCubeContainer calls to not use ScriptCreator
...
Amend: Added comments as requested
Change-Id: Ib787d43638f20babfc7f89ce2eac958e31d21c3c
Former-commit-id: 2d1db7d0e2b633f9987a
2013-09-09 10:10:11 -05:00
Ben Steffensmeier
ecf667fce9
Issue #2310 Switch awipstools to load using bundles.
...
Change-Id: I9a24e6359bd43bfb7c8f84686348f532748503c4
Former-commit-id: 87b6474106d75fdcb916
2013-09-04 16:05:09 -05:00
Ben Steffensmeier
ed989ef777
Issue #2281 Fix shear click distance calculations.
...
Change-Id: I67980264723512a4167cf90cfc3adac2c9ba1d08
Former-commit-id: 057d7b9381bf8dba768a
2013-08-29 13:20:56 -05:00
Richard Peter
1f32ef9c7a
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: 2a9276c7285e5047cc4f
2013-08-14 15:23:18 -05:00
Steve Harris
b848317203
13.5.1-14 baseline
...
Former-commit-id: 80e5f7fbd4d695e5debe
2013-08-14 10:07:41 -04:00
Richard Peter
401ed88e44
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: c6386e306f15d1a6eab0
2013-07-22 09:40:18 -05:00
Steve Harris
630705aa3f
13.5.1-7 baseline
...
Former-commit-id: 86ce1248c2bf58a81b38
2013-07-18 12:07:22 -04:00
Nate Jensen
c4bc1ef034
Issue #2142 clean up dependencies and dead code
...
Change-Id: I30f94c9afb01cdd1b7bef98c6ba40f79c3acea59
Former-commit-id: f28420dac4a636846295
2013-07-17 16:30:08 -05:00
Roger Ferrel
f31f880a19
Issue #2145 Verify movable ring coordinates prior to saving.
...
Change-Id: I4772e180d0af394985dbd1bdc65007a8c02feed0
Former-commit-id: 26ffb4d885f279672f6f
2013-07-09 14:05:35 -05:00
Roger Ferrel
a438c9ff2a
Issue #2145 Added slection indicator and verificaton of lat, lon and radius.
...
Change-Id: I10492bdd2e74b5ea8fd9386528019665185ae584
Former-commit-id: 5224ab80f0c44c11279d
2013-07-05 13:33:53 -05:00
Roger Ferrel
ebb76daf14
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: 752933c7fefab96d28f2
2013-07-02 17:27:22 -05:00
Steve Harris
d8176d4a4c
13.5.1-3 baseline
...
Former-commit-id: 72d22a30c963803c1424
2013-06-24 09:29:43 -04:00
Steve Harris
6384018950
13.5.1-1 baseline
...
Former-commit-id: fe872355a7998961612c
2013-06-10 15:17:17 -04:00
Steve Harris
68fe2134b8
13.4.1-10 baseline
...
Former-commit-id: 92152778b99a403b3615
2013-05-20 10:52:47 -04:00
Steve Harris
6fcbb5ae6b
13.4.1-6 baseline
...
Former-commit-id: 16fe8cc5a28379977673
2013-05-07 08:47:39 -04:00
Steve Harris
9212be8b74
13.4.1-2 baseline
...
Former-commit-id: 5ebd58a0b352f0ae4758
2013-04-24 17:22:10 -05:00
Steve Harris
f95e0ad10b
13.4.1-1 baseline
...
Former-commit-id: 00332e63052f517b7713
2013-04-24 17:15:55 -05:00
