PaintRefresh changed

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

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 52d137b..a643ab8 100755 (executable)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -60,6 +60,7 @@ public class SeqPanel
   public SeqPanel(AlignViewport avp, AlignmentPanel p)\r
   {\r
     this.av = avp;\r
+    setBackground(Color.white);\r
 \r
     seqCanvas = new SeqCanvas(avp);\r
     setLayout(new BorderLayout());\r
@@ -160,9 +161,9 @@ public class SeqPanel
         doMouseEnteredDefineMode(evt);\r
       }\r
     });\r
-    repaint();\r
   }\r
 \r
+\r
   public void doMouseReleased(MouseEvent evt)\r
   {\r
     if (seqEditOccurred > -1)\r
@@ -176,7 +177,7 @@ public class SeqPanel
     editingSeqs = false;\r
     groupEditing = false;\r
 \r
-    ap.repaint();\r
+    seqCanvas.repaint();\r
   }\r
 \r
   public void doMousePressed(MouseEvent evt)\r
@@ -443,14 +444,14 @@ public class SeqPanel
 \r
     endEdit = res;\r
     lastres = res;\r
-    repaint();\r
+    seqCanvas.repaint();\r
   }\r
 \r
   public void drawChars(int seqstart, int seqend, int start)\r
   {\r
     seqCanvas.drawPanel(seqCanvas.gg, start, av.getEndRes(), seqstart,\r
                         seqend, av.getStartRes(), av.getStartSeq(), 0);\r
-    repaint();\r
+    seqCanvas.repaint();\r
   }\r
 \r
   public void insertChar(int j, int seq)\r
@@ -465,7 +466,7 @@ public class SeqPanel
     seqEditOccurred = seq;\r
 \r
     av.alignment.getWidth();\r
-    repaint();\r
+    seqCanvas.repaint();\r
   }\r
 \r
   void editOccurred(int i)\r
@@ -608,24 +609,26 @@ public class SeqPanel
 \r
     stretchGroup.getWidth();\r
 \r
-    repaint();\r
+    seqCanvas.repaint();\r
   }\r
 \r
   public void doMouseReleasedDefineMode(MouseEvent evt)\r
   {\r
-    mouseDragging = false;\r
+    if(mouseDragging)\r
+    {\r
+      stretchGroup.recalcConservation();\r
+      mouseDragging = false;\r
+    }\r
 \r
     if (stretchGroup == null)\r
     {\r
       return;\r
     }\r
 \r
-    stretchGroup.recalcConservation();\r
-\r
     if (stretchGroup.cs instanceof ClustalxColourScheme)\r
     {\r
-      stretchGroup.cs = new ClustalxColourScheme(stretchGroup.sequences,\r
-                                                 av.alignment.getWidth());\r
+      ( (ClustalxColourScheme) stretchGroup.cs).resetClustalX(stretchGroup.sequences,\r
+                                                     stretchGroup.getWidth());\r
     }\r
     else if (stretchGroup.cs instanceof ConservationColourScheme)\r
     {\r
@@ -644,7 +647,7 @@ public class SeqPanel
     changeEndRes = false;\r
     changeStartRes = false;\r
     stretchGroup = null;\r
-    repaint();\r
+    seqCanvas.repaint();\r
     ap.idPanel.repaint();\r
   }\r
 \r
@@ -743,7 +746,7 @@ public class SeqPanel
       scrollThread.setEvent(evt);\r
     }\r
 \r
-    repaint();\r
+    seqCanvas.repaint();\r
   }\r
 \r
   public void doMouseEnteredDefineMode(MouseEvent e)\r