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
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
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
Loubna.Bousaidi
ecb3eba0de
ASM #13998 Fixed precip data display
...
Change-Id: I65081bf5bd80acfca6d4a06e4305822757b3684f
Former-commit-id: 9725611882fb36228c5fd815d216878c5070a5d0
2015-03-09 18:57:03 +00:00
Chris Cody
536396568a
Omaha #4075 Export Hydro Resources package for Hazard Services
...
Change-Id: I04d312f42859a0fcc840d04d685700487204e99c
Former-commit-id: 555795af65c5f138fdf6250752861452297a7f4b
2015-02-02 14:52:48 -06:00
Xuezhi.Wei
e40018f2e1
ASM #634 - Missing Data not getting into HML file
...
Change-Id: I4f2358f28ef7d7945813cbffa6d36517e162e40b
Former-commit-id: 947f9dd3435219ff32890cc4a26d8ae5e43686cf
2014-12-08 20:48:40 +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
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
7d82d522e4
Omaha #3489 Replace Raytheon plugin calls to deprecated IGraphicsTarget.getStringBounds()
...
Change-Id: Ie4c6093ff96e88332b719b9f88434bdd128770ea
Former-commit-id: 331b5994cc4bcd95138b15461b5040004f03d3fd
2014-08-05 14:30:06 -05:00
Nate Jensen
f8d9235104
Omaha #3356 remove registering buddies to viz.volumebrowser and viz.ui
...
since those plugins don't even have buddy policies
Change-Id: Ib81ac30111b9c3020e486d6db52dde3e15d7dacf
Former-commit-id: 4f691341c0368c3e015c73f25aab0cf8877802ac
2014-08-04 18:03:15 -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
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
brian.dyke
58683ad040
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: 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199
2014-05-19 09:45:37 -04:00
Loubna.Bousaidi
d3be6d0476
ASM #527 update revision and shef_qual_code
...
Change-Id: I36fa41796350e8fcae6bcc0101120331188bbeff
Former-commit-id: 860ea4b3644a526ac10b4366f158824fe6cbdcb0
2014-05-12 18:42:12 +00:00
Nate Jensen
5dfb652775
Issue #2060 dropping grid dataURI column
...
Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e
Former-commit-id: 1aab87d9572089a09351ebdfb8fbcef884866feb
2014-04-21 17:34:39 -05: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
Lee Venable
4714913a8c
Issue #2970 - added SWT dispose checks to runAsync methods.
...
Former-commit-id: b07ebb73405c3421c6afa3e45db57162a7ca622b
2014-03-31 16:06:59 -05:00
David Friedman
f146c7bcd0
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: cf35c1870fc4b6b3c2ceaf038274c4701f8046b1
2014-03-27 19:17:03 +00:00
Max Schenkelberg
1854bbb477
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: 51664693bd87df52acdb74d5286b61eeb06b792d
2014-03-03 17:59:48 -06:00
Richard Peter
1c150e6e8b
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: a47eaa9af45db41391fe46e36ec0793f70d06ad6
2014-02-27 15:18:26 -06:00
