all colours can threshold

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

diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java
index de50cae..5a87102 100755 (executable)
--- a/src/jalview/gui/SliderPanel.java
+++ b/src/jalview/gui/SliderPanel.java
@@ -21,11 +21,10 @@ public class SliderPanel extends GSliderPanel
   {\r
     SliderPanel sp = null;\r
     ConservationColourScheme ccs = (ConservationColourScheme)cs;\r
-    int value = ccs.inc;\r
 \r
     if(conservationSlider == null)\r
     {\r
-      sp = new SliderPanel(ap, value, true, cs);\r
+      sp = new SliderPanel(ap, ccs.inc, true, cs);\r
       conservationSlider = new JInternalFrame();\r
       conservationSlider.setContentPane(sp);\r
       conservationSlider.setLayer(JLayeredPane.PALETTE_LAYER);\r
@@ -34,7 +33,6 @@ public class SliderPanel extends GSliderPanel
     {\r
         sp = (SliderPanel)conservationSlider.getContentPane();\r
         sp.cs = cs;\r
-        sp.setValue(value);\r
     }\r
 \r
     conservationSlider.setTitle("Conservation Colour Increment  ("+source+")");\r
@@ -73,9 +71,17 @@ public class SliderPanel extends GSliderPanel
   public static int setPIDSliderSource(AlignmentPanel ap, ColourSchemeI cs, String source)\r
    {\r
      SliderPanel pid = null;\r
+\r
+     int threshold = 50;\r
+     if (cs instanceof ResidueColourScheme)\r
+       threshold = ( ( (ResidueColourScheme) cs).getThreshold());\r
+     else if (cs instanceof ScoreColourScheme)\r
+       threshold = ( ( (ScoreColourScheme) cs).getThreshold());\r
+\r
+\r
      if(PIDSlider == null)\r
      {\r
-       pid = new SliderPanel(ap, 50, false, cs);\r
+       pid = new SliderPanel(ap, threshold, false, cs);\r
        PIDSlider = new JInternalFrame();\r
        PIDSlider.setContentPane(pid);\r
        PIDSlider.setLayer(JLayeredPane.PALETTE_LAYER);\r
@@ -186,14 +192,13 @@ public class SliderPanel extends GSliderPanel
       }\r
       else\r
       {\r
-        if (toChange.canThreshold())\r
           ( (ResidueColourScheme) toChange).setThreshold(i);\r
       }\r
 \r
       groupIndex--;\r
     }\r
 \r
-    ap.seqPanel.repaint();\r
+    ap.seqPanel.seqCanvas.repaint();\r
 \r
   }\r
 \r