X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FScalePanel.java;h=8fe6e30f00520a27833720b26aca0b023e4d4305;hb=f52f7b378972cc884b5d3e5cc250f89667f558f7;hp=e6c98557c2f464c42df423874efb039b1cc5ef8b;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git diff --git a/src/jalview/appletgui/ScalePanel.java b/src/jalview/appletgui/ScalePanel.java index e6c9855..8fe6e30 100755 --- a/src/jalview/appletgui/ScalePanel.java +++ b/src/jalview/appletgui/ScalePanel.java @@ -1,20 +1,19 @@ /* - * 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.7) + * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, 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. * - * 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 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 . */ package jalview.appletgui; @@ -61,7 +60,7 @@ public class ScalePanel extends Panel implements MouseMotionListener, int x = (evt.getX() / av.getCharWidth()) + av.getStartRes(); final int res; - if (av.hasHiddenColumns) + if (av.hasHiddenColumns()) { res = av.getColumnSelection().adjustForHiddenColumns(x); } @@ -123,7 +122,7 @@ public class ScalePanel extends Panel implements MouseMotionListener, { av.hideColumns(res, res); if (av.getSelectionGroup() != null - && av.getSelectionGroup().getSize() == av.alignment + && av.getSelectionGroup().getSize() == av.getAlignment() .getHeight()) { av.setSelectionGroup(null); @@ -151,9 +150,9 @@ public class ScalePanel extends Panel implements MouseMotionListener, av.getColumnSelection().addElement(res); SequenceGroup sg = new SequenceGroup(); - for (int i = 0; i < av.alignment.getSequences().size(); i++) + for (int i = 0; i < av.getAlignment().getSequences().size(); i++) { - sg.addSequence(av.alignment.getSequenceAt(i), false); + sg.addSequence(av.getAlignment().getSequenceAt(i), false); } sg.setStartRes(res); @@ -174,6 +173,7 @@ public class ScalePanel extends Panel implements MouseMotionListener, } ap.paintAlignment(true); + av.sendSelection(); } public void mouseReleased(MouseEvent evt) @@ -182,12 +182,12 @@ public class ScalePanel extends Panel implements MouseMotionListener, int res = (evt.getX() / av.getCharWidth()) + av.getStartRes(); - if (res > av.alignment.getWidth()) + if (res > av.getAlignment().getWidth()) { - res = av.alignment.getWidth() - 1; + res = av.getAlignment().getWidth() - 1; } - if (av.hasHiddenColumns) + if (av.hasHiddenColumns()) { res = av.getColumnSelection().adjustForHiddenColumns(res); } @@ -212,6 +212,7 @@ public class ScalePanel extends Panel implements MouseMotionListener, stretchingGroup = false; ap.paintAlignment(false); + av.sendSelection(); } public void mouseDragged(MouseEvent evt) @@ -224,14 +225,14 @@ public class ScalePanel extends Panel 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) @@ -306,7 +307,7 @@ public class ScalePanel extends Panel implements MouseMotionListener, public void mouseMoved(MouseEvent evt) { - if (!av.hasHiddenColumns) + if (!av.hasHiddenColumns()) { return; } @@ -359,7 +360,7 @@ public class ScalePanel extends Panel implements MouseMotionListener, for (int i = 0; i < cs.size(); i++) { int sel = cs.columnAt(i); - if (av.hasHiddenColumns) + if (av.hasHiddenColumns()) { sel = av.getColumnSelection().findColumnPosition(sel); } @@ -399,26 +400,24 @@ public class ScalePanel extends Panel 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;