Ron Anderson
5ffc65b59d
Omaha #5229 Fix merge errors in SaveLevel2Data
...
Change-Id: Ie27e609925a7ae5231243c70139712ce71b3550b
Former-commit-id: 713ef7be6d924e21a8eefbb220ba1613a650fef7
2016-01-20 16:01:07 -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
Steve Harris
dfcc52e766
Merge tag 'OB_16.2.1-6' into omaha_16.2.1
...
16.2.1-6
Former-commit-id: 29a43c58b69086667c47e86c4a0bb1c849ad4367
2016-01-20 13:29:19 -06:00
Ron Anderson
bbe995a99d
Omaha #5229 Fix auto-merge errors
...
Change-Id: I652d44709a92b8dc474e1be5dab5a1b6e228a8ed
Former-commit-id: 1b634cb275fd62ed659420881842f676bea013b8
2016-01-20 11:19:40 -06:00
Steve Harris
52279f6cc1
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertMessageDlg.java
cave/com.raytheon.uf.viz.tcs/src/com/raytheon/uf/viz/tcs/rsc/TCSResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/GFEConfigDialog.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/MetarPrecipResource.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
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/DataListsProdTableComp.java
Former-commit-id: afd3fb15b22d92b6b30205446b6fe4b3e21271bf
2016-01-20 09:44:34 -06:00
Richard Peter
25665d13f0
Merge "Omaha #4677 Fix bufrmos location caching" into omaha_16.2.2
...
Former-commit-id: 1800f6b8e48d0aa77a3d49f8035dddd01a5896f5
2016-01-19 17:17:21 -06:00
Tom Gurney
63ecf82c4f
Omaha #4677 Fix bufrmos location caching
...
Follow-up to 22d027c. Correct BufrMosLocationCache to still use hash
code as a key, but to use lat/lon/stationId for database lookup (since
hash code is no longer stored in database)
Change-Id: I24249317d51d117f6a420a8ead5aad9e89b382d5
Former-commit-id: d1dc1292e2e0f8b5ea37dcb308bd7373f459f1dd
2016-01-19 17:10:14 -06:00
Nate Jensen
14a9e61d44
Merge "Omaha #4834 fix creating new python files in localization perspective" into omaha_16.2.2
...
Former-commit-id: a762710e651937513a51b0f61ffb82d0d8c5dac7
2016-01-19 16:54:10 -06:00
Ron Anderson
cff3b9cf11
Merge "Omaha #5222 - Add world read to edex start/stop log" into omaha_16.2.2
...
Former-commit-id: 590639621225fd543cda2ab2b2b1939971178c3c
2016-01-19 16:03:06 -06:00
Nate Jensen
fa342b26c6
Omaha #4834 fix creating new python files in localization perspective
...
Change-Id: I1de950c906674a7235369a1144ffae0d5bfefe03
Former-commit-id: da7c223cb78db37b68faa99f3fb4e01c6cb01cc1
2016-01-19 14:53:56 -06:00
Richard Peter
8b797e4518
Merge "Omaha #5253 Remove dataURI from SvrWx plugin" into omaha_16.2.2
...
Former-commit-id: b0a29d586176e28d93bc8c284b6483c8e87d915d
2016-01-19 12:34:26 -06:00
Richard Peter
6313a12f0f
Omaha #5222 - Add world read to edex start/stop log
...
Change-Id: Ic78a36595ca85e8d16055b555603d13a8b2dcbe0
Former-commit-id: f52cfc3e401c61ddf8a42de1c0fb3a4fc9b9a0ac
2016-01-19 12:23:45 -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
24bc0a3344
Omaha #5054 Fix Dialog parenting
...
Change-Id: Ie7e1727ef9666cf510093f8fb6b06a1a258a30e2
Former-commit-id: 5093e43e9d1d26898f9719e00f6489a7f3ea55c8
2016-01-19 09:19:13 -06:00
Ron Anderson
fa5bca3ad3
Merge "Omaha #5239 Fix sizing issues with Make Hazards Dialog" into omaha_16.2.2
...
Former-commit-id: 1aaf74e7f8bf737110411fb456e2c69d1edb542e
2016-01-18 15:54:05 -06:00
Nate Jensen
e8fbff709e
Merge "Omaha #5242 Replaced deprecated method calls on LocalizationFile" into omaha_16.2.2
...
Former-commit-id: c550723ea777e23d6cd8cfce3f8287f46d5b5552
2016-01-18 15:07:54 -06:00
Kevin Bisanz
ee6dd737b7
Omaha #5242 Replaced deprecated method calls on LocalizationFile
...
Replaced deprecated calls and updates to use ILocalizationFile instead
of LocalizationFile.
amend: Fix comments
Change-Id: I2abb4b4339233d78f89ebd4f65f2ba9162fb0f12
Former-commit-id: 8d749dc3a51d81915f4e6838ca51fd1da7576226
2016-01-18 13:01:44 -06:00
Richard Peter
6fb20a2f16
Merge "Omaha #4677 : Update PK column of bufrmos_location" into omaha_16.2.2
...
Former-commit-id: 2f2d4954c307d395d9565c11774b9fdffbd922af
2016-01-18 12:16:00 -06:00
Tom Gurney
31117fcda3
Omaha #4677 : Update PK column of bufrmos_location
...
Change-Id: I265ad75ecaad2f1d829cdcd22ca7de3fc8e67299
Former-commit-id: 22d027cf0f7b0144473c7d3cf471d6d17ff51383
2016-01-18 11:39:25 -06:00
Nate Jensen
743cda39ae
Omaha #4834 fix typo
...
Change-Id: Iea76f914c48ef1281296c7a3bdc69d7024532519
Former-commit-id: 7b31d119b66d2baec5f7d43485eed0fc4f7e5ab2
2016-01-18 09:32:43 -06:00
Ron Anderson
805ae46121
Omaha #5239 Fix sizing issues with Make Hazards Dialog
...
Change-Id: I9898d19ade98916ca925ed94536c059870043fbe
Former-commit-id: beb26659a59d0f14f11bad609ea34f6b4ad2357d
2016-01-15 11:53:15 -06:00
Nate Jensen
1aa0f67909
Merge "Omaha #5247 : Plugin-ize Tools menu in D2D." into omaha_16.2.2
...
Former-commit-id: 3a26ab59843c9e83eee22e550521241e6a16b3e4
2016-01-14 16:19:09 -06:00
Nate Jensen
f227e85468
Merge "Omaha #5237 : Replace calls to deprecated LocalizationFile methods" into omaha_16.2.2
...
Former-commit-id: cdda5279932510e51714db99915e3adf9f54e8e4
2016-01-14 14:28:03 -06:00
Tom Gurney
76bdbc2084
Omaha #5237 : Replace calls to deprecated LocalizationFile methods
...
Change-Id: I81bd2c7fcf29db4b9dea4164b826b8880e707686
Former-commit-id: 843e2b439ea1609dff0583e8eaa25feeb3c6f3cb
2016-01-14 12:27:08 -06:00
David Gillingham
5e18c49d19
Omaha #5247 : Plugin-ize Tools menu in D2D.
...
Change-Id: I7543886b22c1535574b048923c7462226d444086
Former-commit-id: 81e5df1c594a447ea1ef0c4901fe98a242cc6692
2016-01-14 11:36:25 -06:00
Ron Anderson
9bd537d65c
Omaha #5055 Change Volume Browser to stay with CAVE window and improve resizing behavior
...
Change-Id: Ied889a26b348e755c80be76b657ec0fa022be8c0
Former-commit-id: 350800c0f4bf9ec9a1fcd3850ef8b30a05345e01
2016-01-14 09:58:15 -06:00
Nate Jensen
836532c8d5
Merge "Omaha #5243 : Correct handling of duration for TS groups" into omaha_16.2.2
...
Former-commit-id: 6b70280b8de30bbbfe1c66df75c4f18e7d3f375e
2016-01-14 09:17:20 -06:00
Ron Anderson
9f255c8d50
Omaha #5070 Adjust font sizes for dpi scaling
...
(cherry picked from commit 0fac683b60
2016-01-13 19:17:37 -06:00
Ron Anderson
4279c9f227
Omaha #5054 Fix location of GfeConfigDialog in multimonitor display.
...
(cherry picked from commit a19811a730#5054 Fix Text workstation window locations on multimonitor display
(cherry picked from commit 5085377b9d#5054 Fixed resizing of AlertViz bar on multimonitor displayes. Code cleanup.
(cherry picked from commit d6f0f5535e
2016-01-13 18:54:49 -06:00
Nate Jensen
84ef39fc38
Merge "Omaha #5242 Replaced deprecated method calls on LocalizationFile" into omaha_16.2.2
...
Former-commit-id: 7e78ede562e426bc2f84924c7406737c383e0347
2016-01-13 17:59:48 -06:00
Tom Gurney
290bc110ac
Omaha #5243 : Correct handling of duration for TS groups
...
Lookup table in TraceData was missing 5 and 10 min durations. Also when
displaying tabular data the duration was not properly converted from char to
short and thus was always set to 0.
Change-Id: I29a566629f90867ec74c258b1f1097c6833d8689
Former-commit-id: ca4891fee6f1f8fa2a2079bb3ec33a451ed2a6e6
2016-01-13 17:07:21 -06:00
Ben Steffensmeier
8b1291798a
Omaha #5246 Fix blank graph panels.
...
Former-commit-id: da4a78cf8302da5679776c8021871b91e27ab5c1
2016-01-13 13:45:54 -06:00
Kevin Bisanz
9565953bfb
Omaha #5242 Replaced deprecated method calls on LocalizationFile
...
Replaced the deprecated LocalizationFile.getName() method with getPath().
amend: Fix comments
amend2: Fix comments
amend3: Fix typo in revision history
Change-Id: I4c34771e4a022ff07ad5af915c7dc77f220b7431
Former-commit-id: 9001217002afcf425eeb8124fa89a1314fdd27e4
2016-01-13 13:12:31 -06:00
Nate Jensen
1ba4b64743
Merge "Omaha #5244 replaced deprecated method calls on LocalizationFile" into omaha_16.2.2
...
Former-commit-id: 922b238db4d23d2bff341eda937b559f3da0ed2c
2016-01-13 09:28:40 -06:00
Steve Harris
25cee1be8c
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 58b1a82b5cf59525bf266416bc8c3ca6c0dea4ad
2016-01-13 09:20:51 -06:00
Steve Harris
d9dc7ac24a
Merge tag 'OB_16.2.1-5' into omaha_16.2.1
...
16.2.1-5
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
Former-commit-id: 158c21db5a297b68b9c7007ebcbfd5374df3c648
2016-01-13 08:58:43 -06:00
Nate Jensen
b15fcd85b7
Omaha #5244 replaced deprecated method calls on LocalizationFile
...
Change-Id: Ifdd1382a35a8475137be54404cca0a5c48383990
Former-commit-id: fe12ffde9dcf6210b213ded4903d004263be50b4
2016-01-12 16:59:35 -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
Lee Venable
564b29a3c7
Omaha #5238 – Increased label width so the scale labels do not get hidden.
...
Former-commit-id: de3bcf28f18bc130709bc5882d5efc8f2ead8a1d
2016-01-12 13:07:45 -06:00
Nate Jensen
8c21ca692b
Omaha #5244 replaced deprecated method calls on LocalizationFile
...
Change-Id: I209036143d3aaf18b754b5484298f7f2156d24ba
Former-commit-id: 2a7817d6959210f4edc376e237604df0dc3dc830
2016-01-12 09:16:37 -06:00
Greg Armendariz
6495c4c3ef
Omaha #5203 - Remove scriptLauncher from common-core deploy
...
Former-commit-id: d095a3b9a1b69adb17cf67b8ed1a3f141d79d6a6
2016-01-11 13:46:43 -06:00
Nate Jensen
c8d20e5ae9
Merge "Omaha #5226 - LSRDecoder - Gracefully reject ob w/bad location" into omaha_16.2.2
...
Former-commit-id: 7e764f4e098b54bba0fc2b39a70dcfbcb714db43
2016-01-08 13:38:21 -06:00
David Gillingham
98add87c02
Omaha #4816 : Prevent smart tools from terminating edit area query thread pool.
...
Change-Id: Iefa637f6386aa9c7d71b9d844bf29e7d0558e2cb
Former-commit-id: e8b882968f2f8f7b640c19883e9b0b2299e90d2f
2016-01-08 11:34:32 -06:00
Tom Gurney
f482b28005
Omaha #5226 - LSRDecoder - Gracefully reject ob w/bad location
...
Former-commit-id: ba957117ffbc7f07b883a04c9e93ae4996574be5
2016-01-08 11:04:13 -06:00
David Gillingham
7075694a59
Omaha #5129 : Fix exceptions in text formatters caused by changes to WeatherSubKey.py.
...
Change-Id: I9b00fe71c0a6890a4317acd848013d4faaecb902
Former-commit-id: 580c6afb9e8b5e7aeb3118a2944f02f1e1e97f8e
2016-01-08 10:33:02 -06:00
Shawn.Hooper
b9805ddf2e
Merge remote-tracking branch 'vlab/ohd_16.1.1.1' into master_16.1.2
...
Former-commit-id: 4fe656d88ae550c4ee836f1e4efb0e2294ff69dd
2016-01-07 17:15:01 -05:00
Shawn.Hooper
0836b37c4a
Merge remote-tracking branch 'asm/asm_16.1.2' into master_16.1.2
...
Former-commit-id: 6e90fbcc490105418e7fdfa377d9769206de6d17
2016-01-07 17:14:53 -05:00
Slav Korolev
6e365fe428
Omaha #4860 - Fixed issue TextWorkstationNotStartedException
...
Former-commit-id: 6f5222c617c6f130b3a827beff5f1ec4bda45ee4
2016-01-07 09:56:49 -05:00
Richard Peter
f9d81dd662
Merge "Omaha #4834 Fix single-user edit-save-edit-save." into omaha_16.2.2
...
Former-commit-id: 33074d81d8f2e4f005fd4dd8249f1d7b8cb78d9b
2016-01-06 15:52:43 -06:00
Nate Jensen
2be281b3da
Merge "Omaha #5138 Removed pycairo that is not longer used, Moved to local apps repo." into omaha_16.2.2
...
Former-commit-id: d0525ec72d111c562b7415df6f62574e5c0a2aaf
2016-01-06 15:20:08 -06:00
