X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FOverviewPanel.java;h=b3c4a37ffb7e0eea6fbee6ebf4848d0b77e0b166;hb=45fa2a2d8465e302f895576a4c841578d2209cda;hp=c1b5f9cf8d377cabca147dc742b016686397d0f3;hpb=1dff9688cc5ebc8f0a409806c911756a4d80ce52;p=jalview.git diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java index c1b5f9c..b3c4a37 100755 --- a/src/jalview/appletgui/OverviewPanel.java +++ b/src/jalview/appletgui/OverviewPanel.java @@ -20,19 +20,23 @@ */ package jalview.appletgui; -import jalview.datamodel.SequenceI; -import jalview.renderer.seqfeatures.FeatureColourFinder; +import jalview.util.MessageManager; +import jalview.util.Platform; import jalview.viewmodel.OverviewDimensions; +import jalview.viewmodel.OverviewDimensionsHideHidden; +import jalview.viewmodel.OverviewDimensionsShowHidden; import jalview.viewmodel.ViewportListenerI; -import java.awt.Color; +import java.awt.BorderLayout; +import java.awt.CheckboxMenuItem; import java.awt.Dimension; -import java.awt.Frame; -import java.awt.Graphics; -import java.awt.Image; import java.awt.Panel; +import java.awt.PopupMenu; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; +import java.awt.event.InputEvent; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; @@ -43,45 +47,29 @@ public class OverviewPanel extends Panel implements Runnable, { private OverviewDimensions od; - private Image miniMe; - - private Image offscreen; + private OverviewCanvas oviewCanvas; private AlignViewport av; private AlignmentPanel ap; - private boolean resizing = false; - - // This is set true if the user resizes whilst - // the overview is being calculated - private boolean resizeAgain = false; - - // Can set different properties in this seqCanvas than - // main visible SeqCanvas - private SequenceRenderer sr; - - private FeatureRenderer fr; + private boolean showHidden = true; - private Frame nullFrame; + private boolean updateRunning = false; public OverviewPanel(AlignmentPanel alPanel) { this.av = alPanel.av; this.ap = alPanel; setLayout(null); - nullFrame = new Frame(); - nullFrame.addNotify(); - sr = new SequenceRenderer(av); - sr.graphics = nullFrame.getGraphics(); - sr.renderGaps = false; - sr.forOverview = true; - fr = new FeatureRenderer(av); - - od = new OverviewDimensions(av.getRanges(), + od = new OverviewDimensionsShowHidden(av.getRanges(), (av.isShowAnnotation() && av.getSequenceConsensusHash() != null)); + oviewCanvas = new OverviewCanvas(od, av); + setLayout(new BorderLayout()); + add(oviewCanvas, BorderLayout.CENTER); + setSize(new Dimension(od.getWidth(), od.getHeight())); av.getRanges().addPropertyChangeListener(this); @@ -121,6 +109,10 @@ public class OverviewPanel extends Panel implements Runnable, @Override public void mouseClicked(MouseEvent evt) { + if ((evt.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK) + { + showPopupMenu(evt); + } } @Override @@ -148,10 +140,19 @@ public class OverviewPanel extends Panel implements Runnable, private void mouseAction(MouseEvent evt) { - od.updateViewportFromMouse(evt.getX(), evt.getY(), av.getAlignment() - .getHiddenSequences(), av.getColumnSelection(), av - .getRanges()); - ap.paintAlignment(false); + if ((evt.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK) + { + if (!Platform.isAMac()) + { + showPopupMenu(evt); + } + } + else + { + od.updateViewportFromMouse(evt.getX(), evt.getY(), av.getAlignment() + .getHiddenSequences(), av.getAlignment().getHiddenColumns()); + ap.paintAlignment(false); + } } /** @@ -159,19 +160,6 @@ public class OverviewPanel extends Panel implements Runnable, */ public void updateOverviewImage() { - if (resizing) - { - resizeAgain = true; - return; - } - - if (av.isShowSequenceFeatures()) - { - fr.transferSettings(ap.seqPanel.seqCanvas.fr); - } - - resizing = true; - if ((getSize().width > 0) && (getSize().height > 0)) { od.setWidth(getSize().width); @@ -179,156 +167,30 @@ public class OverviewPanel extends Panel implements Runnable, } setSize(new Dimension(od.getWidth(), od.getHeight())); + synchronized (this) + { + if (updateRunning) + { + oviewCanvas.restartDraw(); + return; + } + + updateRunning = true; + } Thread thread = new Thread(this); thread.start(); repaint(); + updateRunning = false; } @Override public void run() { - miniMe = null; - - if (av.isShowSequenceFeatures()) - { - fr.transferSettings(ap.seqPanel.seqCanvas.getFeatureRenderer()); - } - - if (getSize().width > 0 && getSize().height > 0) - { - od.setWidth(getSize().width); - od.setHeight(getSize().height); - } - - setSize(new Dimension(od.getWidth(), od.getHeight())); - - miniMe = nullFrame.createImage(od.getWidth(), od.getHeight()); - offscreen = nullFrame.createImage(od.getWidth(), od.getHeight()); - - Graphics mg = miniMe.getGraphics(); - - int alwidth = av.getAlignment().getWidth(); - int alheight = av.getAlignment().getAbsoluteHeight(); - float sampleCol = alwidth / (float) od.getWidth(); - float sampleRow = alheight / (float) od.getSequencesHeight(); - - buildImage(sampleRow, sampleCol, mg); - - // check for conservation annotation to make sure overview works for DNA too - if (av.isShowAnnotation() - && (av.getAlignmentConservationAnnotation() != null)) - { - for (int col = 0; col < od.getWidth() && !resizeAgain; col++) - { - mg.translate(col, od.getSequencesHeight()); - ap.annotationPanel.renderer.drawGraph(mg, - av.getAlignmentConservationAnnotation(), - av.getAlignmentConservationAnnotation().annotations, - (int) (sampleCol) + 1, od.getGraphHeight(), - (int) (col * sampleCol), (int) (col * sampleCol) + 1); - mg.translate(-col, -od.getSequencesHeight()); - } - } - System.gc(); - - resizing = false; - + oviewCanvas.draw(av.isShowSequenceFeatures(), + (av.isShowAnnotation() && av + .getAlignmentConservationAnnotation() != null), + ap.seqPanel.seqCanvas.getFeatureRenderer()); setBoxPosition(); - - if (resizeAgain) - { - resizeAgain = false; - updateOverviewImage(); - } - } - - /* - * Build the overview panel image - */ - private void buildImage(float sampleRow, float sampleCol, Graphics mg) - { - int lastcol = 0; - int lastrow = 0; - int xstart = 0; - int ystart = 0; - Color color = Color.yellow; - int sameRow = 0; - int sameCol = 0; - - SequenceI seq = null; - FeatureColourFinder finder = new FeatureColourFinder(fr); - - final boolean hasHiddenCols = av.hasHiddenColumns(); - boolean hiddenRow = false; - - for (int row = 0; row <= od.getSequencesHeight() && !resizeAgain; row++) - { - if ((int) (row * sampleRow) == lastrow) - { - sameRow++; - } - else - { - // get the sequence which would be at alignment index 'lastrow' if no - // columns were hidden, and determine whether it is hidden or not - hiddenRow = av.getAlignment().isHidden(lastrow); - seq = av.getAlignment().getSequenceAtAbsoluteIndex(lastrow); - - for (int col = 0; col < od.getWidth(); col++) - { - if ((int) (col * sampleCol) == lastcol - && (int) (row * sampleRow) == lastrow) - { - sameCol++; - } - else - { - lastcol = (int) (col * sampleCol); - - color = getColumnColourFromSequence(seq, hiddenRow, - hasHiddenCols, lastcol, finder); - - mg.setColor(color); - if (sameCol == 1 && sameRow == 1) - { - mg.drawLine(xstart, ystart, xstart, ystart); - } - else - { - mg.fillRect(xstart, ystart, sameCol, sameRow); - } - - xstart = col; - sameCol = 1; - } - } - lastrow = (int) (row * sampleRow); - ystart = row; - sameRow = 1; - } - } - } - - /* - * Find the colour of a sequence at a specified column position - */ - private Color getColumnColourFromSequence( - jalview.datamodel.SequenceI seq, boolean hiddenRow, - boolean hasHiddenCols, int lastcol, FeatureColourFinder finder) - { - Color color = Color.white; - if (seq.getLength() > lastcol) - { - color = sr.getResidueColour(seq, lastcol, finder); - } - - if (hiddenRow - || (hasHiddenCols && !av.getColumnSelection() - .isVisible(lastcol))) - { - color = color.darker().darker(); - } - return color; } /** @@ -339,27 +201,32 @@ public class OverviewPanel extends Panel implements Runnable, private void setBoxPosition() { od.setBoxPosition(av.getAlignment() - .getHiddenSequences(), av.getColumnSelection(), av.getRanges()); +.getHiddenSequences(), av + .getAlignment().getHiddenColumns()); repaint(); } - @Override - public void update(Graphics g) - { - paint(g); - } - - @Override - public void paint(Graphics g) + /* + * Displays the popup menu and acts on user input + */ + private void showPopupMenu(MouseEvent e) { - Graphics og = offscreen.getGraphics(); - if (miniMe != null) + PopupMenu popup = new PopupMenu(); + ItemListener menuListener = new ItemListener() { - og.drawImage(miniMe, 0, 0, this); - og.setColor(Color.red); - od.drawBox(og); - g.drawImage(offscreen, 0, 0, this); - } + @Override + public void itemStateChanged(ItemEvent e) + { + toggleHiddenColumns(); + } + }; + CheckboxMenuItem item = new CheckboxMenuItem( + MessageManager.getString("label.togglehidden")); + item.setState(showHidden); + popup.add(item); + item.addItemListener(menuListener); + this.add(popup); + popup.show(this, e.getX(), e.getY()); } @Override @@ -368,4 +235,26 @@ public class OverviewPanel extends Panel implements Runnable, setBoxPosition(); } + /* + * Toggle overview display between showing hidden columns and hiding hidden columns + */ + private void toggleHiddenColumns() + { + if (showHidden) + { + showHidden = false; + od = new OverviewDimensionsHideHidden(av.getRanges(), + (av.isShowAnnotation() && av + .getAlignmentConservationAnnotation() != null)); + } + else + { + showHidden = true; + od = new OverviewDimensionsShowHidden(av.getRanges(), + (av.isShowAnnotation() && av + .getAlignmentConservationAnnotation() != null)); + } + oviewCanvas.resetOviewDims(od); + updateOverviewImage(); + } }