X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=f2c5154cd384a2b0b8c923484a9ed12e1f90c47e;hb=5019d046ada4f11d4273f8e826961a90b4405947;hp=2acd92cd3595e3e6766800772196bac042bec801;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git
diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 2acd92c..f2c5154 100755
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -1,27 +1,32 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 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.util.MessageManager;
/**
* DOCUMENT ME!
@@ -70,9 +75,14 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
int x = (evt.getX() / av.getCharWidth()) + av.getStartRes();
final int res;
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
+ {
+ x = av.getColumnSelection().adjustForHiddenColumns(x);
+ }
+
+ if (x >= av.getAlignment().getWidth())
{
- res = av.getColumnSelection().adjustForHiddenColumns(x);
+ res = av.getAlignment().getWidth() - 1;
}
else
{
@@ -87,7 +97,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)
@@ -105,7 +116,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
if (av.getColumnSelection().getHiddenColumns().size() > 1)
{
- item = new JMenuItem("Reveal All");
+ item = new JMenuItem(
+ MessageManager.getString("action.reveal_all"));
item.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -125,15 +137,16 @@ 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)
{
av.hideColumns(res, res);
if (av.getSelectionGroup() != null
- && av.getSelectionGroup().getSize() == av.alignment
- .getHeight())
+ && av.getSelectionGroup().getSize() == av
+ .getAlignment().getHeight())
{
av.setSelectionGroup(null);
}
@@ -160,7 +173,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
av.getColumnSelection().addElement(res);
SequenceGroup sg = new SequenceGroup();
// try to be as quick as possible
- SequenceI[] iVec = av.alignment.getSequencesArray();
+ SequenceI[] iVec = av.getAlignment().getSequencesArray();
for (int i = 0; i < iVec.length; i++)
{
sg.addSequence(iVec[i], false);
@@ -169,7 +182,6 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
iVec = null;
sg.setStartRes(res);
sg.setEndRes(res);
- av.setSelectionGroup(sg);
if (evt.isShiftDown())
{
@@ -182,7 +194,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
sg.setStartRes(min);
sg.setEndRes(max);
}
-
+ av.setSelectionGroup(sg);
}
ap.paintAlignment(false);
@@ -201,14 +213,14 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
- if (res > av.alignment.getWidth())
+ if (av.hasHiddenColumns())
{
- res = av.alignment.getWidth() - 1;
+ res = av.getColumnSelection().adjustForHiddenColumns(res);
}
- if (av.hasHiddenColumns)
+ if (res >= av.getAlignment().getWidth())
{
- res = av.getColumnSelection().adjustForHiddenColumns(res);
+ res = av.getAlignment().getWidth() - 1;
}
if (!stretchingGroup)
@@ -252,14 +264,14 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
res = 0;
}
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
res = av.getColumnSelection().adjustForHiddenColumns(res);
}
- if (res > av.alignment.getWidth())
+ if (res >= av.getAlignment().getWidth())
{
- res = av.alignment.getWidth() - 1;
+ res = av.getAlignment().getWidth() - 1;
}
if (res < min)
@@ -295,7 +307,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
int col;
for (int i = min; i <= max; i++)
{
- col = av.getColumnSelection().adjustForHiddenColumns(i);
+ col = i; // av.getColumnSelection().adjustForHiddenColumns(i);
if ((col < sg.getStartRes()) || (col > sg.getEndRes()))
{
@@ -333,7 +345,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
public void mouseMoved(MouseEvent evt)
{
- if (!av.hasHiddenColumns)
+ if (!av.hasHiddenColumns())
{
return;
}
@@ -351,8 +363,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
{
reveal = region;
ToolTipManager.sharedInstance().registerComponent(this);
- this
- .setToolTipText("Reveal Hidden Columns with Right Mouse Button");
+ this.setToolTipText(MessageManager
+ .getString("label.reveal_hidden_columns"));
break;
}
else
@@ -398,6 +410,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
// Fill the selected columns
ColumnSelection cs = av.getColumnSelection();
+ int s;
if (cs != null)
{
gg.setColor(new Color(220, 0, 0));
@@ -405,9 +418,16 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
for (int i = 0; i < cs.size(); i++)
{
int sel = cs.columnAt(i);
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
- sel = cs.findColumnPosition(sel);
+ if (cs.isVisible(sel))
+ {
+ sel = cs.findColumnPosition(sel);
+ }
+ else
+ {
+ continue;
+ }
}
if ((sel >= startx) && (sel <= endx))
@@ -445,26 +465,24 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
maxX = (i - startx + 1) * av.charWidth + fm.stringWidth(string);
}
- gg
- .drawLine(
- (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
- y + 2,
- (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
- y + (fm.getDescent() * 2));
+ gg.drawLine(
+ (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
+ y + 2,
+ (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 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(
+ (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));
}
}
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
gg.setColor(Color.blue);
int res;
@@ -494,7 +512,8 @@ public class ScalePanel extends JPanel 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] * av.charWidth, 0);
}
}