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:
ab2005e
)
-1 to drawGraphs
author
amwaterhouse
<Andrew Waterhouse>
Thu, 16 Mar 2006 15:30:13 +0000
(15:30 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Thu, 16 Mar 2006 15:30:13 +0000
(15:30 +0000)
src/jalview/gui/AnnotationPanel.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/AnnotationPanel.java
b/src/jalview/gui/AnnotationPanel.java
index
0213565
..
e962bdf
100755
(executable)
--- a/
src/jalview/gui/AnnotationPanel.java
+++ b/
src/jalview/gui/AnnotationPanel.java
@@
-24,8
+24,6
@@
import java.awt.*;
import java.awt.event.*;
\r
import java.awt.image.*;
\r
\r
import java.awt.event.*;
\r
import java.awt.image.*;
\r
\r
-import java.util.*;
\r
-
\r
import javax.swing.*;
\r
\r
\r
import javax.swing.*;
\r
\r
\r
@@
-883,6
+881,8
@@
public class AnnotationPanel extends JPanel implements MouseListener,
if(sRes>aa.annotations.length)
\r
return;
\r
\r
if(sRes>aa.annotations.length)
\r
return;
\r
\r
+ eRes = Math.min(eRes, aa.annotations.length);
\r
+
\r
int x = 0;
\r
\r
//Adjustment for fastpaint to left
\r
int x = 0;
\r
\r
//Adjustment for fastpaint to left
\r
@@
-916,7
+916,7
@@
public class AnnotationPanel extends JPanel implements MouseListener,
new float[] { 5f, 3f }, 0f));
\r
\r
y2 = (int)(y - ((aa.threshold.value-min) / range)*graphHeight);
\r
new float[] { 5f, 3f }, 0f));
\r
\r
y2 = (int)(y - ((aa.threshold.value-min) / range)*graphHeight);
\r
- g.drawLine(x-av.charWidth,y2,(eRes-sRes+1)*av.charWidth,y2);
\r
+ g.drawLine(x-av.charWidth,y2,(eRes-sRes)*av.charWidth,y2);
\r
g2.setStroke(new BasicStroke());
\r
}
\r
\r
g2.setStroke(new BasicStroke());
\r
}
\r
\r
@@
-963,6
+963,8
@@
public class AnnotationPanel extends JPanel implements MouseListener,
if(sRes>aa.annotations.length)
\r
return;
\r
\r
if(sRes>aa.annotations.length)
\r
return;
\r
\r
+ eRes = Math.min(eRes, aa.annotations.length);
\r
+
\r
int x=0, y1, y2;
\r
\r
float range = max - min;
\r
int x=0, y1, y2;
\r
\r
float range = max - min;
\r
@@
-977,7
+979,7
@@
public class AnnotationPanel extends JPanel implements MouseListener,
new float[] { 5f, 3f }, 0f));
\r
\r
y2 = (int)(y - ((aa.threshold.value-min) / range)*aa.graphHeight);
\r
new float[] { 5f, 3f }, 0f));
\r
\r
y2 = (int)(y - ((aa.threshold.value-min) / range)*aa.graphHeight);
\r
- g.drawLine(x-av.charWidth,y2,(eRes-sRes+1)*av.charWidth,y2);
\r
+ g.drawLine(x-av.charWidth,y2,(eRes-sRes)*av.charWidth,y2);
\r
g2.setStroke(new BasicStroke());
\r
}
\r
\r
g2.setStroke(new BasicStroke());
\r
}
\r
\r
@@
-988,7
+990,7
@@
public class AnnotationPanel extends JPanel implements MouseListener,
\r
g.setColor(Color.gray);
\r
\r
\r
g.setColor(Color.gray);
\r
\r
- g.drawLine(x,y2,(eRes-sRes+1)*av.charWidth,y2);
\r
+ g.drawLine(x,y2,(eRes-sRes)*av.charWidth,y2);
\r
\r
\r
int column = sRes;
\r
\r
\r
int column = sRes;
\r