git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/merge/JAL-845_JAL-1640' into
[jalview.git]
/
src
/
jalview
/
appletgui
/
AlignmentPanel.java
diff --git
a/src/jalview/appletgui/AlignmentPanel.java
b/src/jalview/appletgui/AlignmentPanel.java
index
5308a42
..
61e8f12
100644
(file)
--- a/
src/jalview/appletgui/AlignmentPanel.java
+++ b/
src/jalview/appletgui/AlignmentPanel.java
@@
-20,6
+20,7
@@
*/
package jalview.appletgui;
*/
package jalview.appletgui;
+import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.SearchResults;
import jalview.api.AlignmentViewPanel;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.SearchResults;
@@
-100,7
+101,7
@@
public class AlignmentPanel extends Panel implements AdjustmentListener,
sequenceHolderPanel.add(annotationPanelHolder, BorderLayout.SOUTH);
alabels = new AnnotationLabels(this);
sequenceHolderPanel.add(annotationPanelHolder, BorderLayout.SOUTH);
alabels = new AnnotationLabels(this);
- setAnnotationVisible(av.showAnnotation);
+ setAnnotationVisible(av.isShowAnnotation());
idPanelHolder.add(idPanel, BorderLayout.CENTER);
idSpaceFillerPanel1.add(idwidthAdjuster, BorderLayout.CENTER);
idPanelHolder.add(idPanel, BorderLayout.CENTER);
idSpaceFillerPanel1.add(idwidthAdjuster, BorderLayout.CENTER);
@@
-153,6
+154,11
@@
public class AlignmentPanel extends Panel implements AdjustmentListener,
});
}
});
}
+ @Override
+ public AlignViewportI getAlignViewport()
+ {
+ return av;
+ }
public SequenceRenderer getSequenceRenderer()
{
return seqPanel.seqCanvas.sr;
public SequenceRenderer getSequenceRenderer()
{
return seqPanel.seqCanvas.sr;
@@
-190,8
+196,9
@@
public class AlignmentPanel extends Panel implements AdjustmentListener,
idPanel.idCanvas.image = null;
FontMetrics fm = getFontMetrics(av.getFont());
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
+ scalePanel.setSize(new Dimension(10, av.getCharHeight()
+ + fm.getDescent()));
+ idwidthAdjuster.setSize(new Dimension(10, av.getCharHeight()
+ fm.getDescent()));
av.updateSequenceIdColours();
annotationPanel.image = null;
+ fm.getDescent()));
av.updateSequenceIdColours();
annotationPanel.image = null;
@@
-375,7
+382,7
@@
public class AlignmentPanel extends Panel implements AdjustmentListener,
{
start = ostart;
}
{
start = ostart;
}
- if (!av.wrapAlignment)
+ if (!av.getWrapAlignment())
{
/*
* int spos=av.getStartRes(),sqpos=av.getStartSeq(); if ((startv =
{
/*
* int spos=av.getStartRes(),sqpos=av.getStartSeq(); if ((startv =
@@
-449,7
+456,7
@@
public class AlignmentPanel extends Panel implements AdjustmentListener,
public void setAnnotationVisible(boolean b)
{
public void setAnnotationVisible(boolean b)
{
- if (!av.wrapAlignment)
+ if (!av.getWrapAlignment())
{
annotationSpaceFillerHolder.setVisible(b);
annotationPanelHolder.setVisible(b);
{
annotationSpaceFillerHolder.setVisible(b);
annotationPanelHolder.setVisible(b);
@@
-566,7
+573,7
@@
public class AlignmentPanel extends Panel implements AdjustmentListener,
annotationPanelHolder.setVisible(false);
annotationSpaceFillerHolder.setVisible(false);
}
annotationPanelHolder.setVisible(false);
annotationSpaceFillerHolder.setVisible(false);
}
- else if (av.showAnnotation)
+ else if (av.isShowAnnotation())
{
annotationPanelHolder.setVisible(true);
annotationSpaceFillerHolder.setVisible(true);
{
annotationPanelHolder.setVisible(true);
annotationSpaceFillerHolder.setVisible(true);
@@
-648,8
+655,8
@@
public class AlignmentPanel extends Panel implements AdjustmentListener,
}
;
}
;
- hextent = seqPanel.seqCanvas.getSize().width / av.charWidth;
- vextent = seqPanel.seqCanvas.getSize().height / av.charHeight;
+ hextent = seqPanel.seqCanvas.getSize().width / av.getCharWidth();
+ vextent = seqPanel.seqCanvas.getSize().height / av.getCharHeight();
if (hextent > width)
{
if (hextent > width)
{
@@
-694,7
+701,8
@@
public class AlignmentPanel extends Panel implements AdjustmentListener,
av.setEndSeq(endSeq);
av.setStartRes(x);
av.setEndSeq(endSeq);
av.setStartRes(x);
- av.setEndRes((x + (seqPanel.seqCanvas.getSize().width / av.charWidth)) - 1);
+ av.setEndRes((x + (seqPanel.seqCanvas.getSize().width / av
+ .getCharWidth())) - 1);
hscroll.setValues(x, hextent, 0, width);
vscroll.setValues(y, vextent, 0, height);
hscroll.setValues(x, hextent, 0, width);
vscroll.setValues(y, vextent, 0, height);
@@
-776,7
+784,7
@@
public class AlignmentPanel extends Panel implements AdjustmentListener,
seqPanel.seqCanvas.fastPaint(scrollX, scrollY);
scalePanel.repaint();
seqPanel.seqCanvas.fastPaint(scrollX, scrollY);
scalePanel.repaint();
- if (av.getShowAnnotation())
+ if (av.isShowAnnotation())
{
annotationPanel.fastPaint(av.getStartRes() - oldX);
}
{
annotationPanel.fastPaint(av.getStartRes() - oldX);
}
@@
-847,9
+855,9
@@
public class AlignmentPanel extends Panel implements AdjustmentListener,
seqPanel.seqCanvas.repaint();
idPanel.idCanvas.repaint();
seqPanel.seqCanvas.repaint();
idPanel.idCanvas.repaint();
- if (!av.wrapAlignment)
+ if (!av.getWrapAlignment())
{
{
- if (av.showAnnotation)
+ if (av.isShowAnnotation())
{
alabels.repaint();
annotationPanel.repaint();
{
alabels.repaint();
annotationPanel.repaint();