git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2600 Tidies
[jalview.git]
/
src
/
jalview
/
gui
/
OverviewPanel.java
diff --git
a/src/jalview/gui/OverviewPanel.java
b/src/jalview/gui/OverviewPanel.java
index
408eca6
..
3fa674e
100755
(executable)
--- a/
src/jalview/gui/OverviewPanel.java
+++ b/
src/jalview/gui/OverviewPanel.java
@@
-23,8
+23,9
@@
package jalview.gui;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.viewmodel.OverviewDimensions;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.viewmodel.OverviewDimensions;
-import jalview.viewmodel.OverviewDimensionsAllVisible;
-import jalview.viewmodel.OverviewDimensionsWithHidden;
+import jalview.viewmodel.OverviewDimensionsHideHidden;
+import jalview.viewmodel.OverviewDimensionsShowHidden;
+import jalview.viewmodel.ViewportListenerI;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.BorderLayout;
import java.awt.Dimension;
@@
-35,8
+36,9
@@
import java.awt.event.ComponentEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionAdapter;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionAdapter;
+import java.beans.PropertyChangeEvent;
-import javax.swing.JMenuItem;
+import javax.swing.JCheckBoxMenuItem;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.SwingUtilities;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.SwingUtilities;
@@
-48,7
+50,8
@@
import javax.swing.SwingUtilities;
* @author $author$
* @version $Revision$
*/
* @author $author$
* @version $Revision$
*/
-public class OverviewPanel extends JPanel implements Runnable
+public class OverviewPanel extends JPanel implements Runnable,
+ ViewportListenerI
{
private OverviewDimensions od;
{
private OverviewDimensions od;
@@
-58,6
+61,8
@@
public class OverviewPanel extends JPanel implements Runnable
private AlignmentPanel ap;
private AlignmentPanel ap;
+ private JCheckBoxMenuItem displayToggle;
+
private boolean showHidden = true;
/**
private boolean showHidden = true;
/**
@@
-71,14
+76,18
@@
public class OverviewPanel extends JPanel implements Runnable
this.av = alPanel.av;
this.ap = alPanel;
this.av = alPanel.av;
this.ap = alPanel;
- od = new OverviewDimensionsWithHidden(av.getRanges(),
+ od = new OverviewDimensionsShowHidden(av.getRanges(),
(av.isShowAnnotation() && av
.getAlignmentConservationAnnotation() != null));
(av.isShowAnnotation() && av
.getAlignmentConservationAnnotation() != null));
+ setSize(od.getWidth(), od.getHeight());
+
oviewCanvas = new OverviewCanvas(od, av);
setLayout(new BorderLayout());
add(oviewCanvas, BorderLayout.CENTER);
oviewCanvas = new OverviewCanvas(od, av);
setLayout(new BorderLayout());
add(oviewCanvas, BorderLayout.CENTER);
+ av.getRanges().addPropertyChangeListener(this);
+
addComponentListener(new ComponentAdapter()
{
@Override
addComponentListener(new ComponentAdapter()
{
@Override
@@
-88,6
+97,7
@@
public class OverviewPanel extends JPanel implements Runnable
|| (getHeight() != (od.getHeight())))
{
updateOverviewImage();
|| (getHeight() != (od.getHeight())))
{
updateOverviewImage();
+ setBoxPosition();
}
}
});
}
}
});
@@
-102,8
+112,8
@@
public class OverviewPanel extends JPanel implements Runnable
{
od.updateViewportFromMouse(evt.getX(), evt.getY(), av
.getAlignment().getHiddenSequences(), av.getAlignment()
{
od.updateViewportFromMouse(evt.getX(), evt.getY(), av
.getAlignment().getHiddenSequences(), av.getAlignment()
- .getHiddenColumns(), av.getRanges());
- ap.setScrollValues(od.getScrollCol(), od.getScrollRow());
+ .getHiddenColumns());
+
}
}
});
}
}
});
@@
-124,8
+134,7
@@
public class OverviewPanel extends JPanel implements Runnable
{
od.updateViewportFromMouse(evt.getX(), evt.getY(), av
.getAlignment().getHiddenSequences(), av.getAlignment()
{
od.updateViewportFromMouse(evt.getX(), evt.getY(), av
.getAlignment().getHiddenSequences(), av.getAlignment()
- .getHiddenColumns(), av.getRanges());
- ap.setScrollValues(od.getScrollCol(), od.getScrollRow());
+ .getHiddenColumns());
}
}
}
}
@@
-156,12
+165,15
@@
public class OverviewPanel extends JPanel implements Runnable
{
// switch on/off the hidden columns view
toggleHiddenColumns();
{
// switch on/off the hidden columns view
toggleHiddenColumns();
+ displayToggle.setSelected(showHidden);
}
};
}
};
- JMenuItem item = new JMenuItem(
+ displayToggle = new JCheckBoxMenuItem(
MessageManager.getString("label.togglehidden"));
MessageManager.getString("label.togglehidden"));
- popup.add(item);
- item.addActionListener(menuListener);
+ displayToggle.setEnabled(true);
+ displayToggle.setSelected(showHidden);
+ popup.add(displayToggle);
+ displayToggle.addActionListener(menuListener);
popup.show(this, e.getX(), e.getY());
}
popup.show(this, e.getX(), e.getY());
}
@@
-173,19
+185,20
@@
public class OverviewPanel extends JPanel implements Runnable
if (showHidden)
{
showHidden = false;
if (showHidden)
{
showHidden = false;
- od = new OverviewDimensionsAllVisible(av.getRanges(),
+ od = new OverviewDimensionsHideHidden(av.getRanges(),
(av.isShowAnnotation() && av
.getAlignmentConservationAnnotation() != null));
}
else
{
showHidden = true;
(av.isShowAnnotation() && av
.getAlignmentConservationAnnotation() != null));
}
else
{
showHidden = true;
- od = new OverviewDimensionsWithHidden(av.getRanges(),
+ od = new OverviewDimensionsShowHidden(av.getRanges(),
(av.isShowAnnotation() && av
.getAlignmentConservationAnnotation() != null));
}
oviewCanvas.resetOviewDims(od);
updateOverviewImage();
(av.isShowAnnotation() && av
.getAlignmentConservationAnnotation() != null));
}
oviewCanvas.resetOviewDims(od);
updateOverviewImage();
+ setBoxPosition();
}
/**
}
/**
@@
-198,7
+211,7
@@
public class OverviewPanel extends JPanel implements Runnable
od.setWidth(getWidth());
od.setHeight(getHeight());
}
od.setWidth(getWidth());
od.setHeight(getHeight());
}
-
+
setPreferredSize(new Dimension(od.getWidth(), od.getHeight()));
if (oviewCanvas.restartDraw())
setPreferredSize(new Dimension(od.getWidth(), od.getHeight()));
if (oviewCanvas.restartDraw())
@@
-227,11
+240,16
@@
public class OverviewPanel extends JPanel implements Runnable
* changed
*
*/
* changed
*
*/
- public void setBoxPosition()
+ private void setBoxPosition()
{
{
- od.setBoxPosition(av.getAlignment()
-.getHiddenSequences(), av
- .getAlignment().getHiddenColumns(), av.getRanges());
+ od.setBoxPosition(av.getAlignment().getHiddenSequences(), av
+ .getAlignment().getHiddenColumns());
repaint();
}
repaint();
}
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt)
+ {
+ setBoxPosition();
+ }
}
}