JAL-2386 simplify changeColour (doesn't change colour thresholds)

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

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 5a0d13e..5cc5111 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -3346,39 +3346,15 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     if (cs != null)
     {
       ColourMenuHelper.setColourSelected(colourMenu, cs.getSchemeName());
-      // Make sure viewport is up to date w.r.t. any sliders
-      // ? not needed as handled by SliderPanel.valueChanged?
-//       if (viewport.getAbovePIDThreshold())
-//       {
-      // int threshold = SliderPanel.setPIDSliderSource(alignPanel, cs,
-//       "Background");
-       //todo is threshold held in viewport style or in colour scheme?
-//       viewport.setThreshold(threshold);
-      // }
-      //
-      // if (viewport.getConservationSelected())
-      // {
-      // cs.setConservationInc(SliderPanel.setConservationSlider(alignPanel,
-      // cs, "Background"));
-      // }
     }
 
     viewport.setGlobalColourScheme(cs);
-    if (viewport.getConservationSelected())
-    {
-      int conservationInc = SliderPanel.getConservationValue();
-      viewport.getViewportColourScheme()
-              .setConservationInc(conservationInc);
-    }
 
     alignPanel.paintAlignment(true);
   }
 
   /**
-   * DOCUMENT ME!
-   * 
-   * @param e
-   *          DOCUMENT ME!
+   * Show the PID threshold slider panel
    */
   @Override
   protected void modifyPID_actionPerformed()
@@ -3392,10 +3368,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
   }
 
   /**
-   * DOCUMENT ME!
-   * 
-   * @param e
-   *          DOCUMENT ME!
+   * Show the Conservation slider panel
    */
   @Override
   protected void modifyConservation_actionPerformed()
@@ -3418,6 +3391,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     boolean selected = conservationMenuItem.isSelected();
     modifyConservation.setEnabled(selected);
     viewport.setConservationSelected(selected);
+    viewport.getViewportColourScheme().setConservationApplied(selected);
 
     changeColour(viewport.getGlobalColourScheme());
     if (selected)