X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FColourSchemeI.java;h=7b79d883ae57a0615ad3643ccf97076ed47fb8ba;hb=db9f5c50215282a01e60cc37e4010f2a0276d5fb;hp=7fc6981a3c5f716895087b46ad9c767fc21c5cb5;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git

diff --git a/src/jalview/schemes/ColourSchemeI.java b/src/jalview/schemes/ColourSchemeI.java
index 7fc6981..7b79d88 100755
--- a/src/jalview/schemes/ColourSchemeI.java
+++ b/src/jalview/schemes/ColourSchemeI.java
@@ -1,53 +1,111 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * 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.
  * 
  * 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.
+ * 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 <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.schemes;
 
-import java.awt.Color;
-import java.util.Map;
-
-import jalview.datamodel.AlignmentI;
+import jalview.api.AlignViewportI;
 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
 {
-  public 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.
+   * 
+   * @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,
+          String consensusResidue, float pid);
 
-  public Color findColour(char c, int j, SequenceI seq);
-
-  public void setConsensus(java.util.Hashtable[] h);
-
-  public void setConservation(jalview.analysis.Conservation c);
-
-  public boolean conservationApplied();
-
-  public void setConservationInc(int i);
+  /**
+   * Recalculate dependent data using the given sequence collection, taking
+   * account of hidden rows
+   * 
+   * @param alignment
+   * @param hiddenReps
+   */
+  void alignmentChanged(AnnotatedCollectionI alignment,
+          Map<SequenceI, SequenceCollectionI> hiddenReps);
 
-  public int getConservationInc();
+  /**
+   * 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.
+   * 
+   * @param viewport
+   *          - the parent viewport
+   * @param sg
+   *          - the collection of sequences to be coloured
+   * @return copy of current scheme with any inherited settings transferred
+   */
+  ColourSchemeI getInstance(AlignViewportI viewport,
+          AnnotatedCollectionI sg);
 
-  public int getThreshold();
+  /**
+   * 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 ac
+   * @return
+   */
+  // TODO can make this method static in Java 8
+  boolean isApplicableTo(AnnotatedCollectionI ac);
 
-  public void setThreshold(int ct, boolean ignoreGaps);
+  /**
+   * Answers the 'official' name of the colour scheme (as used, for example, as
+   * a Jalview startup parameter)
+   * 
+   * @return
+   */
+  String getSchemeName();
 
-  public void alignmentChanged(AnnotatedCollectionI alignment,
-          Map<SequenceI, SequenceCollectionI> hiddenReps);
+  /**
+   * 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.
+   * 
+   * @return
+   */
+  boolean isSimple();
 
+  /**
+   * Answers true if the colour scheme has a colour specified for gaps.
+   * 
+   * @return
+   */
+  boolean hasGapColour();
 }