JAL-2630 update Overview/structure from graduated colour options dialog

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

diff --git a/src/jalview/appletgui/FeatureColourChooser.java b/src/jalview/appletgui/FeatureColourChooser.java
index 4075e8b..6c162e1 100644 (file)
--- a/src/jalview/appletgui/FeatureColourChooser.java
+++ b/src/jalview/appletgui/FeatureColourChooser.java
@@ -51,6 +51,8 @@ import java.util.Hashtable;
 public class FeatureColourChooser extends Panel implements ActionListener,
         AdjustmentListener, ItemListener, MouseListener
 {
+  private static final int SCALE_FACTOR_1K = 1000;
+
   JVDialog frame;
 
   Frame owner;
@@ -149,7 +151,6 @@ public class FeatureColourChooser extends Panel implements ActionListener,
     {
       // cancel
       reset();
-      PaintRefresher.Refresh(this, fr.getViewport().getSequenceSetId());
       frame.setVisible(false);
     }
   }
@@ -268,7 +269,7 @@ public class FeatureColourChooser extends Panel implements ActionListener,
       try
       {
         float f = new Float(thresholdValue.getText()).floatValue();
-        slider.setValue((int) (f * 1000));
+        slider.setValue((int) (f * SCALE_FACTOR_1K));
         adjustmentValueChanged(null);
       } catch (NumberFormatException ex)
       {
@@ -391,11 +392,9 @@ public class FeatureColourChooser extends Panel implements ActionListener,
       adjusting = true;
       acg.setThreshold(threshline.value);
 
-      float range = max * 1000f - min * 1000f;
-
-      slider.setMinimum((int) (min * 1000));
-      slider.setMaximum((int) (max * 1000));
-      slider.setValue((int) (threshline.value * 1000));
+      slider.setMinimum((int) (min * SCALE_FACTOR_1K));
+      slider.setMaximum((int) (max * SCALE_FACTOR_1K));
+      slider.setValue((int) (threshline.value * SCALE_FACTOR_1K));
       thresholdValue.setText(threshline.value + "");
       slider.setEnabled(true);
       thresholdValue.setEnabled(true);
@@ -418,16 +417,13 @@ public class FeatureColourChooser extends Panel implements ActionListener,
 
     fr.setColour(type, acg);
     cs = acg;
-    PaintRefresher.Refresh(this, fr.getViewport().getSequenceSetId());
-    // ap.paintAlignment(false);
+    fs.selectionChanged();
   }
 
   void reset()
   {
     fr.setColour(type, oldcs);
-    PaintRefresher.Refresh(this, fr.getViewport().getSequenceSetId());
-    // ap.paintAlignment(true);
-
+    fs.selectionChanged();
   }
 
   @Override