pass viewport to fileloader, as we need to firepropertychange once sequences are...

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

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 7fa3abd..9add747 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,16 +73,47 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
         min = res;\r
         max = res;\r
 \r
-        if(reveal != null)\r
-        {\r
-          av.getColumnSelection().revealHiddenColumns(reveal[0], av);\r
-          reveal = null;\r
-          return;\r
-        }\r
+      /*  if(reveal != null && SwingUtilities.isRightMouseButton(evt))\r
+          {\r
+            JPopupMenu pop = new JPopupMenu();\r
+            JMenuItem item = new JMenuItem("Reveal");\r
+            item.addActionListener(new ActionListener()\r
+            {\r
+              public void actionPerformed(ActionEvent e)\r
+              {\r
+                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
 \r
-        if (av.getColumnSelection().contains(res))\r
+            if(av.getColumnSelection().hiddenColumns.size()>1)\r
+            {\r
+              item = new JMenuItem("Reveal All");\r
+              item.addActionListener(new ActionListener()\r
+              {\r
+                public void actionPerformed(ActionEvent e)\r
+                {\r
+                  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
+            }\r
+\r
+            pop.show(this, evt.getX(), evt.getY());\r
+\r
+          }\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
@@ -90,16 +122,19 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
               public void actionPerformed(ActionEvent e)\r
               {\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
-            ap.annotationPanel.removeEditableColumn(res);\r
+            av.setSelectionGroup(null);\r
           }\r
         }\r
         else\r
@@ -128,20 +163,18 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
      */\r
     public void mouseReleased(MouseEvent evt)\r
     {\r
-        int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
+        mouseDragging = false;\r
 \r
-        if(av.hasHiddenColumns)\r
-          res = av.getColumnSelection().adjustForHiddenColumns(res);\r
+        int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
 \r
-        if (av.getColumnSelection() != null)\r
+        if(res> av.alignment.getWidth())\r
         {\r
-            for (int i = 0; i < av.getColumnSelection().size(); i++)\r
-            {\r
-                ap.annotationPanel.addEditableColumn(av.getColumnSelection()\r
-                                                       .columnAt(i));\r
-            }\r
+          res = av.alignment.getWidth()-1;\r
         }\r
 \r
+        if(av.hasHiddenColumns)\r
+          res = av.getColumnSelection().adjustForHiddenColumns(res);\r
+\r
         if (!stretchingGroup)\r
         {\r
             ap.repaint();\r
@@ -171,11 +204,19 @@ 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
           res = av.getColumnSelection().adjustForHiddenColumns(res);\r
 \r
+\r
+        if(res> av.alignment.getWidth())\r
+        {\r
+          res = av.alignment.getWidth()-1;\r
+        }\r
+\r
         if (res < min)\r
         {\r
             min = res;\r
@@ -186,6 +227,9 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             max = res;\r
         }\r
 \r
+\r
+\r
+\r
         SequenceGroup sg = av.getSelectionGroup();\r
 \r
         if (sg != null)\r
@@ -201,7 +245,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
@@ -211,7 +255,6 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
                 if ((i < sg.getStartRes()) || (i > sg.getEndRes()))\r
                 {\r
                     av.getColumnSelection().removeElement(i);\r
-                    ap.annotationPanel.removeEditableColumn(res);\r
                 }\r
                 else\r
                 {\r
@@ -223,8 +266,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
@@ -243,8 +296,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
@@ -308,16 +366,27 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             scalestartx += 5;\r
         }\r
 \r
+        String string;\r
+        int maxX=0;\r
+\r
         for (int i = scalestartx; i < endx; i += 5)\r
         {\r
             if ((i % 10) == 0)\r
             {\r
-                gg.drawString(String.valueOf(av.getColumnSelection().adjustForHiddenColumns(i)),\r
-                    (i - startx - 1) * av.charWidth, y);\r
-                gg.drawLine((int) (((i - startx - 1) * av.charWidth) +\r
-                    (av.charWidth / 2)), y + 2,\r
-                    (int) (((i - startx - 1) * av.charWidth) +\r
-                    (av.charWidth / 2)), y + (fm.getDescent() * 2));\r
+                string = String.valueOf(av.getColumnSelection().adjustForHiddenColumns(i));\r
+                if ( (i - startx - 1) * av.charWidth > maxX)\r
+                {\r
+                  gg.drawString(string,\r
+                                (i - startx - 1) * av.charWidth, y);\r
+                  maxX = (i - startx + 1) * av.charWidth + fm.stringWidth(string);\r
+                }\r
+\r
+                gg.drawLine( (int) ( ( (i - startx - 1) * av.charWidth) +\r
+                                    (av.charWidth / 2)), y + 2,\r
+                            (int) ( ( (i - startx - 1) * av.charWidth) +\r
+                                   (av.charWidth / 2)),\r
+                            y + (fm.getDescent() * 2));\r
+\r
             }\r
             else\r
             {\r
@@ -336,8 +405,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
@@ -345,6 +414,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