Commit graph

124 commits

Author SHA1 Message Date
mjames-upc
1edb05df52 Added NAWIPS-like METAR color temp resource to sfc/pointdata plugin/menu 2016-08-05 13:00:32 -06:00
mjames-upc
edd6a4b6c6 SurfaceMSLP bundle and plot modle 2016-08-04 12:51:57 -06:00
mjames-upc
8c4c2897e3 metar colortemp 2016-08-03 11:19:03 -06:00
mjames-upc
960130cf78 Unidata CAVE D2D UI
Former-commit-id: 32ae604d863057fa63748c2e23f384e213140e1b
2016-06-27 14:44:19 -05:00
mjames-upc
c986e0d703 typo fix: verticallAlignment to verticalAlignment
Former-commit-id: c8bf982c48949a9d7f4a6cb423f13a0fa61da34f
2016-06-27 14:36:02 -05:00
Tom Gurney
e2befbb257 Omaha #5345 Update METAR sea level pressure units
Change-Id: I35909de7e85b263118e6e245a575cface980cbde

Former-commit-id: 84005c09fc0685ed1ba95ccf1f5715ce0936009b
2016-05-13 10:15:41 -05:00
Tom Gurney
3d1bee4532 Omaha #5345 - Store SLP values as Pa, not hPa
Also update existing sea level pressure values stored in hdf5 files.

(cherry picked from commit b733a89e8a6a2804bab9faaeee72496d8a65fba1 [formerly 73606213c72ba86a2a0f96232b1d1471fb6bd1c4])
Change-Id: I6924acf4fbe3fba7057f69306d582fc5c368812e

Former-commit-id: a9f91757e4a9cc994b24c025d20aa63433e7c2f7
2016-04-14 16:03:04 -05:00
Steve Harris
9b151020b3 Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.uf.viz.radarapps.rps/src/com/raytheon/uf/viz/radarapps/rps/RpsListEditorDlg.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java


Former-commit-id: 781bddc3e581ba0f9bdaf7fe5b218fd688dbafeb
2016-03-31 15:04:17 -05:00
Ben Steffensmeier
b570e48f88 Omaha #5514 Include DPI in plot model size calculations.
Former-commit-id: 70e24d2180b6abe4f3b551be3db119dd543fbabf
2016-03-30 13:05:05 -05:00
David Gillingham
1f2a0f0c69 Omaha #5242: Remove calls to deprecated Localization APIs from D2D code.
Change-Id: I98c154307a62fbbb05b7351451b5c3c444e73bda

Former-commit-id: b91de1ced4a6630cb2e9e36fef0dfea89e09ab1b
2016-02-12 15:29:40 -06:00
Nathan Bowler
063c473391 Omaha #5283 Remove support for discontinued NGM data
Change-Id: I9c3fcf3bff03ed78cf77a8fdcd8b95da4d470dae

Former-commit-id: 0867569ae733dee3632e31bc216a06d356530e24
2016-02-11 12:20:32 -05:00
Tom Gurney
83e4e93f7f Omaha #5286 Drop dataURI column on tcg
Change-Id: I94203de148c242f8289255974e6e1bcde6ea3293

Former-commit-id: d0e5a8bf870f46f4cb2f89359fd813793f312d9a
2016-01-28 15:11:53 -06:00
Tom Gurney
b05424c902 Omaha #5253 Remove dataURI from SvrWx plugin
Also update SvrWx regex to accept SvrWx hourly products (starting
with "NWUS22") which were incorrectly being rejected.

Change-Id: I58ece4293c0a011edccee5a065e7710557a3951b

Former-commit-id: 183079715d857fd085653a90a21eaeb4c615da07
2016-01-19 11:34:57 -06:00
Ron Anderson
9f255c8d50 Omaha #5070 Adjust font sizes for dpi scaling
(cherry picked from commit 0fac683b60 [formerly 330ae8034e6457f20224c81cf3886d797ea5b8fc])

 Conflicts:
	cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/RedbookResource.java
	cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResource.java


Former-commit-id: 8817960b2aaea9188f868be38930903a498ef633
2016-01-13 19:17:37 -06:00
Steve Harris
8a07970ba6 Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java


Former-commit-id: d9745246c0f81ec088b3f4108b30e02c33f6a9ae
2016-01-06 11:55:00 -06:00
David Gillingham
60313a2120 Omaha #4816: Fix baseline code to support refactored PythonJobCoordinator API.
Change-Id: I906946954158e2c5fa39195e8869bca815720aa0

Former-commit-id: c30f24c376f2548126fe08369951bd5a4cf78225
2015-12-16 10:03:31 -06:00
Ben Steffensmeier
2e71ac2566 Omaha #4903 Fix progressive disclosure counting problem.
Former-commit-id: aec4abe1f78490e7bc0045d1f86eff3b4284dc9a
2015-12-09 14:10:07 -06:00
Nate Jensen
2c30773ad0 Merge "Omaha #4903 Create more efficient rendering of plot winds." into omaha_16.2.2
Former-commit-id: 7a4324bd0a73332b5127543dd9b68364f8f15c66
2015-11-17 16:46:43 -06:00
Ben Steffensmeier
34f7c7e7cc Omaha #4903 Create more efficient rendering of plot winds.
Former-commit-id: b6de70194699733881023b84dc4c232c9482c5b9
2015-11-17 16:26:45 -06:00
Ben Steffensmeier
3682ac1aa6 Omaha #5119 Delete bufrquikscat plugin.
Former-commit-id: f2bcad0c772b0146650da09ad59f206d6320948a
2015-11-16 15:47:47 -06:00
Ron Anderson
0fac683b60 Omaha #5070 Adjust font sizes for dpi scaling
Change-Id: I94b264ee1d96f42423874062b4682934a2521cae

Former-commit-id: 330ae8034e6457f20224c81cf3886d797ea5b8fc
2015-11-09 09:42:07 -06:00
Ben Steffensmeier
c93066c3a6 Omaha #4798 Upgrade batik to 1.8
Former-commit-id: 7b940d4877947b10df29634defb33639287ea47d
2015-11-02 18:01:47 -06:00
David Gillingham
648bb0e367 Omaha #5003: Update A2 baseline code to utilize apache commons-lang version 3.
Change-Id: I2b23399b2cfd3d37a41f89cb3c3173ca628caecb

Former-commit-id: b9c41fe3354a90a03440e1ea67991e6ecd5885c0
2015-10-28 13:21:07 -05:00
Andrew Moore
225c0bdd58 VLab Issue #10353 - SVG solution to DCS_10257. Severe PIREP should be separate color; fixes #10353
Change-Id: I1ad8b823cf67a4a1217ef5eb5ec60085f857c471

VLab Issue #10353 - SVG solution to DCS_10257. Severe PIREP and AIREP should be separate color; fixes #10353

Change-Id: Iddb7c0e9e22b4a9793fd5d44a5a201f73d0c072f

Former-commit-id: 6f7c50bb773c8b5e99c2b08ed5f8dd70866ebb5f
2015-10-22 13:39:18 +00:00
Ron Anderson
d126af0f85 Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/FormatterlauncherAction.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowProductScriptsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowPublishDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowSendIscGridsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductAreaComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenAction.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.uf.edex.plugin.loctables/src/com/raytheon/uf/edex/plugin/loctables/ingest/LocationTablesIngest.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: Ie790e3a9a0c3829655a5a798a2c8b6740d02be6c

Former-commit-id: 691ca66a6f15c3cfae1bd1c8990644951d68a46f
2015-10-14 16:31:41 -05:00
Bryan Kowal
5295e7538b Omaha #4897 - The Collection/Dissemination menu item is now optional.
Change-Id: I3be625b8e2d46babce7359a089c8c7d2ce59a987

Former-commit-id: d224f6c514c9ecc48b832c998ad86fd104ae2faf
2015-10-13 11:26:17 -05:00
Slav Korolev
853d550772 Omaha #3873 - Fixed FSSObs monitors to ingest Moving Maritime and MAROBS data.
Former-commit-id: 5cdd97df619fb9eba6857fa1e3c62dfde870b9ed
2015-09-30 19:10:46 -04:00
Nate Jensen
8577e5c70c Omaha #4880 fix AvnFPS to not use strings for dates
Change-Id: I0357868db043b78aca234c362e9916625b7b9f3e

Former-commit-id: dc39083c187635a6e6c5db7239a1a58ccfc05498
2015-09-14 12:37:01 -05:00
Mark Peters
60b04a20e1 Omaha #4717 Null checks found while testing product browser
Change-Id: Ia93eeff50059bbc2b960d0472fe271e56e51ce62

Former-commit-id: 9cf31b858849bd1c97901cf9e18fd4f9393dd43e
2015-08-20 11:00:25 -05:00
Richard Peter
5d7f17e149 Omaha #4486 - Hibernate return java.util.Date instead of java.sql.Timestamp
Change-Id: Ib425d2f4021a587b5c8cd52bfe3816c723f6b0a1

Former-commit-id: 06d943d51fec264ec34a45ed84547b7972925e7e
2015-08-05 15:19:05 -05:00
Aaron Anderson
c6460c3655 VLab Issue #8975 - DCS_16961 mPING Ingest and Display
Change-Id: Ia9b52718592d127fb71701c2419450f89bfec0b8

Former-commit-id: 43f7e4cc129f8d177f9586ff5f73c7adf96e18d6
2015-07-08 14:30:01 -05:00
David Lovely
80dc4c85d9 Omaha #4146 Bundled class files in a jar when unpacked.
Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02

Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
2015-05-19 10:23:35 -05:00
Ben Steffensmeier
72d601a2a7 Omaha #4079 Extract core grid and point rendering capabilities.
Former-commit-id: a0caefe923b18859fd89cb36749b31e3b24eecbe
2015-05-15 13:55:10 -05:00
Joshua Watson
572bc805ec VLab Issue #6761 - Removed non-functional IFPS menu items and renamed Eta to NAM for menu and display purposes in baseTDLSurface.xml. Changed stdWindDir to windDir in stdDesign.svg; fixes #6761
Change-Id: Ie07f461ae6c85054b233f9cfc68d229c80c9789f

Former-commit-id: e0bcd4f251526348d91930953c6c447e423f03ce
2015-03-05 11:55:07 -05:00
Fay.Liang
eed6737801 ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	rpms/awips2.core/Installer.postgres/component.spec
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/python.site-packages/Installer.h5py/component.spec
	rpms/python.site-packages/Installer.matplotlib/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.qpid/component.spec
	rpms/python.site-packages/Installer.scientific/component.spec
	rpms/python.site-packages/Installer.scipy/component.spec
	rpms/python.site-packages/Installer.shapely/component.spec
	rpms/python.site-packages/Installer.tables/component.spec

Former-commit-id: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
2015-01-12 13:03:31 -05:00
Kiran.Shrestha
10de233231 ASM #14130 Satellite: Derived Products Plots problems for SSM/I Point Data
Change-Id: Id3c2189c017bf6341bc09236dbd39aaff937e2c8

Former-commit-id: 56ff684e6425b43883603f46ef16127e8356450a
2014-12-17 21:03:18 +00:00
Mark Peters
bc9c564192 Omaha #3772 Separate Obs menu out of com.raytheon.uf.viz.d2d.ui plugin
Change-Id: I5e407aeff99d7dc9a393d713096971a7ed4c01a6

Former-commit-id: d946679c5a9b383f689ac3acc66d4aae4ecc4bde
2014-10-31 13:32:42 -05:00
Brian Clements
6fd51c01fe Omaha #2707 LSR rework
removed dataURI column from DB
removed eventType from hdf5
eventType in DB now string
unknown event types now render direct

Change-Id: I24f5041f761758371dcef1fd1157be0bcf329e73

Former-commit-id: 9950454fbe4158bcfcb9d3ce25abafad4d012556
2014-09-17 10:57:07 -05:00
Nate Jensen
62b84b2fb3 Omaha #3356 updates for improved level lookup
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362

Former-commit-id: 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b
2014-09-09 15:38:53 -05:00
Mark Peters
5b3893c56f Omaha #3504 Replace Raytheon references to IODataPreparer
Change-Id: I376f430154996944bd49c2e72d89e57537b68084

Former-commit-id: 08621067f8046b4260e87583d16950fee1e741de
2014-08-12 12:15:35 -05:00
Brian Clements
8738e9cece Omaha #3477 changed plot info locations to floats
Change-Id: I592ba9d4b514aaed8902f3e8fba33b58200e1c61

Former-commit-id: 00504d6aa7fefd7b6d28701aae777c0fb7d5ace5
2014-08-11 13:43:22 -05:00
Brian Clements
a46c71bbfb Omaha #3478 removed PointDataDescription.Type.Double from code and config
Change-Id: I85eabcbe7afc0543c98d23e2c194b9e30a14db13

Former-commit-id: b548a88c6850a558c021a55657edaa6466d57e51
2014-08-07 10:40:14 -05:00
Brian Clements
74a6c3dd20 Omaha #3410 changed lon/lat fields to floats in sfc and air obs location
Change-Id: I4c8d47b9f9e598e69309f1aa99bc30c022cae7af

Former-commit-id: cdb0a72fcb2345564f2b944fdecd7869fd498767
2014-07-24 13:45:58 -05:00
Ben Steffensmeier
35ad2f2b8d Omaha #2061 Remove dataURI from acars.
Former-commit-id: e8b5ea58ca12878922be01c815a354703f5f4387
2014-06-12 13:59:45 -05:00
Nate Jensen
955e115c00 Omaha #3266 remove unused attributes and elements from baseline menu xml
files

Change-Id: I1a1f75f2b2a314679487ddf719f4f0055bdf8d01

Former-commit-id: 797504a970ec39c4fd56c9e0d51b292acfceea1b
2014-06-10 18:30:14 -05:00
Ben Steffensmeier
a98872cb89 Omaha #2061 Delete PlotResource, rename PlotResource2.
Former-commit-id: b569c7c3e175ed1519576aea63048c3f675d3875
2014-06-10 15:59:15 -05:00
Steve Harris
3b16bbafb1 Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	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.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.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
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml

Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66

Former-commit-id: 117fa26f537131552bbe51b2c5fe12405a26db32
2014-05-27 14:48:24 -04:00
Steve Harris
fc2bf6b45c Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
	edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
	tests/.classpath
	tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
	tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java

Former-commit-id: a830db2a282e6a29d119fc0d3357c2223c48d175
2014-05-12 16:13:19 -05:00
Brian.Dyke
41ba5fc348 CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3
2014-05-12 14:07:11 -04:00
Everett Kladstrup
0699041518 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: ad4a8cfbbc6de72810492c8f1de9701d381b6019
2014-04-09 09:31:12 -05:00