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 'JAL-1403' into develop
[jalview.git]
/
src
/
jalview
/
appletgui
/
AnnotationColourChooser.java
diff --git
a/src/jalview/appletgui/AnnotationColourChooser.java
b/src/jalview/appletgui/AnnotationColourChooser.java
index
769e068
..
3c0f704
100644
(file)
--- a/
src/jalview/appletgui/AnnotationColourChooser.java
+++ b/
src/jalview/appletgui/AnnotationColourChooser.java
@@
-81,18
+81,19
@@
public class AnnotationColourChooser extends Panel implements
setDefaultMinMax();
setDefaultMinMax();
+ adjusting = true;
if (oldcs instanceof AnnotationColourGradient)
{
AnnotationColourGradient acg = (AnnotationColourGradient) oldcs;
if (oldcs instanceof AnnotationColourGradient)
{
AnnotationColourGradient acg = (AnnotationColourGradient) oldcs;
- currentColours.setState(acg.predefinedColours);
- if (!acg.predefinedColours)
+ currentColours.setState(acg.isPredefinedColours() || acg.getBaseColour()!=null);
+ if (!acg.isPredefinedColours() && acg.getBaseColour()==null)
{
minColour.setBackground(acg.getMinColour());
maxColour.setBackground(acg.getMaxColour());
}
{
minColour.setBackground(acg.getMinColour());
maxColour.setBackground(acg.getMaxColour());
}
+ // seqAssociated.setState(acg.isSeqAssociated());
}
}
- adjusting = true;
Vector list = new Vector();
int index = 1;
Vector list = new Vector();
int index = 1;
@@
-143,7
+144,7
@@
public class AnnotationColourChooser extends Panel implements
frame = new Frame();
frame.add(this);
frame = new Frame();
frame.add(this);
- jalview.bin.JalviewLite.addFrame(frame, "Colour by Annotation", 560,
+ jalview.bin.JalviewLite.addFrame(frame, MessageManager.getString("label.colour_by_annotation"), 560,
175);
validate();
}
175);
validate();
}
@@
-458,13
+459,14
@@
public class AnnotationColourChooser extends Panel implements
if (currentAnnotation.graphMin == 0f
&& currentAnnotation.graphMax == 0f)
{
if (currentAnnotation.graphMin == 0f
&& currentAnnotation.graphMax == 0f)
{
- acg.predefinedColours = true;
+ acg.setPredefinedColours(true);
}
acg.thresholdIsMinMax = thresholdIsMin.getState();
av.setGlobalColourScheme(acg);
}
acg.thresholdIsMinMax = thresholdIsMin.getState();
av.setGlobalColourScheme(acg);
+ // TODO: per group colour propagation not always desired
if (av.getAlignment().getGroups() != null)
{
for (SequenceGroup sg : ap.av.getAlignment().getGroups())
if (av.getAlignment().getGroups() != null)
{
for (SequenceGroup sg : ap.av.getAlignment().getGroups())
@@
-491,6
+493,7
@@
public class AnnotationColourChooser extends Panel implements
}
// update colours in linked windows
}
// update colours in linked windows
+ ap.alignmentChanged();
ap.paintAlignment(true);
}
ap.paintAlignment(true);
}