X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationColourChooser.java;h=a48553e5278a6b6bc41449508e9105f6f8a35982;hb=a83adb45bdf9554e270921b4baad94defd314b36;hp=253a7ec91e03f95ded558a175cee5378f8d91227;hpb=b59839dfda0a767318fc3c89d9604c39ff298d83;p=jalview.git diff --git a/src/jalview/gui/AnnotationColourChooser.java b/src/jalview/gui/AnnotationColourChooser.java index 253a7ec..a48553e 100644 --- a/src/jalview/gui/AnnotationColourChooser.java +++ b/src/jalview/gui/AnnotationColourChooser.java @@ -24,6 +24,7 @@ import jalview.bin.Cache; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.GraphLine; import jalview.datamodel.SequenceGroup; +import jalview.gui.JalviewColourChooser.ColourChooserListener; import jalview.schemes.AnnotationColourGradient; import jalview.schemes.ColourSchemeI; import jalview.util.MessageManager; @@ -42,7 +43,6 @@ import java.util.Vector; import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JCheckBox; -import javax.swing.JColorChooser; import javax.swing.JComboBox; import javax.swing.JInternalFrame; import javax.swing.JLayeredPane; @@ -63,9 +63,9 @@ public class AnnotationColourChooser extends AnnotationRowFilter private JCheckBox useOriginalColours = new JCheckBox(); - private JPanel minColour = new JPanel(); + JPanel minColour = new JPanel(); - private JPanel maxColour = new JPanel(); + JPanel maxColour = new JPanel(); private JCheckBox thresholdIsMin = new JCheckBox(); @@ -79,7 +79,7 @@ public class AnnotationColourChooser extends AnnotationRowFilter oldcs = av.getGlobalColourScheme(); if (av.getAlignment().getGroups() != null) { - oldgroupColours = new Hashtable(); + oldgroupColours = new Hashtable<>(); for (SequenceGroup sg : ap.av.getAlignment().getGroups()) { if (sg.getColourScheme() != null) @@ -110,8 +110,8 @@ public class AnnotationColourChooser extends AnnotationRowFilter if (oldcs instanceof AnnotationColourGradient) { AnnotationColourGradient acg = (AnnotationColourGradient) oldcs; - useOriginalColours.setSelected(acg.isPredefinedColours() - || acg.getBaseColour() != null); + useOriginalColours.setSelected( + acg.isPredefinedColours() || acg.getBaseColour() != null); if (!acg.isPredefinedColours() && acg.getBaseColour() == null) { minColour.setBackground(acg.getMinColour()); @@ -120,9 +120,9 @@ public class AnnotationColourChooser extends AnnotationRowFilter seqAssociated.setSelected(acg.isSeqAssociated()); } - Vector annotItems = getAnnotationItems(seqAssociated - .isSelected()); - annotations = new JComboBox(annotItems); + Vector annotItems = getAnnotationItems( + seqAssociated.isSelected()); + annotations = new JComboBox<>(annotItems); populateThresholdComboBox(threshold); @@ -143,9 +143,8 @@ public class AnnotationColourChooser extends AnnotationRowFilter getThreshold().setSelectedIndex(2); break; default: - throw new Error( - MessageManager - .getString("error.implementation_error_dont_know_about_threshold_setting")); + throw new Error(MessageManager.getString( + "error.implementation_error_dont_know_about_threshold_setting")); } thresholdIsMin.setSelected(acg.isThresholdIsMinMax()); thresholdValue.setText("" + acg.getAnnotationThreshold()); @@ -175,7 +174,7 @@ public class AnnotationColourChooser extends AnnotationRowFilter { if (minColour.isEnabled()) { - minColour_actionPerformed(); + showColourChooser(minColour, "label.select_colour_minimum_value"); } } }); @@ -190,7 +189,7 @@ public class AnnotationColourChooser extends AnnotationRowFilter { if (maxColour.isEnabled()) { - maxColour_actionPerformed(); + showColourChooser(maxColour, "label.select_colour_maximum_value"); } } }); @@ -212,8 +211,8 @@ public class AnnotationColourChooser extends AnnotationRowFilter useOriginalColours.setFont(JvSwingUtils.getLabelFont()); useOriginalColours.setOpaque(false); - useOriginalColours.setText(MessageManager - .getString("label.use_original_colours")); + useOriginalColours.setText( + MessageManager.getString("label.use_original_colours")); useOriginalColours.addActionListener(new ActionListener() { @Override @@ -224,8 +223,8 @@ public class AnnotationColourChooser extends AnnotationRowFilter }); thresholdIsMin.setBackground(Color.white); thresholdIsMin.setFont(JvSwingUtils.getLabelFont()); - thresholdIsMin.setText(MessageManager - .getString("label.threshold_minmax")); + thresholdIsMin + .setText(MessageManager.getString("label.threshold_minmax")); thresholdIsMin.addActionListener(new ActionListener() { @Override @@ -236,8 +235,8 @@ public class AnnotationColourChooser extends AnnotationRowFilter }); seqAssociated.setBackground(Color.white); seqAssociated.setFont(JvSwingUtils.getLabelFont()); - seqAssociated.setText(MessageManager - .getString("label.per_sequence_only")); + seqAssociated + .setText(MessageManager.getString("label.per_sequence_only")); seqAssociated.addActionListener(new ActionListener() { @@ -283,42 +282,33 @@ public class AnnotationColourChooser extends AnnotationRowFilter private void setDefaultMinMax() { - minColour.setBackground(Cache.getDefaultColour("ANNOTATIONCOLOUR_MIN", - Color.orange)); - maxColour.setBackground(Cache.getDefaultColour("ANNOTATIONCOLOUR_MAX", - Color.red)); + minColour.setBackground( + Cache.getDefaultColour(Preferences.ANNOTATIONCOLOUR_MIN, Color.orange)); + maxColour.setBackground( + Cache.getDefaultColour(Preferences.ANNOTATIONCOLOUR_MAX, Color.red)); } - public void minColour_actionPerformed() + protected void showColourChooser(JPanel colourPanel, String titleKey) { - Color col = JColorChooser.showDialog(this, - MessageManager.getString("label.select_colour_minimum_value"), - minColour.getBackground()); - if (col != null) + String ttl = MessageManager.getString(titleKey); + ColourChooserListener listener = new ColourChooserListener() { - minColour.setBackground(col); - } - minColour.repaint(); - updateView(); - } - - public void maxColour_actionPerformed() - { - Color col = JColorChooser.showDialog(this, - MessageManager.getString("label.select_colour_maximum_value"), - maxColour.getBackground()); - if (col != null) - { - maxColour.setBackground(col); - } - maxColour.repaint(); - updateView(); + @Override + public void colourSelected(Color c) + { + colourPanel.setBackground(c); + colourPanel.repaint(); + updateView(); + } + }; + JalviewColourChooser.showColourChooser(Desktop.getDesktopPane(), ttl, + colourPanel.getBackground(), listener); } @Override public void reset() { - av.setGlobalColourScheme(oldcs); + this.ap.alignFrame.changeColour(oldcs); if (av.getAlignment().getGroups() != null) { @@ -334,15 +324,15 @@ public class AnnotationColourChooser extends AnnotationRowFilter { if (slider.isEnabled()) { - if (useOriginalColours.isSelected() - && !(av.getGlobalColourScheme() instanceof AnnotationColourGradient)) + if (useOriginalColours.isSelected() && !(av + .getGlobalColourScheme() instanceof AnnotationColourGradient)) { updateView(); } getCurrentAnnotation().threshold.value = slider.getValue() / 1000f; propagateSeqAssociatedThreshold(updateAllAnnotation, getCurrentAnnotation()); - ap.paintAlignment(false); + ap.paintAlignment(false, false); } } @@ -368,11 +358,12 @@ public class AnnotationColourChooser extends AnnotationRowFilter return; } - setCurrentAnnotation(av.getAlignment().getAlignmentAnnotation()[annmap[annotations - .getSelectedIndex()]]); + setCurrentAnnotation( + av.getAlignment().getAlignmentAnnotation()[annmap[annotations + .getSelectedIndex()]]); - int selectedThresholdItem = getSelectedThresholdItem(getThreshold() - .getSelectedIndex()); + int selectedThresholdItem = getSelectedThresholdItem( + getThreshold().getSelectedIndex()); slider.setEnabled(true); thresholdValue.setEnabled(true); @@ -388,11 +379,10 @@ public class AnnotationColourChooser extends AnnotationRowFilter else if (selectedThresholdItem != AnnotationColourGradient.NO_THRESHOLD && getCurrentAnnotation().threshold == null) { - getCurrentAnnotation() - .setThreshold( - new GraphLine( - (getCurrentAnnotation().graphMax - getCurrentAnnotation().graphMin) / 2f, - "Threshold", Color.black)); + getCurrentAnnotation().setThreshold(new GraphLine( + (getCurrentAnnotation().graphMax + - getCurrentAnnotation().graphMin) / 2f, + "Threshold", Color.black)); } if (selectedThresholdItem != AnnotationColourGradient.NO_THRESHOLD) @@ -401,9 +391,12 @@ public class AnnotationColourChooser extends AnnotationRowFilter float range = getCurrentAnnotation().graphMax * ONETHOUSAND - getCurrentAnnotation().graphMin * ONETHOUSAND; - slider.setMinimum((int) (getCurrentAnnotation().graphMin * ONETHOUSAND)); - slider.setMaximum((int) (getCurrentAnnotation().graphMax * ONETHOUSAND)); - slider.setValue((int) (getCurrentAnnotation().threshold.value * ONETHOUSAND)); + slider.setMinimum( + (int) (getCurrentAnnotation().graphMin * ONETHOUSAND)); + slider.setMaximum( + (int) (getCurrentAnnotation().graphMax * ONETHOUSAND)); + slider.setValue( + (int) (getCurrentAnnotation().threshold.value * ONETHOUSAND)); thresholdValue.setText(getCurrentAnnotation().threshold.value + ""); slider.setMajorTickSpacing((int) (range / 10f)); slider.setEnabled(true); @@ -413,14 +406,12 @@ public class AnnotationColourChooser extends AnnotationRowFilter colorAlignmentContaining(getCurrentAnnotation(), selectedThresholdItem); ap.alignmentChanged(); - // ensure all associated views (overviews, structures, etc) are notified of - // updated colours. - ap.paintAlignment(true); } - protected boolean colorAlignmentContaining(AlignmentAnnotation currentAnn, int selectedThresholdOption) + protected void colorAlignmentContaining(AlignmentAnnotation currentAnn, + int selectedThresholdOption) { - + AnnotationColourGradient acg = null; if (useOriginalColours.isSelected()) { @@ -434,44 +425,35 @@ public class AnnotationColourChooser extends AnnotationRowFilter selectedThresholdOption); } acg.setSeqAssociated(seqAssociated.isSelected()); - + if (currentAnn.graphMin == 0f && currentAnn.graphMax == 0f) { acg.setPredefinedColours(true); } - + acg.setThresholdIsMinMax(thresholdIsMin.isSelected()); - - av.setGlobalColourScheme(acg); - + + this.ap.alignFrame.changeColour(acg); + if (av.getAlignment().getGroups() != null) { - + for (SequenceGroup sg : ap.av.getAlignment().getGroups()) { if (sg.cs == null) { continue; } - - if (useOriginalColours.isSelected()) - { - sg.setColourScheme(new AnnotationColourGradient(currentAnn, sg - .getColourScheme(), selectedThresholdOption)); - ((AnnotationColourGradient) sg.cs).setSeqAssociated(seqAssociated - .isSelected()); - } - else - { - sg.setColourScheme(new AnnotationColourGradient(currentAnn, - minColour.getBackground(), maxColour.getBackground(), - selectedThresholdOption)); - ((AnnotationColourGradient) sg.cs).setSeqAssociated(seqAssociated - .isSelected()); - } + sg.setColourScheme( + acg.getInstance(av, sg)); } } - return false; } + @Override + protected void sliderDragReleased() + { + super.sliderDragReleased(); + ap.paintAlignment(true, true); + } }