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.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;
* @author $author$
* @version $Revision$
*/
-public class OverviewPanel extends JPanel implements Runnable
+public class OverviewPanel extends JPanel implements Runnable,
+ ViewportListenerI
{
private OverviewDimensions od;
private AlignmentPanel ap;
+ private JCheckBoxMenuItem displayToggle;
+
private boolean showHidden = true;
/**
this.av = alPanel.av;
this.ap = alPanel;
- od = new OverviewDimensionsWithHidden(av.getRanges(),
+ od = new OverviewDimensionsShowHidden(av.getRanges(),
(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
|| (getHeight() != (od.getHeight())))
{
updateOverviewImage();
+ setBoxPosition();
}
}
});
@Override
public void mouseDragged(MouseEvent evt)
{
- if (!SwingUtilities.isRightMouseButton(evt)
- && !av.getWrapAlignment())
+ if (!SwingUtilities.isRightMouseButton(evt))
{
od.updateViewportFromMouse(evt.getX(), evt.getY(), av
- .getAlignment().getHiddenSequences(), av
- .getColumnSelection(), av.getRanges());
- ap.setScrollValues(od.getScrollCol(), od.getScrollRow());
+ .getAlignment().getHiddenSequences(), av.getAlignment()
+ .getHiddenColumns());
}
}
});
showPopupMenu(evt);
}
}
- else if (!av.getWrapAlignment())
+ else
+ // if (!av.getWrapAlignment())
{
od.updateViewportFromMouse(evt.getX(), evt.getY(), av
- .getAlignment().getHiddenSequences(), av
- .getColumnSelection(), av.getRanges());
- ap.setScrollValues(od.getScrollCol(), od.getScrollRow());
+ .getAlignment().getHiddenSequences(), av.getAlignment()
+ .getHiddenColumns());
}
}
{
// switch on/off the hidden columns view
toggleHiddenColumns();
+ displayToggle.setSelected(showHidden);
}
};
- JMenuItem item;
- popup.add(item = new JMenuItem(MessageManager
- .getString("label.togglehidden")));
- item.addActionListener(menuListener);
+ displayToggle = new JCheckBoxMenuItem(
+ MessageManager.getString("label.togglehidden"));
+ displayToggle.setEnabled(true);
+ displayToggle.setSelected(showHidden);
+ popup.add(displayToggle);
+ displayToggle.addActionListener(menuListener);
popup.show(this, e.getX(), e.getY());
}
+ /*
+ * Toggle overview display between showing hidden columns and hiding hidden columns
+ */
private void toggleHiddenColumns()
{
if (showHidden)
{
showHidden = false;
- od = new OverviewDimensionsAllVisible(av.getRanges(),
+ od = new OverviewDimensionsHideHidden(av.getRanges(),
(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();
+ setBoxPosition();
}
/**
od.setWidth(getWidth());
od.setHeight(getHeight());
}
-
+
setPreferredSize(new Dimension(od.getWidth(), od.getHeight()));
if (oviewCanvas.restartDraw())
* changed
*
*/
- public void setBoxPosition()
+ private void setBoxPosition()
{
- od.setBoxPosition(av.getAlignment()
- .getHiddenSequences(), av.getColumnSelection(), av.getRanges());
+ od.setBoxPosition(av.getAlignment().getHiddenSequences(), av
+ .getAlignment().getHiddenColumns());
repaint();
}
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt)
+ {
+ setBoxPosition();
+ }
}