xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

D2D pane switch cleanup

Browse source 
Former-commit-id: cad86814582700636355dce82e2a4b671e1f7822 [formerly 845b1bcd79171630be902344315ede86007e9bdf] [formerly a018df53bb [formerly 1f40fb85b7]]
Former-commit-id: a018df53bb
Former-commit-id: cfb4dfc462
This commit is contained in:
AWIPS User 2015-04-19 23:36:54 -06:00
parent 094ad0c994
commit 50f0596073
2 changed files with 6 additions and 387 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

391
cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
View file

@ -128,7 +128,8 @@
</menu> </menu>
<menu <menu
id="view" id="view"
label="View"> label="View"
sibling_order="&lt;menu&#x0A; label=&quot;label&quot;&gt;&#x0A; &lt;/menu&gt;">
<visibleWhen> <visibleWhen>
<reference <reference
definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet"> definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
@ -205,7 +206,7 @@
</separator> </separator>
<command <command
commandId="com.raytheon.uf.viz.d2d.ui.actions.changeD2DLayout" commandId="com.raytheon.uf.viz.d2d.ui.actions.changeD2DLayout"
label="Full Layout"> label="1 Pane Layout">
<parameter <parameter
name="sideViews" name="sideViews"
value="4"> value="4">
@ -213,7 +214,7 @@
</command> </command>
<command <command
commandId="com.raytheon.uf.viz.d2d.ui.actions.changeD2DLayout" commandId="com.raytheon.uf.viz.d2d.ui.actions.changeD2DLayout"
label="WFO Layout"> label="5 Pane Layout">
<parameter <parameter
name="sideViews" name="sideViews"
value="0"> value="0">
@ -510,30 +511,6 @@
</toolbar> </toolbar>
<toolbar <toolbar
id="d2d-2"> id="d2d-2">
<command
commandId="com.raytheon.uf.viz.d2d.ui.actions.imageCombination"
icon="icons/nocombine.gif"
label="Toggle Image Combination"
style="toggle">
<visibleWhen>
<reference
definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
</reference>
</visibleWhen>
</command>
<command
commandId="com.raytheon.viz.ui.imageProperties"
icon="icons/picture-o.png"
label="Image Properties">
<visibleWhen>
<reference
definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
</reference>
</visibleWhen>
</command>
<separator
name="tools.toolbar" visible="false">
</separator>
<command <command
commandId="com.raytheon.uf.viz.d2d.ui.actions.changeD2DLayout" commandId="com.raytheon.uf.viz.d2d.ui.actions.changeD2DLayout"
icon="icons/stop.png" icon="icons/stop.png"
@ -771,40 +748,6 @@
value="10"> value="10">
</parameter> </parameter>
</command> </command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="11">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="12">
</parameter>
</command>
<separator
name="separator"
visible="true">
</separator>
<menu
label="13 ~ 19">
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="13">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="14">
</parameter>
</command>
<command <command
commandId="com.raytheon.viz.ui.actions.setframes"> commandId="com.raytheon.viz.ui.actions.setframes">
<parameter <parameter
@ -812,37 +755,6 @@
value="15"> value="15">
</parameter> </parameter>
</command> </command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="16">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="17">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="18">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="19">
</parameter>
</command>
</menu>
<menu
label="20 ~ 29">
<command <command
commandId="com.raytheon.viz.ui.actions.setframes"> commandId="com.raytheon.viz.ui.actions.setframes">
<parameter <parameter
@ -854,68 +766,9 @@
commandId="com.raytheon.viz.ui.actions.setframes"> commandId="com.raytheon.viz.ui.actions.setframes">
<parameter <parameter
name="frameCount" name="frameCount"
value="21"> value="5">
</parameter> </parameter>
</command> </command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="22">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="23">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="24">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="25">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="26">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="27">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="28">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="29">
</parameter>
</command>
</menu>
<menu
label="30 ~ 39">
<command <command
commandId="com.raytheon.viz.ui.actions.setframes"> commandId="com.raytheon.viz.ui.actions.setframes">
<parameter <parameter
@ -923,72 +776,6 @@
value="30"> value="30">
</parameter> </parameter>
</command> </command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="31">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="32">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="33">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="34">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="35">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="36">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="37">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="38">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="39">
</parameter>
</command>
</menu>
<menu
label="40 ~ 49">
<command <command
commandId="com.raytheon.viz.ui.actions.setframes"> commandId="com.raytheon.viz.ui.actions.setframes">
<parameter <parameter
@ -996,72 +783,6 @@
value="40"> value="40">
</parameter> </parameter>
</command> </command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="41">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="42">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="43">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="44">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="45">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="46">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="47">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="48">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="49">
</parameter>
</command>
</menu>
<menu
label="50 ~ 59">
<command <command
commandId="com.raytheon.viz.ui.actions.setframes"> commandId="com.raytheon.viz.ui.actions.setframes">
<parameter <parameter
@ -1069,108 +790,6 @@
value="50"> value="50">
</parameter> </parameter>
</command> </command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="51">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="52">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="53">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="54">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="55">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="56">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="57">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="58">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="59">
</parameter>
</command>
</menu>
<menu
label="60 ~ 64">
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="60">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="61">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="62">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="63">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="64">
</parameter>
</command>
</menu>
</menuContribution> </menuContribution>
<menuContribution <menuContribution
locationURI="menu:com.raytheon.viz.ui.actions.magnification"> locationURI="menu:com.raytheon.viz.ui.actions.magnification">

2
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java
View file

@ -65,7 +65,7 @@ public class D2D5Pane implements IPerspectiveFactory {
private static final String BASE_VIEW_ID_PREFIX = SideView.ID private static final String BASE_VIEW_ID_PREFIX = SideView.ID
+ UiUtil.SECONDARY_ID_SEPARATOR + "sideView"; + UiUtil.SECONDARY_ID_SEPARATOR + "sideView";
private static final float FIVE_PANE_WIDTH = 0.2f; private static final float FIVE_PANE_WIDTH = 0.1f;
private static final float ZERO_PANE_WIDTH = 0.0f; private static final float ZERO_PANE_WIDTH = 0.0f;