From d8d1744ce6f7b6a7ba8ca3a20efaeb74bf950317 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Mon, 31 Jul 2017 10:32:11 +0200 Subject: [PATCH] JAL-2623 JAL-2015 set Below Threshold on FeatureColour when selected! --- src/jalview/appletgui/FeatureColourChooser.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/jalview/appletgui/FeatureColourChooser.java b/src/jalview/appletgui/FeatureColourChooser.java index f460389..1bc563a 100644 --- a/src/jalview/appletgui/FeatureColourChooser.java +++ b/src/jalview/appletgui/FeatureColourChooser.java @@ -372,14 +372,14 @@ public class FeatureColourChooser extends Panel implements ActionListener, return; } - int aboveThreshold = AnnotationColourGradient.NO_THRESHOLD; + int thresholdOption = AnnotationColourGradient.NO_THRESHOLD; if (threshold.getSelectedIndex() == 1) { - aboveThreshold = AnnotationColourGradient.ABOVE_THRESHOLD; + thresholdOption = AnnotationColourGradient.ABOVE_THRESHOLD; } else if (threshold.getSelectedIndex() == 2) { - aboveThreshold = AnnotationColourGradient.BELOW_THRESHOLD; + thresholdOption = AnnotationColourGradient.BELOW_THRESHOLD; } slider.setEnabled(true); @@ -390,14 +390,14 @@ public class FeatureColourChooser extends Panel implements ActionListener, acg.setColourByLabel(colourFromLabel.getState()); maxColour.setEnabled(!colourFromLabel.getState()); minColour.setEnabled(!colourFromLabel.getState()); - if (aboveThreshold == AnnotationColourGradient.NO_THRESHOLD) + if (thresholdOption == AnnotationColourGradient.NO_THRESHOLD) { slider.setEnabled(false); thresholdValue.setEnabled(false); thresholdValue.setText(""); } - if (aboveThreshold != AnnotationColourGradient.NO_THRESHOLD) + if (thresholdOption != AnnotationColourGradient.NO_THRESHOLD) { adjusting = true; acg.setThreshold(threshline.value); @@ -411,11 +411,13 @@ public class FeatureColourChooser extends Panel implements ActionListener, adjusting = false; } - acg.setAboveThreshold(true); + acg.setAboveThreshold(thresholdOption == AnnotationColourGradient.ABOVE_THRESHOLD); + acg.setBelowThreshold(thresholdOption == AnnotationColourGradient.BELOW_THRESHOLD); + if (thresholdIsMin.getState() - && aboveThreshold != AnnotationColourGradient.NO_THRESHOLD) + && thresholdOption != AnnotationColourGradient.NO_THRESHOLD) { - if (aboveThreshold == AnnotationColourGradient.ABOVE_THRESHOLD) + if (thresholdOption == AnnotationColourGradient.ABOVE_THRESHOLD) { acg = new FeatureColour(acg, threshline.value, max); } -- 1.7.10.2