Commit graph

207 commits

Author SHA1 Message Date
Steve Harris
e372314a70 Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Former-commit-id: 05d46d7fbe422174cff0fef41df96cfce8c5f3b3
2016-02-15 10:20:00 -06:00
Xuezhi.Wei
07f442b321 ASM #13736 - HydroTS missing data after zoom, edit, reset
Change-Id: Iddab099c51c1c2b90183cb8dc1ed9cfcd8810f0a

Former-commit-id: 9c871e2aa814cd1f0af3002e69f64567acb9b851
2016-02-05 17:27:25 +00:00
Steve Harris
dcaaf9f52b Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: 13a968811d1cdde95f663d7af4b8a6030ece556e
2016-01-28 15:47:31 -06:00
Ron Anderson
cf208cb278 Omaha #5054 Fix parenting of hydro dialogs
Change-Id: I5c1ecde7e6f52e8bf9c278afd56bd710be8fc597

Former-commit-id: dee6dce7ce9570ddf9c8f61cd684ee7c9972195c
2016-01-27 18:50:24 -06:00
Steve Harris
e4202dd626 Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
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


Former-commit-id: 6e31f1b2e4f7c30faf67d0d62b5907b111e4b52f
2016-01-20 16:49:18 -06:00
Ron Anderson
24bc0a3344 Omaha #5054 Fix Dialog parenting
Change-Id: Ie7e1727ef9666cf510093f8fb6b06a1a258a30e2

Former-commit-id: 5093e43e9d1d26898f9719e00f6489a7f3ea55c8
2016-01-19 09:19:13 -06:00
Shawn.Hooper
94eba993a6 Merge branch 'master_16.2.1' into asm_16.2.1
Former-commit-id: 10740febfd3631d4c31312c9427a172cd29c9e62
2016-01-14 16:10:45 -05: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
Shawn.Hooper
bd27f40c6d Merge tag 'OB_16.1.2-9' into master_16.2.1
16.1.2-9

Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewStationDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewZoneDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/DeleteStationDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCFloodingRainThreat.py
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
	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/StyledTextComp.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
	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
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.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/smartinit/Init.py
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaIdXML.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/MonAreaConfigXML.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/StationIdXML.java
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: Ife2115435399146e4873a14f80e73acc15ad1b5c

Former-commit-id: 3d8811acf334fb06854bbaa71d35cff2657b3b7b
2016-01-12 15:10:02 -05:00
Matthew Howard
a616189a2e Merge "ASM #13736 Hydro TS - Missing data after zoom, edit, reset" into asm_16.2.1
Former-commit-id: 64a3910e1c3a6fd8e731f6791baf9d4e2d12a0f7
2016-01-06 09:02:19 -05:00
Xuezhi.Wei
e67a174288 ASM #13736 Hydro TS - Missing data after zoom, edit, reset
Change-Id: Id4c5fe3a1cf2b8009daae04be3b0a73608de8e38

Former-commit-id: c2a39abecda4eaaaeb2e45d14083b1170dd80c8a
2016-01-04 12:02:33 +00:00
Xuezhi.Wei
21daa182d5 ASM #18357 Error opening Timeseries Light for Time-Step data
Change-Id: I14c1d955b36c7c8e5f6bd36aefae406e44150678

Former-commit-id: a3f087a1d7edf8419ac8900a9f6a9577b04d4e7d
2015-12-07 14:37:22 +00:00
Shawn.Hooper
e93839673c Merge branch 'asm_16.2.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py

Former-commit-id: 0d5c4caf82d74459f9412800955d6cb9da18f3fb
2015-11-25 14:31:20 -05:00
Shawn.Hooper
4982393e5d Merge branch 'asdt_16.2.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.2.1
Former-commit-id: 70c5b3a39104af92685e80e7e76177deb05c94e5
2015-11-16 16:40:30 -05:00
Loubna.Bousaidi
0021b0d362 ASM #17846 changed edit and insertRejectedData calls to reset quality code to G after QC when bad data is set to Missing.
Change-Id: I9ad38533737050d836f614968079fa4856071275

Former-commit-id: 6d2def2a683909f2101c827ae98f78542819d5d0
2015-11-06 15:26:58 +00:00
Wen Kwock
57f7d538a1 VLab Issue #12635 - DCS15102 implements preferred order; fixes #12635
Change-Id: Iea4fa46835d36061e6414549d261cda6c6984195

Former-commit-id: ca7df19a2ea3f3a53695f4df681077b6ea2b16cc
2015-11-03 17:48:33 +00:00
Mike Duff
abbd0604d9 Omaha #4900 - Disable transmission of SHEF products when in DRT.
Former-commit-id: 2a6f24ecfa563fd1cca611fcf9930c275b928fb9
2015-10-27 09:29:43 -05:00
Penghai.Wang
d7e3507a76 Merge branch 'omaha_16.2.1' into asdt_16.2.1
Former-commit-id: 273eca0d9d60a0a0f18ac0e3977e79391be0c432
2015-10-23 20:00:22 +00:00
Xuezhi.Wei
c86eed5466 ASM #13736 HydroTS - Missing data after zoom, edit, reset
Change-Id: I6ada51f73810f7a5adc0c18d95c64db5b60d91b1

Former-commit-id: c0111ae76064b6b0273337e3f3c56f018d3661ac
2015-10-23 14:43:04 +00:00
Steve Harris
56131ac305 Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/GageData.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: fa9ad9b8a3900bd5f94017f27bec9a5673ecb881
2015-10-21 09:22:00 -05:00
Penghai.Wang
e3f4d27d0e Merge branch 'omaha_16.2.1' into asdt_16.2.1
Former-commit-id: 6d1b5f63867542721ed6241011250fe39a4c4b94
2015-10-20 17:42:04 +00:00
Penghai Wang
c71b15065a Merge "VLab Issue #10346 - Revert 'DCS15102 implements preferred order' fixes #10346" into asdt_16.2.1
Former-commit-id: 19b2a1c4b7735e7c7bc10cd0e9a434f09bf48e0a
2015-10-20 17:24:44 +00:00
Wen Kwock
0c503ab30d VLab Issue #10346 - Revert 'DCS15102 implements preferred order' fixes #10346
This reverts commit dd47d2a83c [formerly 98024301760553be4fdf14759a474d39039b2ff0].

TimeSeriesDlg.java is conflict with omaha_16.2.1 fix

Change-Id: I7c8fb98f89dd05a3981a9248bde1f004fc56682e

Former-commit-id: 85a0413dd3e900f214290a4a935f782412f749d5
2015-10-20 16:14:05 +00:00
Roger Ferrel
00514d7ad8 Omaha #4933 Refactored TabularTimeSeriesDlg to use selected valued and fixed NPE and resource leaks in TimeSeriesDlg.
Change-Id: I47a9e519eb7b75f6051009b6c46370418c08967d

Former-commit-id: 355c1522e1ebc455a2089b5ba676361d923fed66
2015-10-15 07:05: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
Penghai.Wang
caad2ed64f Merge branch 'omaha_16.2.1' into asdt_16.2.1
Former-commit-id: 83b8514e48dcc33581706d25cfffa17f2ae671cd
2015-10-08 19:54:09 +00:00
Loubna.Bousaidi
bded51a1b9 ASM #17978 fixed the hydroview display for time step
Change-Id: I1d8ad9cc8dc3320190763738be4683f68ab676f3

Former-commit-id: b8709b6bcbcd274d23ea079d9874b57d90cd4b2c
2015-10-08 18:04:01 +00:00
Wufeng Zhou
34d721d3ca Merge "VLab Issue #10346 - DCS15102 implements preferred order; fixes #10346" into asdt_16.2.1
Former-commit-id: 10d4e2b0baab5414512573e200c40962c2f95b6f
2015-10-02 15:31:19 +00:00
Wen Kwock
dd47d2a83c VLab Issue #10346 - DCS15102 implements preferred order; fixes #10346
Change-Id: I379d8853072e162533bd7e6d45aa2b29a86be49d

Former-commit-id: 98024301760553be4fdf14759a474d39039b2ff0
2015-09-24 15:18:35 +00:00
Steve Harris
c94adfbac9 Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/RiverDataManager.java
	edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/GAFFDB.java


Former-commit-id: 4c99916da16fdf0db42218106824b13b2c2668b3
2015-09-08 15:51:57 -05:00
Wen Kwock
16cfa9918d VLab Issue #10345 DR16579 Add HSA filter; fixes #10345
Change-Id: I38481ba78e4547b72c52d4bd3336898463bd2552

Former-commit-id: ae89dbcbd65f4d606859e93efd93b3a7dee9aaae
2015-09-04 18:42:25 +00:00
Richard Peter
36b68aac36 Omaha #4845 - Fix hydro query result processing
Change-Id: If40a575d1f42a3065fe97aefeed8ea14087c5c93

Former-commit-id: 89b40f883c3d611efdf8abcb20394e65bbd8d02c
2015-09-03 16:49:02 -05:00
Mike Duff
4dbde77aad Omaha #4794 - Added 5 minute duration
Change-Id: I7b993102b760f10bf014c1a494319d831319e12c

Former-commit-id: 1c4a0d9e98e087da7e1b1295c9c0a89ce438745c
2015-08-26 11:56:51 -05:00
Steve Harris
a9c82d6eb5 Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java


Former-commit-id: 15f842700f3c6919ca3d29e5bd393913143cdde9
2015-08-19 13:45:47 -05:00
Richard Peter
5cacc8ba5c Omaha #4763 - Update to use Number in blind cast
Change-Id: I47530dffbdd2c29fb9dca61197c2431966d3dbeb

Former-commit-id: 7643aeea81b6d691432414657f8a03e856a853f2
2015-08-18 17:44:06 -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
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
Richard Peter
7a79834265 Omaha #4500 - Update hydro blind casts to use Number
Change-Id: Ide22b937047d254cb3fb003df630c936d601fe22

Former-commit-id: 877a65681207ae7d93ac385e88dbc213980a49de
2015-07-21 17:17:27 -05:00
Nate Jensen
66ab0249ec Merge "Omaha #4215 - Fix gage selection and launching tmie series from multipoint resource." into omaha_16.1.1
Former-commit-id: 8b1b17122a413dedec8f3367448c23267713f69b
2015-07-06 15:11:44 -05:00
Mike Duff
9609e1f566 Omaha #4215 - Fix gage selection and launching tmie series from multipoint resource.
Former-commit-id: ecc9daa288f80a69f221cb644f5bb1bc7fc11deb
2015-07-06 12:23:16 -05:00
Mike Duff
81cbea9d03 Omaha #4416 - move shefIssue.xml to common_static
Former-commit-id: 683ce24770e6fcc38854d3ac225c10e816a95df0
2015-07-06 11:36:43 -05:00
Xuezhi.Wei
26c95661fb ASM #17002 added a drop down button for PC and PP data in time step mode
Change-Id: Ib1d9a02d13c2032a4f3cbbc63d8f7167b68ca752

Former-commit-id: 1de150aa9ade1d8866ae8e1a266be4ac4355ecdc
2015-07-02 11:43:42 +00:00
Loubna.Bousaidi
b071a109a5 ASM #13892 Fixed the saved the preset String selection
Change-Id: I52ebf05fc59bd9becfce4946d8a9a71fe64a1640

Former-commit-id: 179d16a7084bcacbbbc9086c2218856be1340dc6
2015-06-30 19:28:33 +00:00
Xuezhi.Wei
8d06325c15 ASM #17386 HydroView crashes when Refresh Data after loading saved display files fixes
Change-Id: Iec2ebf291b3ca9a1cd51110ea9801b8fd659b8bd

Former-commit-id: 7047f3dc966266b324676411ca2b247e12264f6b
2015-06-26 11:21:12 +00:00
Steve Harris
7e7cdd1c7a Merge tag 'OB_15.1.1-14' into omaha_16.1.1
15.1.1-14

 Conflicts:
	cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
	cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py


Former-commit-id: 92470a2ce7952ee72dbe2557ee16ee54d7ae901c
2015-06-04 11:08:19 -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
Jingtao Deng
3f9ae3a9f3 VLab Issue #8200 - DR17493 Saving a Selected Preset in Hydro PDC does not function; fixes #8200
Change-Id: I3fb9a7e43057f374a3d055a3ab294eca094a16cb

Former-commit-id: f4cfa77511b9d887006582da8dc7dd4f044b4d3e
2015-05-15 16:04:48 -04: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
Mike Duff
3499b1b285 Omaha #4215 - Fix NullPointerException and IndexOutOfBoundsException in Hydro. Discovered during hazard services FAT testing
Former-commit-id: 3828621a84e787cd5d19462708509aa3ec31e786
2015-04-09 09:54:05 -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