X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=af28140da705b3960fb6b379377ad3c6c95c3631;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=da345613455dbe60067ae3ab2cb2c2a1e7d74266;hpb=21c29b20790ac555b2e2a124a034f6c6b4486270;p=jalview.git
diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index da34561..af28140 100755
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -1,27 +1,46 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 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.gui;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import jalview.datamodel.*;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.util.MessageManager;
+
+import java.awt.Color;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+import javax.swing.ToolTipManager;
/**
* DOCUMENT ME!
@@ -92,7 +111,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
JPopupMenu pop = new JPopupMenu();
if (reveal != null)
{
- JMenuItem item = new JMenuItem("Reveal");
+ JMenuItem item = new JMenuItem(
+ MessageManager.getString("label.reveal"));
item.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -108,9 +128,10 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
});
pop.add(item);
- if (av.getColumnSelection().getHiddenColumns().size() > 1)
+ if (av.getColumnSelection().hasHiddenColumns())
{
- item = new JMenuItem("Reveal All");
+ item = new JMenuItem(
+ MessageManager.getString("action.reveal_all"));
item.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -130,7 +151,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
}
else if (av.getColumnSelection().contains(res))
{
- JMenuItem item = new JMenuItem("Hide Columns");
+ JMenuItem item = new JMenuItem(
+ MessageManager.getString("label.hide_columns"));
item.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -319,7 +341,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
{
if (mouseDragging)
{
- ap.seqPanel.scrollCanvas(null);
+ ap.getSeqPanel().scrollCanvas(null);
}
}
@@ -327,7 +349,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
{
if (mouseDragging)
{
- ap.seqPanel.scrollCanvas(evt);
+ ap.getSeqPanel().scrollCanvas(evt);
}
}
@@ -347,24 +369,24 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
res = av.getColumnSelection().adjustForHiddenColumns(res);
reveal = null;
- for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size(); i++)
+ if (av.getColumnSelection().getHiddenColumns() != null)
{
- int[] region = (int[]) av.getColumnSelection().getHiddenColumns()
- .elementAt(i);
- if (res + 1 == region[0] || res - 1 == region[1])
- {
- reveal = region;
- ToolTipManager.sharedInstance().registerComponent(this);
- this.setToolTipText("Reveal Hidden Columns with Right Mouse Button");
- break;
- }
- else
+ for (int[] region : av.getColumnSelection().getHiddenColumns())
{
- this.setToolTipText(null);
+ if (res + 1 == region[0] || res - 1 == region[1])
+ {
+ reveal = region;
+ ToolTipManager.sharedInstance().registerComponent(this);
+ this.setToolTipText(MessageManager
+ .getString("label.reveal_hidden_columns"));
+ break;
+ }
+ else
+ {
+ this.setToolTipText(null);
+ }
}
-
}
-
repaint();
}
@@ -401,6 +423,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
// Fill the selected columns
ColumnSelection cs = av.getColumnSelection();
+ int avCharWidth = av.getCharWidth(), avCharHeight = av.getCharHeight();
+
int s;
if (cs != null)
{
@@ -423,7 +447,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
if ((sel >= startx) && (sel <= endx))
{
- gg.fillRect((sel - startx) * av.charWidth, 0, av.charWidth,
+ gg.fillRect((sel - startx) * avCharWidth, 0, avCharWidth,
getHeight());
}
}
@@ -434,7 +458,7 @@ public class ScalePanel extends JPanel 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)
{
@@ -450,26 +474,22 @@ public class ScalePanel extends JPanel 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)),
+ gg.drawLine(((i - startx - 1) * avCharWidth) + (avCharWidth / 2),
y + 2,
- (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
- y + (fm.getDescent() * 2));
-
+ ((i - startx - 1) * avCharWidth) + (avCharWidth / 2), y
+ + (fm.getDescent() * 2));
}
else
{
- gg.drawLine(
- (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
- y + fm.getDescent(),
- (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
- y + (fm.getDescent() * 2));
+ gg.drawLine(((i - startx - 1) * avCharWidth) + (avCharWidth / 2), y
+ + fm.getDescent(), ((i - startx - 1) * avCharWidth)
+ + (avCharWidth / 2), y + (fm.getDescent() * 2));
}
}
@@ -477,7 +497,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
{
gg.setColor(Color.blue);
int res;
- if (av.getShowHiddenMarkers())
+ if (av.getShowHiddenMarkers()
+ && av.getColumnSelection().getHiddenColumns() != null)
{
for (int i = 0; i < av.getColumnSelection().getHiddenColumns()
.size(); i++)
@@ -491,19 +512,18 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
continue;
}
- gg.fillPolygon(new int[]
- { res * av.charWidth - av.charHeight / 4,
- res * av.charWidth + av.charHeight / 4, res * av.charWidth },
- new int[]
- { y - av.charHeight / 2, y - av.charHeight / 2, y + 8 },
- 3);
+ gg.fillPolygon(new int[] { res * avCharWidth - avCharHeight / 4,
+ res * avCharWidth + avCharHeight / 4, res * avCharWidth },
+ new int[] { y - avCharHeight / 2, y - avCharHeight / 2,
+ y + 8 }, 3);
}
}
if (reveal != null && reveal[0] > startx && reveal[0] < endx)
{
- gg.drawString(MessageManager.getString("label.reveal_columns"), reveal[0] * av.charWidth, 0);
+ gg.drawString(MessageManager.getString("label.reveal_columns"),
+ reveal[0] * avCharWidth, 0);
}
}