David Gillingham
8f3369493f
Omaha #4968 : Fix time matching for SvrWxPlot bundle.
...
Change-Id: I5bb0b4374ea8bfdd55460162a4487b81dea747c0
Former-commit-id: 850393023b435d7a9ab62281b88fc4956fc8c2e4
2016-02-03 14:52:36 -06:00
Steve Harris
85055fcc53
Merge branch 'omaha_16.2.1' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/ClimateDataMenuDlg.java
cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 68c13f9160746f365bd5f896b1400f1a8099ebe8
2016-02-01 11:57:52 -06:00
Nathan Bowler
5412705591
Omaha #5183 Fix PWPF parameters, off by 0.5-1 error in colormap, and add to ingest.
...
Change-Id: I1cff6aa2138bd4d3234a7133cdf10470236dce1c
Former-commit-id: 8674b01f48fd4b5069778e7026919041f67e7011
2016-01-29 14:27:15 -05:00
Richard Peter
204272ee51
Merge "Omaha #5208 Fix NPE when pointset creates a level for styling." into omaha_16.2.2
...
Former-commit-id: 6f560aa1f3a445cb94a2157e6ac6bd5d64e58b59
2016-01-28 20:33:33 -06:00
Richard Peter
2e5e50ce0a
Merge "Omaha #5286 Drop dataURI column on tcg" into omaha_16.2.2
...
Former-commit-id: 16fe777c509a5ec7d57fb041fd7958128340be46
2016-01-28 20:31:07 -06:00
Ben Steffensmeier
a19dad515a
Omaha #5208 Fix NPE when pointset creates a level for styling.
...
Former-commit-id: 61c37c2f1882d3a0a0b0ddcfa466406811a268a1
2016-01-28 17:08:56 -06:00
Steve Harris
2b750a291a
Merge tag 'OB_16.2.1-8' into omaha_16.2.1
...
16.2.1-8
Former-commit-id: b22a2cd9f647e0cffe3bd013138b6617e34379ac
2016-01-28 15:32:25 -06:00
Tom Gurney
83e4e93f7f
Omaha #5286 Drop dataURI column on tcg
...
Change-Id: I94203de148c242f8289255974e6e1bcde6ea3293
Former-commit-id: d0e5a8bf870f46f4cb2f89359fd813793f312d9a
2016-01-28 15:11:53 -06:00
David Gillingham
e53d6e41c8
Omaha #5129 : Fix SmartScript.py bugs caused by changes to IFPClient.
...
Change-Id: I14cea9c8c63fc23921d015ddbea15eb4df6abb1c
Former-commit-id: 3250e376f70089a8d54c021a20c06fab6a3bac75
2016-01-28 14:53:51 -06:00
David Gillingham
e997116f9a
Omaha #5295 : Fix GFE pencil tool when working in ISC mode with grids with different time constraints than Fcst database.
...
Change-Id: Ieed3aced24abb9af15f25b055f25e4f65c67f229
Former-commit-id: 82219b236447c9bde7b2f1cfb306eb9595ab5b51
2016-01-28 13:58:27 -06:00
Nate Jensen
ec41eca172
Merge "Omaha #5285 Drop dataURI column on tcs" into omaha_16.2.2
...
Former-commit-id: 8ed786439e10130abef5be76b23e1c7f18adbdfa
2016-01-28 09:38:34 -06:00
Richard Peter
b196840f83
Merge "Omaha #5264 - verify that certain values mapped to apps defaults tokens map to within a specific directory location." into omaha_16.2.2
...
Former-commit-id: 7a968906c5283f39c683c1373bd96ec5c0fb60b2
2016-01-28 09:37:08 -06:00
Tom Gurney
df06c10573
Omaha #5285 Drop dataURI column on tcs
...
Also fix NPE in TCSResource.paintInternal() when displaying TCS hourly
forecast when no data is available.
Change-Id: I1321ca567ae47c71661d8414c3d2f96d8ff2352d
Former-commit-id: 3044446a32a7dcc22c1617370e5dea6320b4a4cf
2016-01-28 09:26:10 -06:00
Ron Anderson
615df494ce
Omaha #4946 Cleaned up SWTMessageBox
...
Change-Id: I4a7bef632e1b802082f02ee7848faeceaf15258c
Former-commit-id: 997cfa770eeff415e07f384394c6a8e782da9d4e
2016-01-27 18:40:14 -06:00
Steve Harris
2ad363ebca
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
...
Conflicts:
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
Former-commit-id: 8e09133de2543787b207004070a1e1492441d571
2016-01-27 16:26:10 -06:00
Bryan Kowal
e579cf19ff
Omaha #5264 - verify that certain values mapped to apps defaults tokens map to within a specific directory location.
...
Change-Id: Iaf9449f5559517e207c70becfb0f71d04a02a4ee
Former-commit-id: fe05e752e3f1dec2ecca88e200dd4167d634447a
2016-01-27 14:26:07 -06:00
Ron Anderson
3cb4ba321c
Omaha #5054 Fix parenting of TextWorkstationDlg
...
Change-Id: I03e0a8ea2fa1b172fc3b56ea8ff181af0d5dd9b0
Former-commit-id: fdae05e90bf6a7e8f69d11fdba87e0e4c52d07e7
2016-01-26 16:56:38 -06:00
Ben Steffensmeier
8da6dea4c9
Omaha #5208 Support short data for pointset displays.
...
Former-commit-id: c7bd43d4b41b500742787cb282dfd8d2c77a85a3
2016-01-26 10:56:51 -06:00
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
Ron Anderson
3b57044667
Omaha #5054 Remove AlertViz dummy parent shell
...
Change-Id: Iae672fecb7bdd05227cf95a9cf8c4c8b2bc67732
Former-commit-id: 14c6e5c2dd09e6030d59bc5d4a6c1ee2f7bce6d3
2016-01-25 13:18:12 -06:00
Bryan Kowal
8224504f4a
Merge "Omaha #5271 - include the time span for products that track time span in minutes." into omaha_16.2.2
...
Former-commit-id: e89d870c8ea9e98e4039d6eb96ca374efd21c815
2016-01-25 13:02:05 -06:00
Nate Jensen
514e84d23a
Merge "Omaha #5242 replace calls to deprecated LocalizationFile methods" into omaha_16.2.2
...
Former-commit-id: 3b16dcaa9603b97f3d6198dc961e590c223f325b
2016-01-25 11:15:04 -06:00
Richard Peter
a6f2a01e7c
Merge "Omaha #5183 Add PWPF data." into omaha_16.2.2
...
Former-commit-id: eaa13eb55c5b04cf2560edd94c9fa98119e87879
2016-01-22 12:32:42 -06:00
Matthew Howard
8da9fddea8
Merge "ASM #18505 GFE: Resent product should have same WMO, MND, and segment times as original product." into asm_16.1.2
...
Former-commit-id: ef104e0404b16c2ed85b67c8900e055ae58400d3
2016-01-22 11:12:07 -05:00
Nate Jensen
70d33e45eb
Merge "Omaha #5242 fix mistake when refreshing editor contents" into omaha_16.2.2
...
Former-commit-id: b809fe257555cfa929f88cad8dcb65e086ca3fe1
2016-01-21 18:17:46 -06:00
Nate Jensen
65b5c100ad
Omaha #5242 fix mistake when refreshing editor contents
...
Change-Id: Iedf80bdd0fdad1c199b5086946db2eb108ecbe19
Former-commit-id: f0867792743cc6b4c6e03115da853e6bd4752703
2016-01-21 18:00:41 -06:00
Richard Peter
a6230649e7
Merge "Omaha #4562 : Isolate simple text product decoding" into omaha_16.2.2
...
Former-commit-id: 067ed048ee4681602c10086a8dedbeffdeefbeb5
2016-01-21 16:03:03 -06:00
Nathan Bowler
03f7c1d700
Omaha #5183 Add PWPF data.
...
Change-Id: Ib37670d67534f457dd15e9ac912f076f9093e7c9
Former-commit-id: 7aeb4ae1c85f837eef279e224cdf1323dadc0569
2016-01-21 16:34:59 -05:00
Tim Jensen
2a5b0ed793
Omaha #4562 : Isolate simple text product decoding
...
Change-Id: I002bc67d0906b254a131f8a4f2d98d83555926c4
Former-commit-id: cd9fe9fed89fd732f5f904a3a7df9be544d01488
2016-01-21 14:21:15 -06:00
Ying-Lian.Shi
ba9a1d66a5
ASM #18505 GFE: Resent product should have same WMO, MND, and segment times as original product.
...
Change-Id: I8fa675e63f05e16547fdc8ed108790bcbccb0bf7
Former-commit-id: 851ff43a2ba628cc4d239e15784e52ea7d1f1ab1
2016-01-21 19:28:55 +00:00
Nate Jensen
b7628ba147
Omaha #5242 replace calls to deprecated LocalizationFile methods
...
Change-Id: Id3a47ee5b9f3b24690fe59d6a82cfd2e141e3c14
Former-commit-id: 421983feb387cb13c73ed288ddbbc607238e58e2
2016-01-21 10:59:54 -06:00
Ron Anderson
3d867790f3
Omaha #4751 Fix type of mask returned from getComposite()
...
Change-Id: I0c136042a0ea43bb2cf7b9462eb9fea257b19ab9
Former-commit-id: 23bed260bc1e1302070f49dadc3a978e218ee513
2016-01-20 18:22:39 -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
5ffc65b59d
Omaha #5229 Fix merge errors in SaveLevel2Data
...
Change-Id: Ie27e609925a7ae5231243c70139712ce71b3550b
Former-commit-id: 713ef7be6d924e21a8eefbb220ba1613a650fef7
2016-01-20 16:01:07 -06:00
Shawn.Hooper
007b844b3b
Merge remote-tracking branch 'vlab/asdt_16.2.1' into master_16.2.1
...
Former-commit-id: 15caeb10ad31fa9ffb405b4411ccff22b421dd75
2016-01-20 16:50:40 -05:00
Shawn.Hooper
3f05c3da44
Merge remote-tracking branch 'vlab/field_16.2.1' into master_16.2.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I279d046dc8a054563c9ddabd92350f8d97222355
Former-commit-id: f9ff90f121eff9ae632b8bcc47c3500d9f647d00
2016-01-20 16:49:53 -05:00
Shawn.Hooper
da0ff43173
Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
Change-Id: I123674540179ec5fd35a953cb652f613a3400ed5
Former-commit-id: 9f821c69fc8c198fc44529e2e00ecaa13b286e6f
2016-01-20 16:48:34 -05: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
d9857932c6
Omaha #5271 - include the time span for products that track time span in minutes.
...
Former-commit-id: 937126b666ea552cd5c40431d097d68ab83f80c5
2016-01-20 13:45:11 -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
Penghai Wang
b1adfc8043
Merge branch 'master_16.2.1' into asdt_16.2.1
...
Former-commit-id: 8ee3557b04ad9054e8e0c0e0671efa6f4e3abdad
2016-01-20 17:09:39 +00: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
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
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
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
