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
Conservation colour scheme is no more
[jalview.git]
/
src
/
jalview
/
appletgui
/
TreeCanvas.java
diff --git
a/src/jalview/appletgui/TreeCanvas.java
b/src/jalview/appletgui/TreeCanvas.java
index
15c4bfa
..
a6bc5df
100755
(executable)
--- a/
src/jalview/appletgui/TreeCanvas.java
+++ b/
src/jalview/appletgui/TreeCanvas.java
@@
-490,10
+490,8
@@
System.out.println("called here");
false, 0, av.alignment.getWidth());
\r
\r
\r
false, 0, av.alignment.getWidth());
\r
\r
\r
- if (av.getGlobalColourScheme() instanceof ConservationColourScheme)
\r
+ if (av.getGlobalColourScheme().conservationApplied())
\r
{
\r
{
\r
- ConservationColourScheme ccs = (ConservationColourScheme) av.
\r
- getGlobalColourScheme();
\r
Conservation c = new Conservation("Group",
\r
ResidueProperties.propHash, 3,
\r
sg.sequences, sg.getStartRes(),
\r
Conservation c = new Conservation("Group",
\r
ResidueProperties.propHash, 3,
\r
sg.sequences, sg.getStartRes(),
\r
@@
-501,9
+499,9
@@
System.out.println("called here");
\r
c.calculate();
\r
c.verdict(false, av.ConsPercGaps);
\r
\r
c.calculate();
\r
c.verdict(false, av.ConsPercGaps);
\r
- ccs = new ConservationColourScheme(c, ccs.cs);
\r
+ cs.setConservation(c);
\r
\r
\r
- sg.cs = ccs;
\r
+ sg.cs = cs;
\r
\r
}
\r
\r
\r
}
\r
\r