X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FClustalxColourScheme.java;h=30addb0cdf7a9692230d3957d84d2a898e690c20;hb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;hp=273efb864386df9d2b86d2a89560e6ce62d4aed1;hpb=a79f9e113c51c032070c670e45ce3eb464691166;p=jalview.git
diff --git a/src/jalview/schemes/ClustalxColourScheme.java b/src/jalview/schemes/ClustalxColourScheme.java
index 273efb8..30addb0 100755
--- a/src/jalview/schemes/ClustalxColourScheme.java
+++ b/src/jalview/schemes/ClustalxColourScheme.java
@@ -1,26 +1,31 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
+ * Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.schemes;
+import jalview.datamodel.AnnotatedCollectionI;
+import jalview.datamodel.SequenceCollectionI;
import jalview.datamodel.SequenceI;
import java.awt.Color;
import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
import java.util.Vector;
public class ClustalxColourScheme extends ResidueColourScheme // implements
@@ -55,13 +60,17 @@ public class ClustalxColourScheme extends ResidueColourScheme // implements
colhash.put("YELLOW", new Color((float) 0.8, (float) 0.8, (float) 0.0));
}
- public ClustalxColourScheme(Vector seqs, int maxWidth)
+ public ClustalxColourScheme(AnnotatedCollectionI alignment,
+ Map hiddenReps)
{
- resetClustalX(seqs, maxWidth);
+ alignmentChanged(alignment, hiddenReps);
}
- public void resetClustalX(Vector seqs, int maxWidth)
+ public void alignmentChanged(AnnotatedCollectionI alignment,
+ Map hiddenReps)
{
+ int maxWidth = alignment.getWidth();
+ List seqs = alignment.getSequences(hiddenReps);
cons2 = new int[maxWidth][24];
includeGaps = isIncludeGaps(); // does nothing - TODO replace with call to
// get the current setting of the
@@ -82,9 +91,9 @@ public class ClustalxColourScheme extends ResidueColourScheme // implements
int j = 0;
char[] seq;
- while (j < seqs.size())
+ for (SequenceI sq : seqs)
{
- seq = ((SequenceI) seqs.elementAt(j)).getSequence();
+ seq = sq.getSequence();
int end_j = seq.length - 1;
@@ -318,6 +327,14 @@ public class ClustalxColourScheme extends ResidueColourScheme // implements
{
this.includeGaps = includeGaps;
}
+ @Override
+ public ColourSchemeI applyTo(AnnotatedCollectionI sg,
+ Map hiddenRepSequences)
+ {
+ ClustalxColourScheme css= new ClustalxColourScheme(sg, hiddenRepSequences);
+ css.includeGaps = includeGaps;
+ return css;
+ }
}
class ConsensusColour