/*\r
* Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
*\r
* This program is free software; you can redistribute it and/or\r
* modify it under the terms of the GNU General Public License\r
scalePanel = new ScalePanel(av, this);\r
idwidthAdjuster = new IdwidthAdjuster(this);\r
annotationPanel = new AnnotationPanel(this);\r
+\r
+ sequenceHolderPanel.add(annotationPanel, BorderLayout.SOUTH);\r
+\r
alabels = new AnnotationLabels(this);\r
\r
setAnnotationVisible(av.showAnnotation);\r
\r
idPanelHolder.add(idPanel, BorderLayout.CENTER);\r
idSpaceFillerPanel1.add(idwidthAdjuster, BorderLayout.CENTER);\r
- annotationScroller.add(annotationPanel);\r
annotationSpaceFillerHolder.add(alabels, BorderLayout.CENTER);\r
scalePanelHolder.add(scalePanel, BorderLayout.CENTER);\r
seqPanelHolder.add(seqPanel, BorderLayout.CENTER);\r
idPanel.idCanvas.setSize(d);\r
\r
hscrollFillerPanel.setSize(d.width, annotationPanel.getSize().height);\r
- annotationScroller.setSize(annotationPanel.getSize());\r
\r
idPanel.idCanvas.setSize(d.width, seqPanel.seqCanvas.getSize().height);\r
annotationSpaceFillerHolder.setSize(d.width,\r
{\r
// set idCanvas bufferedImage to null\r
// to prevent drawing old image\r
- idPanel.idCanvas.image =null;\r
+ idPanel.idCanvas.image = null;\r
FontMetrics fm = getFontMetrics(av.getFont());\r
\r
scalePanel.setSize(new Dimension(10, av.charHeight + fm.getDescent()));\r
idwidthAdjuster.setSize(new Dimension(10, av.charHeight + fm.getDescent()));\r
\r
+ annotationPanel.image = null;\r
int ap = annotationPanel.adjustPanelHeight();\r
annotationPanel.repaint();\r
Dimension d = calculateIdWidth();\r
\r
Dimension calculateIdWidth()\r
{\r
- Frame frame = new Frame();\r
- frame.addNotify();\r
- Graphics g = frame.getGraphics();\r
- if (g == null)\r
+ if (av.nullFrame == null)\r
{\r
- Frame f = new Frame();\r
- f.addNotify();\r
- g = f.getGraphics();\r
+ av.nullFrame = new Frame();\r
+ av.nullFrame.addNotify();\r
}\r
\r
+ Graphics g = av.nullFrame.getGraphics();\r
+\r
FontMetrics fm = g.getFontMetrics(av.font);\r
AlignmentI al = av.getAlignment();\r
\r
i = 0;\r
if (al.getAlignmentAnnotation() != null)\r
{\r
- fm = g.getFontMetrics(frame.getFont());\r
+ fm = g.getFontMetrics(av.nullFrame.getFont());\r
while (i < al.getAlignmentAnnotation().length)\r
{\r
String label = al.getAlignmentAnnotation()[i].label;\r
}\r
else\r
{\r
- int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.\r
- seqCanvas.getSize().width);\r
- if (start < av.getStartRes() || start > (av.getStartRes() + cwidth))\r
- {\r
- vscroll.setValue(start / cwidth);\r
- av.startRes = vscroll.getValue() * cwidth;\r
- }\r
+ scrollToWrappedVisible(start);\r
}\r
}\r
\r
repaint();\r
}\r
\r
+ void scrollToWrappedVisible(int res)\r
+ {\r
+ int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getSize().width);\r
+ if (res <= av.getStartRes() || res >= (av.getStartRes() + cwidth))\r
+ {\r
+ vscroll.setValue(res / cwidth);\r
+ av.startRes = vscroll.getValue() * cwidth;\r
+ }\r
+ }\r
+\r
+\r
public OverviewPanel getOverviewPanel()\r
{\r
return overviewPanel;\r
if (!av.wrapAlignment)\r
{\r
annotationSpaceFillerHolder.setVisible(b);\r
- annotationScroller.setVisible(b);\r
+ annotationPanel.setVisible(b);\r
}\r
validate();\r
repaint();\r
\r
if (wrap)\r
{\r
- annotationScroller.setVisible(false);\r
+ annotationPanel.setVisible(false);\r
annotationSpaceFillerHolder.setVisible(false);\r
}\r
else if (av.showAnnotation)\r
{\r
- annotationScroller.setVisible(true);\r
+ annotationPanel.setVisible(true);\r
annotationSpaceFillerHolder.setVisible(true);\r
}\r
\r
\r
public boolean scrollRight(boolean right)\r
{\r
-\r
if (!right)\r
{\r
if (hscroll.getValue() < 1)\r
\r
public void setScrollValues(int x, int y)\r
{\r
+ int width = av.alignment.getWidth();\r
+ int height = av.alignment.getHeight();\r
+\r
+ if(av.hasHiddenColumns)\r
+ width = av.getColumnSelection().findColumnPosition(width);\r
+\r
av.setStartRes(x);\r
av.setStartSeq(y);\r
- av.setEndRes(x + seqPanel.seqCanvas.getSize().width / av.getCharWidth() - 1);\r
+\r
+ av.setEndRes( (x + (seqPanel.seqCanvas.getSize().width / av.charWidth)) -1);\r
\r
hextent = seqPanel.seqCanvas.getSize().width / av.charWidth;\r
vextent = seqPanel.seqCanvas.getSize().height / av.charHeight;\r
\r
- if (hextent > av.alignment.getWidth())\r
+ if (hextent > width)\r
{\r
- hextent = av.alignment.getWidth();\r
+ hextent = width;\r
}\r
- if (vextent > av.alignment.getHeight())\r
+\r
+ if (vextent > height)\r
{\r
- vextent = av.alignment.getHeight();\r
+ vextent = height;\r
}\r
\r
- if (hextent + x > av.getAlignment().getWidth())\r
+ if ( (hextent + x) > width)\r
{\r
- x = av.getAlignment().getWidth() - hextent;\r
+ x = width - hextent;\r
}\r
\r
- if (vextent + y > av.getAlignment().getHeight())\r
+ if ( (vextent + y) > height)\r
{\r
- y = av.getAlignment().getHeight() - vextent;\r
+ y = height - vextent;\r
}\r
\r
if (y < 0)\r
av.setEndSeq(endSeq);\r
hscroll.setValues(x, hextent, 0, av.getAlignment().getWidth());\r
vscroll.setValues(y, vextent, 0, av.getAlignment().getHeight());\r
+\r
+ if(overviewPanel!=null)\r
+ overviewPanel.setBoxPosition();\r
+\r
}\r
\r
public void adjustmentValueChanged(AdjustmentEvent evt)\r
\r
if (av.getWrapAlignment())\r
{\r
- int max = av.alignment.getWidth() /\r
- seqPanel.seqCanvas.\r
- getWrappedCanvasWidth(seqPanel.seqCanvas.getSize().width) +1;\r
+ int maxwidth = av.alignment.getWidth();\r
+\r
+ if (av.hasHiddenColumns)\r
+ maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;\r
+\r
+ int max = maxwidth /\r
+ seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getSize().width) +\r
+ 1;\r
+\r
vscroll.setMaximum(max);\r
vscroll.setUnitIncrement(1);\r
vscroll.setVisibleAmount(1);\r
BorderLayout borderLayout10 = new BorderLayout();\r
protected Panel hscrollFillerPanel = new Panel();\r
BorderLayout borderLayout11 = new BorderLayout();\r
- public Panel annotationScroller = new Panel();\r
BorderLayout borderLayout4 = new BorderLayout();\r
BorderLayout borderLayout2 = new BorderLayout();\r
\r
// this.setPreferredSize(new Dimension(220, 166));\r
seqPanelHolder.setBackground(Color.white);\r
idPanelHolder.setBackground(Color.white);\r
- annotationScroller.setLayout(borderLayout2);\r
sequenceHolderPanel.add(scalePanelHolder, BorderLayout.NORTH);\r
sequenceHolderPanel.add(seqPanelHolder, BorderLayout.CENTER);\r
seqPanelHolder.add(vscroll, BorderLayout.EAST);\r
- sequenceHolderPanel.add(annotationScroller, BorderLayout.SOUTH);\r
\r
// Panel3.add(secondaryPanelHolder, BorderLayout.SOUTH);\r
this.add(idPanelHolder, BorderLayout.WEST);\r
git://source.jalview.org / jalview.git / blobdiff