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.adjustPanelHeight();\r
+ annotationPanel.image = null;\r
+ int ap = annotationPanel.adjustPanelHeight();\r
annotationPanel.repaint();\r
Dimension d = calculateIdWidth();\r
d.setSize(d.width + 4, seqPanel.seqCanvas.getSize().height);\r
+ alabels.setSize(d.width+4, ap );\r
idPanel.idCanvas.setSize(d);\r
hscrollFillerPanel.setSize(d);\r
\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
return new Dimension(idWidth, idPanel.idCanvas.getSize().height);\r
}\r
\r
- public void highlightSearchResults(int[] results)\r
+ public void highlightSearchResults(SearchResults results)\r
{\r
seqPanel.seqCanvas.highlightSearchResults(results);\r
\r
- // do we need to scroll the panel?\r
+ // do we need to scroll the panel?\r
if (results != null)\r
{\r
- SequenceI seq = av.alignment.getSequenceAt(results[0]);\r
- int start = seq.findIndex(results[1]) - 1;\r
- int end = seq.findIndex(results[2]) - 1;\r
+ SequenceI seq = results.getResultSequence(0);\r
+ int seqIndex = av.alignment.findIndex(seq);\r
+ int start = seq.findIndex(results.getResultStart(0)) - 1;\r
+ int end = seq.findIndex(results.getResultEnd(0)) - 1;\r
\r
- if(!av.wrapAlignment)\r
- {\r
- if ( (av.getStartRes() > start) || (av.getEndRes() < end) ||\r
- ( (av.getStartSeq() > results[0]) ||\r
- (av.getEndSeq() < results[0])))\r
+ if(!av.wrapAlignment)\r
{\r
- int newy = results[0];\r
- if(start > av.alignment.getWidth() - hextent)\r
+ if ( (av.getStartRes() > end) || (av.getEndRes() < start) ||\r
+ ( (av.getStartSeq() > seqIndex) || (av.getEndSeq() < seqIndex)))\r
{\r
- start = av.alignment.getWidth() - hextent;\r
- if(start<0)\r
- start = 0;\r
+ if (start > av.alignment.getWidth() - hextent)\r
+ {\r
+ start = av.alignment.getWidth() - hextent;\r
+ if (start < 0)\r
+ start = 0;\r
+ }\r
+ if (seqIndex > av.alignment.getHeight() - vextent)\r
+ {\r
+ seqIndex = av.alignment.getHeight() - vextent;\r
+ if (seqIndex < 0)\r
+ seqIndex = 0;\r
+ }\r
+ setScrollValues(start, seqIndex);\r
}\r
- if(newy > av.alignment.getHeight() - vextent)\r
- {\r
- newy = av.alignment.getHeight() - vextent;\r
- if(newy<0)\r
- newy = 0;\r
- }\r
- setScrollValues(start, newy);\r
}\r
- }\r
- else\r
- {\r
- int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getSize().width);\r
- if( start<av.getStartRes() || start>(av.getStartRes()+cwidth) )\r
+ else\r
{\r
-\r
- vscroll.setValue(start / cwidth);\r
- av.startRes = vscroll.getValue() * cwidth;\r
+ scrollToWrappedVisible(start);\r
}\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
return false;\r
}\r
- fastPaint = false;\r
- vscroll.setValue(vscroll.getValue() - 1);\r
+ setScrollValues(hscroll.getValue(), vscroll.getValue()-1);\r
}\r
else\r
{\r
{\r
return false;\r
}\r
- fastPaint = false;\r
- vscroll.setValue(vscroll.getValue() + 1);\r
+ setScrollValues(hscroll.getValue(), vscroll.getValue()+1);\r
}\r
- fastPaint = true;\r
+\r
+ repaint();\r
return true;\r
}\r
\r
public boolean scrollRight(boolean right)\r
{\r
-\r
- if (right)\r
+ if (!right)\r
{\r
if (hscroll.getValue() < 1)\r
{\r
return false;\r
}\r
- fastPaint = false;\r
- hscroll.setValue(hscroll.getValue() - 1);\r
+ setScrollValues(hscroll.getValue()-1, vscroll.getValue());\r
}\r
else\r
{\r
{\r
return false;\r
}\r
- fastPaint = false;\r
- hscroll.setValue(hscroll.getValue() + 1);\r
+ setScrollValues(hscroll.getValue()+1, vscroll.getValue());\r
}\r
- fastPaint = true;\r
+\r
+ repaint();\r
return true;\r
}\r
\r
public void setScrollValues(int x, int y)\r
{\r
-\r
av.setStartRes(x);\r
av.setStartSeq(y);\r
av.setEndRes(x + seqPanel.seqCanvas.getSize().width / av.getCharWidth() - 1);\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
public void adjustmentValueChanged(AdjustmentEvent evt)\r
int oldX = av.getStartRes();\r
int oldY = av.getStartSeq();\r
\r
+\r
if (evt==null || evt.getSource() == hscroll)\r
{\r
int x = hscroll.getValue();\r
1);\r
}\r
\r
+\r
if (evt==null || evt.getSource() == vscroll)\r
{\r
int offy = vscroll.getValue();\r
{\r
repaint();\r
}\r
- else if(!seqPanel.seqCanvas.fastPaint)\r
+ else\r
{\r
// Make sure we're not trying to draw a panel\r
// larger than the visible window\r
if(scrollX>av.endRes-av.startRes)\r
- scrollX = av.endRes-av.startRes;\r
+ {\r
+ scrollX = av.endRes - av.startRes;\r
+ }\r
else if(scrollX<av.startRes-av.endRes)\r
scrollX = av.startRes - av.endRes;\r
\r
\r
public void paint(Graphics g)\r
{\r
+ invalidate();\r
Dimension d = idPanel.idCanvas.getSize();\r
idPanel.idCanvas.setSize(d.width, seqPanel.seqCanvas.getSize().height);\r
annotationSpaceFillerHolder.setSize(d.width,\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