/*\r
-* Jalview - A Sequence Alignment Editor and Viewer\r
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
-*\r
-* This program is free software; you can redistribute it and/or\r
-* modify it under the terms of the GNU General Public License\r
-* as published by the Free Software Foundation; either version 2\r
-* of the License, or (at your option) any later version.\r
-*\r
-* This program is distributed in the hope that it will be useful,\r
-* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
-* GNU General Public License for more details.\r
-*\r
-* You should have received a copy of the GNU General Public License\r
-* along with this program; if not, write to the Free Software\r
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\r
-*/\r
-\r
+ * Jalview - A Sequence Alignment Editor and Viewer\r
+ * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program; if not, write to the Free Software\r
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\r
+ */\r
package jalview.gui;\r
\r
-import jalview.math.*;\r
-import jalview.datamodel.*;\r
-import jalview.util.*;\r
+import java.util.*;\r
\r
import java.awt.*;\r
import java.awt.event.*;\r
import javax.swing.*;\r
-import java.util.*;\r
\r
+import jalview.datamodel.*;\r
+import jalview.math.*;\r
+import jalview.util.*;\r
\r
-public class RotatableCanvas extends JPanel implements MouseListener,\r
- MouseMotionListener,\r
- KeyListener\r
- //RubberbandListener,\r
- //SequenceSelectionListener\r
+public class RotatableCanvas\r
+ extends JPanel implements MouseListener,\r
+ MouseMotionListener, KeyListener\r
+//RubberbandListener,\r
+//SequenceSelectionListener\r
{\r
- RotatableMatrix idmat = new RotatableMatrix(3,3);\r
- RotatableMatrix objmat = new RotatableMatrix(3,3);\r
- RotatableMatrix rotmat = new RotatableMatrix(3,3);\r
+ RotatableMatrix idmat = new RotatableMatrix(3, 3);\r
+ RotatableMatrix objmat = new RotatableMatrix(3, 3);\r
+ RotatableMatrix rotmat = new RotatableMatrix(3, 3);\r
\r
//RubberbandRectangle rubberband;\r
-\r
boolean drawAxes = true;\r
-\r
int omx = 0;\r
int mx = 0;\r
int omy = 0;\r
int my = 0;\r
-\r
Image img;\r
Graphics ig;\r
-\r
Dimension prefsize;\r
-\r
- float centre[] = new float[3];\r
- float width[] = new float[3];\r
-\r
- float max[] = new float[3];\r
- float min[] = new float[3];\r
-\r
+ float[] centre = new float[3];\r
+ float[] width = new float[3];\r
+ float[] max = new float[3];\r
+ float[] min = new float[3];\r
float maxwidth;\r
float scale;\r
-\r
int npoint;\r
-\r
Vector points;\r
float[][] orig;\r
float[][] axes;\r
-\r
int startx;\r
int starty;\r
-\r
int lastx;\r
int lasty;\r
-\r
int rectx1;\r
int recty1;\r
int rectx2;\r
int recty2;\r
-\r
float scalefactor = 1;\r
-\r
AlignViewport av;\r
-// Controller controller;\r
-\r
\r
- public RotatableCanvas(AlignViewport av,\r
- Vector points, int npoint) {\r
+ // Controller controller;\r
+ public RotatableCanvas(AlignViewport av, Vector points, int npoint)\r
+ {\r
this.points = points;\r
this.npoint = npoint;\r
this.av = av;\r
ToolTipManager.sharedInstance().registerComponent(this);\r
PaintRefresher.Register(this);\r
-//\r
+\r
+ //\r
prefsize = getPreferredSize();\r
orig = new float[npoint][3];\r
\r
- for (int i=0; i < npoint; i++) {\r
- SequencePoint sp = (SequencePoint)points.elementAt(i);\r
- for (int j=0; j < 3; j++) {\r
+ for (int i = 0; i < npoint; i++)\r
+ {\r
+ SequencePoint sp = (SequencePoint) points.elementAt(i);\r
+\r
+ for (int j = 0; j < 3; j++)\r
+ {\r
orig[i][j] = sp.coord[j];\r
}\r
}\r
- //Initialize the matrices to identity\r
\r
- for (int i = 0; i < 3; i++) {\r
- for (int j = 0; j < 3 ; j++) {\r
- if (i != j) {\r
- idmat.addElement(i,j,0);\r
- objmat.addElement(i,j,0);\r
- rotmat.addElement(i,j,0);\r
- } else {\r
- idmat.addElement(i,j,0);\r
- objmat.addElement(i,j,0);\r
- rotmat.addElement(i,j,0);\r
+ //Initialize the matrices to identity\r
+ for (int i = 0; i < 3; i++)\r
+ {\r
+ for (int j = 0; j < 3; j++)\r
+ {\r
+ if (i != j)\r
+ {\r
+ idmat.addElement(i, j, 0);\r
+ objmat.addElement(i, j, 0);\r
+ rotmat.addElement(i, j, 0);\r
+ }\r
+ else\r
+ {\r
+ idmat.addElement(i, j, 0);\r
+ objmat.addElement(i, j, 0);\r
+ rotmat.addElement(i, j, 0);\r
}\r
}\r
}\r
scale = findScale();\r
\r
// System.out.println("Scale factor = " + scale);\r
-\r
addMouseListener(this);\r
addKeyListener(this);\r
- // if (getParent() != null) {\r
- // getParent().addKeyListener(this);\r
+\r
+ // if (getParent() != null) {\r
+ // getParent().addKeyListener(this);\r
//}\r
addMouseMotionListener(this);\r
\r
// Add rubberband\r
- // rubberband = new RubberbandRectangle(this);\r
- // rubberband.setActive(true);\r
- // rubberband.addListener(this);\r
- }\r
-\r
- /* public boolean handleSequenceSelectionEvent(SequenceSelectionEvent evt) {\r
- redrawneeded = true;\r
- repaint();\r
- return true;\r
+ // rubberband = new RubberbandRectangle(this);\r
+ // rubberband.setActive(true);\r
+ // rubberband.addListener(this);\r
}\r
\r
- public void removeNotify() {\r
- controller.removeListener(this);\r
- super.removeNotify();\r
- }*/\r
-\r
- public void initAxes() {\r
- for (int i = 0; i < 3; i++) {\r
- for (int j=0; j < 3; j++) {\r
- if (i != j) {\r
+ /* public boolean handleSequenceSelectionEvent(SequenceSelectionEvent evt) {\r
+ redrawneeded = true;\r
+ repaint();\r
+ return true;\r
+ }\r
+\r
+ public void removeNotify() {\r
+ controller.removeListener(this);\r
+ super.removeNotify();\r
+ }*/\r
+ public void initAxes()\r
+ {\r
+ for (int i = 0; i < 3; i++)\r
+ {\r
+ for (int j = 0; j < 3; j++)\r
+ {\r
+ if (i != j)\r
+ {\r
axes[i][j] = 0;\r
- } else {\r
+ }\r
+ else\r
+ {\r
axes[i][j] = 1;\r
}\r
}\r
}\r
}\r
\r
- public void findWidth() {\r
+ public void findWidth()\r
+ {\r
max = new float[3];\r
min = new float[3];\r
\r
- max[0] = (float)-1e30;\r
- max[1] = (float)-1e30;\r
- max[2] = (float)-1e30;\r
+ max[0] = (float) - 1e30;\r
+ max[1] = (float) - 1e30;\r
+ max[2] = (float) - 1e30;\r
+\r
+ min[0] = (float) 1e30;\r
+ min[1] = (float) 1e30;\r
+ min[2] = (float) 1e30;\r
\r
- min[0] = (float)1e30;\r
- min[1] = (float)1e30;\r
- min[2] = (float)1e30;\r
+ for (int i = 0; i < 3; i++)\r
+ {\r
+ for (int j = 0; j < npoint; j++)\r
+ {\r
+ SequencePoint sp = (SequencePoint) points.elementAt(j);\r
\r
- for (int i = 0; i < 3; i++) {\r
- for (int j = 0; j < npoint; j++) {\r
- SequencePoint sp = (SequencePoint)points.elementAt(j);\r
- if (sp.coord[i] >= max[i]) {\r
+ if (sp.coord[i] >= max[i])\r
+ {\r
max[i] = sp.coord[i];\r
}\r
- if (sp.coord[i] <= min[i]) {\r
+\r
+ if (sp.coord[i] <= min[i])\r
+ {\r
min[i] = sp.coord[i];\r
}\r
}\r
// System.out.println("xmax " + max[0] + " min " + min[0]);\r
//System.out.println("ymax " + max[1] + " min " + min[1]);\r
//System.out.println("zmax " + max[2] + " min " + min[2]);\r
-\r
width[0] = Math.abs(max[0] - min[0]);\r
width[1] = Math.abs(max[1] - min[1]);\r
width[2] = Math.abs(max[2] - min[2]);\r
maxwidth = width[0];\r
\r
if (width[1] > width[0])\r
+ {\r
maxwidth = width[1];\r
+ }\r
+\r
if (width[2] > width[1])\r
+ {\r
maxwidth = width[2];\r
+ }\r
\r
//System.out.println("Maxwidth = " + maxwidth);\r
}\r
\r
- public float findScale() {\r
- int dim, width, height;\r
- if (getWidth() != 0) {\r
+ public float findScale()\r
+ {\r
+ int dim;\r
+ int width;\r
+ int height;\r
+\r
+ if (getWidth() != 0)\r
+ {\r
width = getWidth();\r
height = getHeight();\r
- } else {\r
+ }\r
+ else\r
+ {\r
width = prefsize.width;\r
height = prefsize.height;\r
}\r
\r
- if (width < height) {\r
+ if (width < height)\r
+ {\r
dim = width;\r
- } else {\r
+ }\r
+ else\r
+ {\r
dim = height;\r
}\r
\r
- return (float)(dim*scalefactor/(2*maxwidth));\r
+ return (float) ( (dim * scalefactor) / (2 * maxwidth));\r
}\r
\r
- public void findCentre() {\r
+ public void findCentre()\r
+ {\r
//Find centre coordinate\r
findWidth();\r
\r
- centre[0] = (max[0] + min[0])/2;\r
- centre[1] = (max[1] + min[1])/2;\r
- centre[2] = (max[2] + min[2])/2;\r
+ centre[0] = (max[0] + min[0]) / 2;\r
+ centre[1] = (max[1] + min[1]) / 2;\r
+ centre[2] = (max[2] + min[2]) / 2;\r
\r
// System.out.println("Centre x " + centre[0]);\r
//System.out.println("Centre y " + centre[1]);\r
//System.out.println("Centre z " + centre[2]);\r
}\r
\r
- public Dimension getPreferredSize() {\r
- if (prefsize != null) {\r
+ public Dimension getPreferredSize()\r
+ {\r
+ if (prefsize != null)\r
+ {\r
return prefsize;\r
- } else {\r
- return new Dimension(400,400);\r
+ }\r
+ else\r
+ {\r
+ return new Dimension(400, 400);\r
}\r
}\r
\r
- public Dimension getMinimumSize() {\r
+ public Dimension getMinimumSize()\r
+ {\r
return getPreferredSize();\r
}\r
\r
- public void paintComponent(Graphics g) {\r
+ public void paintComponent(Graphics g)\r
+ {\r
//Only create the image at the beginning -\r
- if ((img == null) || (prefsize.width != getWidth()) || (prefsize.height != getHeight())) {\r
+ if ( (img == null) || (prefsize.width != getWidth()) ||\r
+ (prefsize.height != getHeight()))\r
+ {\r
prefsize.width = getWidth();\r
prefsize.height = getHeight();\r
\r
scale = findScale();\r
\r
// System.out.println("New scale = " + scale);\r
- img = createImage(getWidth(),getHeight());\r
+ img = createImage(getWidth(), getHeight());\r
ig = img.getGraphics();\r
-\r
}\r
\r
+ drawBackground(ig, Color.black);\r
+ drawScene(ig);\r
\r
- drawBackground(ig,Color.black);\r
- drawScene(ig);\r
- if (drawAxes == true)\r
- {\r
- drawAxes(ig);\r
- }\r
-\r
+ if (drawAxes == true)\r
+ {\r
+ drawAxes(ig);\r
+ }\r
\r
- g.drawImage(img,0,0,this);\r
+ g.drawImage(img, 0, 0, this);\r
}\r
\r
- public void drawAxes(Graphics g) {\r
-\r
+ public void drawAxes(Graphics g)\r
+ {\r
g.setColor(Color.yellow);\r
- for (int i=0; i < 3 ; i++) {\r
- g.drawLine(getWidth()/2,getHeight()/2,\r
- (int)(axes[i][0]*scale*max[0] + getWidth()/2),\r
- (int)(axes[i][1]*scale*max[1] + getHeight()/2));\r
+\r
+ for (int i = 0; i < 3; i++)\r
+ {\r
+ g.drawLine(getWidth() / 2, getHeight() / 2,\r
+ (int) ( (axes[i][0] * scale * max[0]) + (getWidth() / 2)),\r
+ (int) ( (axes[i][1] * scale * max[1]) + (getHeight() / 2)));\r
}\r
}\r
\r
- public void drawBackground(Graphics g, Color col) {\r
+ public void drawBackground(Graphics g, Color col)\r
+ {\r
g.setColor(col);\r
- g.fillRect(0,0,prefsize.width,prefsize.height);\r
+ g.fillRect(0, 0, prefsize.width, prefsize.height);\r
}\r
\r
-\r
- public void drawScene(Graphics g) {\r
+ public void drawScene(Graphics g)\r
+ {\r
boolean darker = false;\r
\r
- int halfwidth = getWidth()/2;\r
- int halfheight = getHeight()/2;\r
+ int halfwidth = getWidth() / 2;\r
+ int halfheight = getHeight() / 2;\r
\r
- for (int i = 0; i < npoint; i++) {\r
- SequencePoint sp = (SequencePoint)points.elementAt(i);\r
- int x = (int)((float)(sp.coord[0] - centre[0])*scale) + halfwidth;\r
- int y = (int)((float)(sp.coord[1] - centre[1])*scale) + halfheight;\r
+ for (int i = 0; i < npoint; i++)\r
+ {\r
+ SequencePoint sp = (SequencePoint) points.elementAt(i);\r
+ int x = (int) ( (float) (sp.coord[0] - centre[0]) * scale) +\r
+ halfwidth;\r
+ int y = (int) ( (float) (sp.coord[1] - centre[1]) * scale) +\r
+ halfheight;\r
float z = sp.coord[1] - centre[2];\r
\r
-\r
-\r
-\r
if (sp.sequence.getColor() == Color.black)\r
- g.setColor(Color.white);\r
+ {\r
+ g.setColor(Color.white);\r
+ }\r
else\r
- g.setColor(sp.sequence.getColor());\r
-\r
+ {\r
+ g.setColor(sp.sequence.getColor());\r
+ }\r
\r
if (av.getSelectionGroup() != null)\r
{\r
- if (av.getSelectionGroup().sequences.contains(((SequencePoint)points.elementAt(i)).sequence))\r
+ if (av.getSelectionGroup().sequences.contains(\r
+ ( (SequencePoint) points.elementAt(i)).sequence))\r
+ {\r
g.setColor(Color.gray);\r
+ }\r
}\r
+\r
if (z < 0)\r
+ {\r
g.setColor(g.getColor().darker());\r
+ }\r
\r
-\r
- g.fillRect(x-3,y-3,6,6);\r
+ g.fillRect(x - 3, y - 3, 6, 6);\r
g.setColor(Color.red);\r
}\r
-// //Now the rectangle\r
-// if (rectx2 != -1 && recty2 != -1) {\r
-// g.setColor(Color.white);\r
-//\r
-// g.drawRect(rectx1,recty1,rectx2-rectx1,recty2-recty1);\r
-// }\r
+\r
+ // //Now the rectangle\r
+ // if (rectx2 != -1 && recty2 != -1) {\r
+ // g.setColor(Color.white);\r
+ //\r
+ // g.drawRect(rectx1,recty1,rectx2-rectx1,recty2-recty1);\r
+ // }\r
}\r
\r
- public Dimension minimumsize() {\r
+ public Dimension minimumsize()\r
+ {\r
return prefsize;\r
}\r
\r
- public Dimension preferredsize() {\r
+ public Dimension preferredsize()\r
+ {\r
return prefsize;\r
}\r
\r
- public void keyTyped(KeyEvent evt) { }\r
- public void keyReleased(KeyEvent evt) { }\r
+ public void keyTyped(KeyEvent evt)\r
+ {\r
+ }\r
\r
- public void keyPressed(KeyEvent evt) {\r
+ public void keyReleased(KeyEvent evt)\r
+ {\r
+ }\r
+\r
+ public void keyPressed(KeyEvent evt)\r
+ {\r
requestFocus();\r
- if (evt.getKeyCode() == KeyEvent.VK_UP) {\r
- scalefactor = (float)(scalefactor * 1.1);\r
+\r
+ if (evt.getKeyCode() == KeyEvent.VK_UP)\r
+ {\r
+ scalefactor = (float) (scalefactor * 1.1);\r
scale = findScale();\r
- } else if (evt.getKeyCode() == KeyEvent.VK_DOWN) {\r
- scalefactor = (float)(scalefactor * 0.9);\r
+ }\r
+ else if (evt.getKeyCode() == KeyEvent.VK_DOWN)\r
+ {\r
+ scalefactor = (float) (scalefactor * 0.9);\r
scale = findScale();\r
- } else if (evt.getKeyChar() == 's') {\r
+ }\r
+ else if (evt.getKeyChar() == 's')\r
+ {\r
System.err.println("DEBUG: Rectangle selection"); // log.debug\r
- if (rectx2 != -1 && recty2 != -1) {\r
- rectSelect(rectx1,recty1,rectx2,recty2);\r
\r
+ if ( (rectx2 != -1) && (recty2 != -1))\r
+ {\r
+ rectSelect(rectx1, recty1, rectx2, recty2);\r
}\r
}\r
+\r
repaint();\r
}\r
\r
- public void printPoints() {\r
- for (int i=0; i < npoint; i++) {\r
- SequencePoint sp = (SequencePoint)points.elementAt(i);\r
- Format.print(System.out,"%5d ", i);\r
- for (int j=0; j < 3;j++) {\r
- Format.print(System.out,"%13.3f ",sp.coord[j]);\r
+ public void printPoints()\r
+ {\r
+ for (int i = 0; i < npoint; i++)\r
+ {\r
+ SequencePoint sp = (SequencePoint) points.elementAt(i);\r
+ Format.print(System.out, "%5d ", i);\r
+\r
+ for (int j = 0; j < 3; j++)\r
+ {\r
+ Format.print(System.out, "%13.3f ", sp.coord[j]);\r
}\r
+\r
System.out.println();\r
}\r
}\r
\r
- public void mouseClicked(MouseEvent evt) { }\r
- public void mouseEntered(MouseEvent evt) { }\r
- public void mouseExited(MouseEvent evt) { }\r
- public void mouseReleased(MouseEvent evt) { }\r
+ public void mouseClicked(MouseEvent evt)\r
+ {\r
+ }\r
+\r
+ public void mouseEntered(MouseEvent evt)\r
+ {\r
+ }\r
+\r
+ public void mouseExited(MouseEvent evt)\r
+ {\r
+ }\r
\r
- public void mousePressed(MouseEvent evt) {\r
+ public void mouseReleased(MouseEvent evt)\r
+ {\r
+ }\r
+\r
+ public void mousePressed(MouseEvent evt)\r
+ {\r
int x = evt.getX();\r
int y = evt.getY();\r
\r
rectx2 = -1;\r
recty2 = -1;\r
\r
- SequenceI found = findPoint(x,y);\r
+ SequenceI found = findPoint(x, y);\r
\r
if (found != null)\r
{\r
}\r
else\r
{\r
- av.setSelectionGroup(new SequenceGroup());\r
- av.getSelectionGroup().addOrRemove(found);\r
- av.getSelectionGroup().setEndRes(av.alignment.getWidth());\r
-\r
+ av.setSelectionGroup(new SequenceGroup());\r
+ av.getSelectionGroup().addOrRemove(found);\r
+ av.getSelectionGroup().setEndRes(av.alignment.getWidth());\r
}\r
}\r
+\r
repaint();\r
}\r
\r
- // private void fireSequenceSelectionEvent(Selection sel) {\r
- // controller.handleSequenceSelectionEvent(new SequenceSelectionEvent(this,sel));\r
+ // private void fireSequenceSelectionEvent(Selection sel) {\r
+ // controller.handleSequenceSelectionEvent(new SequenceSelectionEvent(this,sel));\r
//}\r
-\r
public void mouseMoved(MouseEvent evt)\r
{\r
- SequenceI found = findPoint(evt.getX(), evt.getY());\r
- if (found != null)\r
- this.setToolTipText(found.getName());\r
- else\r
- this.setToolTipText(null);\r
- }\r
-\r
- public void mouseDragged(MouseEvent evt) {\r
+ SequenceI found = findPoint(evt.getX(), evt.getY());\r
+\r
+ if (found != null)\r
+ {\r
+ this.setToolTipText(found.getName());\r
+ }\r
+ else\r
+ {\r
+ this.setToolTipText(null);\r
+ }\r
+ }\r
+\r
+ public void mouseDragged(MouseEvent evt)\r
+ {\r
mx = evt.getX();\r
my = evt.getY();\r
+\r
//Check if this is a rectangle drawing drag\r
- if ((evt.getModifiers() & InputEvent.BUTTON2_MASK) != 0) {\r
-// rectx2 = evt.getX();\r
-// recty2 = evt.getY();\r
- } else {\r
+ if ( (evt.getModifiers() & InputEvent.BUTTON2_MASK) != 0)\r
+ {\r
+ // rectx2 = evt.getX();\r
+ // recty2 = evt.getY();\r
+ }\r
+ else\r
+ {\r
rotmat.setIdentity();\r
\r
- rotmat.rotate((float)(my-omy),'x');\r
- rotmat.rotate((float)(mx-omx),'y');\r
+ rotmat.rotate( (float) (my - omy), 'x');\r
+ rotmat.rotate( (float) (mx - omx), 'y');\r
\r
- for (int i = 0; i < npoint; i++) {\r
- SequencePoint sp = (SequencePoint)points.elementAt(i);\r
+ for (int i = 0; i < npoint; i++)\r
+ {\r
+ SequencePoint sp = (SequencePoint) points.elementAt(i);\r
sp.coord[0] -= centre[0];\r
sp.coord[1] -= centre[1];\r
sp.coord[2] -= centre[2];\r
\r
//Now apply the rotation matrix\r
- sp.coord= rotmat.vectorMultiply(sp.coord);\r
+ sp.coord = rotmat.vectorMultiply(sp.coord);\r
\r
//Now translate back again\r
sp.coord[0] += centre[0];\r
sp.coord[2] += centre[2];\r
}\r
\r
- for (int i=0; i < 3; i++) {\r
+ for (int i = 0; i < 3; i++)\r
+ {\r
axes[i] = rotmat.vectorMultiply(axes[i]);\r
}\r
+\r
omx = mx;\r
omy = my;\r
\r
paint(this.getGraphics());\r
}\r
-\r
}\r
\r
- public void rectSelect(int x1, int y1, int x2, int y2) {\r
+ public void rectSelect(int x1, int y1, int x2, int y2)\r
+ {\r
boolean changedSel = false;\r
- for (int i=0; i < npoint; i++) {\r
- SequencePoint sp = (SequencePoint)points.elementAt(i);\r
- int tmp1 = (int)((sp.coord[0] - centre[0])*scale + (float)getWidth()/2.0);\r
- int tmp2 = (int)((sp.coord[1] - centre[1])*scale + (float)getHeight()/2.0);\r
\r
- if (tmp1 > x1 && tmp1 < x2 && tmp2 > y1 && tmp2 < y2) {\r
- if (av != null) {\r
+ for (int i = 0; i < npoint; i++)\r
+ {\r
+ SequencePoint sp = (SequencePoint) points.elementAt(i);\r
+ int tmp1 = (int) ( ( (sp.coord[0] - centre[0]) * scale) +\r
+ ( (float) getWidth() / 2.0));\r
+ int tmp2 = (int) ( ( (sp.coord[1] - centre[1]) * scale) +\r
+ ( (float) getHeight() / 2.0));\r
+\r
+ if ( (tmp1 > x1) && (tmp1 < x2) && (tmp2 > y1) && (tmp2 < y2))\r
+ {\r
+ if (av != null)\r
+ {\r
if (!av.getSelectionGroup().sequences.contains(sp.sequence))\r
{\r
changedSel = true;\r
}\r
}\r
}\r
- // if (changedSel) {\r
- // fireSequenceSelectionEvent(av.getSelection());\r
- // }\r
+\r
+ // if (changedSel) {\r
+ // fireSequenceSelectionEvent(av.getSelection());\r
+ // }\r
}\r
- public SequenceI findPoint(int x, int y) {\r
\r
- int halfwidth = getWidth()/2;\r
- int halfheight = getHeight()/2;\r
+ public SequenceI findPoint(int x, int y)\r
+ {\r
+ int halfwidth = getWidth() / 2;\r
+ int halfheight = getHeight() / 2;\r
\r
int found = -1;\r
\r
- for (int i=0; i < npoint; i++) {\r
-\r
- SequencePoint sp = (SequencePoint)points.elementAt(i);\r
- int px = (int)((float)(sp.coord[0] - centre[0])*scale) + halfwidth;\r
- int py = (int)((float)(sp.coord[1] - centre[1])*scale) + halfheight;\r
-\r
+ for (int i = 0; i < npoint; i++)\r
+ {\r
+ SequencePoint sp = (SequencePoint) points.elementAt(i);\r
+ int px = (int) ( (float) (sp.coord[0] - centre[0]) * scale) +\r
+ halfwidth;\r
+ int py = (int) ( (float) (sp.coord[1] - centre[1]) * scale) +\r
+ halfheight;\r
\r
- if (Math.abs(px-x)<3 && Math.abs(py - y) < 3 ) {\r
+ if ( (Math.abs(px - x) < 3) && (Math.abs(py - y) < 3))\r
+ {\r
found = i;\r
}\r
}\r
- if (found != -1) {\r
- return ((SequencePoint)points.elementAt(found)).sequence;\r
- } else {\r
+\r
+ if (found != -1)\r
+ {\r
+ return ( (SequencePoint) points.elementAt(found)).sequence;\r
+ }\r
+ else\r
+ {\r
return null;\r
}\r
}\r
-/* public boolean handleRubberbandEvent(RubberbandEvent evt) {\r
- System.out.println("Rubberband handler called in RotatableCanvas with " +\r
- evt.getBounds());\r
\r
- Rubberband rb = (Rubberband)evt.getSource();\r
+ /* public boolean handleRubberbandEvent(RubberbandEvent evt) {\r
+ System.out.println("Rubberband handler called in RotatableCanvas with " +\r
+ evt.getBounds());\r
\r
- // Clear the current selection (instance variable)\r
- //if ((rb.getModifiers() & Event.SHIFT_MASK) == 0) {\r
- // clearSelection();\r
- //}\r
+ Rubberband rb = (Rubberband)evt.getSource();\r
\r
- if (rb.getComponent() == this) {\r
- Rectangle bounds = evt.getBounds();\r
- rectSelect(bounds.x,bounds.y,bounds.x+bounds.width,bounds.y+bounds.height);\r
- }\r
+ // Clear the current selection (instance variable)\r
+ //if ((rb.getModifiers() & Event.SHIFT_MASK) == 0) {\r
+ // clearSelection();\r
+ //}\r
\r
- redrawneeded = true;\r
- paint(this.getGraphics());\r
+ if (rb.getComponent() == this) {\r
+ Rectangle bounds = evt.getBounds();\r
+ rectSelect(bounds.x,bounds.y,bounds.x+bounds.width,bounds.y+bounds.height);\r
+ }\r
\r
- return true;\r
- }*/\r
+ redrawneeded = true;\r
+ paint(this.getGraphics());\r
\r
+ return true;\r
+ }*/\r
}\r
git://source.jalview.org / jalview.git / blobdiff