Commit graph

52 commits

Author SHA1 Message Date
Ben Steffensmeier
5a4f7a1fd4 Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings.
Former-commit-id: fc25774506 [formerly e267e8b0bae314abf3396db6072c6ff8adc732bf]
Former-commit-id: f292f204c9
2014-06-11 13:45:42 -05:00
Ben Steffensmeier
8783e9e23c Omaha #3263 Synchronize dataTimes of storm track resources.
Former-commit-id: cad15768cc [formerly d0a3a73a3a2375a49dc3e224a1c13956530d3351]
Former-commit-id: eff1921f70
2014-06-10 16:34:44 -05: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: 58683ad040 [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]
Former-commit-id: 011d121e4b
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: d8753a4145 [formerly 66a6c50cd501358e0c8c993631b288aa78dfdc97]
Former-commit-id: 18e92f03c1
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: 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]
Former-commit-id: 44b1782461
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: 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]
Former-commit-id: fb1f5aa593
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: dcb7e697e8 [formerly ed2fc05f61861efe6c70b8fc73ad10d27bb73c12]
Former-commit-id: 3c45a24efb
2014-04-21 13:47:31 -05:00
Brian.Dyke
9df6fb2d4d Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: b8829139a2 [formerly 712064db471de93da585f9c765bb4dfbe510df53]
Former-commit-id: 12a482e1d7
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: 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]
Former-commit-id: 3575d6586f
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: b15d288530 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]
Former-commit-id: 95eba8dcf6
2014-04-09 16:00:54 -05:00
Brian.Dyke
e4136f79dd Merged 1354 -7 and -8 into 1412
Former-commit-id: 929b736038 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]
Former-commit-id: 947194c998
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: 0699041518 [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]
Former-commit-id: 06d6961c0f
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: dd98c213c7 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]
Former-commit-id: 6a28fcb156
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: f146c7bcd0 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]
Former-commit-id: fd900e38c2
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: 1854bbb477 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]
Former-commit-id: dbcbd1b560
2014-03-03 17:59:48 -06:00
Juliya Dynina
3edd73f78c Merge "ASM #114" into asm_14.2.2
Former-commit-id: c6253811e8 [formerly d719e88d510424020955f06d8b597d2df3573836]
Former-commit-id: 575ed3610d
2014-02-05 10:42:30 -05:00
David Friedman
d36cbb2ca9 ASM #110
Change-Id: I9df0f0491fa96ecb4c8f46125d987179f3aefc2f

Former-commit-id: e18c49ea72 [formerly c4b3411f4d5f7632e3c804316bd5959d16cc97f0]
Former-commit-id: 769086c0b7
2014-01-29 20:23:55 +00:00
Michael Gamazaychikov
297d1cffc6 ASM #114
Change-Id: I6308422a99e66701852e3b6de6c89b756513ef02

Former-commit-id: 8f90c0dee2 [formerly 56dc40096e58fa8ae40b9f2cd6a1bd8f9dd3d35a]
Former-commit-id: 97f9c2ea92
2014-01-29 10:58:18 -05:00
brian.dyke
4a62e83835 merge 14.2.1-3 into asm-14.2.2
Former-commit-id: f10f6d4e8a [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]
Former-commit-id: 2294c81a57
2014-01-27 15:27:49 -05:00
David Friedman
6c1b1f33ee Issue #114
Change-Id: I7fd218b0120fe8d8eb6ab535d6d07b40c6c0773d

Former-commit-id: fe50967163 [formerly cd136c3a57f7836606755ad9d1de7a3b8234d1d8]
Former-commit-id: 01d657fd50
2013-12-20 20:33:18 +00:00
Ben Steffensmeier
f34bfc1e5b Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: cac1f07cbb [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]
Former-commit-id: c14cc609a8
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: c1dd4b40fb [formerly 563212924964f8ca66cba789d7867b19c68d0682]
Former-commit-id: 8e9e495149
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: ce457b5be4 [formerly e4e6f46be381f83c7273d84e62d274575048aac2]
Former-commit-id: 08bd2c0241
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: 2d1db7d0e2 [formerly efb402d2835f715143cddffeec2bd7c20d0a65f6]
Former-commit-id: b633f9987a
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: 87b6474106 [formerly afc80cb00cce9b22f1ecd730b60da1de1afbfb2e]
Former-commit-id: d75fdcb916
2013-09-04 16:05:09 -05:00
Ben Steffensmeier
ed989ef777 Issue #2281 Fix shear click distance calculations.
Change-Id: I67980264723512a4167cf90cfc3adac2c9ba1d08

Former-commit-id: 057d7b9381 [formerly eac729a60aab70e4940c03d8aba5e7dee0072b59]
Former-commit-id: bf8dba768a
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: 2a9276c728 [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]
Former-commit-id: 5e5047cc4f
2013-08-14 15:23:18 -05:00
Steve Harris
b848317203 13.5.1-14 baseline
Former-commit-id: 80e5f7fbd4 [formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]
Former-commit-id: d695e5debe
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: c6386e306f [formerly 293586df88f53c2ddf6f7586bf71719298728022]
Former-commit-id: 15d1a6eab0
2013-07-22 09:40:18 -05:00
Steve Harris
630705aa3f 13.5.1-7 baseline
Former-commit-id: 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]
Former-commit-id: bf58a81b38
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: f28420dac4 [formerly 593073cade120a95899f4f4d2c5a652c6ac3389a]
Former-commit-id: a636846295
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: 26ffb4d885 [formerly 8048d0e91041d734239b11b18df34a87b5e75c35]
Former-commit-id: f279672f6f
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: 5224ab80f0 [formerly ab2bd047048b72ea69566925046b329dc67091ab]
Former-commit-id: c44c11279d
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: 752933c7fe [formerly f7cb404093a0a2bdda1e202bc8cdd98ba146bd85]
Former-commit-id: fab96d28f2
2013-07-02 17:27:22 -05:00
Steve Harris
d8176d4a4c 13.5.1-3 baseline
Former-commit-id: 72d22a30c9 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]
Former-commit-id: 63803c1424
2013-06-24 09:29:43 -04:00
Steve Harris
6384018950 13.5.1-1 baseline
Former-commit-id: fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]
Former-commit-id: 998961612c
2013-06-10 15:17:17 -04:00
Steve Harris
68fe2134b8 13.4.1-10 baseline
Former-commit-id: 92152778b9 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]
Former-commit-id: 9a403b3615
2013-05-20 10:52:47 -04:00
Steve Harris
6fcbb5ae6b 13.4.1-6 baseline
Former-commit-id: 16fe8cc5a2 [formerly f30c650b1c406889c38a5f82bbeda3605adbd9a5]
Former-commit-id: 8379977673
2013-05-07 08:47:39 -04:00
Steve Harris
9212be8b74 13.4.1-2 baseline
Former-commit-id: 5ebd58a0b3 [formerly 8b85b1f1e96220b29e8c3b891f6df6a9633c3b4d]
Former-commit-id: 52f0ae4758
2013-04-24 17:22:10 -05:00
Steve Harris
f95e0ad10b 13.4.1-1 baseline
Former-commit-id: 00332e6305 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]
Former-commit-id: 2f517b7713
2013-04-24 17:15:55 -05:00
Steve Harris
07f7e6e2b4 13.3.1-20 baseline
Former-commit-id: 446bec6f49 [formerly 91210030e50e7a19c3d8d4c9d377494de2bc83dd]
Former-commit-id: 25432cc388
2013-04-15 08:58:59 -05:00
Steve Harris
bc9df0a8f9 13.3.1-8 baseline
Former-commit-id: c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]
Former-commit-id: f97d78994b
2013-03-18 15:43:32 -05:00
Steve Harris
2e110bd151 13.3.1-6 baseline
Former-commit-id: 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]
Former-commit-id: 3a4c7931e1
2013-03-12 08:35:45 -05:00
Steve Harris
efd3392abe 13.1.2-6 baseline
Former-commit-id: 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]
Former-commit-id: 8e5f9e0e6c
2013-01-06 14:55:11 -06:00
Steve Harris
51208e5515 13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: c0c1d56f3a
2013-01-06 14:32:24 -06:00
Steve Harris
c2839cc86d 12.12.1-1 baseline
Former-commit-id: e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]
Former-commit-id: e4bd20a515
2012-11-07 12:41:20 -06:00
Steve Harris
98171b5de9 12.11.1-4 baseline
Former-commit-id: 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]
Former-commit-id: d3497e47eb
2012-10-16 13:27:07 -05:00
Steve Harris
a1d931fd44 12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: 61f269f54c
2012-08-21 15:27:03 -05:00
Steve Harris
7c064b6868 12.6.1-9 baseline
Former-commit-id: 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]
Former-commit-id: 2c0ff851ca
2012-07-10 07:53:49 -05:00
Steve Harris
750b7543dd 12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 67a5a68300
2012-04-18 15:18:16 -05:00