From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 21 Apr 2006 11:19:13 +0000 (+0000)
Subject: Alignment compression on middle mouse button
X-Git-Tag: Release_2_08_1~36
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f0ea7e292e26e7cec19720be39b143d261f53821;p=jalview.git

Alignment compression on middle mouse button
---

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 8f32d8c..e9082b8 100755
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -353,16 +353,27 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             scalestartx += 5;
         }
 
+        String string;
+        int maxX=0;
+
         for (int i = scalestartx; i < endx; i += 5)
         {
             if ((i % 10) == 0)
             {
-                gg.drawString(String.valueOf(av.getColumnSelection().adjustForHiddenColumns(i)),
-                    (i - startx - 1) * av.charWidth, y);
-                gg.drawLine((int) (((i - startx - 1) * av.charWidth) +
-                    (av.charWidth / 2)), y + 2,
-                    (int) (((i - startx - 1) * av.charWidth) +
-                    (av.charWidth / 2)), y + (fm.getDescent() * 2));
+                string = String.valueOf(av.getColumnSelection().adjustForHiddenColumns(i));
+                if ( (i - startx - 1) * av.charWidth > maxX)
+                {
+                  gg.drawString(string,
+                                (i - startx - 1) * av.charWidth, y);
+                  maxX = (i - startx + 1) * av.charWidth + fm.stringWidth(string);
+                }
+
+                gg.drawLine( (int) ( ( (i - startx - 1) * av.charWidth) +
+                                    (av.charWidth / 2)), y + 2,
+                            (int) ( ( (i - startx - 1) * av.charWidth) +
+                                   (av.charWidth / 2)),
+                            y + (fm.getDescent() * 2));
+
             }
             else
             {
diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index d9f7ebb..27601ca 100755
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -591,14 +591,11 @@ public class SeqCanvas extends JComponent
 
     //int startRes, int endRes, int startSeq, int endSeq, int x, int y,
     // int x1, int x2, int y1, int y2, int startx, int starty,
-    void draw(Graphics g1,
+    void draw(Graphics g,
                    int startRes, int endRes,
                    int startSeq, int endSeq,
                    int offset)
    {
-
-
-      Graphics2D g = (Graphics2D) g1;
       g.setFont(av.getFont());
       sr.prepare(g, av.renderGaps);
 
@@ -616,7 +613,7 @@ public class SeqCanvas extends JComponent
 
             if (av.showSequenceFeatures)
             {
-                fr.drawSequence(g1, nextSeq, startRes, endRes,
+                fr.drawSequence(g, nextSeq, startRes, endRes,
                     offset + ((i - startSeq) * av.charHeight));
             }
 
@@ -643,6 +640,17 @@ public class SeqCanvas extends JComponent
             }
           }
 
+          if(av.getSelectionGroup()!=null || av.alignment.getGroups().size()>0)
+            drawGroupsBoundaries(g, startRes, endRes, startSeq, endSeq, offset);
+
+   }
+
+   void drawGroupsBoundaries(Graphics g1,
+                   int startRes, int endRes,
+                   int startSeq, int endSeq,
+                   int offset)
+   {
+       Graphics2D g = (Graphics2D)g1;
         //
         /////////////////////////////////////
         // Now outline any areas if necessary
diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 933ca04..d081f16 100755
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -65,6 +65,7 @@ public class SeqPanel extends JPanel implements MouseListener,
     SequenceGroup stretchGroup = null;
     boolean remove = false;
 
+    Point lastMousePress;
     boolean mouseWheelPressed = false;
     StringBuffer keyboardNo1;
     StringBuffer keyboardNo2;
@@ -409,6 +410,8 @@ public class SeqPanel extends JPanel implements MouseListener,
      */
     public void mousePressed(MouseEvent evt)
     {
+      lastMousePress = evt.getPoint();
+
       if (javax.swing.SwingUtilities.isMiddleMouseButton(evt))
       {
         mouseWheelPressed = true;
@@ -594,6 +597,54 @@ public class SeqPanel extends JPanel implements MouseListener,
      */
     public void mouseDragged(MouseEvent evt)
     {
+      if(mouseWheelPressed)
+      {
+        int oldWidth = av.charWidth;
+
+        //Which is bigger, left-right or up-down?
+        if( Math.abs(evt.getY()-lastMousePress.getY())
+          > Math.abs(evt.getX()-lastMousePress.getX()))
+     {
+       int fontSize = av.font.getSize();
+
+       if (evt.getY() < lastMousePress.getY() && av.charHeight > 1)
+       {
+         fontSize--;
+       }
+       else if (evt.getY() > lastMousePress.getY())
+       {
+         fontSize++;
+       }
+
+       av.setFont(new Font(av.font.getName(), av.font.getStyle(), fontSize));
+       av.charWidth = oldWidth;
+       ap.fontChanged();
+
+
+     }
+     else
+     {
+       if (evt.getX() < lastMousePress.getX() && av.charWidth > 1)
+       {
+         av.charWidth--;
+       }
+       else if (evt.getX() > lastMousePress.getX())
+       {
+         av.charWidth++;
+       }
+
+       ap.repaint();
+     }
+
+      FontMetrics fm = getFontMetrics(av.getFont());
+      av.showText = (fm.charWidth('M') < av.charWidth);
+               // && fm.getHeight()<av.charHeight
+
+        lastMousePress = evt.getPoint();
+
+        return;
+      }
+
       if (!editingSeqs)
       {
         doMouseDraggedDefineMode(evt);
@@ -1029,7 +1080,7 @@ public class SeqPanel extends JPanel implements MouseListener,
     public void mouseWheelMoved(MouseWheelEvent e)
     {
       e.consume();
-      if (mouseWheelPressed)
+     /* if (mouseWheelPressed)
       {
         Font font = av.getFont();
         int fontSize = font.getSize();
@@ -1038,10 +1089,13 @@ public class SeqPanel extends JPanel implements MouseListener,
         else if (fontSize > 1)
           fontSize--;
 
+
+
         av.setFont(new Font(font.getName(), font.getStyle(), fontSize));
+
         ap.fontChanged();
       }
-      else
+      else*/
       {
         if (e.getWheelRotation() > 0)
           ap.scrollUp(false);