doco writing.

[jalview.git] / src / jalview / gui / ScalePanel.java

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 87e72dc..8f32d8c 100755 (executable)
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -43,6 +43,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
     boolean stretchingGroup = false;\r
     int min; //used by mouseDragged to see if user\r
     int max; //used by mouseDragged to see if user\r
+    boolean mouseDragging = false;\r
 \r
     // wants to delete columns\r
     public ScalePanel(AlignViewport av, AlignmentPanel ap)\r
@@ -72,7 +73,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
         min = res;\r
         max = res;\r
 \r
-        if(reveal != null && SwingUtilities.isRightMouseButton(evt))\r
+      /*  if(reveal != null && SwingUtilities.isRightMouseButton(evt))\r
           {\r
             JPopupMenu pop = new JPopupMenu();\r
             JMenuItem item = new JMenuItem("Reveal");\r
@@ -83,6 +84,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
                 av.getColumnSelection().revealHiddenColumns(reveal[0], av);\r
                 reveal = null;\r
                 ap.repaint();\r
+                if(ap.overviewPanel != null)\r
+                    ap.overviewPanel.updateOverviewImage();\r
               }\r
             });\r
             pop.add(item);\r
@@ -97,6 +100,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
                   av.getColumnSelection().revealAllHiddenColumns(av);\r
                   reveal = null;\r
                   ap.repaint();\r
+                  if(ap.overviewPanel != null)\r
+                    ap.overviewPanel.updateOverviewImage();\r
                 }\r
               });\r
               pop.add(item);\r
@@ -105,9 +110,10 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             pop.show(this, evt.getX(), evt.getY());\r
 \r
           }\r
-        else if (av.getColumnSelection().contains(res))\r
+        else*/\r
+      if (av.getColumnSelection().contains(res))\r
         {\r
-          if( SwingUtilities.isRightMouseButton(evt))\r
+        /*  if( SwingUtilities.isRightMouseButton(evt))\r
           {\r
             JPopupMenu pop = new JPopupMenu();\r
             JMenuItem item = new JMenuItem("Hide Columns");\r
@@ -117,13 +123,15 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
               {\r
                 av.getColumnSelection().hideColumns(res, av);\r
                 ap.repaint();\r
+                if(ap.overviewPanel != null)\r
+                  ap.overviewPanel.updateOverviewImage();\r
               }\r
             });\r
             pop.add(item);\r
             pop.show(this, evt.getX(), evt.getY());\r
 \r
           }\r
-          else\r
+          else*/\r
           {\r
             av.getColumnSelection().removeElement(res);\r
             av.setSelectionGroup(null);\r
@@ -155,6 +163,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
      */\r
     public void mouseReleased(MouseEvent evt)\r
     {\r
+        mouseDragging = false;\r
+\r
         int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
 \r
         if(av.hasHiddenColumns)\r
@@ -189,6 +199,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
      */\r
     public void mouseDragged(MouseEvent evt)\r
     {\r
+        mouseDragging = true;\r
+\r
         int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
 \r
         if(av.hasHiddenColumns)\r
@@ -204,6 +216,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             max = res;\r
         }\r
 \r
+\r
         SequenceGroup sg = av.getSelectionGroup();\r
 \r
         if (sg != null)\r
@@ -219,7 +232,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             {\r
                 sg.setEndRes(res);\r
             }\r
-            else if (res < sg.getStartRes())\r
+            if (res < sg.getStartRes())\r
             {\r
                 sg.setStartRes(res);\r
             }\r
@@ -240,8 +253,18 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
         }\r
     }\r
 \r
-    public void mouseEntered(MouseEvent evt){}\r
-    public void mouseExited(MouseEvent evt){}\r
+    public void mouseEntered(MouseEvent evt)\r
+    {\r
+      if(mouseDragging)\r
+        ap.seqPanel.scrollCanvas(null);\r
+    }\r
+\r
+    public void mouseExited(MouseEvent evt)\r
+    {\r
+      if(mouseDragging)\r
+        ap.seqPanel.scrollCanvas(evt);\r
+    }\r
+\r
     public void mouseClicked(MouseEvent evt){}\r
 \r
     public void mouseMoved(MouseEvent evt)\r
@@ -260,8 +283,13 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
         if(res+1==region[0] || res-1==region[1])\r
         {\r
           reveal = region;\r
+          ToolTipManager.sharedInstance().registerComponent(this);\r
+          this.setToolTipText("Reveal Hidden Columns with Right Mouse Button");\r
           break;\r
         }\r
+        else\r
+          this.setToolTipText(null);\r
+\r
       }\r
 \r
       repaint();\r
@@ -353,8 +381,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
           {\r
             res = av.getColumnSelection().findHiddenRegionPosition( i )-startx;\r
 \r
-            gg.fillPolygon(new int[] { res*av.charWidth - 4,\r
-                                         res*av.charWidth + 4,\r
+            gg.fillPolygon(new int[] { res*av.charWidth - av.charHeight/4,\r
+                                         res*av.charWidth + av.charHeight/4,\r
                                          res*av.charWidth },\r
                                 new int[]\r
                                 {\r
@@ -362,6 +390,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
                                     y + 8\r
                                 }, 3);\r
 \r
+\r
           }\r
 \r
           if (reveal != null && reveal[0] > startx && reveal[0] < endx)\r