X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=62f767d4c19ba7562282e509fc98c2b7b144ac7d;hb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;hp=d8bdba3751d33dcc1f79545d138511d8af30c438;hpb=7783ef0322e6aebb2df9fb5083d92b70ae69876a;p=jalview.git diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java index d8bdba3..62f767d 100755 --- a/src/jalview/gui/ScalePanel.java +++ b/src/jalview/gui/ScalePanel.java @@ -1,47 +1,55 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2007 AM Waterhouse, J Procter, 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 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. - * - * 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 + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1) + * 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. + * + * 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 . + * 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! - * + * * @author $author$ * @version $Revision$ */ -public class ScalePanel - extends JPanel implements MouseMotionListener, MouseListener +public class ScalePanel extends JPanel implements MouseMotionListener, + MouseListener { protected int offy = 4; /** DOCUMENT ME!! */ public int width; + protected AlignViewport av; + AlignmentPanel ap; + boolean stretchingGroup = false; - int min; //used by mouseDragged to see if user - int max; //used by mouseDragged to see if user + + int min; // used by mouseDragged to see if user + + int max; // used by mouseDragged to see if user + boolean mouseDragging = false; // wants to delete columns @@ -56,17 +64,23 @@ public class ScalePanel /** * DOCUMENT ME! - * - * @param evt DOCUMENT ME! + * + * @param evt + * 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 { @@ -81,7 +95,7 @@ public class ScalePanel 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) @@ -99,7 +113,7 @@ public class ScalePanel 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) @@ -119,14 +133,15 @@ public class ScalePanel } 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); } @@ -142,7 +157,8 @@ public class ScalePanel pop.show(this, evt.getX(), evt.getY()); } } - else // LEFT MOUSE TO SELECT + else + // LEFT MOUSE TO SELECT { if (!evt.isControlDown() && !evt.isShiftDown()) { @@ -152,16 +168,15 @@ public class ScalePanel 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); iVec[i] = null; } - iVec=null; + iVec = null; sg.setStartRes(res); sg.setEndRes(res); - av.setSelectionGroup(sg); if (evt.isShiftDown()) { @@ -174,16 +189,18 @@ public class ScalePanel sg.setStartRes(min); sg.setEndRes(max); } - + av.setSelectionGroup(sg); } ap.paintAlignment(false); + av.sendSelection(); } /** * DOCUMENT ME! - * - * @param evt DOCUMENT ME! + * + * @param evt + * DOCUMENT ME! */ public void mouseReleased(MouseEvent evt) { @@ -191,14 +208,14 @@ public class ScalePanel 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) @@ -223,12 +240,14 @@ public class ScalePanel } stretchingGroup = false; ap.paintAlignment(false); + av.sendSelection(); } /** * DOCUMENT ME! - * - * @param evt DOCUMENT ME! + * + * @param evt + * DOCUMENT ME! */ public void mouseDragged(MouseEvent evt) { @@ -240,14 +259,14 @@ public class ScalePanel 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) @@ -283,9 +302,9 @@ public class ScalePanel 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())) + if ((col < sg.getStartRes()) || (col > sg.getEndRes())) { av.getColumnSelection().removeElement(col); } @@ -316,11 +335,12 @@ public class ScalePanel } public void mouseClicked(MouseEvent evt) - {} + { + } public void mouseMoved(MouseEvent evt) { - if (!av.hasHiddenColumns) + if (!av.hasHiddenColumns()) { return; } @@ -332,13 +352,13 @@ public class ScalePanel reveal = null; for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size(); i++) { - int[] region = (int[]) av.getColumnSelection().getHiddenColumns(). - elementAt(i); + 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"); + this.setToolTipText(MessageManager.getString("label.reveal_hidden_columns")); break; } else @@ -355,8 +375,9 @@ public class ScalePanel /** * DOCUMENT ME! - * - * @param g DOCUMENT ME! + * + * @param g + * DOCUMENT ME! */ public void paintComponent(Graphics g) { @@ -365,7 +386,7 @@ public class ScalePanel // scalewidth will normally be screenwidth, public void drawScale(Graphics g, int startx, int endx, int width, - int height) + int height) { Graphics2D gg = (Graphics2D) g; gg.setFont(av.getFont()); @@ -373,33 +394,43 @@ public class ScalePanel if (av.antiAlias) { gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING, - RenderingHints.VALUE_ANTIALIAS_ON); + RenderingHints.VALUE_ANTIALIAS_ON); } - //Fill in the background + // Fill in the background gg.setColor(Color.white); gg.fillRect(0, 0, width, height); gg.setColor(Color.black); - //Fill the selected columns + // 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); @@ -408,7 +439,7 @@ public class ScalePanel FontMetrics fm = gg.getFontMetrics(av.getFont()); int y = av.charHeight - fm.getDescent(); - if ( (scalestartx % 10) == 0) + if ((scalestartx % 10) == 0) { scalestartx += 5; } @@ -418,45 +449,45 @@ public class ScalePanel for (int i = scalestartx; i < endx; i += 5) { - if ( (i % 10) == 0) + if ((i % 10) == 0) { - string = String.valueOf(av.getColumnSelection().adjustForHiddenColumns( - i)); - if ( (i - startx - 1) * av.charWidth > maxX) + string = String.valueOf(av.getColumnSelection() + .adjustForHiddenColumns(i)); + if ((i - startx - 1) * av.charWidth > maxX) { - gg.drawString(string, - (i - startx - 1) * av.charWidth, y); + gg.drawString(string, (i - startx - 1) * av.charWidth, y); 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; if (av.getShowHiddenMarkers()) { - for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size(); - i++) + for (int i = 0; i < av.getColumnSelection().getHiddenColumns() + .size(); i++) { - res = av.getColumnSelection().findHiddenRegionPosition(i) - - startx; + res = av.getColumnSelection().findHiddenRegionPosition(i) + - startx; if (res < 0 || res > endx - scalestartx) { @@ -464,21 +495,18 @@ public class ScalePanel } 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); + { 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); } } 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); } }