X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAnnotationColourChooser.java;h=9456986e141d6a4ba6f7a99c042a817c70eb224c;hb=d465aa924dae06b94ecaa229c74dc7ee6404df45;hp=f85a07310d102f6c277a232a7efdf2e0e18c9e54;hpb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;p=jalview.git diff --git a/src/jalview/appletgui/AnnotationColourChooser.java b/src/jalview/appletgui/AnnotationColourChooser.java index f85a073..9456986 100644 --- a/src/jalview/appletgui/AnnotationColourChooser.java +++ b/src/jalview/appletgui/AnnotationColourChooser.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,15 +20,36 @@ */ package jalview.appletgui; -import java.util.*; - -import java.awt.*; -import java.awt.event.*; - -import jalview.datamodel.*; -import jalview.schemes.*; +import jalview.datamodel.AlignmentAnnotation; +import jalview.datamodel.SequenceGroup; +import jalview.schemes.AnnotationColourGradient; +import jalview.schemes.ColourSchemeI; import jalview.util.MessageManager; +import java.awt.BorderLayout; +import java.awt.Button; +import java.awt.Checkbox; +import java.awt.Choice; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.Frame; +import java.awt.Panel; +import java.awt.Scrollbar; +import java.awt.TextField; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.AdjustmentEvent; +import java.awt.event.AdjustmentListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.util.HashMap; +import java.util.Map; +import java.util.Vector; + public class AnnotationColourChooser extends Panel implements ActionListener, AdjustmentListener, ItemListener, MouseListener { @@ -40,9 +61,15 @@ public class AnnotationColourChooser extends Panel implements ColourSchemeI oldcs; - Hashtable oldgroupColours; + Map oldgroupColours; - jalview.datamodel.AlignmentAnnotation currentAnnotation; + /* + * map from annotation to its menu item display label + * - so we know which item to pre-select on restore + */ + private Map annotationLabels; + + AlignmentAnnotation currentAnnotation; boolean adjusting = false; @@ -58,17 +85,10 @@ public class AnnotationColourChooser extends Panel implements oldcs = av.getGlobalColourScheme(); if (av.getAlignment().getGroups() != null) { - oldgroupColours = new Hashtable(); + oldgroupColours = new HashMap<>(); for (SequenceGroup sg : ap.av.getAlignment().getGroups()) { - if (sg.cs != null) - { - oldgroupColours.put(sg, sg.cs); - } - else - { - oldgroupColours.put(sg, "null"); - } + oldgroupColours.put(sg, sg.getColourScheme()); } } this.av = av; @@ -77,7 +97,8 @@ public class AnnotationColourChooser extends Panel implements slider.addAdjustmentListener(this); slider.addMouseListener(this); - if (av.getAlignment().getAlignmentAnnotation() == null) + AlignmentAnnotation[] anns = av.getAlignment().getAlignmentAnnotation(); + if (anns == null) { return; } @@ -88,8 +109,8 @@ public class AnnotationColourChooser extends Panel implements if (oldcs instanceof AnnotationColourGradient) { AnnotationColourGradient acg = (AnnotationColourGradient) oldcs; - currentColours.setState(acg.isPredefinedColours() - || acg.getBaseColour() != null); + currentColours.setState( + acg.isPredefinedColours() || acg.getBaseColour() != null); if (!acg.isPredefinedColours() && acg.getBaseColour() == null) { minColour.setBackground(acg.getMinColour()); @@ -98,16 +119,7 @@ public class AnnotationColourChooser extends Panel implements // seqAssociated.setState(acg.isSeqAssociated()); } - Vector list = new Vector(); - int index = 1; - for (int i = 0; i < av.getAlignment().getAlignmentAnnotation().length; i++) - { - String label = av.getAlignment().getAlignmentAnnotation()[i].label; - if (!list.contains(label)) - list.addElement(label); - else - list.addElement(label + "_" + (index++)); - } + Vector list = getAnnotationItems(); for (int i = 0; i < list.size(); i++) { @@ -115,16 +127,17 @@ public class AnnotationColourChooser extends Panel implements } threshold.addItem(MessageManager - .getString("label.threshold_feature_no_thereshold")); + .getString("label.threshold_feature_no_threshold")); threshold.addItem(MessageManager - .getString("label.threshold_feature_above_thereshold")); + .getString("label.threshold_feature_above_threshold")); threshold.addItem(MessageManager - .getString("label.threshold_feature_below_thereshold")); + .getString("label.threshold_feature_below_threshold")); if (oldcs instanceof AnnotationColourGradient) { AnnotationColourGradient acg = (AnnotationColourGradient) oldcs; - annotations.select(acg.getAnnotation()); + String label = annotationLabels.get(acg.getAnnotation()); + annotations.select(label); switch (acg.getAboveThreshold()) { case AnnotationColourGradient.NO_THRESHOLD: @@ -137,10 +150,10 @@ public class AnnotationColourChooser extends Panel implements threshold.select(1); break; default: - throw new Error( - "Implementation error: don't know about threshold setting for current AnnotationColourGradient."); + throw new Error(MessageManager.getString( + "error.implementation_error_dont_know_threshold_annotationcolourgradient")); } - thresholdIsMin.setState(acg.thresholdIsMinMax); + thresholdIsMin.setState(acg.isThresholdIsMinMax()); thresholdValue.setText("" + acg.getAnnotationThreshold()); } @@ -156,12 +169,57 @@ public class AnnotationColourChooser extends Panel implements validate(); } + /** + * Builds and returns a list of menu items (display text) for choice of + * annotation. Also builds a map between annotations and their display labels. + * + * @return + */ + protected Vector getAnnotationItems() + { + // TODO remove duplication with gui.AnnotationRowFilter + // TODO add 'per sequence only' option / parameter + + annotationLabels = new HashMap<>(); + Vector list = new Vector<>(); + AlignmentAnnotation[] anns = av.getAlignment().getAlignmentAnnotation(); + if (anns == null) + { + return list; + } + int index = 1; + for (int i = 0; i < anns.length; i++) + { + String label = anns[i].label; + if (anns[i].sequenceRef != null) + { + /* + * be helpful and include sequence id in label for + * sequence-associated annotation (JAL-2236) + */ + label = label + "_" + anns[i].sequenceRef.getName(); + } + if (!list.contains(label)) + { + list.addElement(label); + annotationLabels.put(anns[i], label); + } + else + { + label = label + "_" + (index++); + list.addElement(label); + annotationLabels.put(anns[i], label); + } + } + return list; + } + private void setDefaultMinMax() { minColour.setBackground(av.applet.getDefaultColourParameter( "ANNOTATIONCOLOUR_MIN", Color.orange)); - maxColour.setBackground(av.applet.getDefaultColourParameter( - "ANNOTATIONCOLOUR_MAX", Color.red)); + maxColour.setBackground(av.applet + .getDefaultColourParameter("ANNOTATIONCOLOUR_MAX", Color.red)); } @@ -206,13 +264,13 @@ public class AnnotationColourChooser extends Panel implements thresholdValue.setEnabled(false); thresholdValue.setColumns(5); currentColours.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - currentColours.setLabel(MessageManager - .getString("label.use_original_colours")); + currentColours.setLabel( + MessageManager.getString("label.use_original_colours")); currentColours.addItemListener(this); thresholdIsMin.setBackground(Color.white); - thresholdIsMin.setLabel(MessageManager - .getString("label.threshold_minmax")); + thresholdIsMin + .setLabel(MessageManager.getString("label.threshold_minmax")); this.setLayout(borderLayout1); @@ -285,13 +343,14 @@ public class AnnotationColourChooser extends Panel implements Checkbox thresholdIsMin = new Checkbox(); + @Override public void actionPerformed(ActionEvent evt) { if (evt.getSource() == thresholdValue) { try { - float f = new Float(thresholdValue.getText()).floatValue(); + float f = Float.valueOf(thresholdValue.getText()).floatValue(); slider.setValue((int) (f * 1000)); adjustmentValueChanged(null); } catch (NumberFormatException ex) @@ -312,13 +371,12 @@ public class AnnotationColourChooser extends Panel implements } else if (evt.getSource() == ok) { - changeColour(); frame.setVisible(false); } else if (evt.getSource() == cancel) { reset(); - ap.paintAlignment(true); + ap.paintAlignment(true, true); frame.setVisible(false); } @@ -328,6 +386,7 @@ public class AnnotationColourChooser extends Panel implements } } + @Override public void itemStateChanged(ItemEvent evt) { if (evt.getSource() == currentColours) @@ -345,19 +404,20 @@ public class AnnotationColourChooser extends Panel implements changeColour(); } + @Override public void adjustmentValueChanged(AdjustmentEvent evt) { if (!adjusting) { - thresholdValue.setText(((float) slider.getValue() / 1000f) + ""); - if (currentColours.getState() - && !(av.getGlobalColourScheme() instanceof AnnotationColourGradient)) + thresholdValue.setText((slider.getValue() / 1000f) + ""); + if (currentColours.getState() && !(av + .getGlobalColourScheme() instanceof AnnotationColourGradient)) { changeColour(); } - currentAnnotation.threshold.value = (float) slider.getValue() / 1000f; - ap.paintAlignment(false); + currentAnnotation.threshold.value = slider.getValue() / 1000f; + ap.paintAlignment(false, false); } } @@ -406,8 +466,8 @@ public class AnnotationColourChooser extends Panel implements return; } - currentAnnotation = av.getAlignment().getAlignmentAnnotation()[annotations - .getSelectedIndex()]; + currentAnnotation = av.getAlignment() + .getAlignmentAnnotation()[annotations.getSelectedIndex()]; int aboveThreshold = -1; if (threshold.getSelectedIndex() == 1) @@ -433,10 +493,10 @@ public class AnnotationColourChooser extends Panel implements else if (aboveThreshold != AnnotationColourGradient.NO_THRESHOLD && currentAnnotation.threshold == null) { - currentAnnotation - .setThreshold(new jalview.datamodel.GraphLine( - (currentAnnotation.graphMax - currentAnnotation.graphMin) / 2f, - "Threshold", Color.black)); + currentAnnotation.setThreshold(new jalview.datamodel.GraphLine( + (currentAnnotation.graphMax - currentAnnotation.graphMin) + / 2f, + "Threshold", Color.black)); } if (aboveThreshold != AnnotationColourGradient.NO_THRESHOLD) @@ -455,8 +515,6 @@ public class AnnotationColourChooser extends Panel implements AnnotationColourGradient acg = null; if (currentColours.getState()) { - acg = new AnnotationColourGradient(currentAnnotation, - av.getGlobalColourScheme(), aboveThreshold); } else { @@ -471,7 +529,7 @@ public class AnnotationColourChooser extends Panel implements acg.setPredefinedColours(true); } - acg.thresholdIsMinMax = thresholdIsMin.getState(); + acg.setThresholdIsMinMax(thresholdIsMin.getState()); av.setGlobalColourScheme(acg); @@ -480,30 +538,28 @@ public class AnnotationColourChooser extends Panel implements { for (SequenceGroup sg : ap.av.getAlignment().getGroups()) { - - if (sg.cs == null) + if (sg.getColourScheme() == null) { continue; } if (currentColours.getState()) { - sg.cs = new AnnotationColourGradient(currentAnnotation, sg.cs, - aboveThreshold); + sg.setColourScheme(new AnnotationColourGradient(currentAnnotation, + sg.getColourScheme(), aboveThreshold)); } else { - sg.cs = new AnnotationColourGradient(currentAnnotation, + sg.setColourScheme(new AnnotationColourGradient(currentAnnotation, minColour.getBackground(), maxColour.getBackground(), - aboveThreshold); + aboveThreshold)); } - } } // update colours in linked windows ap.alignmentChanged(); - ap.paintAlignment(true); + ap.paintAlignment(true, true); } void reset() @@ -513,39 +569,34 @@ public class AnnotationColourChooser extends Panel implements { for (SequenceGroup sg : ap.av.getAlignment().getGroups()) { - Object cs = oldgroupColours.get(sg); - if (cs instanceof ColourSchemeI) - { - sg.cs = (ColourSchemeI) cs; - } - else - { - // probably the "null" string we set it to if it was null originally. - sg.cs = null; - } + sg.setColourScheme(oldgroupColours.get(sg)); } } - ap.paintAlignment(true); - + ap.paintAlignment(true, true); } + @Override public void mouseClicked(MouseEvent evt) { } + @Override public void mousePressed(MouseEvent evt) { } + @Override public void mouseReleased(MouseEvent evt) { - ap.paintAlignment(true); + ap.paintAlignment(true, true); } + @Override public void mouseEntered(MouseEvent evt) { } + @Override public void mouseExited(MouseEvent evt) { }