X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FRotatableCanvas.java;h=e8294ba5a1466360a6eae783efe23d55c0d9923a;hb=4ea6a00274e0a209a7dbec074f04a21ec1a80b28;hp=a722718032760fe7be7a1e0b70f3575411522de0;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git diff --git a/src/jalview/appletgui/RotatableCanvas.java b/src/jalview/appletgui/RotatableCanvas.java index a722718..e8294ba 100755 --- a/src/jalview/appletgui/RotatableCanvas.java +++ b/src/jalview/appletgui/RotatableCanvas.java @@ -1,13 +1,13 @@ /* - * 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) + * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle * * 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 @@ -22,12 +22,13 @@ import java.util.*; import java.awt.*; import java.awt.event.*; +import jalview.api.RotatableCanvasI; import jalview.datamodel.*; import jalview.math.*; import jalview.util.*; public class RotatableCanvas extends Panel implements MouseListener, - MouseMotionListener, KeyListener + MouseMotionListener, KeyListener, RotatableCanvasI { RotatableMatrix idmat = new RotatableMatrix(3, 3); @@ -396,8 +397,8 @@ public class RotatableCanvas extends Panel implements MouseListener, if (av.getSelectionGroup() != null) { - if (av.getSelectionGroup().getSequences(null).contains( - ((SequencePoint) points.elementAt(i)).sequence)) + if (av.getSelectionGroup().getSequences(null) + .contains(((SequencePoint) points.elementAt(i)).sequence)) { g.setColor(Color.gray); } @@ -411,8 +412,9 @@ public class RotatableCanvas extends Panel implements MouseListener, if (showLabels) { g.setColor(Color.red); - g.drawString(((SequencePoint) points.elementAt(i)).sequence - .getName(), x - 3, y - 4); + g.drawString( + ((SequencePoint) points.elementAt(i)).sequence.getName(), + x - 3, y - 4); } } } @@ -513,19 +515,22 @@ public class RotatableCanvas extends Panel implements MouseListener, if (found != null) { + // TODO: applet PCA is not associatable with multi-panels - only parent + // view if (av.getSelectionGroup() != null) { av.getSelectionGroup().addOrRemove(found, true); - av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1); - PaintRefresher.Refresh(this, av.getSequenceSetId()); + av.getSelectionGroup().setEndRes(av.getAlignment().getWidth() - 1); } else { av.setSelectionGroup(new SequenceGroup()); av.getSelectionGroup().addOrRemove(found, true); - av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1); + av.getSelectionGroup().setEndRes(av.getAlignment().getWidth() - 1); } + PaintRefresher.Refresh(this, av.getSequenceSetId()); + av.sendSelection(); } repaint(); } @@ -595,8 +600,8 @@ public class RotatableCanvas extends Panel implements MouseListener, { if (av != null) { - if (!av.getSelectionGroup().getSequences(null).contains( - sp.sequence)) + if (!av.getSelectionGroup().getSequences(null) + .contains(sp.sequence)) { av.getSelectionGroup().addSequence(sp.sequence, true); }