/*
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * along with Jalview. If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.appletgui;
-import java.util.*;
-
-import java.awt.*;
-import java.awt.event.*;
-
-import jalview.datamodel.*;
-import jalview.schemes.*;
-import java.awt.Rectangle;
-
-public class FeatureColourChooser extends Panel implements
- ActionListener, AdjustmentListener, ItemListener, MouseListener
+import jalview.api.FeatureColourI;
+import jalview.datamodel.GraphLine;
+import jalview.schemes.AnnotationColourGradient;
+import jalview.schemes.FeatureColour;
+import jalview.util.MessageManager;
+
+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.GridLayout;
+import java.awt.Label;
+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.Hashtable;
+
+public class FeatureColourChooser extends Panel implements ActionListener,
+ AdjustmentListener, ItemListener, MouseListener
{
JVDialog frame;
+ Frame owner;
+
FeatureRenderer fr;
+
FeatureSettings fs = null;
+
// AlignmentPanel ap;
- GraduatedColor cs;
- Object oldcs;
+ FeatureColourI cs;
- Hashtable oldgroupColours;
+ FeatureColourI oldcs;
+ Hashtable oldgroupColours;
boolean adjusting = false;
- private float min,max;
- String type=null;
- private AlignFrame af=null;
+ private float min, max;
+
+ String type = null;
+
+ private AlignFrame af = null;
+
public FeatureColourChooser(AlignFrame af, String type)
{
this.af = af;
init(af.getSeqcanvas().getFeatureRenderer(), type);
}
+
public FeatureColourChooser(FeatureSettings fsettings, String type)
{
this.fs = fsettings;
init(fsettings.fr, type);
// this.ap = fsettings.ap;
}
- private void init(FeatureRenderer frenderer,String type) {
+
+ private void init(FeatureRenderer frenderer, String type)
+ {
this.type = type;
fr = frenderer;
- float mm[] = ((float[][]) fr.minmax.get(type))[0];
+ float mm[] = fr.getMinMax().get(type)[0];
min = mm[0];
max = mm[1];
- oldcs = fr.featureColours.get(type);
- if (oldcs instanceof GraduatedColor)
+ oldcs = fr.getFeatureColours().get(type);
+ if (oldcs.isGraduatedColour())
+ {
+ cs = new FeatureColour((FeatureColour) oldcs, min, max);
+ }
+ else
{
- cs = new GraduatedColor((GraduatedColor) oldcs, min, max);
- } else {
// promote original color to a graduated color
Color bl = Color.black;
- if (oldcs instanceof Color)
+ if (oldcs.isSimpleColour())
{
- bl = (Color) oldcs;
+ bl = oldcs.getColour();
}
// original colour becomes the maximum colour
- cs = new GraduatedColor(Color.white,bl,mm[0],mm[1]);
+ cs = new FeatureColour(Color.white, bl, mm[0], mm[1]);
}
- minColour.setBackground(cs.getMinColor());
- maxColour.setBackground(cs.getMaxColor());
+ minColour.setBackground(cs.getMinColour());
+ maxColour.setBackground(cs.getMaxColour());
+ minColour.setForeground(cs.getMinColour());
+ maxColour.setForeground(cs.getMaxColour());
colourFromLabel.setState(cs.isColourByLabel());
adjusting = true;
} catch (Exception ex)
{
}
- threshold.select(cs.getThreshType()==AnnotationColourGradient.NO_THRESHOLD ? 0 : cs.getThreshType() == AnnotationColourGradient.ABOVE_THRESHOLD ? 1 : 2);
-
+ threshold.select(cs.isAboveThreshold() ? 1 : (cs.isBelowThreshold() ? 2
+ : 0));
+
adjusting = false;
changeColour();
colourFromLabel.addItemListener(this);
slider.addAdjustmentListener(this);
slider.addMouseListener(this);
- Frame owner = (af!=null) ? af : fs.frame;
- frame = new JVDialog(owner,"Graduated Feature Colour for "+type,true,480,248);
+ owner = (af != null) ? af : fs.frame;
+ frame = new JVDialog(owner, MessageManager.formatMessage(
+ "label.graduated_color_for_params", new String[] { type }),
+ true, 480, 248);
frame.setMainPanel(this);
validate();
frame.setVisible(true);
- if (frame.accept) {
+ if (frame.accept)
+ {
changeColour();
- } else {
+ }
+ else
+ {
// cancel
- reset();
- PaintRefresher.Refresh(this, fr.av.getSequenceSetId());
- frame.setVisible(false);
+ reset();
+ PaintRefresher.Refresh(this, fr.getViewport().getSequenceSetId());
+ frame.setVisible(false);
}
}
private void jbInit() throws Exception
{
- minColour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
- minColour.setLabel("Min Colour");
- minColour.addActionListener(this);
+ Label minLabel = new Label(MessageManager.getString("label.min")), maxLabel = new Label(
+ MessageManager.getString("label.max"));
+ 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));
+ // minColour.setLabel("Min Colour");
+
+ minColour.setBounds(0, 0, 40, 27);
+ maxColour.setBounds(0, 0, 40, 27);
+ minColour.addMouseListener(this);
maxColour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
- maxColour.setLabel("Max Colour");
- maxColour.addActionListener(this);
+ maxColour.addMouseListener(this);
thresholdIsMin.addItemListener(this);
- this.setLayout(new GridLayout(4,1));
+ this.setLayout(new GridLayout(4, 1));
jPanel1.setLayout(new FlowLayout());
jPanel2.setLayout(new FlowLayout());
- jPanel3.setLayout(new GridLayout(1,1));
+ jPanel3.setLayout(new GridLayout(1, 1));
jPanel4.setLayout(new FlowLayout());
jPanel1.setBackground(Color.white);
jPanel2.setBackground(Color.white);
jPanel4.setBackground(Color.white);
threshold.addItemListener(this);
- threshold.addItem("No Threshold");
- threshold.addItem("Above Threshold");
- threshold.addItem("Below Threshold");
+ threshold.addItem(MessageManager
+ .getString("label.threshold_feature_no_threshold"));
+ threshold.addItem(MessageManager
+ .getString("label.threshold_feature_above_threshold"));
+ threshold.addItem(MessageManager
+ .getString("label.threshold_feature_below_threshold"));
thresholdValue.addActionListener(this);
slider.setBackground(Color.white);
slider.setEnabled(false);
slider.setSize(new Dimension(93, 21));
thresholdValue.setEnabled(false);
- thresholdValue.setSize(new Dimension(79,22)); //setBounds(new Rectangle(248, 2, 79, 22));
+ thresholdValue.setSize(new Dimension(79, 22)); // setBounds(new
+ // Rectangle(248, 2, 79,
+ // 22));
thresholdValue.setColumns(5);
jPanel3.setBackground(Color.white);
-
+
colourFromLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
- colourFromLabel.setLabel("Colour by Label");
- colourFromLabel.setSize(new Dimension(139,22));
- //threshold.setBounds(new Rectangle(11, 3, 139, 22));
+ 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("Threshold is min/max");
- thresholdIsMin.setSize(new Dimension(135,23));
- //thresholdIsMin.setBounds(new Rectangle(328, 3, 135, 23));
+ thresholdIsMin.setLabel(MessageManager
+ .getString("label.threshold_minmax"));
+ thresholdIsMin.setSize(new Dimension(135, 23));
+ // thresholdIsMin.setBounds(new Rectangle(328, 3, 135, 23));
+ jPanel1.add(minLabel);
jPanel1.add(minColour);
+ jPanel1.add(maxLabel);
jPanel1.add(maxColour);
jPanel1.add(colourFromLabel);
jPanel2.add(threshold);
jPanel3.add(slider);
jPanel4.add(thresholdValue);
jPanel4.add(thresholdIsMin);
- this.add(jPanel1);//, java.awt.BorderLayout.NORTH);
- this.add(jPanel2);//, java.awt.BorderLayout.NORTH);
- this.add(jPanel3);//, java.awt.BorderLayout.CENTER);
- this.add(jPanel4);//, java.awt.BorderLayout.CENTER);
+ this.add(jPanel1);// , java.awt.BorderLayout.NORTH);
+ this.add(jPanel2);// , java.awt.BorderLayout.NORTH);
+ this.add(jPanel3);// , java.awt.BorderLayout.CENTER);
+ this.add(jPanel4);// , java.awt.BorderLayout.CENTER);
}
- Button minColour = new Button();
+ Panel minColour = new Panel();
- Button maxColour = new Button();
+ Panel maxColour = new Panel();
-
Panel jPanel1 = new Panel();
Panel jPanel2 = new Panel();
Choice threshold = new Choice();
Panel jPanel3 = new Panel();
+
Panel jPanel4 = new Panel();
Scrollbar slider = new Scrollbar(Scrollbar.HORIZONTAL);
TextField thresholdValue = new TextField(20);
-
-// BorderLayout borderLayout1 = new BorderLayout();
+ // BorderLayout borderLayout1 = new BorderLayout();
Checkbox thresholdIsMin = new Checkbox();
+
Checkbox colourFromLabel = new Checkbox();
private GraphLine threshline;
+ @Override
public void actionPerformed(ActionEvent evt)
{
if (evt.getSource() == thresholdValue)
}
}
+ @Override
public void itemStateChanged(ItemEvent evt)
{
maxColour.setEnabled(!colourFromLabel.getState());
changeColour();
}
+ @Override
public void adjustmentValueChanged(AdjustmentEvent evt)
{
if (!adjusting)
{
- thresholdValue.setText(((float) slider.getValue() / 1000f) + "");
+ thresholdValue.setText((slider.getValue() / 1000f) + "");
valueChanged();
}
}
- protected void valueChanged() {
- threshline.value = (float) slider.getValue() / 1000f;
- cs.setThresh(threshline.value);
+
+ protected void valueChanged()
+ {
+ threshline.value = slider.getValue() / 1000f;
+ cs.setThreshold(threshline.value);
changeColour();
- PaintRefresher.Refresh(this, fr.av.getSequenceSetId());
+ PaintRefresher.Refresh(this, fr.getViewport().getSequenceSetId());
// ap.paintAlignment(false);
}
+
public void minColour_actionPerformed(Color newCol)
{
if (newCol == null)
{
- UserDefinedColours udc = new UserDefinedColours(this,minColour.getBackground(), frame, "Select Colour for Minimum Value");
- } else {
+ UserDefinedColours udc = new UserDefinedColours(this,
+ minColour.getBackground(), owner,
+ MessageManager.getString("label.select_colour_minimum_value")); // frame.owner,
+ }
+ else
+ {
minColour.setBackground(newCol);
+ minColour.setForeground(newCol);
minColour.repaint();
changeColour();
}
-
+
}
public void maxColour_actionPerformed(Color newCol)
{
if (newCol == null)
{
- UserDefinedColours udc = new UserDefinedColours(this,maxColour.getBackground(), frame, "Select Colour for Maximum Value");// this, "Select Colour for Maximum Value", maxColour.getBackground());
- } else {
+
+ // UserDefinedColours udc = new UserDefinedColours(this,
+ // "Select Colour for Maximum Value",maxColour.getBackground(),true);
+ UserDefinedColours udc = new UserDefinedColours(this,
+ maxColour.getBackground(), owner,
+ MessageManager.getString("label.select_colour_maximum_value"));
+ }
+ else
+ {
maxColour.setBackground(newCol);
+ maxColour.setForeground(newCol);
maxColour.repaint();
changeColour();
}
}
int aboveThreshold = AnnotationColourGradient.NO_THRESHOLD;
- if (threshold.getSelectedItem().equals("Above Threshold"))
+ if (threshold.getSelectedIndex() == 1)
{
aboveThreshold = AnnotationColourGradient.ABOVE_THRESHOLD;
}
- else if (threshold.getSelectedItem().equals("Below Threshold"))
+ else if (threshold.getSelectedIndex() == 2)
{
aboveThreshold = AnnotationColourGradient.BELOW_THRESHOLD;
}
slider.setEnabled(true);
thresholdValue.setEnabled(true);
- GraduatedColor acg = new GraduatedColor(minColour.getBackground(), maxColour.getBackground(), min, max);
+ FeatureColour acg = new FeatureColour(minColour.getBackground(),
+ maxColour.getBackground(), min, max);
acg.setColourByLabel(colourFromLabel.getState());
maxColour.setEnabled(!colourFromLabel.getState());
thresholdValue.setEnabled(false);
thresholdValue.setText("");
}
-
+
else if (aboveThreshold != AnnotationColourGradient.NO_THRESHOLD
&& threshline == null)
{
// todo visual indication of feature threshold
- threshline = new jalview.datamodel.GraphLine(
- (max - min) / 2f,
- "Threshold", Color.black);
+ threshline = new jalview.datamodel.GraphLine((max - min) / 2f,
+ "Threshold", Color.black);
}
if (aboveThreshold != AnnotationColourGradient.NO_THRESHOLD)
{
adjusting = true;
- acg.setThresh(threshline.value);
+ acg.setThreshold(threshline.value);
- float range = max * 1000f
- - min * 1000f;
+ float range = max * 1000f - min * 1000f;
slider.setMinimum((int) (min * 1000));
slider.setMaximum((int) (max * 1000));
adjusting = false;
}
- acg.setThreshType(aboveThreshold);
- if (thresholdIsMin.getState() && aboveThreshold != AnnotationColourGradient.NO_THRESHOLD)
+ acg.setAboveThreshold(true);
+ if (thresholdIsMin.getState()
+ && aboveThreshold != AnnotationColourGradient.NO_THRESHOLD)
{
- if (aboveThreshold==AnnotationColourGradient.ABOVE_THRESHOLD)
- {
- acg = new GraduatedColor(acg, threshline.value, max);
- } else {
- acg = new GraduatedColor(acg, min,threshline.value);
+ if (aboveThreshold == AnnotationColourGradient.ABOVE_THRESHOLD)
+ {
+ acg = new FeatureColour(acg, threshline.value, max);
+ }
+ else
+ {
+ acg = new FeatureColour(acg, min, threshline.value);
}
}
-
- fr.featureColours.put(type,acg);
+
+ fr.setColour(type, acg);
cs = acg;
- PaintRefresher.Refresh(this, fr.av.getSequenceSetId());
+ PaintRefresher.Refresh(this, fr.getViewport().getSequenceSetId());
// ap.paintAlignment(false);
}
void reset()
{
- fr.featureColours.put(type, oldcs);
- PaintRefresher.Refresh(this, fr.av.getSequenceSetId());
+ fr.setColour(type, oldcs);
+ PaintRefresher.Refresh(this, fr.getViewport().getSequenceSetId());
// ap.paintAlignment(true);
}
+ @Override
public void mouseClicked(MouseEvent evt)
{
}
+ @Override
public void mousePressed(MouseEvent evt)
{
}
+ @Override
public void mouseReleased(MouseEvent evt)
{
- PaintRefresher.Refresh(this, fr.av.getSequenceSetId());
+ if (evt.getSource() == minColour || evt.getSource() == maxColour)
+ {
+ // relay the event
+ actionPerformed(new ActionEvent(evt.getSource(), 1, "Clicked"));
+ }
+ else
+ {
+ PaintRefresher.Refresh(this, fr.getViewport().getSequenceSetId());
+ }
// ap.paintAlignment(true);
}
+ @Override
public void mouseEntered(MouseEvent evt)
{
}
+ @Override
public void mouseExited(MouseEvent evt)
{
}
git://source.jalview.org / jalview.git / blobdiff