X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=abd41c0d15766628a1ed5cd0bad86daaf47cabdd;hb=6fb502e4a8749d1d98f5442c3b8156ab47996b77;hp=045471aa5a00c4c8442c2d6794433d6bd9b73573;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java index 045471a..abd41c0 100755 --- a/src/jalview/gui/ScalePanel.java +++ b/src/jalview/gui/ScalePanel.java @@ -1,28 +1,29 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1) - * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * 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 * - * 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 + * You should have received a copy of the GNU General Public License along with Jalview. If not, see . */ package jalview.gui; import java.awt.*; import java.awt.event.*; + import javax.swing.*; import jalview.datamodel.*; +import jalview.util.MessageManager; /** * DOCUMENT ME! @@ -64,16 +65,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()) + { + x = av.getColumnSelection().adjustForHiddenColumns(x); + } + + if (x >= av.getAlignment().getWidth()) { - res = av.getColumnSelection().adjustForHiddenColumns(x); + res = av.getAlignment().getWidth() - 1; } else { @@ -133,8 +139,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener, { 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 +167,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 +176,6 @@ public class ScalePanel extends JPanel implements MouseMotionListener, iVec = null; sg.setStartRes(res); sg.setEndRes(res); - av.setSelectionGroup(sg); if (evt.isShiftDown()) { @@ -183,7 +188,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, sg.setStartRes(min); sg.setEndRes(max); } - + av.setSelectionGroup(sg); } ap.paintAlignment(false); @@ -194,7 +199,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseReleased(MouseEvent evt) { @@ -202,14 +207,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) @@ -241,7 +246,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseDragged(MouseEvent evt) { @@ -253,14 +258,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) @@ -296,7 +301,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())) { @@ -334,7 +339,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, public void mouseMoved(MouseEvent evt) { - if (!av.hasHiddenColumns) + if (!av.hasHiddenColumns()) { return; } @@ -352,8 +357,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, { reveal = region; ToolTipManager.sharedInstance().registerComponent(this); - this - .setToolTipText("Reveal Hidden Columns with Right Mouse Button"); + this.setToolTipText("Reveal Hidden Columns with Right Mouse Button"); break; } else @@ -372,7 +376,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, * DOCUMENT ME! * * @param g - * DOCUMENT ME! + * DOCUMENT ME! */ public void paintComponent(Graphics g) { @@ -399,23 +403,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); @@ -444,26 +458,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; @@ -493,7 +505,7 @@ 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); } }