From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 9 May 2005 11:02:00 +0000 (+0000)
Subject: correct conservation errors after edit
X-Git-Tag: Release_2_0~305
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ddc09b021cb6e14cb8da881f56f5f3f150ac5794;p=jalview.git

correct conservation errors after edit
---

diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index 889533e..6e4a34f 100755
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -354,16 +354,17 @@ public class SeqPanel extends Panel
 
   void updateConservation(int i)
   {
-    if (av.getGlobalColourScheme() instanceof jalview.schemes.
-        ClustalxColourScheme)
-    {
-      av.setGlobalColourScheme(
-          new jalview.schemes.ClustalxColourScheme(av.alignment.getSequences(),
-                                                   av.alignment.getWidth()));
-    }
-
     av.updateConservation();
     av.updateConsensus();
+
+    ColourSchemeI cs = av.getGlobalColourScheme();
+    if(cs instanceof ConservationColourScheme)
+      cs = ( (ConservationColourScheme) cs).cs;
+
+    if(cs instanceof ClustalxColourScheme)
+      cs = new ClustalxColourScheme(av.alignment.getSequences(), av.alignment.getWidth());
+
+    ap.alignFrame.changeColour(cs);
   }
 
 //////////////////////////////////////////
diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index fc93fbc..ddbd97c 100755
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -357,13 +357,18 @@ public class SeqPanel extends JPanel
 
   void updateConservation(int i)
   {
-    if(av.getGlobalColourScheme() instanceof jalview.schemes.ClustalxColourScheme)
-    {
-      av.setGlobalColourScheme(
-          new jalview.schemes.ClustalxColourScheme(av.alignment.getSequences(),av.alignment.getWidth() ));
-    }
     av.updateConservation();
     av.updateConsensus();
+
+    ColourSchemeI cs = av.getGlobalColourScheme();
+    if(cs instanceof ConservationColourScheme)
+      cs = ( (ConservationColourScheme) cs).cs;
+
+    if(cs instanceof ClustalxColourScheme)
+      cs = new ClustalxColourScheme(av.alignment.getSequences(), av.alignment.getWidth());
+
+    ap.alignFrame.changeColour(cs);
+
   }
 
 //////////////////////////////////////////