X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=3fa674e60f8d6f1661dc57df07fc601e101ed171;hb=fe654aee9b43fb9c9307830c277f1e63576826ae;hp=a6c3960351233df0d618f67e862bf8e51c2152d3;hpb=e073a5187b948dd845d01dbdbbda3516911ef7f6;p=jalview.git diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java index a6c3960..3fa674e 100755 --- a/src/jalview/gui/OverviewPanel.java +++ b/src/jalview/gui/OverviewPanel.java @@ -25,6 +25,7 @@ import jalview.util.Platform; import jalview.viewmodel.OverviewDimensions; import jalview.viewmodel.OverviewDimensionsHideHidden; import jalview.viewmodel.OverviewDimensionsShowHidden; +import jalview.viewmodel.ViewportListenerI; import java.awt.BorderLayout; import java.awt.Dimension; @@ -35,6 +36,7 @@ import java.awt.event.ComponentEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; +import java.beans.PropertyChangeEvent; import javax.swing.JCheckBoxMenuItem; import javax.swing.JPanel; @@ -48,7 +50,8 @@ import javax.swing.SwingUtilities; * @author $author$ * @version $Revision$ */ -public class OverviewPanel extends JPanel implements Runnable +public class OverviewPanel extends JPanel implements Runnable, + ViewportListenerI { private OverviewDimensions od; @@ -77,10 +80,14 @@ public class OverviewPanel extends JPanel implements Runnable (av.isShowAnnotation() && av .getAlignmentConservationAnnotation() != null)); + setSize(od.getWidth(), od.getHeight()); + oviewCanvas = new OverviewCanvas(od, av); setLayout(new BorderLayout()); add(oviewCanvas, BorderLayout.CENTER); + av.getRanges().addPropertyChangeListener(this); + addComponentListener(new ComponentAdapter() { @Override @@ -90,6 +97,7 @@ public class OverviewPanel extends JPanel implements Runnable || (getHeight() != (od.getHeight()))) { updateOverviewImage(); + setBoxPosition(); } } }); @@ -105,7 +113,7 @@ public class OverviewPanel extends JPanel implements Runnable od.updateViewportFromMouse(evt.getX(), evt.getY(), av .getAlignment().getHiddenSequences(), av.getAlignment() .getHiddenColumns()); - ap.setScrollValues(od.getScrollCol(), od.getScrollRow()); + } } }); @@ -127,7 +135,6 @@ public class OverviewPanel extends JPanel implements Runnable od.updateViewportFromMouse(evt.getX(), evt.getY(), av .getAlignment().getHiddenSequences(), av.getAlignment() .getHiddenColumns()); - ap.setScrollValues(od.getScrollCol(), od.getScrollRow()); } } @@ -191,6 +198,7 @@ public class OverviewPanel extends JPanel implements Runnable } oviewCanvas.resetOviewDims(od); updateOverviewImage(); + setBoxPosition(); } /** @@ -232,10 +240,16 @@ public class OverviewPanel extends JPanel implements Runnable * changed * */ - public void setBoxPosition() + private void setBoxPosition() { od.setBoxPosition(av.getAlignment().getHiddenSequences(), av .getAlignment().getHiddenColumns()); repaint(); } + + @Override + public void propertyChange(PropertyChangeEvent evt) + { + setBoxPosition(); + } }