Commit graph

98 commits

Author SHA1 Message Date
steve.naples
7814a0b807 ASM #18350 MPE: DailyQC Temp stations will not display in Daily QC.
Change-Id: I6cd6d9cebdbcf7faddcfb03b7658142872eb9798

Former-commit-id: 7d73b1b6993473a17f8175516cedae2a847e003d
2016-04-07 19:27:15 +00:00
Steve Harris
c2b471a870 Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitorDisplayThreshDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/TCVDictionary.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: a7340c2bf23cbc3d27ca52fbf2ccd9c7d1cb09c2
2016-02-29 13:39:42 -06:00
Steve Harris
11a5db155d Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	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/gis/GeospatialFactory.java
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/common/FSSObsConfig.java


Former-commit-id: 218244406e4be6cb31b3986ff6457398a0a00bb5
2016-01-20 15:23:43 -06:00
Bryan Kowal
8550d0e6c3 Omaha #5173 - Do not estimate a station that has been forced good. Eliminated warnings.
Former-commit-id: 30adae423e3b73c70636dfd4274a31ce9e1d7cd8
2016-01-11 18:10:30 -06:00
steve.naples
d789483421 ASM #17986 - MPE: Fix array of QC codes to correspond to dialog box layout.
Change-Id: If2127996b3cc599fd09983f19ac3c000f961129f

Former-commit-id: 4d2b7ae803c6ca479fddcecbbab759ddd6234c43
2015-11-25 19:52:32 +00: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
steve.naples
a0ee8f6cc0 ASM #17977 - MPE: Daily QC does not display subarea data.
Change-Id: Ida8ed71ea8b39df58143cd69515ccfc3259d3e00

Former-commit-id: 415e268723240f6fcf56b44464aefb80afdae445
2015-10-14 15:58:14 +00:00
steve.naples
6250424f87 ASM #17975 MPE - Fixed issue with Hydro date not following CAVE date/time.
Change-Id: I87c482fd5b3d306310d9e954e15efc66057312da

Former-commit-id: 21d86a91f29948292816823c2078f46b0366bf6c
2015-09-29 17:23:51 +00:00
Richard Peter
5e7f16663f Omaha #4500 - Fix mpe type casts.
Change-Id: Ibe3b3d49d77a4071bb03dcd0f477037f7e706060

Former-commit-id: b1197d655fba833ab207c51a4680b9f4a8d7b48b
2015-08-11 11:46:27 -05:00
David Friedman
4bdfeb8da8 Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1
Conflicts:
	cave/build/static/linux/alertviz/alertviz.sh
	cave/build/static/linux/cave/cave.sh
	cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.xdat/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/Riverstat.java
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration

Change-Id: I9acfead0148ca1df35b8f69cd556b40d8189c226

Former-commit-id: 33053b2a6b55dacfecb24d5cde2cd3068e999f2f
2015-07-30 20:53:19 +00:00
steve.naples
6b295a0981 ASM #17471 - MPE: Radar Bias Edit table showing incorrect data.
Change-Id: I4d07d6c602f3f20bec64c3241dbf66bce6da5e97

Former-commit-id: 17fb48e1d5e973cfe04697c7fa8d0a325710b224
2015-07-29 15:28:37 +00:00
steve.naples
bdd9b93873 ASM #17561 - MPE: Daily QC disagg 6 hr values always zero.
Change-Id: I91ca25ae0afd442759315e0cd2d894ecc2001214

Former-commit-id: 450ff9256aa4ca845f3267e049153278bf350280
2015-07-16 17:23:27 +00:00
steve.naples
bd49319f5f ASM #17229 Fixed issue with Snow Water not distributing to 6hr periods.
Change-Id: I111b284439ac44bf5f3945390096a0684a060fbb

Former-commit-id: f3e1880cd1523e77c63a800b3a56dc86fb2b9040
2015-07-01 18:44:54 +00:00
steve.naples
c897636f5e ASM #17388 Fixed issue with 6hr-24hr set bad token not used.
Change-Id: I816a72779d222faa56dd280d2e18cb1e9bd1b998

Former-commit-id: 33bfe88bcdfc845aca878c176b7a76b3530c5517
2015-07-01 18:43:58 +00:00
steve.naples
a382a129ea ASM #17397 Fixed issues with grid being removed from display in Group Edit mode.
Change-Id: Ib480d800c473e0cea952e38ce3f70272887c43ce

Former-commit-id: 10ca648533a189b37cfeff2047e15089d31a07f5
2015-07-01 18:37:44 +00:00
Steve Harris
4de63454fc Merge tag 'OB_15.1.1-16' into omaha_16.1.1
15.1.1-16

 Conflicts:
	cave/com.raytheon.viz.gfe/build.properties
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java (moved to ufcore)
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py


Former-commit-id: 9f115206966a85c409a731e51bb4360c44ccc7fc
2015-06-05 15:38:00 -05:00
Fay.Liang
31496dac17 Merge tag 'OB_14.4.1-47' into int_15.1.1
14.4.1-47

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 602505383d4a1ec8a2cea08f94b7350cabae39b7
2015-05-29 15:42:40 -04: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
Matthew Howard
3b0b0be2d7 Merge "ASM #15660 Fixed issues with array not setup in Disagg6hr." into asm_14.4.1
Former-commit-id: b4345d3d2be525233c80ad00bf44ae8f9c61e04a
2015-05-14 17:18:31 -05:00
steve.naples
3700aa789f ASM #15660 Fixed issues with array not setup in Disagg6hr.
Change-Id: Ie94bdbb75164d45ac971ea4005b25903180f4057

Former-commit-id: 04930514d6398bc9ac8bbbcefa7f2ed544b0321b
2015-05-14 21:21:41 +00:00
Ana Rivera
388e4a3d8c Merge branch 'master_15.1.1'(master_15.1.1-2m) into field_15.1.1
Change-Id: If8fdc78136ac00065a7c1f9a3b45e814a58c815e

Former-commit-id: 87043a26d3e1aa32f693ff0f48d4357ac416e6d9
2015-04-09 15:13:54 +00:00
Steve Harris
7375074ed8 Merge tag 'OB_15.1.1-2m' into omaha_15.1.1
15.1.1-2m

 Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 7cad81591e22bc1a46f54982f0cd0ca647208290
2015-03-30 11:07:52 -05:00
Fay.Liang
86a8041062 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Conflicts:
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/build.edex/edex/common.properties

Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
2015-03-19 12:35:31 -04:00
steve.naples
8e974829b3 ASM #14575 - Fixed issue with exiting CAVE, without closing DailyQC, throwing errors.
Change-Id: I897a00e84ce30e81896cd2d1559d8c39cd74b701

Former-commit-id: 1bd7175c022f8c29a1a19474cfc8b6b3688ee024
2015-03-10 13:34:58 -05:00
Fay.Liang
0e475cb704 Merge tag 'OB_14.3.2-19m' into master_14.4.1
14.3.2-19m

Conflicts:
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 4b3626307cf35ada45985c25cf062e7b857db764
2015-03-09 16:11:13 -04:00
steve.naples
31a7909085 ASM #15660 Fixed issues with saving disagg data.
Change-Id: I6f0e8b02b7035e9d9614c52718026fce81b2e331

Former-commit-id: 4646f7396153651359624f3dd12660810fe2bf6e
2015-03-03 21:02:54 +00:00
Fay.Liang
43c7161dcf Merge branch 'master_14.3.2' into master_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
	edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
	rpms/awips2.core/Installer.java/1.7/component.spec

Former-commit-id: e91a78eec910b84f44350d3aae68a26f4e0dcd72
2015-02-09 17:19:41 -05:00
steve.naples
d52da7d4fa ASM #17101 MPE: Bad data not being written to file.
Change-Id: Id1524abf8ae7379f5d8aac31b4d9cfff0469a577

Former-commit-id: fe3d6ffc320ea338d755c6fb19aa4f00c74c4283
2015-02-05 20:21:33 +00:00
steve.naples
eccd38608c ASM #16993 MPE: Fixed issue with Climo and data units issue for Monthly Precip.
Change-Id: I958266658373d62ec8d61998cebed3099f3a11cf

Former-commit-id: 236ebde830681a338e32b938c5fc709fae582e42
2015-02-03 19:32:13 +00:00
steve.naples
0260da784d ASM #283 - MPE GroupEditPrecipStns updated to fix issue with selecting gages when filtered out with Reverse Point slider.
Change-Id: I9743b37adfb8658d40458c00204ad87c50c10528

Former-commit-id: b10de7db401a9d4199c9eed98e41913a87b4b64a
2015-01-27 18:36:49 +00:00
steve.naples
540ea64498 ASM #17051 MPE: Daily QC will not display Points+Grids together.
Change-Id: Ic74de62f60769456e7fd2762690e539cc553062a

Former-commit-id: 8db85622ff4d0f7202c4d2c2e6eefeefe2ef39c3
2015-01-23 20:40:48 +00:00
steve.naples
9a38ed0b4d ASM #16993 - Restored code to DrawPolygonDlg to use Combo box for fields.
Change-Id: I736af4ac43de16c3978c462fca22bb147846d81b

Former-commit-id: 3a8aaf4ab99e8ae93dd9f074c5671cc8f3dc5f8d
2015-01-12 19:08:06 +00: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
Loubna.Bousaidi
fac9ebed4a ASM #16952 - Fixed the bug in the estimated precip values algorithm.
Change-Id: I065fc7744747e52c7f10c499f5b100ef60e25e44

Former-commit-id: 33872d6facbcb1da29847f1edfd7e29c65621b8e
2014-12-23 14:48:29 +00:00
steve.naples
9c0e08a03c ASM #16911 - Updated to fix Ending Hydrologic data when time is after 18Z.
Change-Id: Ia3022f07f1ebc54543b6e210d77d95b1458b434b

Former-commit-id: 571f7dde74c6cbf14553edc2fe27a5031e42d6be
2014-12-13 01:55:19 +00:00
Richard Peter
8de1ebcb65 Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
	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/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java

Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5

Former-commit-id: e190a710b1b9506c99120fdaa1ebfdb144fcbf6f
2014-12-12 10:36:04 -06:00
steve.naples
45c3852132 ASM #16911 - Fixed issue where Hydrologic date did not advance to next day after 18Z.
Change-Id: Ie26af265d8a233e4fdf6e9dbc1e4ff6934aae4e4

Former-commit-id: b2c9cd15e1f02c8272c1d9a9d50e877470b05eb3
2014-12-09 19:04:17 +00:00
steve.naples
539b859040 ASM #16889 - Fixed issue with precip station count, also added logging for Snow data file read and station edit.
Change-Id: I1b689b485a152e1c942c021ac0f778b0f299d3e3

Former-commit-id: c836fb0c1f8721f81049af56cb8f7be9960a5cd6
2014-12-08 15:48:28 +00:00
Nate Jensen
8dbe6abbe4 Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 3ba611e111585d2aa9cd9f647687fedb794077f7
2014-12-03 15:47:10 -06:00
steve.naples
b5389ced26 ASM #16889 - Fixed colorvalue_use warning and cleaned up some code.
Change-Id: Id9d52cdb328ed7f863f7e09c09ee3e7ef70bf8a4

Former-commit-id: 862cb7c4d789915067558c4508cf5f1e45a2cdf2
2014-12-03 18:35:19 +00:00
Paul.Grell
370466a7e8 ASM #16911 HydroDate set to next day if hour is 18Z or later
Change-Id: Ied55660cb81e3fdf2e87295fe22eb0915f7b4764

Former-commit-id: 38d9bc8c4e385e339df5bdd010160728730bed8d
2014-12-02 11:35:28 -05:00
steve.naples
a0face5b02 ASM #16889 - Daily QC does not display SNOTEL data.
Change-Id: I42035d5d4d856a395400a1be1d0c6a24bc64b0d8

Former-commit-id: 01735909fffdc9b5ef14ed072253eed6deaecad9
2014-11-26 18:24:53 +00:00
Brian.Dyke
01dfe503f5 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java

Former-commit-id: a3365943e7b7972a5c86f8cb1ad39667ab9e0695
2014-09-09 11:44:30 -04:00
steve.naples
ff52f1dc0a ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138

Former-commit-id: 2e8fb864f410b9b08ccc6de6c0d75666931da3a2
2014-08-28 16:08:17 +00:00
steve.naples
4be6abad1b ASM #14807 Updated snow file parser in ReadSnowData to fix parsing issues.
Change-Id: I5182f2640baebbb0f5c6d66e5a3d81da7461af69

Former-commit-id: 67e36d96d0acaa8dfdf61164a5c66fbda9dd753b
2014-08-20 17:17:14 +00:00
Loubna.Bousaidi
d41e489ced ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004

Former-commit-id: a43ad03838d53d3b9688b48851f41a1af6b043f6
2014-08-15 10:54:10 -05:00
Brian.Dyke
3f1e12effc Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade

Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults

Former-commit-id: 9d7a819489480e119b65cb5643520818adeb1ebf
2014-05-30 10:46:25 -04:00
Chip Gobs
e42bef2a33 VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) )
Change-Id: Id96c25de545144d769309fef608c431d67d1bada

Former-commit-id: 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734
2014-05-06 10:48:35 -04:00
Loubna.Bousaidi
6d526cb1ff ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004

Former-commit-id: a6033a982c80e822d9f4cb62a70b9722d79432c6
2014-04-29 21:09:34 +00:00
Richard Peter
21ae3b5fcd 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: bd13bc332bcdd87723bec8669885f4594ad483b9
2014-04-11 16:23:09 -05:00