git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2677eb3
)
JAL-2690attemptedmerge seems to work
author
kiramt
<k.mourao@dundee.ac.uk>
Tue, 10 Oct 2017 13:30:43 +0000
(14:30 +0100)
committer
kiramt
<k.mourao@dundee.ac.uk>
Tue, 10 Oct 2017 13:30:43 +0000
(14:30 +0100)
src/jalview/gui/SeqCanvas.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/SeqCanvas.java
b/src/jalview/gui/SeqCanvas.java
index
8ad094f
..
70ac11f
100755
(executable)
--- a/
src/jalview/gui/SeqCanvas.java
+++ b/
src/jalview/gui/SeqCanvas.java
@@
-527,6
+527,9
@@
public class SeqCanvas extends JComponent implements ViewportListenerI
{
BufferedImage lcimg = null;
{
BufferedImage lcimg = null;
+ int charWidth = av.getCharWidth();
+ int charHeight = av.getCharHeight();
+
int width = getWidth();
int height = getHeight();
int width = getWidth();
int height = getHeight();
@@
-772,7
+775,7
@@
public class SeqCanvas extends JComponent implements ViewportListenerI
*/
int xOffset = labelWidthWest
+ ((startColumn - ranges.getStartRes()) % viewportWidth)
*/
int xOffset = labelWidthWest
+ ((startColumn - ranges.getStartRes()) % viewportWidth)
- * charWidth;
+ * charWidth;
g.translate(xOffset, 0);
// When printing we have an extra clipped region,
g.translate(xOffset, 0);
// When printing we have an extra clipped region,
@@
-785,8
+788,8
@@
public class SeqCanvas extends JComponent implements ViewportListenerI
}
else
{
}
else
{
- g.setClip(0, (int) clip.getBounds().getY(), viewportWidth * charWidth,
- (int) clip.getBounds().getHeight());
+ g.setClip(0, (int) clip.getBounds().getY(),
+ viewportWidth * charWidth, (int) clip.getBounds().getHeight());
}
/*
}
/*
@@
-859,9
+862,8
@@
public class SeqCanvas extends JComponent implements ViewportListenerI
* (to support incremental fast paint of image)
*/
g.setColor(Color.white);
* (to support incremental fast paint of image)
*/
g.setColor(Color.white);
- g.fillRect(0, ypos - wrappedSpaceAboveAlignment,
- viewportWidth * charWidth + labelWidthWest,
- wrappedSpaceAboveAlignment);
+ g.fillRect(0, ypos - wrappedSpaceAboveAlignment, viewportWidth
+ * charWidth + labelWidthWest, wrappedSpaceAboveAlignment);
g.setColor(Color.black);
g.translate(labelWidthWest, 0);
g.setColor(Color.black);
g.translate(labelWidthWest, 0);
@@
-928,6
+930,9
@@
public class SeqCanvas extends JComponent implements ViewportListenerI
int canvasWidth,
int canvasHeight, int startRes)
{
int canvasWidth,
int canvasHeight, int startRes)
{
+ int charHeight = av.getCharHeight();
+ int charWidth = av.getCharWidth();
+
// height gap above each panel
int hgap = charHeight;
if (av.getScaleAboveWrapped())
// height gap above each panel
int hgap = charHeight;
if (av.getScaleAboveWrapped())