/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
*
import java.awt.*;
import java.awt.event.*;
+
import javax.swing.*;
import javax.swing.event.*;
+import net.miginfocom.swing.MigLayout;
+
import jalview.bin.Cache;
import jalview.datamodel.*;
import jalview.schemes.*;
public AnnotationColourChooser(AlignViewport av, final AlignmentPanel ap)
{
oldcs = av.getGlobalColourScheme();
- if (av.alignment.getGroups() != null)
+ if (av.getAlignment().getGroups() != null)
{
oldgroupColours = new Hashtable();
- Vector allGroups = ap.av.alignment.getGroups();
- SequenceGroup sg;
- for (int g = 0; g < allGroups.size(); g++)
+ for (SequenceGroup sg:ap.av.getAlignment().getGroups())
{
- sg = (SequenceGroup) allGroups.get(g);
if (sg.cs != null)
{
oldgroupColours.put(sg, sg.cs);
frame = new JInternalFrame();
frame.setContentPane(this);
frame.setLayer(JLayeredPane.PALETTE_LAYER);
- Desktop.addInternalFrame(frame, "Colour by Annotation", 480, 145);
+ Desktop.addInternalFrame(frame, "Colour by Annotation", 520, 215);
slider.addChangeListener(new ChangeListener()
{
}
});
- if (av.alignment.getAlignmentAnnotation() == null)
+ if (av.getAlignment().getAlignmentAnnotation() == null)
{
return;
}
// Always get default shading from preferences.
- minColour.setBackground(Cache.getDefaultColour("ANNOTATIONCOLOUR_MIN", Color.orange));
- maxColour.setBackground(Cache.getDefaultColour("ANNOTATIONCOLOUR_MAX", Color.red));
-
+ setDefaultMinMax();
+
if (oldcs instanceof AnnotationColourGradient)
{
AnnotationColourGradient acg = (AnnotationColourGradient) oldcs;
currentColours.setSelected(acg.predefinedColours);
- if (acg.predefinedColours)
+ if (!acg.predefinedColours)
{
-
- } else {
- minColour.setBackground(acg.getMinColour());
+ minColour.setBackground(acg.getMinColour());
maxColour.setBackground(acg.getMaxColour());
}
+ seqAssociated.setSelected(acg.isSeqAssociated());
}
-
adjusting = true;
Vector list = new Vector();
int index = 1;
- for (int i = 0; i < av.alignment.getAlignmentAnnotation().length; i++)
+ for (int i = 0; i < av.getAlignment().getAlignmentAnnotation().length; i++)
{
- String label = av.alignment.getAlignmentAnnotation()[i].label;
+ String label = av.getAlignment().getAlignmentAnnotation()[i].label;
if (!list.contains(label))
list.addElement(label);
else
adjusting = false;
changeColour();
- validate();
+ frame.invalidate();
+ frame.pack();
+
+ }
+ private void setDefaultMinMax()
+ {
+ minColour.setBackground(Cache.getDefaultColour("ANNOTATIONCOLOUR_MIN", Color.orange));
+ maxColour.setBackground(Cache.getDefaultColour("ANNOTATIONCOLOUR_MAX", Color.red));
}
public AnnotationColourChooser()
private void jbInit() throws Exception
{
- minColour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+ minColour.setFont(JvSwingUtils.getLabelFont());
minColour.setBorder(BorderFactory.createEtchedBorder());
minColour.setPreferredSize(new Dimension(40, 20));
minColour.setToolTipText("Minimum Colour");
}
}
});
- maxColour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+ maxColour.setFont(JvSwingUtils.getLabelFont());
maxColour.setBorder(BorderFactory.createEtchedBorder());
maxColour.setPreferredSize(new Dimension(40, 20));
maxColour.setToolTipText("Maximum Colour");
cancel_actionPerformed(e);
}
});
- this.setLayout(borderLayout1);
- jPanel2.setLayout(flowLayout1);
+ defColours.setOpaque(false);
+ defColours.setText("Defaults");
+ defColours.setToolTipText("Reset min and max colours to defaults from user preferences.");
+ defColours.addActionListener(new ActionListener()
+ {
+
+ @Override
+ public void actionPerformed(ActionEvent arg0)
+ {
+ resetColours_actionPerformed(arg0);
+ }
+ });
+
annotations.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
annotations_actionPerformed(e);
}
});
- jPanel1.setBackground(Color.white);
- jPanel2.setBackground(Color.white);
threshold.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
threshold_actionPerformed(e);
}
});
- jPanel3.setLayout(flowLayout2);
thresholdValue.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
slider.setPreferredSize(new Dimension(100, 32));
thresholdValue.setEnabled(false);
thresholdValue.setColumns(7);
- jPanel3.setBackground(Color.white);
- currentColours.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
+ currentColours.setFont(JvSwingUtils.getLabelFont());
currentColours.setOpaque(false);
currentColours.setText("Use Original Colours");
currentColours.addActionListener(new ActionListener()
}
});
thresholdIsMin.setBackground(Color.white);
+ thresholdIsMin.setFont(JvSwingUtils.getLabelFont());
thresholdIsMin.setText("Threshold is Min/Max");
thresholdIsMin.addActionListener(new ActionListener()
{
thresholdIsMin_actionPerformed(actionEvent);
}
});
+ seqAssociated.setBackground(Color.white);
+ seqAssociated.setFont(JvSwingUtils.getLabelFont());
+ seqAssociated.setText("Per-sequence only");
+ seqAssociated.addActionListener(new ActionListener()
+ {
+
+ @Override
+ public void actionPerformed(ActionEvent arg0)
+ {
+ seqAssociated_actionPerformed(arg0);
+ }
+ });
+
+ this.setLayout(borderLayout1);
+ jPanel2.setLayout(new MigLayout("","[left][center][right]","[][][]"));
+ jPanel1.setBackground(Color.white);
+ jPanel2.setBackground(Color.white);
+
jPanel1.add(ok);
jPanel1.add(cancel);
jPanel2.add(annotations);
jPanel2.add(currentColours);
- jPanel2.add(minColour);
- jPanel2.add(maxColour);
- this.add(jPanel3, java.awt.BorderLayout.CENTER);
- jPanel3.add(threshold);
- jPanel3.add(slider);
- jPanel3.add(thresholdValue);
- jPanel3.add(thresholdIsMin);
+ JPanel colpanel = new JPanel(new FlowLayout());
+ colpanel.setBackground(Color.white);
+ colpanel.add(minColour);
+ colpanel.add(maxColour);
+ jPanel2.add(colpanel, "wrap");
+ jPanel2.add(seqAssociated, "wrap");
+ jPanel2.add(threshold);
+ jPanel2.add(defColours,"skip 1, wrap");
+ jPanel2.add(thresholdIsMin);
+ jPanel2.add(slider, "grow");
+ jPanel2.add(thresholdValue, "grow");
this.add(jPanel1, java.awt.BorderLayout.SOUTH);
- this.add(jPanel2, java.awt.BorderLayout.NORTH);
+ this.add(jPanel2, java.awt.BorderLayout.CENTER);
+ this.validate();
+ }
+
+ protected void seqAssociated_actionPerformed(ActionEvent arg0)
+ {
+ changeColour();
+ }
+
+ protected void resetColours_actionPerformed(ActionEvent arg0)
+ {
+ setDefaultMinMax();
+ changeColour();
}
JComboBox annotations;
JPanel minColour = new JPanel();
JPanel maxColour = new JPanel();
-
+ JButton defColours = new JButton();
JButton ok = new JButton();
JButton cancel = new JButton();
JPanel jPanel1 = new JPanel();
-
JPanel jPanel2 = new JPanel();
-
+
BorderLayout borderLayout1 = new BorderLayout();
JComboBox threshold = new JComboBox();
- FlowLayout flowLayout1 = new FlowLayout();
-
- JPanel jPanel3 = new JPanel();
-
- FlowLayout flowLayout2 = new FlowLayout();
JSlider slider = new JSlider();
JCheckBox currentColours = new JCheckBox();
JCheckBox thresholdIsMin = new JCheckBox();
+
+ JCheckBox seqAssociated = new JCheckBox();
public void minColour_actionPerformed()
{
return;
}
- currentAnnotation = av.alignment.getAlignmentAnnotation()[annotations
+ currentAnnotation = av.getAlignment().getAlignmentAnnotation()[annotations
.getSelectedIndex()];
int aboveThreshold = -1;
slider.setEnabled(true);
thresholdValue.setEnabled(true);
+ thresholdIsMin.setEnabled(true);
if (aboveThreshold == AnnotationColourGradient.NO_THRESHOLD)
{
slider.setEnabled(false);
thresholdValue.setEnabled(false);
thresholdValue.setText("");
+ thresholdIsMin.setEnabled(false);
}
else if (aboveThreshold != AnnotationColourGradient.NO_THRESHOLD
&& currentAnnotation.threshold == null)
minColour.getBackground(), maxColour.getBackground(),
aboveThreshold);
}
+ acg.setSeqAssociated(seqAssociated.isSelected());
if (currentAnnotation.graphMin == 0f
&& currentAnnotation.graphMax == 0f)
av.setGlobalColourScheme(acg);
- if (av.alignment.getGroups() != null)
+ if (av.getAlignment().getGroups() != null)
{
- Vector allGroups = ap.av.alignment.getGroups();
- SequenceGroup sg;
- for (int g = 0; g < allGroups.size(); g++)
+
+ for (SequenceGroup sg:ap.av.getAlignment().getGroups())
{
- sg = (SequenceGroup) allGroups.get(g);
-
if (sg.cs == null)
{
continue;
{
sg.cs = new AnnotationColourGradient(currentAnnotation, sg.cs,
aboveThreshold);
+ ((AnnotationColourGradient)sg.cs).setSeqAssociated(seqAssociated.isSelected());
+
}
else
{
sg.cs = new AnnotationColourGradient(currentAnnotation,
minColour.getBackground(), maxColour.getBackground(),
aboveThreshold);
+ ((AnnotationColourGradient)sg.cs).setSeqAssociated(seqAssociated.isSelected());
}
}
}
+ ap.alignmentChanged();
// ensure all associated views (overviews, structures, etc) are notified of updated colours.
ap.paintAlignment(true);
}
public void cancel_actionPerformed(ActionEvent e)
{
reset();
+ // ensure all original colouring is propagated to listeners.
+ ap.paintAlignment(true);
try
{
frame.setClosed(true);
void reset()
{
av.setGlobalColourScheme(oldcs);
- if (av.alignment.getGroups() != null)
+ if (av.getAlignment().getGroups() != null)
{
- Vector allGroups = ap.av.alignment.getGroups();
- SequenceGroup sg;
- for (int g = 0; g < allGroups.size(); g++)
+
+ for (SequenceGroup sg:ap.av.getAlignment().getGroups())
{
- sg = (SequenceGroup) allGroups.get(g);
sg.cs = (ColourSchemeI) oldgroupColours.get(sg);
}
}
git://source.jalview.org / jalview.git / blobdiff