X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FAlignmentPanel.java;h=bcdffa095f04cd590a4f0aa227c7f33e81cbf84f;hb=f4fd7b0e74572c8fddbfe9e3e55bc624f8ba0c6a;hp=e0c327f769e17409f8dbf9f3df67102b55bc068a;hpb=49057b644ae4dc904a3245b695ba86678ac01ede;p=jalview.git diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java index e0c327f..bcdffa0 100755 --- a/src/jalview/appletgui/AlignmentPanel.java +++ b/src/jalview/appletgui/AlignmentPanel.java @@ -1,6 +1,6 @@ /* * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -40,7 +40,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener // this value is set false when selection area being dragged boolean fastPaint = true; - boolean MAC = false; + public AlignmentPanel(AlignFrame af, final AlignViewport av) { @@ -53,8 +53,6 @@ public class AlignmentPanel extends Panel implements AdjustmentListener e.printStackTrace(); } - if(System.getProperty("os.name").startsWith("Mac")) - MAC = true; alignFrame = af; this.av = av; @@ -63,13 +61,15 @@ public class AlignmentPanel extends Panel implements AdjustmentListener scalePanel = new ScalePanel(av, this); idwidthAdjuster = new IdwidthAdjuster(this); annotationPanel = new AnnotationPanel(this); + + sequenceHolderPanel.add(annotationPanel, BorderLayout.SOUTH); + alabels = new AnnotationLabels(this); setAnnotationVisible(av.showAnnotation); idPanelHolder.add(idPanel, BorderLayout.CENTER); idSpaceFillerPanel1.add(idwidthAdjuster, BorderLayout.CENTER); - annotationScroller.add(annotationPanel); annotationSpaceFillerHolder.add(alabels, BorderLayout.CENTER); scalePanelHolder.add(scalePanel, BorderLayout.CENTER); seqPanelHolder.add(seqPanel, BorderLayout.CENTER); @@ -93,7 +93,6 @@ public class AlignmentPanel extends Panel implements AdjustmentListener idPanel.idCanvas.setSize(d); hscrollFillerPanel.setSize(d.width, annotationPanel.getSize().height); - annotationScroller.setSize(annotationPanel.getSize()); idPanel.idCanvas.setSize(d.width, seqPanel.seqCanvas.getSize().height); annotationSpaceFillerHolder.setSize(d.width, @@ -107,12 +106,13 @@ public class AlignmentPanel extends Panel implements AdjustmentListener { // set idCanvas bufferedImage to null // to prevent drawing old image - idPanel.idCanvas.image =null; + idPanel.idCanvas.image = null; FontMetrics fm = getFontMetrics(av.getFont()); scalePanel.setSize(new Dimension(10, av.charHeight + fm.getDescent())); idwidthAdjuster.setSize(new Dimension(10, av.charHeight + fm.getDescent())); + annotationPanel.image = null; int ap = annotationPanel.adjustPanelHeight(); annotationPanel.repaint(); Dimension d = calculateIdWidth(); @@ -138,16 +138,14 @@ public class AlignmentPanel extends Panel implements AdjustmentListener Dimension calculateIdWidth() { - Frame frame = new Frame(); - frame.addNotify(); - Graphics g = frame.getGraphics(); - if (g == null) + if (av.nullFrame == null) { - Frame f = new Frame(); - f.addNotify(); - g = f.getGraphics(); + av.nullFrame = new Frame(); + av.nullFrame.addNotify(); } + Graphics g = av.nullFrame.getGraphics(); + FontMetrics fm = g.getFontMetrics(av.font); AlignmentI al = av.getAlignment(); @@ -170,7 +168,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener i = 0; if (al.getAlignmentAnnotation() != null) { - fm = g.getFontMetrics(frame.getFont()); + fm = g.getFontMetrics(av.nullFrame.getFont()); while (i < al.getAlignmentAnnotation().length) { String label = al.getAlignmentAnnotation()[i].label; @@ -219,19 +217,24 @@ public class AlignmentPanel extends Panel implements AdjustmentListener } else { - int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel. - seqCanvas.getSize().width); - if (start < av.getStartRes() || start > (av.getStartRes() + cwidth)) - { - vscroll.setValue(start / cwidth); - av.startRes = vscroll.getValue() * cwidth; - } + scrollToWrappedVisible(start); } } repaint(); } + void scrollToWrappedVisible(int res) + { + int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getSize().width); + if (res <= av.getStartRes() || res >= (av.getStartRes() + cwidth)) + { + vscroll.setValue(res / cwidth); + av.startRes = vscroll.getValue() * cwidth; + } + } + + public OverviewPanel getOverviewPanel() { return overviewPanel; @@ -247,7 +250,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener if (!av.wrapAlignment) { annotationSpaceFillerHolder.setVisible(b); - annotationScroller.setVisible(b); + annotationPanel.setVisible(b); } validate(); repaint(); @@ -264,12 +267,12 @@ public class AlignmentPanel extends Panel implements AdjustmentListener if (wrap) { - annotationScroller.setVisible(false); + annotationPanel.setVisible(false); annotationSpaceFillerHolder.setVisible(false); } else if (av.showAnnotation) { - annotationScroller.setVisible(true); + annotationPanel.setVisible(true); annotationSpaceFillerHolder.setVisible(true); } @@ -306,14 +309,14 @@ public class AlignmentPanel extends Panel implements AdjustmentListener } setScrollValues(hscroll.getValue(), vscroll.getValue()+1); } + repaint(); return true; } public boolean scrollRight(boolean right) { - - if (right) + if (!right) { if (hscroll.getValue() < 1) { @@ -336,30 +339,38 @@ public class AlignmentPanel extends Panel implements AdjustmentListener public void setScrollValues(int x, int y) { + int width = av.alignment.getWidth(); + int height = av.alignment.getHeight(); + + if(av.hasHiddenColumns) + width = av.getColumnSelection().findColumnPosition(width); + av.setStartRes(x); av.setStartSeq(y); - av.setEndRes(x + seqPanel.seqCanvas.getSize().width / av.getCharWidth() - 1); + + av.setEndRes( (x + (seqPanel.seqCanvas.getSize().width / av.charWidth)) -1); hextent = seqPanel.seqCanvas.getSize().width / av.charWidth; vextent = seqPanel.seqCanvas.getSize().height / av.charHeight; - if (hextent > av.alignment.getWidth()) + if (hextent > width) { - hextent = av.alignment.getWidth(); + hextent = width; } - if (vextent > av.alignment.getHeight()) + + if (vextent > height) { - vextent = av.alignment.getHeight(); + vextent = height; } - if (hextent + x > av.getAlignment().getWidth()) + if ( (hextent + x) > width) { - x = av.getAlignment().getWidth() - hextent; + x = width - hextent; } - if (vextent + y > av.getAlignment().getHeight()) + if ( (vextent + y) > height) { - y = av.getAlignment().getHeight() - vextent; + y = height - vextent; } if (y < 0) @@ -381,6 +392,10 @@ public class AlignmentPanel extends Panel implements AdjustmentListener av.setEndSeq(endSeq); hscroll.setValues(x, hextent, 0, av.getAlignment().getWidth()); vscroll.setValues(y, vextent, 0, av.getAlignment().getHeight()); + + if(overviewPanel!=null) + overviewPanel.setBoxPosition(); + } public void adjustmentValueChanged(AdjustmentEvent evt) @@ -424,7 +439,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener int scrollX = av.startRes - oldX; int scrollY = av.startSeq - oldY; - if (av.getWrapAlignment() || !fastPaint || MAC) + if (av.getWrapAlignment() || !fastPaint || av.MAC) { repaint(); } @@ -469,9 +484,15 @@ public class AlignmentPanel extends Panel implements AdjustmentListener if (av.getWrapAlignment()) { - int max = av.alignment.getWidth() / - seqPanel.seqCanvas. - getWrappedCanvasWidth(seqPanel.seqCanvas.getSize().width) +1; + int maxwidth = av.alignment.getWidth(); + + if (av.hasHiddenColumns) + maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1; + + int max = maxwidth / + seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getSize().width) + + 1; + vscroll.setMaximum(max); vscroll.setUnitIncrement(1); vscroll.setVisibleAmount(1); @@ -513,7 +534,6 @@ public class AlignmentPanel extends Panel implements AdjustmentListener BorderLayout borderLayout10 = new BorderLayout(); protected Panel hscrollFillerPanel = new Panel(); BorderLayout borderLayout11 = new BorderLayout(); - public Panel annotationScroller = new Panel(); BorderLayout borderLayout4 = new BorderLayout(); BorderLayout borderLayout2 = new BorderLayout(); @@ -548,11 +568,9 @@ public class AlignmentPanel extends Panel implements AdjustmentListener // this.setPreferredSize(new Dimension(220, 166)); seqPanelHolder.setBackground(Color.white); idPanelHolder.setBackground(Color.white); - annotationScroller.setLayout(borderLayout2); sequenceHolderPanel.add(scalePanelHolder, BorderLayout.NORTH); sequenceHolderPanel.add(seqPanelHolder, BorderLayout.CENTER); seqPanelHolder.add(vscroll, BorderLayout.EAST); - sequenceHolderPanel.add(annotationScroller, BorderLayout.SOUTH); // Panel3.add(secondaryPanelHolder, BorderLayout.SOUTH); this.add(idPanelHolder, BorderLayout.WEST);