import jalview.schemes.PIDColourScheme;
import jalview.schemes.PurinePyrimidineColourScheme;
import jalview.schemes.RNAHelicesColour;
-import jalview.schemes.RNAHelicesColourChooser;
import jalview.schemes.StrandColourScheme;
import jalview.schemes.TCoffeeColourScheme;
import jalview.schemes.TaylorColourScheme;
@Override
public void changeColour(ColourSchemeI cs)
{
-
+ // FIXME threshold, conservation, increment belong inside
+ // AlignmentColourScheme and/or ViewStyleI, not ColourSchemeI
if (cs != null)
{
if (viewport.getAbovePIDThreshold())
{
viewport.setThreshold(SliderPanel.setPIDSliderSource(alignPanel,
- cs, "Background"));
+ viewport.getViewportColourScheme(), "Background"));
}
if (viewport.getConservationSelected())
{
- cs.setConservationApplied(true);
+ // cs.setConservationApplied(true);
viewport.setIncrement(SliderPanel.setConservationSlider(alignPanel,
- cs, "Background"));
- }
- else
- {
- cs.setConservationApplied(false);
+ viewport.getViewportColourScheme(), "Background"));
}
+ // else
+ // {
+ // cs.setConservationApplied(false);
+ // }
}
viewport.setGlobalColourScheme(cs);
+ viewport.getViewportColourScheme().setConservationApplied(
+ viewport.getConservationSelected());
alignPanel.paintAlignment(true);
}
&& viewport.getGlobalColourScheme() != null)
{
SliderPanel.setPIDSliderSource(alignPanel,
- viewport.getGlobalColourScheme(), "Background");
+ viewport.getViewportColourScheme(), "Background");
SliderPanel.showPIDSlider();
}
}
&& viewport.getGlobalColourScheme() != null)
{
SliderPanel.setConservationSlider(alignPanel,
- viewport.getGlobalColourScheme(), "Background");
+ viewport.getViewportColourScheme(), "Background");
SliderPanel.showConservationSlider();
}
}