X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FScalePanel.java;h=3bb676f8a72e414d99dc50611fab29f6c6819c08;hb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;hp=8fe6e30f00520a27833720b26aca0b023e4d4305;hpb=d053a3c980cf4318b9a19a255f9fc870e74de989;p=jalview.git
diff --git a/src/jalview/appletgui/ScalePanel.java b/src/jalview/appletgui/ScalePanel.java
index 8fe6e30..3bb676f 100755
--- a/src/jalview/appletgui/ScalePanel.java
+++ b/src/jalview/appletgui/ScalePanel.java
@@ -1,26 +1,41 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.appletgui;
-import java.awt.*;
-import java.awt.event.*;
-
-import jalview.datamodel.*;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.SequenceGroup;
+import jalview.util.MessageManager;
+
+import java.awt.Color;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.MenuItem;
+import java.awt.Panel;
+import java.awt.PopupMenu;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
public class ScalePanel extends Panel implements MouseMotionListener,
MouseListener
@@ -76,7 +91,8 @@ public class ScalePanel extends Panel implements MouseMotionListener,
PopupMenu pop = new PopupMenu();
if (reveal != null)
{
- MenuItem item = new MenuItem("Reveal");
+ MenuItem item = new MenuItem(
+ MessageManager.getString("label.reveal"));
item.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -92,9 +108,9 @@ public class ScalePanel extends Panel implements MouseMotionListener,
});
pop.add(item);
- if (av.getColumnSelection().getHiddenColumns().size() > 1)
+ if (av.getColumnSelection().hasManyHiddenColumns())
{
- item = new MenuItem("Reveal All");
+ item = new MenuItem(MessageManager.getString("action.reveal_all"));
item.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -115,15 +131,16 @@ public class ScalePanel extends Panel implements MouseMotionListener,
}
else if (av.getColumnSelection().contains(res))
{
- MenuItem item = new MenuItem("Hide Columns");
+ MenuItem item = new MenuItem(
+ MessageManager.getString("label.hide_columns"));
item.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
{
av.hideColumns(res, res);
if (av.getSelectionGroup() != null
- && av.getSelectionGroup().getSize() == av.getAlignment()
- .getHeight())
+ && av.getSelectionGroup().getSize() == av
+ .getAlignment().getHeight())
{
av.setSelectionGroup(null);
}
@@ -317,10 +334,8 @@ public class ScalePanel extends Panel implements MouseMotionListener,
res = av.getColumnSelection().adjustForHiddenColumns(res);
reveal = null;
- for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size(); i++)
+ for (int[] region : av.getColumnSelection().getHiddenColumns())
{
- int[] region = (int[]) av.getColumnSelection().getHiddenColumns()
- .elementAt(i);
if (res + 1 == region[0] || res - 1 == region[1])
{
reveal = region;
@@ -347,7 +362,6 @@ public class ScalePanel extends Panel implements MouseMotionListener,
int height)
{
gg.setFont(av.getFont());
-
// Fill in the background
gg.setColor(Color.white);
gg.fillRect(0, 0, width, height);
@@ -356,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));
-
+ int avcharWidth = av.getCharWidth(), avcharHeight = av.getCharHeight();
for (int i = 0; i < cs.size(); i++)
{
int sel = cs.columnAt(i);
@@ -367,7 +381,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
if ((sel >= startx) && (sel <= endx))
{
- gg.fillRect((sel - startx) * av.charWidth, 0, av.charWidth,
+ gg.fillRect((sel - startx) * avcharWidth, 0, avcharWidth,
getSize().height);
}
}
@@ -378,7 +392,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
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)
{
@@ -394,25 +408,26 @@ public class ScalePanel extends Panel implements MouseMotionListener,
{
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(
- (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
+((i - startx - 1) * avcharWidth) + (avcharWidth / 2),
y + 2,
- (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
+ ((i - startx - 1) * avcharWidth) + (avcharWidth / 2),
y + (fm.getDescent() * 2));
}
else
{
gg.drawLine(
- (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
+((i - startx - 1) * avcharWidth) + (avcharWidth / 2),
y + fm.getDescent(),
- (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
+ ((i - startx - 1) * avcharWidth)
+ + (avcharWidth / 2),
y + (fm.getDescent() * 2));
}
}
@@ -436,10 +451,10 @@ public class ScalePanel extends Panel implements MouseMotionListener,
}
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[]
- { y - av.charHeight / 2, y - av.charHeight / 2, y + 8 },
+ { y - avcharHeight / 2, y - avcharHeight / 2, y + 8 },
3);
}
@@ -447,7 +462,8 @@ public class ScalePanel extends Panel implements MouseMotionListener,
if (reveal != null && reveal[0] > startx && reveal[0] < endx)
{
- gg.drawString("Reveal Columns", reveal[0] * av.charWidth, 0);
+ gg.drawString(MessageManager.getString("label.reveal_columns"),
+ reveal[0] * avcharWidth, 0);
}
}