import jalview.bin.Cache;
import jalview.datamodel.*;
import jalview.schemes.*;
+import jalview.util.MessageManager;
+
import java.awt.Dimension;
public class AnnotationColourChooser extends JPanel
jalview.datamodel.AlignmentAnnotation currentAnnotation;
boolean adjusting = false;
+ /**
+ * enabled if the user is dragging the slider - try to keep updates to a minimun
+ */
+ boolean sliderDragging = false;
public AnnotationColourChooser(AlignViewport av, final AlignmentPanel ap)
{
if (!adjusting)
{
thresholdValue.setText(((float) slider.getValue() / 1000f) + "");
- valueChanged();
+ valueChanged(!sliderDragging);
}
}
});
slider.addMouseListener(new MouseAdapter()
{
+ @Override
+ public void mousePressed(MouseEvent e)
+ {
+ sliderDragging=true;
+ super.mousePressed(e);
+ }
+
+ @Override
+ public void mouseDragged(MouseEvent e)
+ {
+ sliderDragging=true;
+ super.mouseDragged(e);
+ }
public void mouseReleased(MouseEvent evt)
{
+ if (sliderDragging)
+ {
+ sliderDragging=false;
+ valueChanged(true);
+ }
ap.paintAlignment(true);
}
});
// Always get default shading from preferences.
setDefaultMinMax();
+ adjusting = true;
if (oldcs instanceof AnnotationColourGradient)
{
AnnotationColourGradient acg = (AnnotationColourGradient) oldcs;
- currentColours.setSelected(acg.predefinedColours);
- if (!acg.predefinedColours)
+ currentColours.setSelected(acg.isPredefinedColours() || acg.getBaseColour()!=null);
+ if (!acg.isPredefinedColours() && acg.getBaseColour()==null)
{
minColour.setBackground(acg.getMinColour());
maxColour.setBackground(acg.getMaxColour());
}
seqAssociated.setSelected(acg.isSeqAssociated());
+
}
- adjusting = true;
annotations = new JComboBox(
getAnnotationItems(seqAssociated.isSelected()));
System.arraycopy(anmap, 0, annmap, 0, annmap.length);
return list;
}
-
private void setDefaultMinMax()
{
minColour.setBackground(Cache.getDefaultColour("ANNOTATIONCOLOUR_MIN",
}
});
ok.setOpaque(false);
- ok.setText("OK");
+ ok.setText(MessageManager.getString("action.ok"));
ok.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
}
});
cancel.setOpaque(false);
- cancel.setText("Cancel");
+ cancel.setText(MessageManager.getString("action.cancel"));
cancel.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
}
});
defColours.setOpaque(false);
- defColours.setText("Defaults");
+ defColours.setText(MessageManager.getString("action.set_defaults"));
defColours
.setToolTipText("Reset min and max colours to defaults from user preferences.");
defColours.addActionListener(new ActionListener()
thresholdValue.setColumns(7);
currentColours.setFont(JvSwingUtils.getLabelFont());
currentColours.setOpaque(false);
- currentColours.setText("Use Original Colours");
+ currentColours.setText(MessageManager.getString("label.use_original_colours"));
currentColours.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
});
thresholdIsMin.setBackground(Color.white);
thresholdIsMin.setFont(JvSwingUtils.getLabelFont());
- thresholdIsMin.setText("Threshold is Min/Max");
+ thresholdIsMin.setText(MessageManager.getString("label.threshold_minmax"));
thresholdIsMin.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent actionEvent)
});
seqAssociated.setBackground(Color.white);
seqAssociated.setFont(JvSwingUtils.getLabelFont());
- seqAssociated.setText("Per-sequence only");
+ seqAssociated.setText(MessageManager.getString("label.per_sequence_only"));
seqAssociated.addActionListener(new ActionListener()
{
if (currentAnnotation.graphMin == 0f
&& currentAnnotation.graphMax == 0f)
{
- acg.predefinedColours = true;
+ acg.setPredefinedColours(true);
}
acg.thresholdIsMinMax = thresholdIsMin.isSelected();
}
}
- public void valueChanged()
+ public void valueChanged(boolean updateAllAnnotation)
{
if (currentColours.isSelected()
&& !(av.getGlobalColourScheme() instanceof AnnotationColourGradient))
{
changeColour();
}
-
currentAnnotation.threshold.value = (float) slider.getValue() / 1000f;
+ propagateSeqAssociatedThreshold(updateAllAnnotation);
ap.paintAlignment(false);
}
+ private void propagateSeqAssociatedThreshold(boolean allAnnotation)
+ {
+ if (currentAnnotation.sequenceRef == null
+ || currentAnnotation.threshold == null)
+ {
+ return;
+ }
+ // TODO: JAL-1327 only update visible annotation thresholds if allAnnotation is false, since we only need to provide a quick visual indicator
+
+ float thr = currentAnnotation.threshold.value;
+ for (int i = 0; i < av.getAlignment().getAlignmentAnnotation().length; i++)
+ {
+ AlignmentAnnotation aa = av.getAlignment().getAlignmentAnnotation()[i];
+ if (aa.label.equals(currentAnnotation.label))
+ {
+ aa.threshold.value = thr;
+ }
+ }
+ }
+
public void currentColours_actionPerformed(ActionEvent e)
{
if (currentColours.isSelected())