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
JAL-3210 Improvements to eclipse detection. New src tree and SwingJS updated from...
[jalview.git]
/
src
/
jalview
/
appletgui
/
AlignmentPanel.java
diff --git
a/src/jalview/appletgui/AlignmentPanel.java
b/src/jalview/appletgui/AlignmentPanel.java
index
83d8ade
..
df8fe87
100644
(file)
--- a/
src/jalview/appletgui/AlignmentPanel.java
+++ b/
src/jalview/appletgui/AlignmentPanel.java
@@
-43,9
+43,11
@@
import java.awt.event.AdjustmentEvent;
import java.awt.event.AdjustmentListener;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.awt.event.AdjustmentListener;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
+import java.awt.image.BufferedImage;
import java.beans.PropertyChangeEvent;
import java.util.List;
import java.beans.PropertyChangeEvent;
import java.util.List;
+@SuppressWarnings("serial")
public class AlignmentPanel extends Panel
implements AdjustmentListener, AlignmentViewPanel, ViewportListenerI
{
public class AlignmentPanel extends Panel
implements AdjustmentListener, AlignmentViewPanel, ViewportListenerI
{
@@
-177,6
+179,7
@@
public class AlignmentPanel extends Panel
return av;
}
return av;
}
+ @Override
public SequenceRenderer getSequenceRenderer()
{
return seqPanel.seqCanvas.sr;
public SequenceRenderer getSequenceRenderer()
{
return seqPanel.seqCanvas.sr;
@@
-415,7
+418,7
@@
public class AlignmentPanel extends Panel
public boolean scrollTo(int ostart, int end, int seqIndex,
boolean scrollToNearest, boolean redrawOverview)
{
public boolean scrollTo(int ostart, int end, int seqIndex,
boolean scrollToNearest, boolean redrawOverview)
{
- int startv, endv, starts, ends, width;
+ int startv, endv, starts, ends;//, width;
int start = -1;
if (av.hasHiddenColumns())
int start = -1;
if (av.hasHiddenColumns())
@@
-669,14
+672,9
@@
public class AlignmentPanel extends Panel
}
else
{
}
else
{
- int width = av.getAlignment().getWidth();
+ int width = av.getAlignment().getVisibleWidth();
int height = av.getAlignment().getHeight();
int height = av.getAlignment().getHeight();
- if (av.hasHiddenColumns())
- {
- width = av.getAlignment().getHiddenColumns()
- .absoluteToVisibleColumn(width);
- }
if (x < 0)
{
x = 0;
if (x < 0)
{
x = 0;
@@
-1162,4
+1160,10
@@
public class AlignmentPanel extends Panel
}
}
+ @Override
+ public void overviewDone(BufferedImage miniMe)
+ {
+ overviewPanel.canvas.finalizeDraw(miniMe);
+ }
+
}
}