git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'documentation/JAL-2418_release2102' into develop
[jalview.git]
/
src
/
jalview
/
appletgui
/
FeatureColourChooser.java
diff --git
a/src/jalview/appletgui/FeatureColourChooser.java
b/src/jalview/appletgui/FeatureColourChooser.java
index
27539b8
..
4075e8b
100644
(file)
--- a/
src/jalview/appletgui/FeatureColourChooser.java
+++ b/
src/jalview/appletgui/FeatureColourChooser.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * Copyright (C) 2015 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.
*
*
* This file is part of Jalview.
*
@@
-20,9
+20,10
@@
*/
package jalview.appletgui;
*/
package jalview.appletgui;
+import jalview.api.FeatureColourI;
import jalview.datamodel.GraphLine;
import jalview.schemes.AnnotationColourGradient;
import jalview.datamodel.GraphLine;
import jalview.schemes.AnnotationColourGradient;
-import jalview.schemes.GraduatedColor;
+import jalview.schemes.FeatureColour;
import jalview.util.MessageManager;
import java.awt.Checkbox;
import jalview.util.MessageManager;
import java.awt.Checkbox;
@@
-60,9
+61,9
@@
public class FeatureColourChooser extends Panel implements ActionListener,
// AlignmentPanel ap;
// AlignmentPanel ap;
- GraduatedColor cs;
+ FeatureColourI cs;
- Object oldcs;
+ FeatureColourI oldcs;
Hashtable oldgroupColours;
Hashtable oldgroupColours;
@@
-91,29
+92,31
@@
public class FeatureColourChooser extends Panel implements ActionListener,
{
this.type = type;
fr = frenderer;
{
this.type = type;
fr = frenderer;
- float mm[] = ((float[][]) fr.getMinMax().get(type))[0];
+ float mm[] = fr.getMinMax().get(type)[0];
min = mm[0];
max = mm[1];
min = mm[0];
max = mm[1];
+ threshline = new GraphLine((max - min) / 2f, "Threshold", Color.black);
oldcs = fr.getFeatureColours().get(type);
oldcs = fr.getFeatureColours().get(type);
- if (oldcs instanceof GraduatedColor)
+ if (oldcs.isGraduatedColour())
{
{
- cs = new GraduatedColor((GraduatedColor) oldcs, min, max);
+ threshline.value = oldcs.getThreshold();
+ cs = new FeatureColour((FeatureColour) oldcs, min, max);
}
else
{
// promote original color to a graduated color
Color bl = Color.black;
}
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
}
// 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.setForeground(cs.getMinColor());
- maxColour.setForeground(cs.getMaxColor());
+ minColour.setBackground(cs.getMinColour());
+ maxColour.setBackground(cs.getMaxColour());
+ minColour.setForeground(cs.getMinColour());
+ maxColour.setForeground(cs.getMaxColour());
colourFromLabel.setState(cs.isColourByLabel());
adjusting = true;
colourFromLabel.setState(cs.isColourByLabel());
adjusting = true;
@@
-123,10
+126,8
@@
public class FeatureColourChooser extends Panel implements ActionListener,
} catch (Exception ex)
{
}
} 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();
adjusting = false;
changeColour();
@@
-192,11
+193,11
@@
public class FeatureColourChooser extends Panel implements ActionListener,
jPanel4.setBackground(Color.white);
threshold.addItemListener(this);
threshold.addItem(MessageManager
jPanel4.setBackground(Color.white);
threshold.addItemListener(this);
threshold.addItem(MessageManager
- .getString("label.threshold_feature_no_thereshold"));
+ .getString("label.threshold_feature_no_threshold"));
threshold.addItem(MessageManager
threshold.addItem(MessageManager
- .getString("label.threshold_feature_above_thereshold"));
+ .getString("label.threshold_feature_above_threshold"));
threshold.addItem(MessageManager
threshold.addItem(MessageManager
- .getString("label.threshold_feature_below_thereshold"));
+ .getString("label.threshold_feature_below_threshold"));
thresholdValue.addActionListener(this);
slider.setBackground(Color.white);
slider.setEnabled(false);
thresholdValue.addActionListener(this);
slider.setBackground(Color.white);
slider.setEnabled(false);
@@
-259,6
+260,7
@@
public class FeatureColourChooser extends Panel implements ActionListener,
private GraphLine threshline;
private GraphLine threshline;
+ @Override
public void actionPerformed(ActionEvent evt)
{
if (evt.getSource() == thresholdValue)
public void actionPerformed(ActionEvent evt)
{
if (evt.getSource() == thresholdValue)
@@
-286,6
+288,7
@@
public class FeatureColourChooser extends Panel implements ActionListener,
}
}
}
}
+ @Override
public void itemStateChanged(ItemEvent evt)
{
maxColour.setEnabled(!colourFromLabel.getState());
public void itemStateChanged(ItemEvent evt)
{
maxColour.setEnabled(!colourFromLabel.getState());
@@
-293,19
+296,20
@@
public class FeatureColourChooser extends Panel implements ActionListener,
changeColour();
}
changeColour();
}
+ @Override
public void adjustmentValueChanged(AdjustmentEvent evt)
{
if (!adjusting)
{
public void adjustmentValueChanged(AdjustmentEvent evt)
{
if (!adjusting)
{
- thresholdValue.setText(((float) slider.getValue() / 1000f) + "");
+ thresholdValue.setText((slider.getValue() / 1000f) + "");
valueChanged();
}
}
protected void valueChanged()
{
valueChanged();
}
}
protected void valueChanged()
{
- threshline.value = (float) slider.getValue() / 1000f;
- cs.setThresh(threshline.value);
+ threshline.value = slider.getValue() / 1000f;
+ cs.setThreshold(threshline.value);
changeColour();
PaintRefresher.Refresh(this, fr.getViewport().getSequenceSetId());
// ap.paintAlignment(false);
changeColour();
PaintRefresher.Refresh(this, fr.getViewport().getSequenceSetId());
// ap.paintAlignment(false);
@@
-369,7
+373,7
@@
public class FeatureColourChooser extends Panel implements ActionListener,
slider.setEnabled(true);
thresholdValue.setEnabled(true);
slider.setEnabled(true);
thresholdValue.setEnabled(true);
- GraduatedColor acg = new GraduatedColor(minColour.getBackground(),
+ FeatureColour acg = new FeatureColour(minColour.getBackground(),
maxColour.getBackground(), min, max);
acg.setColourByLabel(colourFromLabel.getState());
maxColour.getBackground(), min, max);
acg.setColourByLabel(colourFromLabel.getState());
@@
-382,18
+386,10
@@
public class FeatureColourChooser extends Panel implements ActionListener,
thresholdValue.setText("");
}
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);
- }
-
if (aboveThreshold != AnnotationColourGradient.NO_THRESHOLD)
{
adjusting = true;
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;
@@
-406,17
+402,17
@@
public class FeatureColourChooser extends Panel implements ActionListener,
adjusting = false;
}
adjusting = false;
}
- acg.setThreshType(aboveThreshold);
+ acg.setAboveThreshold(true);
if (thresholdIsMin.getState()
&& aboveThreshold != AnnotationColourGradient.NO_THRESHOLD)
{
if (aboveThreshold == AnnotationColourGradient.ABOVE_THRESHOLD)
{
if (thresholdIsMin.getState()
&& aboveThreshold != AnnotationColourGradient.NO_THRESHOLD)
{
if (aboveThreshold == AnnotationColourGradient.ABOVE_THRESHOLD)
{
- acg = new GraduatedColor(acg, threshline.value, max);
+ acg = new FeatureColour(acg, threshline.value, max);
}
else
{
}
else
{
- acg = new GraduatedColor(acg, min, threshline.value);
+ acg = new FeatureColour(acg, min, threshline.value);
}
}
}
}
@@
-434,14
+430,17
@@
public class FeatureColourChooser extends Panel implements ActionListener,
}
}
+ @Override
public void mouseClicked(MouseEvent evt)
{
}
public void mouseClicked(MouseEvent evt)
{
}
+ @Override
public void mousePressed(MouseEvent evt)
{
}
public void mousePressed(MouseEvent evt)
{
}
+ @Override
public void mouseReleased(MouseEvent evt)
{
if (evt.getSource() == minColour || evt.getSource() == maxColour)
public void mouseReleased(MouseEvent evt)
{
if (evt.getSource() == minColour || evt.getSource() == maxColour)
@@
-456,10
+455,12
@@
public class FeatureColourChooser extends Panel implements ActionListener,
// ap.paintAlignment(true);
}
// ap.paintAlignment(true);
}
+ @Override
public void mouseEntered(MouseEvent evt)
{
}
public void mouseEntered(MouseEvent evt)
{
}
+ @Override
public void mouseExited(MouseEvent evt)
{
}
public void mouseExited(MouseEvent evt)
{
}