Commit graph

6 commits

Author SHA1 Message Date
Steve Harris
2c559f4c88 Merge tag 'OB_14.4.1-2m' into omaha_15.1.1
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py (self-resolved)
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml (took both Anna and David's additions)
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py (took both Anna and David's additions)

Former-commit-id: 01c4aa19ab0b21f331c2200076efbd44eb3b2af6
2015-01-23 09:32:44 -06:00
Ron Anderson
596149053f Omaha #3955 Changes to support editing GFE topo and comparing with new Standard Terrain data
Change-Id: Ic12b1e257b7997fc2fbc5efd7a8833ac26366135

Former-commit-id: 653d8ec5a7adfc2ebb87ec6cbde2715f9c8fcfe9
2015-01-19 14:02:42 -06:00
Ana Rivera
061fd0af28 VLab Issue #5318 - Baseline Hurricane Threats and Impacts (O&M RM16791); fixes #5318
Change-Id: Ibbc9e39a294417524c57c86e68e92644433ba847

Former-commit-id: 8a4e53a23a222dc88e3db8cc053fc31c33d3ed42
2014-11-14 16:58:11 +00:00
Ana Rivera
535f254357 VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297

Former-commit-id: 2c16492202230dcbec93cf390b47f400a77a545e
2014-09-24 20:11:29 +00:00
Brian Clements
2f25116c10 Issue #2404 Moved colormap parameter factory to common
moved grid level translator from viz to common
updated references to moved classes
created grid style util for common styling code
updated style manager to look in common for files
moved data plugin style rules to common


Former-commit-id: 7cdff04cc4d60b50a2a2c08499ee329586031e0f
2013-09-27 09:41:51 -05:00
Nate Jensen
a1a9a4751a Issue #2210 moved base cave_static colormaps to common_static and updated code
deleted duplicate edex_static colormaps
            wrote delta script for site/user cave_static colormaps to move to common_static

Change-Id: I53c86d0974706023608e1ec5e10f34619aafb8de

Former-commit-id: 4383d88a37c9ae9298f7ea9081d87d6ded34de66
2013-08-06 17:17:53 -05:00