X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fschemes%2FColourSchemeI.java;h=bfeb0174b92f86db5e4b67e9f38399f40f66d49c;hb=8e1be43e250107a4d86898bd554cf03098fa5957;hp=dd1c5be08b9832bfc2dd11c458ec19b4936b89bd;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git

diff --git a/src/jalview/schemes/ColourSchemeI.java b/src/jalview/schemes/ColourSchemeI.java
index dd1c5be..bfeb017 100755
--- a/src/jalview/schemes/ColourSchemeI.java
+++ b/src/jalview/schemes/ColourSchemeI.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,111 +20,99 @@
  */
 package jalview.schemes;
 
-import java.awt.Color;
-import java.util.Map;
-
-import jalview.datamodel.AlignmentI;
 import jalview.datamodel.AnnotatedCollectionI;
 import jalview.datamodel.SequenceCollectionI;
-import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
 
+import java.awt.Color;
+import java.util.Map;
+
 public interface ColourSchemeI
 {
   /**
+   * Returns the fixed colour for the colour scheme. For use when the colour
+   * does not vary.
    * 
-   * @param c
-   * @return the colour for the given character
-   */
-  public Color findColour(char c);
-
-  /**
-   * 
-   * @param c
-   *          - sequence symbol or gap
-   * @param j
-   *          - position in seq
-   * @param seq
-   *          - sequence being coloured
-   * @return context dependent colour for the given symbol at the position in
-   *         the given sequence
-   */
-  public Color findColour(char c, int j, SequenceI seq);
-
-  /**
-   * assign the given consensus profile for the colourscheme
+   * @return
    */
-  public void setConsensus(java.util.Hashtable[] h);
+  Color findColour();
 
   /**
-   * assign the given conservation to the colourscheme
+   * Returns the colour for the given character. For use when the colour depends
+   * only on the symbol.
    * 
    * @param c
+   * @return
    */
-  public void setConservation(jalview.analysis.Conservation c);
-
-  /**
-   * enable or disable conservation shading for this colourscheme
-   * 
-   * @param conservationApplied
-   */
-  public void setConservationApplied(boolean conservationApplied);
+  Color findColour(char c);
 
   /**
+   * Returns the possibly context dependent colour for the given symbol at the
+   * aligned position in the given sequence. For example, the colour may depend
+   * on the symbol's relationship to the consensus residue for the column.
    * 
-   * @return true if conservation shading is enabled for this colourscheme
-   */
-  public boolean conservationApplied();
-
-  /**
-   * set scale factor for bleaching of colour in unconserved regions
-   * 
-   * @param i
+   * @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
    */
-  public void setConservationInc(int i);
+  Color findColour(char symbol, int position, SequenceI seq,
+          String consensusResidue, float pid);
 
   /**
+   * Recalculate dependent data using the given sequence collection, taking
+   * account of hidden rows
    * 
-   * @return scale factor for bleaching colour in unconserved regions
+   * @param alignment
+   * @param hiddenReps
    */
-  public int getConservationInc();
+  void alignmentChanged(AnnotatedCollectionI alignment,
+          Map<SequenceI, SequenceCollectionI> hiddenReps);
 
   /**
+   * Creates and returns a new instance of the colourscheme configured to colour
+   * the given collection. Note that even simple colour schemes should return a
+   * new instance for each call to this method, as different instances may have
+   * differing shading by consensus or percentage identity applied.
    * 
-   * @return percentage identity threshold for applying colourscheme
+   * @param sg
+   * @param hiddenRepSequences
+   * @return copy of current scheme with any inherited settings transferred
    */
-  public int getThreshold();
+  ColourSchemeI getInstance(AnnotatedCollectionI sg,
+          Map<SequenceI, SequenceCollectionI> hiddenRepSequences);
 
   /**
-   * set percentage identity threshold and type of %age identity calculation for
-   * shading
+   * Answers true if the colour scheme is suitable for the given data, else
+   * false. For example, some colour schemes are specific to either peptide or
+   * nucleotide, or only apply if certain kinds of annotation are present.
    * 
-   * @param ct
-   *          0..100 percentage identity for applying this colourscheme
-   * @param ignoreGaps
-   *          when true, calculate PID without including gapped positions
+   * @param ac
+   * @return
    */
-  public void setThreshold(int ct, boolean ignoreGaps);
+  // TODO can make this method static in Java 8
+  boolean isApplicableTo(AnnotatedCollectionI ac);
 
   /**
-   * recalculate dependent data using the given sequence collection, taking
-   * account of hidden rows
+   * Answers the 'official' name of the colour scheme (as used, for example, as
+   * a Jalview startup parameter)
    * 
-   * @param alignment
-   * @param hiddenReps
+   * @return
    */
-  public void alignmentChanged(AnnotatedCollectionI alignment,
-          Map<SequenceI, SequenceCollectionI> hiddenReps);
+  String getSchemeName();
 
   /**
-   * create a new instance of the colourscheme configured to colour the given
-   * connection
+   * Answers true if the colour scheme depends only on the sequence symbol, and
+   * not on other information such as alignment consensus or annotation. (Note
+   * that simple colour schemes may have a fading by percentage identity or
+   * conservation overlaid.) Simple colour schemes can be propagated to
+   * structure viewers.
    * 
-   * @param sg
-   * @param hiddenRepSequences
-   * @return copy of current scheme with any inherited settings transfered
+   * @return
    */
-  public ColourSchemeI applyTo(AnnotatedCollectionI sg,
-          Map<SequenceI, SequenceCollectionI> hiddenRepSequences);
-
+  boolean isSimple();
 }