Preparing for groupselect mode

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

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 1714a31..ebcbc76 100755 (executable)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -27,10 +27,10 @@ public class SeqPanel extends JPanel
   // if character is inserted or deleted, we will need to recalculate the conservation\r
   int seqEditOccurred = -1;\r
 \r
-  public SeqPanel(AlignViewport av, AlignmentPanel p) {\r
-    this.av         = av;\r
+  public SeqPanel(AlignViewport avp, AlignmentPanel p) {\r
+    this.av         = avp;\r
 \r
-    seqCanvas  = new SeqCanvas(av);\r
+    seqCanvas  = new SeqCanvas(avp);\r
     setLayout(new BorderLayout());\r
     add(seqCanvas, BorderLayout.CENTER);\r
 \r
@@ -41,15 +41,30 @@ public class SeqPanel extends JPanel
       public void mouseMoved(MouseEvent evt)\r
       {  doMouseMoved(evt);   }\r
       public void mouseDragged(MouseEvent evt)\r
-      {      doMouseDragged(evt);  }\r
+      {\r
+        if(av.groupDefiningMode)\r
+          doMouseDraggedDefineMode(evt);\r
+        else\r
+          doMouseDragged(evt);\r
+      }\r
     });\r
 \r
     addMouseListener( new MouseAdapter()\r
     {\r
       public void mouseReleased(MouseEvent evt)\r
-      {  doMouseReleased(evt);  }\r
+      {\r
+        if(av.groupDefiningMode)\r
+          doMouseReleasedDefineMode(evt);\r
+        else\r
+          doMouseReleased(evt);\r
+      }\r
       public void mousePressed(MouseEvent evt)\r
-      {  doMousePressed(evt);   }\r
+      {\r
+        if(av.groupDefiningMode)\r
+          doMousePressedDefineMode(evt);\r
+        else\r
+          doMousePressed(evt);\r
+      }\r
 \r
     });\r
     repaint();\r
@@ -59,7 +74,7 @@ public class SeqPanel extends JPanel
   public void doMouseReleased(MouseEvent evt) {\r
 \r
     int x = evt.getX();\r
-    int res = (int)(x/av.getCharWidth()) + av.getStartRes();\r
+    int res = x/av.getCharWidth() + av.getStartRes();\r
 \r
     endres = res;\r
 \r
@@ -79,15 +94,15 @@ public class SeqPanel extends JPanel
   }\r
 \r
   public void doMousePressed(MouseEvent evt) {\r
-  parent.alignFrame.addHistoryItem("sequence edit");\r
+    parent.alignFrame.addHistoryItem("sequence edit");\r
     int seq;\r
     int res;\r
 \r
     int x = evt.getX();\r
     int y = evt.getY();\r
 \r
-    res = (int)(x/av.getCharWidth()) + av.getStartRes();\r
-    seq = (y)/av.getCharHeight() + av.getStartSeq();\r
+    res = x/av.getCharWidth() + av.getStartRes();\r
+    seq = y/av.getCharHeight() + av.getStartSeq();\r
 \r
     if (seq < av.getAlignment().getHeight() && res < av.getAlignment().getSequenceAt(seq).getLength())\r
     {\r
@@ -126,7 +141,7 @@ public class SeqPanel extends JPanel
       int chunkHeight = (av.getAlignment().getHeight()+2)*av.charHeight;\r
 \r
 \r
-      res =   (int)((y/chunkHeight)*(getWidth()/av.charWidth)) +  (int)(x/av.getCharWidth()) + av.getStartRes();\r
+      res =   (int)((y/chunkHeight)*(getWidth()/av.charWidth)) +  x/av.getCharWidth() + av.getStartRes();\r
 \r
       System.out.println( ((y/chunkHeight)*(getWidth()/av.charWidth)) +" "+((x / av.getCharWidth()) + av.getStartRes()) );\r
       y %= chunkHeight;\r
@@ -137,7 +152,7 @@ public class SeqPanel extends JPanel
     }\r
     else\r
     {\r
-      res = (int) (x / av.getCharWidth()) + av.getStartRes();\r
+      res = x / av.getCharWidth()  + av.getStartRes();\r
       seq = y / av.getCharHeight() + av.getStartSeq();\r
     }\r
 \r
@@ -163,7 +178,7 @@ public class SeqPanel extends JPanel
     editFlag = true;\r
     int x = evt.getX();\r
 \r
-    int res = (int)(x/av.getCharWidth()) + av.getStartRes();\r
+    int res = x/av.getCharWidth() + av.getStartRes();\r
     if (res < 0) {res = 0;}\r
 \r
     if (res  != lastres) {\r
@@ -318,7 +333,7 @@ public class SeqPanel extends JPanel
     seqCanvas.paintFlag = true;\r
     if (av.getSelection().size() == 0)\r
     {\r
-      seqCanvas.cs = cs;\r
+      seqCanvas.globalColorScheme = cs;\r
       for (int i = 0; i < av.alignment.getGroups().size();i++)\r
       {\r
         SequenceGroup sg = (SequenceGroup)av.alignment.getGroups().elementAt(i);\r
@@ -392,6 +407,9 @@ public class SeqPanel extends JPanel
 \r
   boolean isNewSelection(SequenceGroup sg)\r
   {\r
+    if(sg==null)\r
+      return true;\r
+\r
     if(sg.getSize()!=av.getSelection().size())\r
       return true;\r
 \r
@@ -408,8 +426,65 @@ public class SeqPanel extends JPanel
     if(av.getSelection().size()>0)\r
        return av.alignment.findGroup((Sequence)av.sel.sequenceAt(0)).cs;\r
     else\r
-      return seqCanvas.cs;\r
+      return seqCanvas.globalColorScheme;\r
+  }\r
+\r
+  public void doMousePressedDefineMode(MouseEvent evt)\r
+  {\r
+    int res = evt.getX()/av.getCharWidth() + av.getStartRes();\r
+    int seq = evt.getY()/av.getCharHeight() + av.getStartSeq();\r
+\r
+    stretchGroup = av.alignment.findGroup((Sequence)av.getAlignment().getSequenceAt(seq));\r
+\r
+    if(stretchGroup!=null  && stretchGroup.getEndRes()==res)\r
+    {\r
+      // Edit end res position of selected group\r
+      changeEndRes = true;\r
+    }\r
+    else if(stretchGroup!=null  && stretchGroup.getStartRes()==res)\r
+    {\r
+      // Edit end res position of selected group\r
+      changeStartRes = true;\r
+    }\r
+\r
+\r
+  }\r
+\r
+  boolean changeEndRes = false;\r
+  boolean changeStartRes = false;\r
+  SequenceGroup stretchGroup = null;\r
+\r
+  public void doMouseReleasedDefineMode(MouseEvent evt)\r
+  {\r
+    changeEndRes = false;\r
+    changeStartRes = false;\r
+  }\r
+\r
+  public void doMouseDraggedDefineMode(MouseEvent evt)\r
+  {\r
+    int res = evt.getX()/av.getCharWidth() + av.getStartRes();\r
+    int seq = evt.getY()/av.getCharHeight() + av.getStartSeq();\r
+\r
+    if(res<av.getStartRes())\r
+      res = av.getStartRes();\r
+    else if(res>av.getEndRes())\r
+      res = av.getEndRes();\r
+\r
+    if(changeEndRes)\r
+    {\r
+      if(res>stretchGroup.getStartRes()-1)\r
+        stretchGroup.setEndRes( res );\r
+    }\r
+    else if(changeStartRes)\r
+    {\r
+      if(res<stretchGroup.getEndRes()+1)\r
+        stretchGroup.setStartRes( res );\r
+    }\r
+    seqCanvas.paintFlag = true;\r
+    repaint();\r
+\r
   }\r
+\r
 }\r
 \r
 \r