Formatting

[jalview.git] / src / jalview / appletgui / RotatableCanvas.java

diff --git a/src/jalview/appletgui/RotatableCanvas.java b/src/jalview/appletgui/RotatableCanvas.java
index 36e0859..a2463e8 100755 (executable)
--- a/src/jalview/appletgui/RotatableCanvas.java
+++ b/src/jalview/appletgui/RotatableCanvas.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2007 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
@@ -297,6 +297,7 @@ public class RotatableCanvas
   {\r
     paint(g);\r
   }\r
+\r
   public void paint(Graphics g)\r
   {\r
     if (points == null)\r
@@ -329,7 +330,7 @@ public class RotatableCanvas
         drawAxes(ig);\r
       }\r
 \r
-      if(tooltip!=null)\r
+      if (tooltip != null)\r
       {\r
         ig.setColor(Color.red);\r
         ig.drawString(tooltip, toolx, tooly);\r
@@ -382,7 +383,8 @@ public class RotatableCanvas
 \r
       if (av.getSelectionGroup() != null)\r
       {\r
-        if (av.getSelectionGroup().getSequences(null).contains( ( (SequencePoint) points.\r
+        if (av.getSelectionGroup().getSequences(null).contains( ( (\r
+            SequencePoint) points.\r
             elementAt(i)).sequence))\r
         {\r
           g.setColor(Color.gray);\r
@@ -497,33 +499,34 @@ public class RotatableCanvas
       if (av.getSelectionGroup() != null)\r
       {\r
         av.getSelectionGroup().addOrRemove(found, true);\r
-        av.getSelectionGroup().setEndRes(av.alignment.getWidth()-1);\r
+        av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1);\r
         PaintRefresher.Refresh(this, av.getSequenceSetId());\r
       }\r
       else\r
       {\r
         av.setSelectionGroup(new SequenceGroup());\r
         av.getSelectionGroup().addOrRemove(found, true);\r
-        av.getSelectionGroup().setEndRes(av.alignment.getWidth()-1);\r
+        av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1);\r
 \r
       }\r
     }\r
     repaint();\r
   }\r
 \r
-\r
   public void mouseMoved(MouseEvent evt)\r
   {\r
-     SequenceI found = findPoint(evt.getX(), evt.getY());\r
-     if(found==null)\r
-       tooltip = null;\r
-     else\r
-     {\r
-       tooltip = found.getName();\r
-       toolx = evt.getX();\r
-       tooly = evt.getY();\r
-     }\r
-     repaint();\r
+    SequenceI found = findPoint(evt.getX(), evt.getY());\r
+    if (found == null)\r
+    {\r
+      tooltip = null;\r
+    }\r
+    else\r
+    {\r
+      tooltip = found.getName();\r
+      toolx = evt.getX();\r
+      tooly = evt.getY();\r
+    }\r
+    repaint();\r
   }\r
 \r
   public void mouseDragged(MouseEvent evt)\r
@@ -531,35 +534,35 @@ public class RotatableCanvas
     mx = evt.getX();\r
     my = evt.getY();\r
 \r
-      rotmat.setIdentity();\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
-      {\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
-\r
-        //Now translate back again\r
-        sp.coord[0] += centre[0];\r
-        sp.coord[1] += centre[1];\r
-        sp.coord[2] += centre[2];\r
-      }\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
-      for (int i = 0; i < 3; i++)\r
-      {\r
-        axes[i] = rotmat.vectorMultiply(axes[i]);\r
-      }\r
-      omx = mx;\r
-      omy = my;\r
+      //Now apply the rotation matrix\r
+      sp.coord = rotmat.vectorMultiply(sp.coord);\r
+\r
+      //Now translate back again\r
+      sp.coord[0] += centre[0];\r
+      sp.coord[1] += centre[1];\r
+      sp.coord[2] += centre[2];\r
+    }\r
+\r
+    for (int i = 0; i < 3; i++)\r
+    {\r
+      axes[i] = rotmat.vectorMultiply(axes[i]);\r
+    }\r
+    omx = mx;\r
+    omy = my;\r
 \r
-      paint(this.getGraphics());\r
+    paint(this.getGraphics());\r
   }\r
 \r
   public void rectSelect(int x1, int y1, int x2, int y2)\r