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
/
project
/
Jalview2XML.java
diff --git
a/src/jalview/project/Jalview2XML.java
b/src/jalview/project/Jalview2XML.java
index
53e9a83
..
11404dc
100644
(file)
--- a/
src/jalview/project/Jalview2XML.java
+++ b/
src/jalview/project/Jalview2XML.java
@@
-3859,7
+3859,7
@@
public class Jalview2XML
}
else
{
}
else
{
- cs = ColourSchemeProperty.getColourScheme(al,
+ cs = ColourSchemeProperty.getColourScheme(null, al,
jGroup.getColour());
}
}
jGroup.getColour());
}
}
@@
-4973,7
+4973,8
@@
public class Jalview2XML
}
else
{
}
else
{
- cs = ColourSchemeProperty.getColourScheme(al, view.getBgColour());
+ cs = ColourSchemeProperty.getColourScheme(af.getViewport(), al,
+ view.getBgColour());
}
}
}
}
@@
-5270,7
+5271,7
@@
public class Jalview2XML
else
{
cs = new AnnotationColourGradient(matchedAnnotation,
else
{
cs = new AnnotationColourGradient(matchedAnnotation,
- ColourSchemeProperty.getColourScheme(al,
+ ColourSchemeProperty.getColourScheme(af.getViewport(), al,
viewAnnColour.getColourScheme()),
safeInt(viewAnnColour.getAboveThreshold()));
}
viewAnnColour.getColourScheme()),
safeInt(viewAnnColour.getAboveThreshold()));
}