Allow userdefined colours for groups

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

diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java
index 0329926..644d2ce 100755 (executable)
--- a/src/jalview/gui/IdPanel.java
+++ b/src/jalview/gui/IdPanel.java
@@ -17,10 +17,7 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
   public    int            width;\r
   public    int            lastid;\r
 \r
-\r
-\r
-  boolean mouseDown;\r
-  boolean mouseUp;\r
+  SequenceGroup selectedSequenceGroup;\r
 \r
   public IdPanel(AlignViewport av, AlignmentPanel parent)\r
   {\r
@@ -42,33 +39,50 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
        end   = tmp;\r
      }\r
 \r
-     for (int i = start; i <= end; i++) {\r
+     for (int i = start; i <= end; i++)\r
+     {\r
        SequenceI pickedSeq = av.getAlignment().getSequenceAt(i);\r
-\r
-       if (av.getSelection().contains(pickedSeq)) {\r
+       if (av.getSelection().contains(pickedSeq))\r
+       {\r
          av.getSelection().removeElement(pickedSeq);\r
-       } else {\r
+         selectedSequenceGroup.deleteSequence(pickedSeq);\r
+       }\r
+       else\r
+       {\r
          av.getSelection().addElement(pickedSeq);\r
+         if(selectedSequenceGroup==null)\r
+         {\r
+           selectedSequenceGroup = new SequenceGroup();\r
+           av.setRubberbandGroup( selectedSequenceGroup );\r
+          // av.alignment.addGroup( selectedSequenceGroup );\r
+           selectedSequenceGroup.setStartRes(0);\r
+           selectedSequenceGroup.setEndRes( pickedSeq.getSequence().length());\r
+         }\r
+\r
+         selectedSequenceGroup.addSequence( pickedSeq );\r
        }\r
+\r
      }\r
 \r
+     alignPanel.seqPanel.seqCanvas.paintFlag=true;\r
+     alignPanel.repaint();\r
      repaint();\r
 \r
    }\r
 \r
   public void mouseDragged(MouseEvent e) {\r
     int y = e.getY();\r
-\r
     int seq = av.getIndex(y);\r
 \r
-    if (mouseDown == true) {\r
-      if (seq < lastid) {\r
-        selectSeqs(lastid-1,seq);\r
-      } else if (seq > lastid) {\r
-         selectSeqs(lastid+1,seq);\r
-      }\r
-      lastid = seq;\r
-    }\r
+\r
+\r
+\r
+    if (seq < lastid)\r
+      selectSeqs(lastid - 1, seq);\r
+    else if (seq > lastid)\r
+      selectSeqs(lastid + 1, seq);\r
+\r
+    lastid = seq;\r
 \r
     return;\r
   }\r
@@ -98,11 +112,14 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
     int y = e.getY();\r
     int seq = av.getIndex(y);\r
 \r
-    mouseDown = true;\r
 \r
       if( javax.swing.SwingUtilities.isRightMouseButton(e))\r
       {\r
-        String id = av.getAlignment().getSequenceAt(seq).getName();\r
+        jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu( av , alignPanel.seqPanel);\r
+        pop.show(this, e.getX(), y);\r
+\r
+\r
+  /*      String id = av.getAlignment().getSequenceAt(seq).getName();\r
         String s = (String)JOptionPane.showInternalInputDialog(\r
                     this,\r
                     "Edit sequence name",\r
@@ -116,11 +133,24 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
         {\r
           av.getAlignment().getSequenceAt(seq).setName(s);\r
           alignPanel.RefreshPanels();\r
-        }\r
+        }*/\r
 \r
       }\r
       else\r
       {\r
+\r
+        selectedSequenceGroup = av.getRubberbandGroup();\r
+        if(selectedSequenceGroup==null)\r
+        {\r
+          selectedSequenceGroup = new SequenceGroup();\r
+          av.setRubberbandGroup(selectedSequenceGroup);\r
+        }\r
+\r
+        selectedSequenceGroup.setStartRes(0);\r
+        selectedSequenceGroup.setEndRes( av.getAlignment().getWidth()-1 );\r
+\r
+       // selectedSequenceGroup = av.alignment.findGroup(seq);\r
+\r
         if (seq != -1)\r
           selectSeqs(seq,seq);\r
 \r
@@ -129,13 +159,10 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
     return;\r
   }\r
 \r
-  public void mouseReleased(MouseEvent e) {\r
+  public void mouseReleased(MouseEvent e)\r
+  {\r
     lastid = -1;\r
-\r
-    mouseDown = false;\r
-    mouseUp   = true;\r
-\r
     PaintRefresher.Refresh(this);\r
-\r
+    selectedSequenceGroup = null;\r
   }\r
 }\r