diff --git a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
index 2b34154169..b762983def 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
@@ -287,11 +287,6 @@
label="Time Options"
style="toggle">
-
-
-
-
@@ -1426,12 +1417,6 @@
optional="false">
-
-
+ *
+ * SOFTWARE HISTORY
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Apr 20, 2016 mjames@ucar Copied from FourPanelLayoutHandler
+ *
+ *
+ *
+ * @author bsteffen
+ * @version 1.0
+ */
+public class TwoPanelLayoutHandler extends AbstractTool {
+ public Object execute(ExecutionEvent arg0) throws ExecutionException {
+ // There might be a better way to merge these two actions.
+ IEditorPart curEditor = EditorUtil.getActiveEditor();
+ if (curEditor == null) {
+ new NewTwoPanelEditor().execute(null);
+ } else if (curEditor instanceof IDisplayPaneContainer) {
+ TwoPanelLayoutMenuAction menuAction = new TwoPanelLayoutMenuAction();
+ menuAction.setContainer((IDisplayPaneContainer) curEditor);
+ menuAction.run();
+ }
+ return null;
+ }
+}
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/TwoPanelLayoutMenuAction.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/TwoPanelLayoutMenuAction.java
index bda5fdd34f..7ed13561a2 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/TwoPanelLayoutMenuAction.java
+++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/TwoPanelLayoutMenuAction.java
@@ -42,7 +42,16 @@ import com.raytheon.viz.ui.editor.IMultiPaneEditor;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 20, 2016 mjames@ucar Copied from FourPanelLayoutMenuAction
+ *
*
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Apr 20, 2016 mjames@ucar Copied from FourPanelLayoutMenuAction
+ * Jul 19, 2016 mjames@ucar Removed unnecessary part name code (undid previous change)
*
*
* @author bgonzale
@@ -65,21 +74,14 @@ public class TwoPanelLayoutMenuAction extends AbstractRightClickAction {
@Override
public void run() {
if (getContainer() instanceof IMultiPaneEditor == false
- || getContainer().getDisplayPanes()[0].getRenderableDisplay() instanceof ID2DRenderableDisplay == false) {
+ || getContainer().getDisplayPanes()[0].getRenderableDisplay()
+ instanceof ID2DRenderableDisplay == false) {
return;
}
IMultiPaneEditor editor = (IMultiPaneEditor) getContainer();
IRenderableDisplay definiteDisplay = getContainer().getDisplayPanes()[0]
.getRenderableDisplay();
- String partName = null;
- if (editor instanceof EditorPart) {
- EditorPart part = (EditorPart) editor;
- if (!part.getPartName().equals(part.getEditorInput().getName())) {
- partName = part.getPartName();
- }
- }
-
if (editor.getNumberofPanes() > 1) {
for (IDisplayPane pane : getContainer().getDisplayPanes()) {
editor.showPane(pane);
@@ -90,11 +92,6 @@ public class TwoPanelLayoutMenuAction extends AbstractRightClickAction {
}
}
- // keep the part name if it was customized
- if (partName != null && editor instanceof IRenameablePart) {
- ((IRenameablePart) editor).setPartName(partName);
- }
-
for (IDisplayPane pane : editor.getDisplayPanes()) {
List rscs = pane.getDescriptor()
.getResourceList()
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarDualPolBaseData.xml b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarDualPolBaseData.xml
index 2d5266b6f2..c3df66597e 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarDualPolBaseData.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/DefaultRadarDualPolBaseData.xml
@@ -23,7 +23,7 @@
+++++++++++++++++++++++
+ Z SRM + ZDR V +
+++++++++++++++++++++++
- + KDP HC + CC SW +
+ + KDP HC + CC +
+++++++++++++++++++++++
substitution keys:
@@ -315,32 +315,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarFourPanel.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarFourPanel.xml
index ac321fffbf..c5f4e47184 100644
--- a/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarFourPanel.xml
+++ b/cave/com.raytheon.viz.radar/localization/menus/radar/dualPol/baseRadarFourPanel.xml
@@ -20,7 +20,7 @@
-->
+ titleText="------ 4-Panel Z+SRM/ZDR+V/KDP+HC/CC ------" />
@@ -126,95 +126,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/utility/common_static/base/colormaps/Radar/Storm Clear Reflectivity.cmap b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/utility/common_static/base/colormaps/Radar/Storm Clear Reflectivity.cmap
index 1bfef4aed8..bebe84fc94 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/utility/common_static/base/colormaps/Radar/Storm Clear Reflectivity.cmap
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/utility/common_static/base/colormaps/Radar/Storm Clear Reflectivity.cmap
@@ -1,261 +1,259 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/rpms/awips2.core/Installer.localization/utility/cave_static/bundles/scales/WFO.xml b/rpms/awips2.core/Installer.localization/utility/cave_static/bundles/scales/WFO.xml
index 6ae89a9999..974c5ff171 100644
--- a/rpms/awips2.core/Installer.localization/utility/cave_static/bundles/scales/WFO.xml
+++ b/rpms/awips2.core/Installer.localization/utility/cave_static/bundles/scales/WFO.xml
@@ -22,6 +22,27 @@
+
+
+ PLAN_VIEW
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Interstates
+
+ the_geom
+
+
@@ -99,7 +120,7 @@
-
+
@@ -115,7 +136,7 @@
12
-
+
PROJCS["Equidistant_Cylindrical",
GEOGCS["WGS84(DD)",
DATUM["WGS84",