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
GRPAH_HEIGHT variable
[jalview.git]
/
src
/
jalview
/
gui
/
ScalePanel.java
diff --git
a/src/jalview/gui/ScalePanel.java
b/src/jalview/gui/ScalePanel.java
index
dc80d1b
..
01ba119
100755
(executable)
--- a/
src/jalview/gui/ScalePanel.java
+++ b/
src/jalview/gui/ScalePanel.java
@@
-61,6
+61,8
@@
public class ScalePanel extends JPanel
\r
sg.setStartRes(res);
\r
sg.setEndRes(res);
\r
\r
sg.setStartRes(res);
\r
sg.setEndRes(res);
\r
+
\r
+ ap.annotationPanel.addEditableColumn(res);
\r
}
\r
av.setSelectionGroup(sg);
\r
ap.RefreshPanels();
\r
}
\r
av.setSelectionGroup(sg);
\r
ap.RefreshPanels();
\r
@@
-102,6
+104,7
@@
public class ScalePanel extends JPanel
else if (res < sg.getStartRes())
\r
sg.setStartRes(res);
\r
\r
else if (res < sg.getStartRes())
\r
sg.setStartRes(res);
\r
\r
+ ap.annotationPanel.addEditableColumn(res);
\r
ap.RefreshPanels();
\r
}
\r
}
\r
ap.RefreshPanels();
\r
}
\r
}
\r
@@
-112,8
+115,10
@@
public class ScalePanel extends JPanel
}
\r
\r
// scalewidth will normally be screenwidth,
\r
}
\r
\r
// scalewidth will normally be screenwidth,
\r
- public void drawScale(Graphics gg, int startx, int endx, int scaleWidth)
\r
+ public void drawScale(Graphics g, int startx, int endx, int scaleWidth)
\r
{
\r
{
\r
+ Graphics2D gg = (Graphics2D)g;
\r
+ gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON);
\r
int charWidth = av.getCharWidth();
\r
\r
gg.setFont(av.getFont());
\r
int charWidth = av.getCharWidth();
\r
\r
gg.setFont(av.getFont());
\r
@@
-134,14
+139,15
@@
public class ScalePanel extends JPanel
int digits = (int)(Math.log(roughtick)/Math.log(10));
\r
int num = (int)(roughtick/Math.pow(10,digits));
\r
\r
int digits = (int)(Math.log(roughtick)/Math.log(10));
\r
int num = (int)(roughtick/Math.pow(10,digits));
\r
\r
- if (Math.abs(10-num) < 3)
\r
+ if (roughtick>5)
\r
num = 10;
\r
num = 10;
\r
- else if (Math.abs(5-num) >= 2)
\r
+ else
\r
num = 5;
\r
num = 5;
\r
+
\r
// else
\r
// num = 2;
\r
\r
// else
\r
// num = 2;
\r
\r
- //System.out.println("Dig " + digits + " " + rough + " " + roughtick + " " + getWidth() + " " + num);
\r
+ // System.out.println("Dig " + digits + " " + rough + " " + roughtick + " " + getWidth() + " " + num);
\r
\r
int space = (int)(num * Math.pow(10,digits));
\r
\r
\r
int space = (int)(num * Math.pow(10,digits));
\r
\r
@@
-149,7
+155,10
@@
public class ScalePanel extends JPanel
\r
gg.setColor(Color.black);
\r
\r
\r
gg.setColor(Color.black);
\r
\r
- int scalestartx = startx - startx%space + space;
\r
+
\r
+ int scalestartx = 0;
\r
+ if(space>0)
\r
+ scalestartx = startx - startx%space + space;
\r
\r
\r
//Fill the selected columns
\r
\r
\r
//Fill the selected columns
\r