X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=568062b790a6bde5af2ea7dce3a8ec9e68d3f9bd;hb=7b39c1ea0410b4cc8410b69b2d008ed0af3b6cb5;hp=4dfb8c8aebb9f2ba071558816932dea3d44501ec;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java index 4dfb8c8..568062b 100755 --- a/src/jalview/gui/ScalePanel.java +++ b/src/jalview/gui/ScalePanel.java @@ -1,28 +1,32 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4) - * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) + * Copyright (C) 2014 The Jalview Authors * - * This program 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 2 - * of the License, or (at your option) any later version. + * This file is part of Jalview. * - * This program 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. + * 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. + * + * 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * 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! @@ -64,16 +68,21 @@ public class ScalePanel extends JPanel implements MouseMotionListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mousePressed(MouseEvent evt) { int x = (evt.getX() / av.getCharWidth()) + av.getStartRes(); final int res; - if (av.hasHiddenColumns) + if (av.hasHiddenColumns()) { - res = av.getColumnSelection().adjustForHiddenColumns(x); + x = av.getColumnSelection().adjustForHiddenColumns(x); + } + + if (x >= av.getAlignment().getWidth()) + { + res = av.getAlignment().getWidth() - 1; } else { @@ -88,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) @@ -106,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) @@ -126,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); } @@ -161,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); @@ -170,7 +182,6 @@ public class ScalePanel extends JPanel implements MouseMotionListener, iVec = null; sg.setStartRes(res); sg.setEndRes(res); - av.setSelectionGroup(sg); if (evt.isShiftDown()) { @@ -183,17 +194,18 @@ public class ScalePanel extends JPanel implements MouseMotionListener, sg.setStartRes(min); sg.setEndRes(max); } - + av.setSelectionGroup(sg); } ap.paintAlignment(false); + av.sendSelection(); } /** * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseReleased(MouseEvent evt) { @@ -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) @@ -233,13 +245,14 @@ public class ScalePanel extends JPanel implements MouseMotionListener, } stretchingGroup = false; ap.paintAlignment(false); + av.sendSelection(); } /** * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseDragged(MouseEvent evt) { @@ -251,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) @@ -294,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())) { @@ -314,7 +327,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, { if (mouseDragging) { - ap.seqPanel.scrollCanvas(null); + ap.getSeqPanel().scrollCanvas(null); } } @@ -322,7 +335,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, { if (mouseDragging) { - ap.seqPanel.scrollCanvas(evt); + ap.getSeqPanel().scrollCanvas(evt); } } @@ -332,7 +345,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, public void mouseMoved(MouseEvent evt) { - if (!av.hasHiddenColumns) + if (!av.hasHiddenColumns()) { return; } @@ -350,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 @@ -370,7 +383,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, * DOCUMENT ME! * * @param g - * DOCUMENT ME! + * DOCUMENT ME! */ public void paintComponent(Graphics g) { @@ -397,23 +410,33 @@ public class ScalePanel extends JPanel implements MouseMotionListener, // Fill the selected columns ColumnSelection cs = av.getColumnSelection(); - gg.setColor(new Color(220, 0, 0)); - - for (int i = 0; i < cs.size(); i++) + int s; + if (cs != null) { - int sel = cs.columnAt(i); - if (av.hasHiddenColumns) - { - sel = av.getColumnSelection().findColumnPosition(sel); - } + gg.setColor(new Color(220, 0, 0)); - if ((sel >= startx) && (sel <= endx)) + for (int i = 0; i < cs.size(); i++) { - gg.fillRect((sel - startx) * av.charWidth, 0, av.charWidth, - getHeight()); + int sel = cs.columnAt(i); + if (av.hasHiddenColumns()) + { + if (cs.isVisible(sel)) + { + sel = cs.findColumnPosition(sel); + } + else + { + continue; + } + } + + if ((sel >= startx) && (sel <= endx)) + { + gg.fillRect((sel - startx) * av.charWidth, 0, av.charWidth, + getHeight()); + } } } - // Draw the scale numbers gg.setColor(Color.black); @@ -442,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; @@ -491,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); } }