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 develop to Release_2_8_3_Branch
[jalview.git]
/
src
/
jalview
/
appletgui
/
ScalePanel.java
diff --git
a/src/jalview/appletgui/ScalePanel.java
b/src/jalview/appletgui/ScalePanel.java
index
f888e3a
..
3bb676f
100755
(executable)
--- a/
src/jalview/appletgui/ScalePanel.java
+++ b/
src/jalview/appletgui/ScalePanel.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-108,7
+108,7
@@
public class ScalePanel extends Panel implements MouseMotionListener,
});
pop.add(item);
});
pop.add(item);
- if (av.getColumnSelection().hasHiddenColumns())
+ if (av.getColumnSelection().hasManyHiddenColumns())
{
item = new MenuItem(MessageManager.getString("action.reveal_all"));
item.addActionListener(new ActionListener()
{
item = new MenuItem(MessageManager.getString("action.reveal_all"));
item.addActionListener(new ActionListener()
@@
-362,7
+362,6
@@
public class ScalePanel extends Panel implements MouseMotionListener,
int height)
{
gg.setFont(av.getFont());
int height)
{
gg.setFont(av.getFont());
-
// Fill in the background
gg.setColor(Color.white);
gg.fillRect(0, 0, width, height);
// Fill in the background
gg.setColor(Color.white);
gg.fillRect(0, 0, width, height);
@@
-371,7
+370,7
@@
public class ScalePanel extends Panel implements MouseMotionListener,
// Fill the selected columns
ColumnSelection cs = av.getColumnSelection();
gg.setColor(new Color(220, 0, 0));
// Fill the selected columns
ColumnSelection cs = av.getColumnSelection();
gg.setColor(new Color(220, 0, 0));
-
+ int avcharWidth = av.getCharWidth(), avcharHeight = av.getCharHeight();
for (int i = 0; i < cs.size(); i++)
{
int sel = cs.columnAt(i);
for (int i = 0; i < cs.size(); i++)
{
int sel = cs.columnAt(i);
@@
-382,7
+381,7
@@
public class ScalePanel extends Panel implements MouseMotionListener,
if ((sel >= startx) && (sel <= endx))
{
if ((sel >= startx) && (sel <= endx))
{
- gg.fillRect((sel - startx) * av.charWidth, 0, av.charWidth,
+ gg.fillRect((sel - startx) * avcharWidth, 0, avcharWidth,
getSize().height);
}
}
getSize().height);
}
}
@@
-393,7
+392,7
@@
public class ScalePanel extends Panel implements MouseMotionListener,
int scalestartx = (startx / 10) * 10;
FontMetrics fm = gg.getFontMetrics(av.getFont());
int scalestartx = (startx / 10) * 10;
FontMetrics fm = gg.getFontMetrics(av.getFont());
- int y = av.charHeight - fm.getDescent();
+ int y = avcharHeight - fm.getDescent();
if ((scalestartx % 10) == 0)
{
if ((scalestartx % 10) == 0)
{
@@
-409,25
+408,26
@@
public class ScalePanel extends Panel implements MouseMotionListener,
{
string = String.valueOf(av.getColumnSelection()
.adjustForHiddenColumns(i));
{
string = String.valueOf(av.getColumnSelection()
.adjustForHiddenColumns(i));
- if ((i - startx - 1) * av.charWidth > maxX)
+ if ((i - startx - 1) * avcharWidth > maxX)
{
{
- gg.drawString(string, (i - startx - 1) * av.charWidth, y);
- maxX = (i - startx + 1) * av.charWidth + fm.stringWidth(string);
+ gg.drawString(string, (i - startx - 1) * avcharWidth, y);
+ maxX = (i - startx + 1) * avcharWidth + fm.stringWidth(string);
}
gg.drawLine(
}
gg.drawLine(
- ((i - startx - 1) * av.charWidth) + (av.charWidth / 2),
+((i - startx - 1) * avcharWidth) + (avcharWidth / 2),
y + 2,
y + 2,
- ((i - startx - 1) * av.charWidth) + (av.charWidth / 2),
+ ((i - startx - 1) * avcharWidth) + (avcharWidth / 2),
y + (fm.getDescent() * 2));
}
else
{
gg.drawLine(
y + (fm.getDescent() * 2));
}
else
{
gg.drawLine(
- ((i - startx - 1) * av.charWidth) + (av.charWidth / 2),
+((i - startx - 1) * avcharWidth) + (avcharWidth / 2),
y + fm.getDescent(),
y + fm.getDescent(),
- ((i - startx - 1) * av.charWidth) + (av.charWidth / 2),
+ ((i - startx - 1) * avcharWidth)
+ + (avcharWidth / 2),
y + (fm.getDescent() * 2));
}
}
y + (fm.getDescent() * 2));
}
}
@@
-451,10
+451,10
@@
public class ScalePanel extends Panel implements MouseMotionListener,
}
gg.fillPolygon(new int[]
}
gg.fillPolygon(new int[]
- { res * av.charWidth - av.charHeight / 4,
- res * av.charWidth + av.charHeight / 4, res * av.charWidth },
+ { res * avcharWidth - avcharHeight / 4,
+ res * avcharWidth + avcharHeight / 4, res * avcharWidth },
new int[]
new int[]
- { y - av.charHeight / 2, y - av.charHeight / 2, y + 8 },
+ { y - avcharHeight / 2, y - avcharHeight / 2, y + 8 },
3);
}
3);
}
@@
-463,7
+463,7
@@
public class ScalePanel extends Panel implements MouseMotionListener,
if (reveal != null && reveal[0] > startx && reveal[0] < endx)
{
gg.drawString(MessageManager.getString("label.reveal_columns"),
if (reveal != null && reveal[0] > startx && reveal[0] < endx)
{
gg.drawString(MessageManager.getString("label.reveal_columns"),
- reveal[0] * av.charWidth, 0);
+ reveal[0] * avcharWidth, 0);
}
}
}
}