X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fschemes%2FCovariationColourScheme.java;h=4884283aa1024b9636932482a37f3cafa2489214;hb=155a17a423e980849fd4dc5f857da1a72b0010b9;hp=41acef3bf7cbef64770fc5dc2959f85c7b3bff3a;hpb=1d0f5219658cdf6ad5e1a1cbe6e1bb8cd12e6d85;p=jalview.git diff --git a/src/jalview/schemes/CovariationColourScheme.java b/src/jalview/schemes/CovariationColourScheme.java index 41acef3..4884283 100644 --- a/src/jalview/schemes/CovariationColourScheme.java +++ b/src/jalview/schemes/CovariationColourScheme.java @@ -23,8 +23,6 @@ package jalview.schemes; import jalview.api.AlignViewportI; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AnnotatedCollectionI; -import jalview.datamodel.SequenceCollectionI; -import jalview.datamodel.SequenceI; import jalview.util.ColorUtils; import java.awt.Color; @@ -53,8 +51,7 @@ public class CovariationColourScheme extends ResidueColourScheme */ @Override public ColourSchemeI getInstance(AlignViewportI view, - AnnotatedCollectionI coll, - Map hrs) + AnnotatedCollectionI coll) { return new CovariationColourScheme(coll.getAlignmentAnnotation()[0]); } @@ -68,9 +65,9 @@ public class CovariationColourScheme extends ResidueColourScheme for (int x = 0; x < this.annotation._rnasecstr.length; x++) { - // System.out.println(this.annotation._rnasecstr[x] + " Begin" + + // jalview.bin.Console.outPrintln(this.annotation._rnasecstr[x] + " Begin" + // this.annotation._rnasecstr[x].getBegin()); - // System.out.println(this.annotation._rnasecstr[x].getFeatureGroup()); + // jalview.bin.Console.outPrintln(this.annotation._rnasecstr[x].getFeatureGroup()); // pairs.put(this.annotation._rnasecstr[x].getBegin(), // this.annotation._rnasecstr[x].getEnd()); @@ -107,7 +104,7 @@ public class CovariationColourScheme extends ResidueColourScheme @Override public Color findColour(char c) { - // System.out.println("called"); log.debug + // jalview.bin.Console.outPrintln("called"); log.debug // Generate a random pastel color return ResidueProperties.purinepyrimidine[ResidueProperties.purinepyrimidineIndex[c]];// jalview.util.ColorUtils.generateRandomColor(Color.white); @@ -127,16 +124,16 @@ public class CovariationColourScheme extends ResidueColourScheme { Color currentColour = Color.white; String currentHelix = null; - // System.out.println(c + " " + j); + // jalview.bin.Console.outPrintln(c + " " + j); currentHelix = positionsToHelix.get(j); - // System.out.println(positionsToHelix.get(j)); + // jalview.bin.Console.outPrintln(positionsToHelix.get(j)); if (currentHelix != null) { currentColour = helixcolorhash.get(currentHelix); } - // System.out.println(c + " " + j + " helix " + currentHelix + " " + + // jalview.bin.Console.outPrintln(c + " " + j + " helix " + currentHelix + " " + // currentColour); return currentColour; }