X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;fp=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=5f4f157af641c5ae69fa19c0756a9267570eb723;hb=6d06be2714c9cba8c69148d5e2d26b50b7051840;hp=593f7aea4a572811f37ced4e1572403b3ca4cf6b;hpb=58962a97c9819d186ce347072e8750dbcae16f0f;p=jalview.git diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java index 593f7ae..5f4f157 100755 --- a/src/jalview/gui/OverviewPanel.java +++ b/src/jalview/gui/OverviewPanel.java @@ -20,6 +20,7 @@ */ package jalview.gui; +import jalview.bin.Cache; import jalview.renderer.OverviewRenderer; import jalview.util.MessageManager; import jalview.util.Platform; @@ -52,8 +53,8 @@ import javax.swing.SwingUtilities; * @author $author$ * @version $Revision$ */ -public class OverviewPanel extends JPanel implements Runnable, - ViewportListenerI +public class OverviewPanel extends JPanel + implements Runnable, ViewportListenerI { private OverviewDimensions od; @@ -82,9 +83,20 @@ public class OverviewPanel extends JPanel implements Runnable, this.av = alPanel.av; this.ap = alPanel; - od = new OverviewDimensionsShowHidden(av.getRanges(), - (av.isShowAnnotation() && av - .getAlignmentConservationAnnotation() != null)); + showHidden = Cache.getDefault(Preferences.SHOW_OV_HIDDEN_AT_START, + true); + if (showHidden) + { + od = new OverviewDimensionsShowHidden(av.getRanges(), + (av.isShowAnnotation() + && av.getAlignmentConservationAnnotation() != null)); + } + else + { + od = new OverviewDimensionsHideHidden(av.getRanges(), + (av.isShowAnnotation() + && av.getAlignmentConservationAnnotation() != null)); + } setLayout(new BorderLayout()); progressPanel = new ProgressPanel(OverviewRenderer.UPDATE, @@ -140,15 +152,15 @@ public class OverviewPanel extends JPanel implements Runnable, { // set the mouse position as a fixed point in the box // and drag relative to that position - od.adjustViewportFromMouse(evt.getX(), - evt.getY(), av.getAlignment().getHiddenSequences(), + od.adjustViewportFromMouse(evt.getX(), evt.getY(), + av.getAlignment().getHiddenSequences(), av.getAlignment().getHiddenColumns()); } else { - od.updateViewportFromMouse(evt.getX(), evt.getY(), av - .getAlignment().getHiddenSequences(), av.getAlignment() - .getHiddenColumns()); + od.updateViewportFromMouse(evt.getX(), evt.getY(), + av.getAlignment().getHiddenSequences(), + av.getAlignment().getHiddenColumns()); } } } @@ -256,15 +268,15 @@ public class OverviewPanel extends JPanel implements Runnable, { showHidden = false; od = new OverviewDimensionsHideHidden(av.getRanges(), - (av.isShowAnnotation() && av - .getAlignmentConservationAnnotation() != null)); + (av.isShowAnnotation() + && av.getAlignmentConservationAnnotation() != null)); } else { showHidden = true; od = new OverviewDimensionsShowHidden(av.getRanges(), - (av.isShowAnnotation() && av - .getAlignmentConservationAnnotation() != null)); + (av.isShowAnnotation() + && av.getAlignmentConservationAnnotation() != null)); } oviewCanvas.resetOviewDims(od); updateOverviewImage();