Use font.getName, not font.getFontName

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

diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index 1720edc..665a444 100755 (executable)
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -545,7 +545,7 @@ public class SeqPanel
       SequenceGroup sg = new SequenceGroup();\r
       sg.setStartRes(res);\r
       sg.setEndRes(res);\r
-      sg.addSequence(sequence);\r
+      sg.addSequence(sequence, false);\r
       av.setSelectionGroup(sg);\r
       stretchGroup = sg;\r
 \r
@@ -593,42 +593,34 @@ public class SeqPanel
 \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
-    if (stretchGroup.cs instanceof ClustalxColourScheme)\r
-    {\r
-      stretchGroup.cs = new ClustalxColourScheme(stretchGroup.sequences,\r
-                                                 av.alignment.getWidth());\r
-      seqCanvas.repaint();\r
-    }\r
-\r
-    else if (stretchGroup.cs instanceof ConservationColourScheme)\r
+    if (stretchGroup.cs instanceof ConservationColourScheme)\r
     {\r
       ConservationColourScheme ccs = (ConservationColourScheme) stretchGroup.cs;\r
       stretchGroup.cs = ccs;\r
       SliderPanel.setConservationSlider(ap, stretchGroup.cs,\r
                                         stretchGroup.getName());\r
-\r
-      seqCanvas.repaint();\r
     }\r
     else\r
     {\r
-      if (stretchGroup.cs != null)\r
-      {\r
         SliderPanel.setPIDSliderSource(ap, stretchGroup.cs,\r
                                        stretchGroup.getName());\r
-      }\r
-\r
     }\r
 \r
     changeEndRes = false;\r
     changeStartRes = false;\r
     stretchGroup = null;\r
+    seqCanvas.repaint();\r
     ap.repaint();\r
   }\r
 \r
@@ -705,16 +697,15 @@ public class SeqPanel
 \r
       if (stretchGroup.sequences.contains(nextSeq))\r
       {\r
-        stretchGroup.deleteSequence(seq);\r
-        stretchGroup.deleteSequence(nextSeq);\r
+        stretchGroup.deleteSequence(seq, false);\r
       }\r
       else\r
       {\r
         if (seq != null)\r
         {\r
-          stretchGroup.addSequence(seq);\r
+          stretchGroup.addSequence(seq, false);\r
         }\r
-        stretchGroup.addSequence(nextSeq);\r
+        stretchGroup.addSequence(nextSeq, false);\r
       }\r
     }\r
     oldSeq = y;\r