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 'feature/JAL-3127_seqidChainshading' into merge/JAL-3127
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationColourChooser.java
diff --git
a/src/jalview/gui/AnnotationColourChooser.java
b/src/jalview/gui/AnnotationColourChooser.java
index
13390da
..
60ad75d
100644
(file)
--- a/
src/jalview/gui/AnnotationColourChooser.java
+++ b/
src/jalview/gui/AnnotationColourChooser.java
@@
-317,7
+317,7
@@
public class AnnotationColourChooser extends AnnotationRowFilter
@Override
public void reset()
{
@Override
public void reset()
{
- av.setGlobalColourScheme(oldcs);
+ this.ap.alignFrame.changeColour(oldcs);
if (av.getAlignment().getGroups() != null)
{
if (av.getAlignment().getGroups() != null)
{
@@
-442,7
+442,7
@@
public class AnnotationColourChooser extends AnnotationRowFilter
acg.setThresholdIsMinMax(thresholdIsMin.isSelected());
acg.setThresholdIsMinMax(thresholdIsMin.isSelected());
- av.setGlobalColourScheme(acg);
+ this.ap.alignFrame.changeColour(acg);
if (av.getAlignment().getGroups() != null)
{
if (av.getAlignment().getGroups() != null)
{
@@
-465,5
+465,4
@@
public class AnnotationColourChooser extends AnnotationRowFilter
super.sliderDragReleased();
ap.paintAlignment(true, true);
}
super.sliderDragReleased();
ap.paintAlignment(true, true);
}
-
}
}