X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFeatureColourChooser.java;h=30733efb404421b7780c936166a26422183fb216;hb=e1d3e0e3ae13f29c0c027e94cd23d05dd9ed4360;hp=f4603895dc6539265f2aa213c34d2779e9f7697b;hpb=93a90c5084d1e81afd65bf2e3063cde96d6b3b48;p=jalview.git diff --git a/src/jalview/appletgui/FeatureColourChooser.java b/src/jalview/appletgui/FeatureColourChooser.java index f460389..30733ef 100644 --- a/src/jalview/appletgui/FeatureColourChooser.java +++ b/src/jalview/appletgui/FeatureColourChooser.java @@ -42,6 +42,8 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.AdjustmentEvent; import java.awt.event.AdjustmentListener; +import java.awt.event.FocusAdapter; +import java.awt.event.FocusEvent; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.MouseEvent; @@ -56,6 +58,8 @@ public class FeatureColourChooser extends Panel implements ActionListener, */ private static final int SCALE_FACTOR_1K = 1000; + private static final String COLON = ":"; + private JVDialog frame; private Frame owner; @@ -130,7 +134,8 @@ public class FeatureColourChooser extends Panel implements ActionListener, if (oldcs.isGraduatedColour()) { threshline.value = oldcs.getThreshold(); - cs = new FeatureColour((FeatureColour) oldcs, min, max); + cs = new FeatureColour(oldcs.getColour(), oldcs.getMinColour(), + oldcs.getMaxColour(), oldcs.getNoColour(), min, max); } else { @@ -141,7 +146,8 @@ public class FeatureColourChooser extends Panel implements ActionListener, bl = oldcs.getColour(); } // original colour becomes the maximum colour - cs = new FeatureColour(Color.white, bl, mm[0], mm[1]); + cs = new FeatureColour(bl, Color.white, bl, Color.white, mm[0], + mm[1]); } minColour.setBackground(cs.getMinColour()); maxColour.setBackground(cs.getMaxColour()); @@ -156,8 +162,8 @@ public class FeatureColourChooser extends Panel implements ActionListener, } catch (Exception ex) { } - threshold.select(cs.isAboveThreshold() ? 1 : (cs.isBelowThreshold() ? 2 - : 0)); + threshold.select( + cs.isAboveThreshold() ? 1 : (cs.isBelowThreshold() ? 2 : 0)); adjusting = false; changeColour(true); @@ -165,9 +171,9 @@ public class FeatureColourChooser extends Panel implements ActionListener, slider.addAdjustmentListener(this); slider.addMouseListener(this); owner = (af != null) ? af : fs.frame; - frame = new JVDialog(owner, MessageManager.formatMessage( - "label.graduated_color_for_params", new String[] { type }), - true, 480, 248); + frame = new JVDialog(owner, MessageManager + .formatMessage("label.variable_color_for", new String[] + { type }), true, 480, 248); frame.setMainPanel(this); validate(); frame.setVisible(true); @@ -196,8 +202,10 @@ public class FeatureColourChooser extends Panel implements ActionListener, private void jbInit() throws Exception { - Label minLabel = new Label(MessageManager.getString("label.min")), maxLabel = new Label( - MessageManager.getString("label.max")); + Label minLabel = new Label( + MessageManager.getString("label.min_value") + COLON); + Label maxLabel = new Label( + MessageManager.getString("label.max_value") + COLON); minLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); maxLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); // minColour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); @@ -232,6 +240,14 @@ public class FeatureColourChooser extends Panel implements ActionListener, threshold.addItem(MessageManager .getString("label.threshold_feature_below_threshold")); thresholdValue.addActionListener(this); + thresholdValue.addFocusListener(new FocusAdapter() + { + @Override + public void focusLost(FocusEvent e) + { + thresholdValue_actionPerformed(); + } + }); slider.setBackground(Color.white); slider.setEnabled(false); slider.setSize(new Dimension(93, 21)); @@ -243,13 +259,13 @@ public class FeatureColourChooser extends Panel implements ActionListener, jPanel3.setBackground(Color.white); colourFromLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - colourFromLabel.setLabel(MessageManager - .getString("label.colour_by_label")); + colourFromLabel + .setLabel(MessageManager.getString("label.colour_by_label")); colourFromLabel.setSize(new Dimension(139, 22)); // threshold.setBounds(new Rectangle(11, 3, 139, 22)); thresholdIsMin.setBackground(Color.white); - thresholdIsMin.setLabel(MessageManager - .getString("label.threshold_minmax")); + thresholdIsMin + .setLabel(MessageManager.getString("label.threshold_minmax")); thresholdIsMin.setSize(new Dimension(135, 23)); // thresholdIsMin.setBounds(new Rectangle(328, 3, 135, 23)); jPanel1.add(minLabel); @@ -272,14 +288,7 @@ public class FeatureColourChooser extends Panel implements ActionListener, { if (evt.getSource() == thresholdValue) { - try - { - float f = new Float(thresholdValue.getText()).floatValue(); - slider.setValue((int) (f * SCALE_FACTOR_1K)); - adjustmentValueChanged(null); - } catch (NumberFormatException ex) - { - } + thresholdValue_actionPerformed(); } else if (evt.getSource() == minColour) { @@ -295,6 +304,26 @@ public class FeatureColourChooser extends Panel implements ActionListener, } } + /** + * Action on input of a value for colour score threshold + */ + protected void thresholdValue_actionPerformed() + { + try + { + float f = Float.valueOf(thresholdValue.getText()).floatValue(); + slider.setValue((int) (f * SCALE_FACTOR_1K)); + adjustmentValueChanged(null); + + /* + * force repaint of any Overview window or structure + */ + changeColour(true); + } catch (NumberFormatException ex) + { + } + } + @Override public void itemStateChanged(ItemEvent evt) { @@ -333,9 +362,9 @@ public class FeatureColourChooser extends Panel implements ActionListener, { if (newCol == null) { - new UserDefinedColours(this, - minColour.getBackground(), owner, - MessageManager.getString("label.select_colour_minimum_value")); + new UserDefinedColours(this, minColour.getBackground(), owner, + MessageManager + .getString("label.select_colour_minimum_value")); } else { @@ -351,9 +380,9 @@ public class FeatureColourChooser extends Panel implements ActionListener, { if (newCol == null) { - new UserDefinedColours(this, - maxColour.getBackground(), owner, - MessageManager.getString("label.select_colour_maximum_value")); + new UserDefinedColours(this, maxColour.getBackground(), owner, + MessageManager + .getString("label.select_colour_maximum_value")); } else { @@ -372,32 +401,33 @@ 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); thresholdValue.setEnabled(true); - FeatureColour acg = new FeatureColour(minColour.getBackground(), - maxColour.getBackground(), min, max); + Color minc = minColour.getBackground(); + Color maxc = maxColour.getBackground(); + FeatureColour acg = new FeatureColour(maxc, minc, maxc, minc, min, max); 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,17 +441,25 @@ 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); + acg = new FeatureColour(acg.getColour(), acg.getMinColour(), + acg.getMaxColour(), acg.getNoColour(), threshline.value, + max); } else { - acg = new FeatureColour(acg, min, threshline.value); + acg = new FeatureColour(acg.getColour(), acg.getMinColour(), + acg.getMaxColour(), acg.getNoColour(), min, + threshline.value); } }