JAL-2371 CollectionColourScheme wraps ColourSchemeI

[jalview.git] / src / jalview / schemes / ColourSchemeI.java

diff --git a/src/jalview/schemes/ColourSchemeI.java b/src/jalview/schemes/ColourSchemeI.java
index 372b569..bfeb017 100755 (executable)
--- a/src/jalview/schemes/ColourSchemeI.java
+++ b/src/jalview/schemes/ColourSchemeI.java
@@ -20,9 +20,7 @@
  */
 package jalview.schemes;
 
-import jalview.analysis.Conservation;
 import jalview.datamodel.AnnotatedCollectionI;
-import jalview.datamodel.ProfilesI;
 import jalview.datamodel.SequenceCollectionI;
 import jalview.datamodel.SequenceI;
 
@@ -56,67 +54,14 @@ public interface ColourSchemeI
    * @param symbol
    * @param position
    * @param seq
+   * @param consensusResidue
+   *          the modal symbol (e.g. K) or symbols (e.g. KF) for the column
+   * @param pid
+   *          the percentage identity of the column's consensus (if known)
    * @return
    */
-  Color findColour(char symbol, int position, SequenceI seq);
-
-  /**
-   * Assigns the given consensus profile for the colourscheme
-   */
-  void setConsensus(ProfilesI hconsensus);
-
-  /**
-   * Assigns the given conservation to the colourscheme
-   * 
-   * @param c
-   */
-  void setConservation(Conservation c);
-
-  /**
-   * Enable or disable conservation shading for this colourscheme
-   * 
-   * @param conservationApplied
-   */
-  void setConservationApplied(boolean conservationApplied);
-
-  /**
-   * Answers true if conservation shading is enabled for this colourscheme
-   * 
-   * @return
-   */
-  boolean conservationApplied();
-
-  /**
-   * Sets the scale factor for bleaching of colour in unconserved regions
-   * 
-   * @param i
-   */
-  void setConservationInc(int i);
-
-  /**
-   * Returns the scale factor for bleaching colour in unconserved regions
-   * 
-   * @return
-   */
-  int getConservationInc();
-
-  /**
-   * Returns the percentage identity threshold for applying colourscheme
-   * 
-   * @return
-   */
-  int getThreshold();
-
-  /**
-   * Sets the percentage identity threshold and type of %age identity
-   * calculation for shading
-   * 
-   * @param pct
-   *          0..100 percentage identity for applying this colourscheme
-   * @param ignoreGaps
-   *          when true, calculate PID without including gapped positions
-   */
-  void setThreshold(int pct, boolean ignoreGaps);
+  Color findColour(char symbol, int position, SequenceI seq,
+          String consensusResidue, float pid);
 
   /**
    * Recalculate dependent data using the given sequence collection, taking