Shawn.Hooper
2861d7abd7
Merge tag 'OB_16.1.2-14' into master_16.2.1
...
16.1.2-14
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
Change-Id: If4483610b92d4c2ef975c3ac75403e12a70d612c
Former-commit-id: 66d3cd35731e59996c34f003e42cbb2a41010717
2016-01-25 14:32:31 -05: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
Mike Duff
36ecc40284
Omaha #5217 - Fixes to basin import for hydrobase.
...
Change-Id: I4b9c8bbe46336f24a299ca538920ad4a12722cba
Former-commit-id: 8dcad8fbe28821da3ae70f7562ca35c86d48779b
2016-01-07 15:19:28 -06:00
Xuezhi.Wei
141b8ae2eb
ASM #18357 Fixed error when opening Timeseries Light for Time-Step data
...
Change-Id: I6615c684057aebe898da2b814d7d1a47b2839a75
Former-commit-id: 64bc5b5d451e93321e18f08940cdddeb220a1cd5
2015-12-10 11:38:38 +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
Bryan Kowal
9efe808806
Omaha #5100 - partially rewrote pc and pp hourly data retrieval.
...
Updates will require verifying that the hydro perspective successfully loads
due to changes that slightly affected ArrayList<Object[]> loadPeRaw.
amend: use status handler in place of stacktrace console logging.
amend: additional code cleanup
Change-Id: Id00d5fce59d8c84656e7a063e5cefee9ea65c222
Former-commit-id: b6a7f6dde7b1fc3e2db50efc0bc4178050cc4422
2015-11-17 11:10:29 -06:00
Bryan Kowal
484bbda8b5
Omaha #5100 - fix for mpe issue when displaying data for hour 24 to hour 1.
...
Former-commit-id: f256859ec6ef5c32370e58eedbf503f6b7c3dcab
2015-11-04 17:43:11 -06: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
Xuezhi.Wei
d4be5a8b87
ASM #14375 Hydrobase Data Manager Rating Curve GUI problems
...
Change-Id: I55d7f860ab84c2b8773821b75bfd04ba95ee8c93
Former-commit-id: 34c5d0e67b4e1cd1d58c0c849554b35e872c005e
2015-10-23 15:02:14 +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
Shawn.Hooper
90badd7a3e
Merge tag 'OB_15.1.2-9' into master_16.1.1
...
15.1.2-9
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/RiverStatData.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/ContactsDataManager.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/DescriptionDataManager.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/LocationAreaManager.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: e9e9660925d0afc016f88ec73182f9eae6ab0c18
2015-10-15 17:10:19 -04:00
Jingtao Deng
1234ccdfae
VLab Issue #12477 - Hydrobase cannot update certain textfields with special char; fixes #12477
...
Change-Id: I1f97bc6c9c1610080297d7968f7653c446a107eb
Former-commit-id: 37350d2119e037f22fb3c41090512b961347a84e
2015-10-14 13:31:58 -04:00
Shawn.Hooper
becd5935a5
Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
...
Former-commit-id: 19aefb32d4243a30511b9d5de557c51adf689d2d
2015-10-13 16:21:51 -04: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
Steve Harris
b0cb953346
Merge branch 'omaha_16.1.1' into omaha_16.2.1
...
Former-commit-id: dcdb27bc06556bccae34817d33b7a096ebb1def4
2015-10-01 12:39:24 -05:00
Richard Peter
b07bf0e9a7
Omaha #4943 - Fix HydroBase River Forecast Points
...
Change-Id: I58ab07d26bf84ee911c14d8d68472f7e17e8866a
Former-commit-id: b8a179251a315985dcb3ecabe7816267692fc510
2015-10-01 09:14:12 -05: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
Richard Peter
5e4ae39884
Omaha #4846 - Fix AddModifyLocationDataManager query
...
Change-Id: I86f2a3054c50e997de46aa4e0b7d7ac5c3f983da
Former-commit-id: 5546d7847322bd1459a970a65616470924398648
2015-09-04 14:24:14 -05:00
Richard Peter
dd8e4b448b
Merge "Omaha #4846 - Fix hydro queries" into omaha_16.1.1
...
Former-commit-id: 412b777c6daa76c5be146276520706d6014828b9
2015-09-04 09:05:09 -05:00
Richard Peter
c71f7797cb
Omaha #4846 - Fix hydro queries
...
Change-Id: I1211a3bdafe639ef13f81eee3be2796a5f5ec3fc
Former-commit-id: 31c9e28452f7b5bd1ffaffc9522d144b57221613
2015-09-03 16:56:01 -05: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
Steve Harris
943628f462
Merge branch 'omaha_16.1.1' into omaha_16.2.1
...
Conflicts:
rpms/build/common/lookupRPM.sh
Former-commit-id: 8db96f4003ee58a46c7b37c385d0683329b66d55
2015-08-10 20:42:11 -05:00
Richard Peter
32a4df07a7
Omaha #4500 - Fix hydro type casts
...
Change-Id: Ie2cbfed309ff9c2274d9cdfd3768f8d60ca18af8
Former-commit-id: e8d3d006f9bd1485b59dfbc869714f1320ec2ff0
2015-08-07 15:12:38 -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
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
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
Ben Steffensmeier
8aa0a02c44
Omaha #4079 Fix hydrocommon manifest.
...
Former-commit-id: a6780dfca764da9a0a15cb6db2e898009e09e569
2015-05-26 10:35:19 -05:00
Slav Korolev
497fe6e160
Omaha #4380 - Added new hydro forecast issuance stage and flow
...
Former-commit-id: 544d831ab3467af567ced94f97fe479b667d915c
2015-05-21 08:57:22 -04:00
Ben Steffensmeier
bf1c165307
Omaha #4079 Move gridded image displays into core grid plugin.
...
Former-commit-id: 2bb93741be4be6559c4aad7027dc1935ebe264b4
2015-05-19 10:46:28 -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
Jingtao Deng
74d8aa9c25
VLab Issue #7440 - DR17338 Apostrophe in the Hydrobase textfields are not saved; fixes #7440
...
Change-Id: Ifa008dc2cbdb77a60230a66724dd1a5d56a7c696
Former-commit-id: 6cdfbaba29b9ed4b4130218d765dc59919c1a513
2015-04-13 11:12:46 -04:00
Jingtao Deng
47e6761918
VLab Issue #6751 - DR16848 MPE color scale merge problem; fixes #6751
...
Change-Id: Ib85e9943c93f89b74d8f1530a99f7e819c63e7e6
Former-commit-id: 1324a6ebb687b9af972562c7b1adca402b799ced
2015-04-01 13:50:45 -04:00
Chip Gobs
d49f89e62e
VLab Issue #6751 - MPE DR 16848: if color scale is saved over existing one, the 2 scales are merged instead of target being overwritten ;fixes #6751
...
Former-commit-id: c85338a748d4f950aedcc960fc983f003e8b3fad
2015-03-09 11:47:38 -04:00
Chip Gobs
f3d411900e
VLab Issue #6750 - MPE DR 16777: MPE and Hydro Color Scale Manager: the 'Undo' button does not undo changes to the 'MSG' or '< Min' entries. ; fixes #6750
...
Former-commit-id: 2e5ccb1b360cb04e738e9ce60185f5f3c3f87607
2015-03-09 07:58:30 -04:00
Jingtao Deng
976c0b8539
VLab Issue #6376 - Hydrobase problem with sequence numbers for contacts; fixes #6376
...
Change-Id: Ic7b7b6ec7b6dbaf428eecac306197f7ceff3ec41
Former-commit-id: 96e27325e66e396854d5fc5870d3895a379eee2a
2015-03-02 16:15:25 -05:00
Jingtao Deng
3b2369a749
VLab Issue #6372 - Hydrobase Contacts New button causes record to be written to db; fixes #6372
...
Change-Id: I9bdd20e99531bf54af3fd9a3c62c67d7ecb787fc
Former-commit-id: 8ec0410b9f4155c553523af542f83f83a251c719
2015-03-02 16:14:53 -05:00
Jingtao Deng
e6e037cbc7
VLab Issue #6373 - Hydrobase Crest History failed validation dialog pops up; fixes #6373
...
Change-Id: Ie19a2ceead5998f1a71fa230bce00270fde60cf5
Former-commit-id: 0a4a268693a5bcdcb0706fb9024b173b2a338892
2015-03-02 16:14:16 -05:00
Jingtao Deng
338dd05bdb
VLab Issue #6374 - HydroBase does not save update due to apostrophe; fixes #6374
...
Change-Id: I270e51c2a8282ddd68cf38559d8e0cc1d5863091
Former-commit-id: 66d852168ca99dc791576a27594c940dbe1904ba
2015-03-02 16:12:19 -05:00
Loubna Bousaidi
2facd8c547
ASM #628 - Fixed Crest time
...
Change-Id: I5f9f58cfdb1689f331628498a781bb60f5549ac5
Former-commit-id: cddb0ff5626f25dd3555853d578928d7b93dcacb
2014-12-10 20:01:42 +00:00
Steve Harris
b979960b7b
Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java
Former-commit-id: 72f387d2802c12eedfe5643616fe5a54420aef66
2014-09-23 11:41:10 -05:00
Nate Jensen
e637963736
Omaha #3356 fix apps_dir setting detection in viz/cave
...
Change-Id: If78a4ec84f6237450a6494c06b5a5271c66f10a3
Former-commit-id: ca8195c7835b9d96158d048fdd548cc744ba96bc
2014-09-22 13:00:04 -05:00
Chip Gobs
25e4ed8d51
VLab Issue #4611
...
Fixes O&M Redmine DR 14448 - which concerns displaying changes to a color set just after the changes are saved,
instead of after the ColorScaleManager is closed.
Change-Id: I0156612302853141392c263eab8b54a16c3be7a3
Former-commit-id: 44f6bf08a72b5450d6d0db40ff49dd5123cf811c
2014-09-08 12:06:45 -04:00
Nate Jensen
9b72a1399d
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
...
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: 48536dd79d933508ac54b3b6e9bbd166fd218330
2014-08-14 10:22:37 -05:00
Mark Peters
47aec2aae3
Omaha #3465 Replace plugin calls to deprecated IGraphicsTarget.drawStrings()
...
Change-Id: Ib72cf8806852aff718af56c5f2c2cf4e07f9f548
Former-commit-id: 29d170af7a0c36e614a84923c2fb5054db73c390
2014-07-30 16:03:57 -05:00
Nate Jensen
d5b929d5c1
Merge "Omaha #3422 Update plug-in version number and java version for viz.hydrocommon and viz.mpe.ui" into omaha_14.4.1
...
Former-commit-id: 13ad27128cd4a29bb559d6911f870b15f447fdf5
2014-07-24 14:53:47 -05:00
Mark Peters
627ecd28e1
Omaha #3422 Update plug-in version number and java version for viz.hydrocommon and viz.mpe.ui
...
Change-Id: I2f8799c32a11ed636f714c0bfe304c5248f48a98
Former-commit-id: 02b964ae1e7490cc9124dcd70d6806881396a692
2014-07-24 14:38:59 -05:00
Mark Peters
29bc0fae50
Omaha #3422 Move HydroPointResource and HydroPointResourceData to MPE plugin
...
Change-Id: I222f99b0b952d9cef91208eb27f6adca43e13669
Former-commit-id: 7929e5b809d83a0f682e9f1c6953c9a090ed7310
2014-07-22 14:57:35 -05:00
Mark Peters
b0e9c73eaf
Omaha #3422 Replace drawFilledCircle and drawArc calls
...
Change-Id: I2ecd1e2fd9614317addc248130bfc8ececc3d80e
Former-commit-id: f0575e788549a1728c6d6fff7b99e3764c3739d8
2014-07-22 13:50:39 -05:00
Steve Harris
455eb8b39d
Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
edexOsgi/build.edex/edex/common.properties
edexOsgi/build.edex/esb/conf/modes.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so
Former-commit-id: 45250149681f057cf168f4d3cb27276279f62c05
2014-06-02 11:21:46 -05:00
