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

Continued changes for single pane default view

Browse source 
ChangeD2DLayoutAction:
- set initial side view number to 0
- added comment for side view resizing (from previous commit)

D2D5Pane
- removed the THREE_PANE_WIDTH (not used anymore)
- added a ZERO_PANE_WIDTH
- default to 0 views otherwise use the base views for side views
- use the ZERO_PANE_WIDTH when there are zero views
This commit is contained in:
srcarter3 2022-08-29 17:06:35 -07:00
parent 18aafccd2d
commit 470a6bcdfd
2 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/ChangeD2DLayoutAction.java
View file

@ -52,6 +52,7 @@ import com.raytheon.viz.ui.EditorUtil;
* to resize the display for differing number of * to resize the display for differing number of
* side views * side views
* Aug 24, 2022 srcarter If no side panes, make the side width 0 * Aug 24, 2022 srcarter If no side panes, make the side width 0
* Aug 29, 2022 srcarter Set the initial side pane count to 0
* *
* </pre> * </pre>
* *
@ -65,7 +66,7 @@ public class ChangeD2DLayoutAction extends AbstractHandler {
public static int getViewCount() { public static int getViewCount() {
Integer views = viewMap Integer views = viewMap
.get(PlatformUI.getWorkbench().getActiveWorkbenchWindow()); .get(PlatformUI.getWorkbench().getActiveWorkbenchWindow());
return views != null ? views : 4; return views != null ? views : 0;
} }
@Override @Override
@ -169,6 +170,8 @@ public class ChangeD2DLayoutAction extends AbstractHandler {
if (nSideViews > 5) { if (nSideViews > 5) {
nSideViews = 5; nSideViews = 5;
} }
// When switching back to single pane (nSideViews == 0) make sure
// the side panes are completely collapsed
if (nSideViews == 0) { if (nSideViews == 0) {
width = 0; width = 0;
} else { } else {

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

@ -51,7 +51,7 @@ import com.raytheon.viz.ui.UiUtil;
* 7/1/06 chammack Initial Creation. * 7/1/06 chammack Initial Creation.
* Mar 21, 2013 1638 mschenke Changed map scales not tied to d2d * Mar 21, 2013 1638 mschenke Changed map scales not tied to d2d
* Oct 10, 2013 2104 mschenke Switched to use MapScalesManager * Oct 10, 2013 2104 mschenke Switched to use MapScalesManager
* Aug 24, 2022 srcarter Default to single pane view * Aug 29, 2022 srcarter Default to single pane view, with zero side panel width
* *
* </pre> * </pre>
* *
@ -66,10 +66,10 @@ 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 THREE_PANE_WIDTH = 0.4f;
private static final float FIVE_PANE_WIDTH = 0.2f; private static final float FIVE_PANE_WIDTH = 0.2f;
private static final float ZERO_PANE_WIDTH = 0.0f;
/* /*
* (non-Javadoc) * (non-Javadoc)
* *
@ -94,32 +94,30 @@ public class D2D5Pane implements IPerspectiveFactory {
} }
} }
int numViews = 0; int numViews = ChangeD2DLayoutAction.getViewCount() == 0 ? 0
: baseViewsToAdd.size();
String lastAdded = null; String lastAdded = null;
Collections.sort(baseViewsToAdd); Collections.sort(baseViewsToAdd);
if (numViews > 0) { for (int i = 0; i < baseViewsToAdd.size(); ++i) {
for (int i = 0; i < baseViewsToAdd.size(); ++i) { String baseView = baseViewsToAdd.get(i);
String baseView = baseViewsToAdd.get(i); if (baseViewsToAdd.contains(baseView)) {
if (baseViewsToAdd.contains(baseView)) { if (lastAdded == null) {
if (lastAdded == null) { layout.addStandaloneView(
layout.addStandaloneView(baseView, false, baseView,
IPageLayout.LEFT, false,
ChangeD2DLayoutAction.getViewCount() == 2 IPageLayout.LEFT,
? THREE_PANE_WIDTH ChangeD2DLayoutAction.getViewCount() == 0 ? ZERO_PANE_WIDTH
: FIVE_PANE_WIDTH, : FIVE_PANE_WIDTH, editorArea);
editorArea); } else {
} else { layout.addStandaloneView(baseView, false,
layout.addStandaloneView(baseView, false, IPageLayout.BOTTOM, (i >= numViews) ? 1.0f
IPageLayout.BOTTOM, (i >= numViews) ? 1.0f : 1.0f / (numViews - i + 1), lastAdded);
: 1.0f / (numViews - i + 1),
lastAdded);
}
lastAdded = baseView;
addedViews.add(lastAdded);
} }
lastAdded = baseView;
addedViews.add(lastAdded);
} }
} }