X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignViewport.java;h=f232e92fbe4501b805b9fa404f4d39045739a460;hb=a8f483d04205bb8273ee311c12968b7e86d205fa;hp=cbb19fb99f2a23ecbd585b9613130f6cc878892a;hpb=fd618c7346eab858aa0039376872820aca37783a;p=jalview.git

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
old mode 100755
new mode 100644
index cbb19fb..f232e92
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -1,4 +1,22 @@
- /*
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * 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 <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
+/*
  * Jalview - A Sequence Alignment Editor and Viewer
  * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
@@ -18,1850 +36,1231 @@
  */
 package jalview.gui;
 
-import java.util.*;
-
-import java.awt.*;
-
-import jalview.analysis.*;
-
-import jalview.bin.*;
-
-import jalview.datamodel.*;
-
-import jalview.schemes.*;
+import jalview.analysis.NJTree;
+import jalview.api.AlignViewportI;
+import jalview.bin.Cache;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.Annotation;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.PDBEntry;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.schemes.ColourSchemeProperty;
+import jalview.schemes.UserColourScheme;
+import jalview.structure.SelectionSource;
+import jalview.structure.StructureSelectionManager;
+import jalview.structure.VamsasSource;
+import jalview.viewmodel.AlignmentViewport;
+import jalview.ws.params.AutoCalcSetting;
+
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.Font;
+import java.awt.Rectangle;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Stack;
+import java.util.Vector;
 
 /**
  * DOCUMENT ME!
- *
+ * 
  * @author $author$
- * @version $Revision$
+ * @version $Revision: 1.141 $
  */
-public class AlignViewport
+public class AlignViewport extends AlignmentViewport implements
+        SelectionSource, VamsasSource, AlignViewportI
 {
-    int startRes;
-    int endRes;
-    int startSeq;
-    int endSeq;
-    boolean showJVSuffix = true;
-    boolean showText = true;
-    boolean showColourText = false;
-    boolean showBoxes = true;
-    boolean wrapAlignment = false;
-    boolean renderGaps = true;
-    boolean showSequenceFeatures = false;
-    boolean showAnnotation = true;
-    boolean colourAppliesToAllGroups = true;
-    ColourSchemeI globalColourScheme = null;
-    boolean conservationColourSelected = false;
-    boolean abovePIDThreshold = false;
-    SequenceGroup selectionGroup;
-    int charHeight;
-    int charWidth;
-    boolean validCharWidth;
-    int wrappedWidth;
-    Font font;
-    boolean seqNameItalics;
-    AlignmentI alignment;
-    ColumnSelection colSel = new ColumnSelection();
-    int threshold;
-    int increment;
-    NJTree currentTree = null;
-    boolean scaleAboveWrapped = false;
-    boolean scaleLeftWrapped = true;
-    boolean scaleRightWrapped = true;
-    boolean hasHiddenColumns = false;
-    boolean hasHiddenRows = false;
-    boolean showHiddenMarkers = true;
-
-    boolean cursorMode = false;
-
-    // The following vector holds the features which are
-    // currently visible, in the correct order or rendering
-    Hashtable featuresDisplayed = null;
-
-
-    /** DOCUMENT ME!! */
-    public Hashtable [] hconsensus;
-    AlignmentAnnotation consensus;
-    AlignmentAnnotation conservation;
-    AlignmentAnnotation quality;
-    boolean autoCalculateConsensus = true;
-
-    /** DOCUMENT ME!! */
-    public int ConsPercGaps = 25; // JBPNote : This should be a scalable property!
-
-    // JBPNote Prolly only need this in the applet version.
-  private java.beans.PropertyChangeSupport changeSupport = new java.beans.
-      PropertyChangeSupport(this);
-
-    boolean ignoreGapsInConsensusCalculation = false;
-
-    boolean isDataset = false;
-
-    boolean antiAlias = false;
-
-    boolean padGaps = false;
-
-    Rectangle explodedPosition;
-
-    String viewName;
-
-    String sequenceSetID;
-
-    boolean gatherViewsHere = false;
-
-    Stack historyList = new Stack();
-    Stack redoList = new Stack();
-
-    Hashtable sequenceColours;
-
-    int thresholdTextColour = 0;
-    Color textColour = Color.black;
-    Color textColour2 = Color.white;
-
-    boolean rightAlignIds = false;
-
-    Hashtable hiddenRepSequences;
-
-
-    /**
-     * Creates a new AlignViewport object.
-     *
-     * @param al DOCUMENT ME!
-     */
-    public AlignViewport(AlignmentI al)
-    {
-        setAlignment(al);
-        init();
-    }
-    /**
-     * Create a new AlignViewport with hidden regions
-     * @param al AlignmentI
-     * @param hiddenColumns ColumnSelection
-     */
-  public AlignViewport(AlignmentI al, ColumnSelection hiddenColumns)
-  {
-      setAlignment(al);
-    if (hiddenColumns != null)
-    {
-        this.colSel = hiddenColumns;
-        if (hiddenColumns.getHiddenColumns() != null)
-      {
-          hasHiddenColumns = true;
-      }
-    }
-      init();
-    }
-
-    void init()
-    {
-        this.startRes = 0;
-        this.endRes = alignment.getWidth() - 1;
-        this.startSeq = 0;
-        this.endSeq = alignment.getHeight() - 1;
-
-      antiAlias = Cache.getDefault("ANTI_ALIAS", false);
+  int startRes;
 
-      showJVSuffix = Cache.getDefault("SHOW_JVSUFFIX", true);
-      showAnnotation = Cache.getDefault("SHOW_ANNOTATIONS", true);
+  int endRes;
 
-      rightAlignIds = Cache.getDefault("RIGHT_ALIGN_IDS", false);
+  int startSeq;
 
-      autoCalculateConsensus = Cache.getDefault("AUTO_CALC_CONSENSUS", true);
+  int endSeq;
 
-      padGaps = Cache.getDefault("PAD_GAPS", true);
+  boolean showJVSuffix = true;
 
-       String fontName = Cache.getDefault("FONT_NAME", "SansSerif");
-       String fontStyle = Cache.getDefault("FONT_STYLE", Font.PLAIN + "") ;
-       String fontSize = Cache.getDefault("FONT_SIZE", "10");
+  boolean showText = true;
 
-       seqNameItalics = Cache.getDefault("ID_ITALICS", true);
+  boolean showColourText = false;
 
-       int style = 0;
+  boolean showBoxes = true;
 
-       if (fontStyle.equals("bold"))
-       {
-         style = 1;
-       }
-       else if (fontStyle.equals("italic"))
-       {
-         style = 2;
-       }
+  boolean wrapAlignment = false;
 
-       setFont(new Font(fontName, style, Integer.parseInt(fontSize)));
-
-       alignment.setGapCharacter( Cache.getDefault("GAP_SYMBOL", "-").charAt(0) );
-
-
-        // We must set conservation and consensus before setting colour,
-        // as Blosum and Clustal require this to be done
-        if(hconsensus==null && !isDataset)
-        {
-          if(!alignment.isNucleotide())
-          {
-            conservation = new AlignmentAnnotation("Conservation",
-                "Conservation of total alignment less than " +
-                ConsPercGaps + "% gaps",
-                new Annotation[1], 0f,
-                11f,
-                AlignmentAnnotation.BAR_GRAPH);
-            conservation.hasText = true;
-            conservation.autoCalculated=true;
-
-
-            if (Cache.getDefault("SHOW_CONSERVATION", true))
-            {
-              alignment.addAnnotation(conservation);
-            }
-
-            if (Cache.getDefault("SHOW_QUALITY", true))
-            {
-              quality = new AlignmentAnnotation("Quality",
-                                                "Alignment Quality based on Blosum62 scores",
-                                                new Annotation[1],
-                                                0f,
-                                                11f,
-                                                AlignmentAnnotation.BAR_GRAPH);
-              quality.hasText = true;
-              quality.autoCalculated=true;
-
-              alignment.addAnnotation(quality);
-            }
-          }
+  boolean renderGaps = true;
 
-          consensus = new AlignmentAnnotation("Consensus", "PID",
-                                               new Annotation[1], 0f, 100f,
-                                               AlignmentAnnotation.BAR_GRAPH);
-          consensus.hasText = true;
-          consensus.autoCalculated=true;
+  boolean showSequenceFeatures = false;
 
-           if (Cache.getDefault("SHOW_IDENTITY", true))
-           {
-             alignment.addAnnotation(consensus);
-           }
-        }
+  boolean showAnnotation = true;
 
-        if (jalview.bin.Cache.getProperty("DEFAULT_COLOUR") != null)
-        {
-          globalColourScheme = ColourSchemeProperty.getColour(alignment,
-              jalview.bin.Cache.getProperty("DEFAULT_COLOUR"));
+  int charHeight;
 
-            if (globalColourScheme instanceof UserColourScheme)
-            {
-                globalColourScheme = UserDefinedColours.loadDefaultColours();
-        ( (UserColourScheme) globalColourScheme).setThreshold(0,
-            getIgnoreGapsConsensus());
-            }
-
-            if (globalColourScheme != null)
-            {
-                globalColourScheme.setConsensus(hconsensus);
-            }
-        }
+  int charWidth;
 
-        wrapAlignment = jalview.bin.Cache.getDefault("WRAP_ALIGNMENT", false);
-    }
+  boolean validCharWidth;
 
+  int wrappedWidth;
 
+  Font font;
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param b DOCUMENT ME!
-     */
-    public void setShowSequenceFeatures(boolean b)
-    {
-        showSequenceFeatures = b;
-    }
+  boolean seqNameItalics;
 
-    public boolean getShowSequenceFeatures()
-    {
-      return showSequenceFeatures;
-    }
+  NJTree currentTree = null;
 
-  class ConservationThread
-      extends Thread
-    {
-      AlignmentPanel ap;
-      public ConservationThread(AlignmentPanel ap)
-      {
-        this.ap = ap;
-      }
+  boolean scaleAboveWrapped = false;
 
-      public void run()
-      {
-        try
-        {
-          updatingConservation = true;
+  boolean scaleLeftWrapped = true;
 
-          while (UPDATING_CONSERVATION)
-          {
-            try
-            {
-              if (ap != null)
-              {
-                ap.paintAlignment(false);
-              }
-              Thread.sleep(200);
-            }
-            catch (Exception ex)
-            {
-              ex.printStackTrace();
-            }
-          }
+  boolean scaleRightWrapped = true;
 
-          UPDATING_CONSERVATION = true;
+  boolean showHiddenMarkers = true;
 
+  boolean cursorMode = false;
 
-          int alWidth = alignment.getWidth();
-          if(alWidth<0)
-        {
-            return;
-        }
+  /**
+   * Keys are the feature types which are currently visible. Note: Values are
+   * not used!
+   */
+  Hashtable featuresDisplayed = null;
 
-          Conservation cons = new jalview.analysis.Conservation("All",
-              jalview.schemes.ResidueProperties.propHash, 3,
-              alignment.getSequences(), 0, alWidth -1);
+  boolean antiAlias = false;
 
-          cons.calculate();
-          cons.verdict(false, ConsPercGaps);
+  Rectangle explodedPosition;
 
-          if (quality!=null)
-          {
-            cons.findQuality();
-          }
+  String viewName;
 
-          char [] sequence = cons.getConsSequence().getSequence();
-          float minR;
-          float minG;
-          float minB;
-          float maxR;
-          float maxG;
-          float maxB;
-          minR = 0.3f;
-          minG = 0.0f;
-          minB = 0f;
-          maxR = 1.0f - minR;
-          maxG = 0.9f - minG;
-          maxB = 0f - minB; // scalable range for colouring both Conservation and Quality
-
-          float min = 0f;
-          float max = 11f;
-          float qmin = 0f;
-          float qmax = 0f;
-
-          char c;
-
-          conservation.annotations = new Annotation[alWidth];
-
-          if (quality!=null)
-          {
-            quality.graphMax = cons.qualityRange[1].floatValue();
-            quality.annotations = new Annotation[alWidth];
-            qmin = cons.qualityRange[0].floatValue();
-            qmax = cons.qualityRange[1].floatValue();
-          }
+  boolean gatherViewsHere = false;
 
-          for (int i = 0; i < alWidth; i++)
-          {
-            float value = 0;
+  Stack historyList = new Stack();
 
-            c = sequence[i];
+  Stack redoList = new Stack();
 
-            if (Character.isDigit(c))
-          {
-              value = (int) (c - '0');
-          }
-            else if (c == '*')
-          {
-              value = 11;
-          }
-            else if (c == '+')
-          {
-              value = 10;
-          }
+  int thresholdTextColour = 0;
 
-            float vprop = value - min;
-            vprop /= max;
-            conservation.annotations[i] =
-                new Annotation(String.valueOf(c),
-                               String.valueOf(value), ' ', value,
-                               new Color(minR + (maxR * vprop),
-                                         minG + (maxG * vprop),
-                                         minB + (maxB * vprop)));
-
-            // Quality calc
-            if (quality!=null)
-            {
-              value = ( (Double) cons.quality.get(i)).floatValue();
-              vprop = value - qmin;
-              vprop /= qmax;
-            quality.annotations[i] = new Annotation(" ", String.valueOf(value),
-                ' ',
-                                               value,
-                                               new Color(minR + (maxR * vprop),
-                  minG + (maxG * vprop),
-                  minB + (maxB * vprop)));
-            }
-          }
-        }
-        catch (OutOfMemoryError error)
-        {
-          javax.swing.SwingUtilities.invokeLater(new Runnable()
-          {
+  Color textColour = Color.black;
 
+  Color textColour2 = Color.white;
 
-            public void run()
-            {
-              javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
-                  "Out of memory calculating conservation!!"
-                  +
-                  "\nSee help files for increasing Java Virtual Machine memory."
-                  , "Out of memory",
-                  javax.swing.JOptionPane.WARNING_MESSAGE);
-            }
-          });
+  boolean rightAlignIds = false;
 
-          conservation = null;
-          quality = null;
+  /**
+   * Creates a new AlignViewport object.
+   * 
+   * @param al
+   *          alignment to view
+   */
+  public AlignViewport(AlignmentI al)
+  {
+    setAlignment(al);
+    init();
+  }
 
-          System.out.println("Conservation calculation: " + error);
-          System.gc();
+  /**
+   * Create a new AlignViewport object with a specific sequence set ID
+   * 
+   * @param al
+   * @param seqsetid
+   *          (may be null - but potential for ambiguous constructor exception)
+   */
+  public AlignViewport(AlignmentI al, String seqsetid)
+  {
+    this(al, seqsetid, null);
+  }
 
-        }
+  public AlignViewport(AlignmentI al, String seqsetid, String viewid)
+  {
+    sequenceSetID = seqsetid;
+    viewId = viewid;
+    // TODO remove these once 2.4.VAMSAS release finished
+    if (Cache.log != null && Cache.log.isDebugEnabled() && seqsetid != null)
+    {
+      Cache.log.debug("Setting viewport's sequence set id : "
+              + sequenceSetID);
+    }
+    if (Cache.log != null && Cache.log.isDebugEnabled() && viewId != null)
+    {
+      Cache.log.debug("Setting viewport's view id : " + viewId);
+    }
+    setAlignment(al);
+    init();
+  }
 
-        UPDATING_CONSERVATION = false;
-        updatingConservation = false;
+  /**
+   * Create a new AlignViewport with hidden regions
+   * 
+   * @param al
+   *          AlignmentI
+   * @param hiddenColumns
+   *          ColumnSelection
+   */
+  public AlignViewport(AlignmentI al, ColumnSelection hiddenColumns)
+  {
+    setAlignment(al);
+    if (hiddenColumns != null)
+    {
+      this.colSel = hiddenColumns;
+      if (hiddenColumns.getHiddenColumns() != null
+              && hiddenColumns.getHiddenColumns().size() > 0)
+      {
+        hasHiddenColumns = true;
+      }
+      else
+      {
+        hasHiddenColumns = false;
+      }
+    }
+    init();
+  }
 
-        if(ap!=null)
-        {
-        ap.paintAlignment(true);
-        }
+  /**
+   * New viewport with hidden columns and an existing sequence set id
+   * 
+   * @param al
+   * @param hiddenColumns
+   * @param seqsetid
+   *          (may be null)
+   */
+  public AlignViewport(AlignmentI al, ColumnSelection hiddenColumns,
+          String seqsetid)
+  {
+    this(al, hiddenColumns, seqsetid, null);
+  }
 
+  /**
+   * New viewport with hidden columns and an existing sequence set id and viewid
+   * 
+   * @param al
+   * @param hiddenColumns
+   * @param seqsetid
+   *          (may be null)
+   * @param viewid
+   *          (may be null)
+   */
+  public AlignViewport(AlignmentI al, ColumnSelection hiddenColumns,
+          String seqsetid, String viewid)
+  {
+    sequenceSetID = seqsetid;
+    viewId = viewid;
+    // TODO remove these once 2.4.VAMSAS release finished
+    if (Cache.log != null && Cache.log.isDebugEnabled() && seqsetid != null)
+    {
+      Cache.log.debug("Setting viewport's sequence set id : "
+              + sequenceSetID);
+    }
+    if (Cache.log != null && Cache.log.isDebugEnabled() && viewId != null)
+    {
+      Cache.log.debug("Setting viewport's view id : " + viewId);
+    }
+    setAlignment(al);
+    if (hiddenColumns != null)
+    {
+      this.colSel = hiddenColumns;
+      if (hiddenColumns.getHiddenColumns() != null
+              && hiddenColumns.getHiddenColumns().size() > 0)
+      {
+        hasHiddenColumns = true;
+      }
+      else
+      {
+        hasHiddenColumns = false;
       }
     }
+    init();
+  }
 
+  void init()
+  {
+    this.startRes = 0;
+    this.endRes = alignment.getWidth() - 1;
+    this.startSeq = 0;
+    this.endSeq = alignment.getHeight() - 1;
 
-    ConservationThread conservationThread;
+    antiAlias = Cache.getDefault("ANTI_ALIAS", false);
 
-    ConsensusThread consensusThread;
+    showJVSuffix = Cache.getDefault("SHOW_JVSUFFIX", true);
+    showAnnotation = Cache.getDefault("SHOW_ANNOTATIONS", true);
 
-    boolean consUpdateNeeded = false;
+    rightAlignIds = Cache.getDefault("RIGHT_ALIGN_IDS", false);
+    centreColumnLabels = Cache.getDefault("CENTRE_COLUMN_LABELS", false);
+    autoCalculateConsensus = Cache.getDefault("AUTO_CALC_CONSENSUS", true);
 
-    static boolean UPDATING_CONSENSUS = false;
+    setPadGaps(Cache.getDefault("PAD_GAPS", true));
+    shownpfeats = Cache.getDefault("SHOW_NPFEATS_TOOLTIP", true);
+    showdbrefs = Cache.getDefault("SHOW_DBREFS_TOOLTIP", true);
 
-    static boolean UPDATING_CONSERVATION = false;
+    String fontName = Cache.getDefault("FONT_NAME", "SansSerif");
+    String fontStyle = Cache.getDefault("FONT_STYLE", Font.PLAIN + "");
+    String fontSize = Cache.getDefault("FONT_SIZE", "10");
 
-    boolean updatingConsensus = false;
+    seqNameItalics = Cache.getDefault("ID_ITALICS", true);
 
-    boolean updatingConservation = false;
+    int style = 0;
 
-    /**
-     * DOCUMENT ME!
-     */
-    public void updateConservation(final AlignmentPanel ap)
+    if (fontStyle.equals("bold"))
     {
-      if (alignment.isNucleotide() || conservation==null)
+      style = 1;
+    }
+    else if (fontStyle.equals("italic"))
     {
-        return;
+      style = 2;
     }
 
-      conservationThread = new ConservationThread(ap);
-      conservationThread.start();
-    }
+    setFont(new Font(fontName, style, Integer.parseInt(fontSize)));
 
-    /**
-     * DOCUMENT ME!
-     */
-    public void updateConsensus(final AlignmentPanel ap)
-    {
-      consensusThread = new ConsensusThread(ap);
-      consensusThread.start();
-    }
+    alignment
+            .setGapCharacter(Cache.getDefault("GAP_SYMBOL", "-").charAt(0));
 
-  class ConsensusThread
-      extends Thread
+    // We must set conservation and consensus before setting colour,
+    // as Blosum and Clustal require this to be done
+    if (hconsensus == null && !isDataset)
     {
-      AlignmentPanel ap;
-      public ConsensusThread(AlignmentPanel ap)
+      if (!alignment.isNucleotide())
       {
-        this.ap = ap;
+        showConservation = Cache.getDefault("SHOW_CONSERVATION", true);
+        showQuality = Cache.getDefault("SHOW_QUALITY", true);
+        showGroupConservation = Cache.getDefault("SHOW_GROUP_CONSERVATION",
+                false);
       }
-      public void run()
-      {
-        updatingConsensus = true;
-        while (UPDATING_CONSENSUS)
-        {
-          try
-          {
-            if (ap != null)
-            {
-            ap.paintAlignment(false);
-            }
-
-            Thread.sleep(200);
-          }
-          catch (Exception ex)
-          {
-            ex.printStackTrace();
-          }
-        }
-
-
-        UPDATING_CONSENSUS = true;
-
-        try
-        {
-          int aWidth = alignment.getWidth();
-          if(aWidth<0)
-        {
-            return;
-        }
-
-          consensus.annotations = null;
-          consensus.annotations = new Annotation[aWidth];
-
+      showConsensusHistogram = Cache.getDefault("SHOW_CONSENSUS_HISTOGRAM",
+              true);
+      showSequenceLogo = Cache.getDefault("SHOW_CONSENSUS_LOGO", false);
+      normaliseSequenceLogo = Cache.getDefault("NORMALISE_CONSENSUS_LOGO",
+              false);
+      showGroupConsensus = Cache.getDefault("SHOW_GROUP_CONSENSUS", false);
+      showConsensus = Cache.getDefault("SHOW_IDENTITY", true);
+      consensus = new AlignmentAnnotation("Consensus", "PID",
+              new Annotation[1], 0f, 100f, AlignmentAnnotation.BAR_GRAPH);
+      consensus.hasText = true;
+      consensus.autoCalculated = true;
+    }
+    initAutoAnnotation();
+    if (jalview.bin.Cache.getProperty("DEFAULT_COLOUR") != null)
+    {
+      globalColourScheme = ColourSchemeProperty.getColour(alignment,
+              jalview.bin.Cache.getProperty("DEFAULT_COLOUR"));
 
-          hconsensus = new Hashtable[aWidth];
-          AAFrequency.calculate(alignment.getSequencesArray(),
-                                0,
-                                alignment.getWidth(),
-                                hconsensus);
+      if (globalColourScheme instanceof UserColourScheme)
+      {
+        globalColourScheme = UserDefinedColours.loadDefaultColours();
+        ((UserColourScheme) globalColourScheme).setThreshold(0,
+                getIgnoreGapsConsensus());
+      }
 
-          for (int i = 0; i < aWidth; i++)
-          {
-            float value = 0;
-            if (ignoreGapsInConsensusCalculation)
-          {
-              value = ( (Float) hconsensus[i].get(AAFrequency.PID_NOGAPS)).
-                  floatValue();
-          }
-            else
-          {
-              value = ( (Float) hconsensus[i].get(AAFrequency.PID_GAPS)).
-                  floatValue();
-          }
+      if (globalColourScheme != null)
+      {
+        globalColourScheme.setConsensus(hconsensus);
+      }
+    }
 
-            String maxRes = hconsensus[i].get(AAFrequency.MAXRESIDUE).toString();
-            String mouseOver = hconsensus[i].get(AAFrequency.MAXRESIDUE) + " ";
+    wrapAlignment = jalview.bin.Cache.getDefault("WRAP_ALIGNMENT", false);
+    showUnconserved = jalview.bin.Cache.getDefault("SHOW_UNCONSERVED",
+            false);
+    sortByTree = jalview.bin.Cache.getDefault("SORT_BY_TREE", false);
+    followSelection = jalview.bin.Cache.getDefault("FOLLOW_SELECTIONS",
+            true);
+  }
 
-            if (maxRes.length() > 1)
-            {
-              mouseOver = "[" + maxRes + "] ";
-              maxRes = "+";
-            }
+  /**
+   * set the flag
+   * 
+   * @param b
+   *          features are displayed if true
+   */
+  public void setShowSequenceFeatures(boolean b)
+  {
+    showSequenceFeatures = b;
+  }
 
-            mouseOver += ( (int) value + "%");
-          consensus.annotations[i] = new Annotation(maxRes, mouseOver, ' ',
-              value);
-          }
+  public boolean getShowSequenceFeatures()
+  {
+    return showSequenceFeatures;
+  }
 
+  /**
+   * centre columnar annotation labels in displayed alignment annotation TODO:
+   * add to jalviewXML and annotation display settings
+   */
+  boolean centreColumnLabels = false;
 
-          if (globalColourScheme != null)
-        {
-            globalColourScheme.setConsensus(hconsensus);
-        }
+  private boolean showdbrefs;
 
-        }
-        catch (OutOfMemoryError error)
-        {
-          alignment.deleteAnnotation(consensus);
+  private boolean shownpfeats;
 
-          consensus = null;
-          hconsensus = null;
-          javax.swing.SwingUtilities.invokeLater(new Runnable()
-          {
-            public void run()
-            {
-              javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
-                  "Out of memory calculating consensus!!"
-                  +
-                  "\nSee help files for increasing Java Virtual Machine memory."
-                  , "Out of memory",
-                  javax.swing.JOptionPane.WARNING_MESSAGE);
-            }
-          });
-
-          System.out.println("Consensus calculation: " + error);
-          System.gc();
-        }
-        UPDATING_CONSENSUS = false;
-        updatingConsensus = false;
+  // --------END Structure Conservation
 
-        if (ap != null)
-        {
-        ap.paintAlignment(true);
-        }
-      }
-    }
-    /**
-     * get the consensus sequence as displayed under the PID consensus annotation row.
-     * @return consensus sequence as a new sequence object
-     */
+  /**
+   * get the consensus sequence as displayed under the PID consensus annotation
+   * row.
+   * 
+   * @return consensus sequence as a new sequence object
+   */
   public SequenceI getConsensusSeq()
   {
-      if (consensus==null)
+    if (consensus == null)
     {
-        updateConsensus(null);
+      updateConsensus(null);
     }
-      if (consensus==null)
+    if (consensus == null)
     {
-        return null;
+      return null;
     }
-      StringBuffer seqs=new StringBuffer();
+    StringBuffer seqs = new StringBuffer();
     for (int i = 0; i < consensus.annotations.length; i++)
     {
       if (consensus.annotations[i] != null)
       {
-          if (consensus.annotations[i].description.charAt(0) == '[')
+        if (consensus.annotations[i].description.charAt(0) == '[')
         {
-            seqs.append(consensus.annotations[i].description.charAt(1));
+          seqs.append(consensus.annotations[i].description.charAt(1));
         }
-          else
+        else
         {
-            seqs.append(consensus.annotations[i].displayCharacter);
+          seqs.append(consensus.annotations[i].displayCharacter);
         }
       }
     }
 
-      SequenceI sq = new Sequence("Consensus", seqs.toString());
-    sq.setDescription("Percentage Identity Consensus " +
-                      ( (ignoreGapsInConsensusCalculation) ? " without gaps" :
-                       ""));
-      return sq;
-    }
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public SequenceGroup getSelectionGroup()
-    {
-        return selectionGroup;
-    }
+    SequenceI sq = new Sequence("Consensus", seqs.toString());
+    sq.setDescription("Percentage Identity Consensus "
+            + ((ignoreGapsInConsensusCalculation) ? " without gaps" : ""));
+    return sq;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param sg DOCUMENT ME!
-     */
-    public void setSelectionGroup(SequenceGroup sg)
-    {
-        selectionGroup = sg;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public int getStartRes()
+  {
+    return startRes;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public boolean getConservationSelected()
-    {
-        return conservationColourSelected;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public int getEndRes()
+  {
+    return endRes;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param b DOCUMENT ME!
-     */
-    public void setConservationSelected(boolean b)
-    {
-        conservationColourSelected = b;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public int getStartSeq()
+  {
+    return startSeq;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public boolean getAbovePIDThreshold()
-    {
-        return abovePIDThreshold;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param res
+   *          DOCUMENT ME!
+   */
+  public void setStartRes(int res)
+  {
+    this.startRes = res;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param b DOCUMENT ME!
-     */
-    public void setAbovePIDThreshold(boolean b)
-    {
-        abovePIDThreshold = b;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param seq
+   *          DOCUMENT ME!
+   */
+  public void setStartSeq(int seq)
+  {
+    this.startSeq = seq;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public int getStartRes()
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param res
+   *          DOCUMENT ME!
+   */
+  public void setEndRes(int res)
+  {
+    if (res > (alignment.getWidth() - 1))
     {
-        return startRes;
+      // log.System.out.println(" Corrected res from " + res + " to maximum " +
+      // (alignment.getWidth()-1));
+      res = alignment.getWidth() - 1;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public int getEndRes()
+    if (res < 0)
     {
-        return endRes;
+      res = 0;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public int getStartSeq()
-    {
-        return startSeq;
-    }
+    this.endRes = res;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param cs DOCUMENT ME!
-     */
-    public void setGlobalColourScheme(ColourSchemeI cs)
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param seq
+   *          DOCUMENT ME!
+   */
+  public void setEndSeq(int seq)
+  {
+    if (seq > alignment.getHeight())
     {
-        globalColourScheme = cs;
+      seq = alignment.getHeight();
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public ColourSchemeI getGlobalColourScheme()
+    if (seq < 0)
     {
-        return globalColourScheme;
+      seq = 0;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param res DOCUMENT ME!
-     */
-    public void setStartRes(int res)
-    {
-        this.startRes = res;
-    }
+    this.endSeq = seq;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param seq DOCUMENT ME!
-     */
-    public void setStartSeq(int seq)
-    {
-        this.startSeq = seq;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public int getEndSeq()
+  {
+    return endSeq;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param res DOCUMENT ME!
-     */
-    public void setEndRes(int res)
-    {
-        if (res > (alignment.getWidth() - 1))
-        {
-            // log.System.out.println(" Corrected res from " + res + " to maximum " + (alignment.getWidth()-1));
-            res = alignment.getWidth() - 1;
-        }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param f
+   *          DOCUMENT ME!
+   */
+  public void setFont(Font f)
+  {
+    font = f;
 
-        if (res < 0)
-        {
-            res = 0;
-        }
+    Container c = new Container();
 
-        this.endRes = res;
-    }
+    java.awt.FontMetrics fm = c.getFontMetrics(font);
+    setCharHeight(fm.getHeight());
+    setCharWidth(fm.charWidth('M'));
+    validCharWidth = true;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param seq DOCUMENT ME!
-     */
-    public void setEndSeq(int seq)
-    {
-        if (seq > alignment.getHeight())
-        {
-            seq = alignment.getHeight();
-        }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public Font getFont()
+  {
+    return font;
+  }
 
-        if (seq < 0)
-        {
-            seq = 0;
-        }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param w
+   *          DOCUMENT ME!
+   */
+  public void setCharWidth(int w)
+  {
+    this.charWidth = w;
+  }
 
-        this.endSeq = seq;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public int getCharWidth()
+  {
+    return charWidth;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public int getEndSeq()
-    {
-        return endSeq;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param h
+   *          DOCUMENT ME!
+   */
+  public void setCharHeight(int h)
+  {
+    this.charHeight = h;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param f DOCUMENT ME!
-     */
-    public void setFont(Font f)
-    {
-        font = f;
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public int getCharHeight()
+  {
+    return charHeight;
+  }
 
-        Container c = new Container();
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param w
+   *          DOCUMENT ME!
+   */
+  public void setWrappedWidth(int w)
+  {
+    this.wrappedWidth = w;
+  }
 
-        java.awt.FontMetrics fm = c.getFontMetrics(font);
-        setCharHeight(fm.getHeight());
-        setCharWidth(fm.charWidth('M'));
-        validCharWidth = true;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public int getWrappedWidth()
+  {
+    return wrappedWidth;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public Font getFont()
-    {
-        return font;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public AlignmentI getAlignment()
+  {
+    return alignment;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param w DOCUMENT ME!
-     */
-    public void setCharWidth(int w)
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param align
+   *          DOCUMENT ME!
+   */
+  public void setAlignment(AlignmentI align)
+  {
+    if (alignment != null && alignment.getCodonFrames() != null)
     {
-        this.charWidth = w;
+      StructureSelectionManager.getStructureSelectionManager(
+              Desktop.instance).removeMappings(alignment.getCodonFrames());
     }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public int getCharWidth()
+    this.alignment = align;
+    if (alignment != null && alignment.getCodonFrames() != null)
     {
-        return charWidth;
+      StructureSelectionManager.getStructureSelectionManager(
+              Desktop.instance).addMappings(alignment.getCodonFrames());
     }
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param h DOCUMENT ME!
-     */
-    public void setCharHeight(int h)
-    {
-        this.charHeight = h;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param state
+   *          DOCUMENT ME!
+   */
+  public void setWrapAlignment(boolean state)
+  {
+    wrapAlignment = state;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public int getCharHeight()
-    {
-        return charHeight;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param state
+   *          DOCUMENT ME!
+   */
+  public void setShowText(boolean state)
+  {
+    showText = state;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param w DOCUMENT ME!
-     */
-    public void setWrappedWidth(int w)
-    {
-        this.wrappedWidth = w;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param state
+   *          DOCUMENT ME!
+   */
+  public void setRenderGaps(boolean state)
+  {
+    renderGaps = state;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public int getWrappedWidth()
-    {
-        return wrappedWidth;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public boolean getColourText()
+  {
+    return showColourText;
+  }
 
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param state
+   *          DOCUMENT ME!
+   */
+  public void setColourText(boolean state)
+  {
+    showColourText = state;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public AlignmentI getAlignment()
-    {
-        return alignment;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param state
+   *          DOCUMENT ME!
+   */
+  public void setShowBoxes(boolean state)
+  {
+    showBoxes = state;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param align DOCUMENT ME!
-     */
-    public void setAlignment(AlignmentI align)
-    {
-        this.alignment = align;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public boolean getWrapAlignment()
+  {
+    return wrapAlignment;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param state DOCUMENT ME!
-     */
-    public void setWrapAlignment(boolean state)
-    {
-        wrapAlignment = state;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public boolean getShowText()
+  {
+    return showText;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param state DOCUMENT ME!
-     */
-    public void setShowText(boolean state)
-    {
-        showText = state;
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param state DOCUMENT ME!
-     */
-    public void setRenderGaps(boolean state)
-    {
-        renderGaps = state;
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public boolean getColourText()
-    {
-        return showColourText;
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param state DOCUMENT ME!
-     */
-    public void setColourText(boolean state)
-    {
-        showColourText = state;
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param state DOCUMENT ME!
-     */
-    public void setShowBoxes(boolean state)
-    {
-        showBoxes = state;
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public boolean getWrapAlignment()
-    {
-        return wrapAlignment;
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public boolean getShowText()
-    {
-        return showText;
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public boolean getShowBoxes()
-    {
-        return showBoxes;
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public char getGapCharacter()
-    {
-        return getAlignment().getGapCharacter();
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param gap DOCUMENT ME!
-     */
-    public void setGapCharacter(char gap)
-    {
-        if (getAlignment() != null)
-        {
-            getAlignment().setGapCharacter(gap);
-        }
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param thresh DOCUMENT ME!
-     */
-    public void setThreshold(int thresh)
-    {
-        threshold = thresh;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public boolean getShowBoxes()
+  {
+    return showBoxes;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public int getThreshold()
-    {
-        return threshold;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public char getGapCharacter()
+  {
+    return getAlignment().getGapCharacter();
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param inc DOCUMENT ME!
-     */
-    public void setIncrement(int inc)
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param gap
+   *          DOCUMENT ME!
+   */
+  public void setGapCharacter(char gap)
+  {
+    if (getAlignment() != null)
     {
-        increment = inc;
+      getAlignment().setGapCharacter(gap);
     }
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public int getIncrement()
-    {
-        return increment;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public ColumnSelection getColumnSelection()
+  {
+    return colSel;
+  }
 
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param tree
+   *          DOCUMENT ME!
+   */
+  public void setCurrentTree(NJTree tree)
+  {
+    currentTree = tree;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public ColumnSelection getColumnSelection()
-    {
-        return colSel;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public NJTree getCurrentTree()
+  {
+    return currentTree;
+  }
 
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public boolean getShowJVSuffix()
+  {
+    return showJVSuffix;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param tree DOCUMENT ME!
-     */
-    public void setCurrentTree(NJTree tree)
-    {
-        currentTree = tree;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param b
+   *          DOCUMENT ME!
+   */
+  public void setShowJVSuffix(boolean b)
+  {
+    showJVSuffix = b;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public NJTree getCurrentTree()
-    {
-        return currentTree;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public boolean getShowAnnotation()
+  {
+    return showAnnotation;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param b DOCUMENT ME!
-     */
-    public void setColourAppliesToAllGroups(boolean b)
-    {
-        colourAppliesToAllGroups = b;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param b
+   *          DOCUMENT ME!
+   */
+  public void setShowAnnotation(boolean b)
+  {
+    showAnnotation = b;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public boolean getColourAppliesToAllGroups()
-    {
-        return colourAppliesToAllGroups;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public boolean getScaleAboveWrapped()
+  {
+    return scaleAboveWrapped;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public boolean getShowJVSuffix()
-    {
-        return showJVSuffix;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public boolean getScaleLeftWrapped()
+  {
+    return scaleLeftWrapped;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param b DOCUMENT ME!
-     */
-    public void setShowJVSuffix(boolean b)
-    {
-        showJVSuffix = b;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  public boolean getScaleRightWrapped()
+  {
+    return scaleRightWrapped;
+  }
 
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param b
+   *          DOCUMENT ME!
+   */
+  public void setScaleAboveWrapped(boolean b)
+  {
+    scaleAboveWrapped = b;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public boolean getShowAnnotation()
-    {
-        return showAnnotation;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param b
+   *          DOCUMENT ME!
+   */
+  public void setScaleLeftWrapped(boolean b)
+  {
+    scaleLeftWrapped = b;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param b DOCUMENT ME!
-     */
-    public void setShowAnnotation(boolean b)
-    {
-        showAnnotation = b;
-    }
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param b
+   *          DOCUMENT ME!
+   */
+  public void setScaleRightWrapped(boolean b)
+  {
+    scaleRightWrapped = b;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public boolean getScaleAboveWrapped()
-    {
-        return scaleAboveWrapped;
-    }
+  public void setDataset(boolean b)
+  {
+    isDataset = b;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public boolean getScaleLeftWrapped()
-    {
-        return scaleLeftWrapped;
-    }
+  public boolean isDataset()
+  {
+    return isDataset;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public boolean getScaleRightWrapped()
-    {
-        return scaleRightWrapped;
-    }
+  public boolean getShowHiddenMarkers()
+  {
+    return showHiddenMarkers;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param b DOCUMENT ME!
-     */
-    public void setScaleAboveWrapped(boolean b)
-    {
-        scaleAboveWrapped = b;
-    }
+  public void setShowHiddenMarkers(boolean show)
+  {
+    showHiddenMarkers = show;
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param b DOCUMENT ME!
-     */
-    public void setScaleLeftWrapped(boolean b)
+  /**
+   * returns the visible column regions of the alignment
+   * 
+   * @param selectedRegionOnly
+   *          true to just return the contigs intersecting with the selected
+   *          area
+   * @return
+   */
+  public int[] getViewAsVisibleContigs(boolean selectedRegionOnly)
+  {
+    int[] viscontigs = null;
+    int start = 0, end = 0;
+    if (selectedRegionOnly && selectionGroup != null)
     {
-        scaleLeftWrapped = b;
+      start = selectionGroup.getStartRes();
+      end = selectionGroup.getEndRes() + 1;
     }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param b DOCUMENT ME!
-     */
-    public void setScaleRightWrapped(boolean b)
+    else
     {
-        scaleRightWrapped = b;
+      end = alignment.getWidth();
     }
+    viscontigs = colSel.getVisibleContigs(start, end);
+    return viscontigs;
+  }
 
-    /**
-     * Property change listener for changes in alignment
-     *
-     * @param listener DOCUMENT ME!
-     */
-    public void addPropertyChangeListener(
-        java.beans.PropertyChangeListener listener)
-    {
-        changeSupport.addPropertyChangeListener(listener);
-    }
+  /**
+   * get hash of undo and redo list for the alignment
+   * 
+   * @return long[] { historyList.hashCode, redoList.hashCode };
+   */
+  public long[] getUndoRedoHash()
+  {
+    // TODO: JAL-1126
+    if (historyList == null || redoList == null)
+      return new long[]
+      { -1, -1 };
+    return new long[]
+    { historyList.hashCode(), this.redoList.hashCode() };
+  }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param listener DOCUMENT ME!
-     */
-    public void removePropertyChangeListener(
-        java.beans.PropertyChangeListener listener)
+  /**
+   * test if a particular set of hashcodes are different to the hashcodes for
+   * the undo and redo list.
+   * 
+   * @param undoredo
+   *          the stored set of hashcodes as returned by getUndoRedoHash
+   * @return true if the hashcodes differ (ie the alignment has been edited) or
+   *         the stored hashcode array differs in size
+   */
+  public boolean isUndoRedoHashModified(long[] undoredo)
+  {
+    if (undoredo == null)
     {
-        changeSupport.removePropertyChangeListener(listener);
+      return true;
     }
-
-    /**
-     * Property change listener for changes in alignment
-     *
-     * @param prop DOCUMENT ME!
-     * @param oldvalue DOCUMENT ME!
-     * @param newvalue DOCUMENT ME!
-     */
-    public void firePropertyChange(String prop, Object oldvalue, Object newvalue)
+    long[] cstate = getUndoRedoHash();
+    if (cstate.length != undoredo.length)
     {
-        changeSupport.firePropertyChange(prop, oldvalue, newvalue);
+      return true;
     }
 
-    public void setIgnoreGapsConsensus(boolean b, AlignmentPanel ap)
+    for (int i = 0; i < cstate.length; i++)
     {
-      ignoreGapsInConsensusCalculation = b;
-      updateConsensus(ap);
-      if(globalColourScheme!=null)
+      if (cstate[i] != undoredo[i])
       {
-      globalColourScheme.setThreshold(globalColourScheme.getThreshold(),
-                                      ignoreGapsInConsensusCalculation);
+        return true;
       }
     }
+    return false;
+  }
 
-    public boolean getIgnoreGapsConsensus()
-    {
-     return ignoreGapsInConsensusCalculation;
-    }
-
-    public void setDataset(boolean b)
-    {
-      isDataset = b;
-    }
-
-    public boolean isDataset()
-    {
-      return isDataset;
-    }
-
-
-    public void hideSelectedColumns()
-    {
-      if (colSel.size() < 1)
-    {
-        return;
-    }
-
-      colSel.hideSelectedColumns();
-      setSelectionGroup(null);
-
-      hasHiddenColumns = true;
-    }
-
-
-    public void hideColumns(int start, int end)
-    {
-      if(start==end)
-    {
-        colSel.hideColumns(start);
-    }
-      else
-    {
-        colSel.hideColumns(start, end);
-    }
-
-      hasHiddenColumns = true;
-    }
-
-    public void hideRepSequences(SequenceI repSequence, SequenceGroup sg)
-    {
-      int sSize = sg.getSize();
-      if(sSize < 2)
-    {
-        return;
-    }
-
-      if(hiddenRepSequences==null)
-    {
-        hiddenRepSequences = new Hashtable();
-    }
-
-       hiddenRepSequences.put(repSequence, sg);
-
-      //Hide all sequences except the repSequence
-      SequenceI [] seqs = new SequenceI[sSize-1];
-      int index = 0;
-      for(int i=0; i<sSize; i++)
-    {
-        if(sg.getSequenceAt(i)!=repSequence)
-        {
-          if(index==sSize-1)
-        {
-            return;
-        }
-
-          seqs[index++] = sg.getSequenceAt(i);
-        }
-    }
-
-      hideSequence(seqs);
-
-    }
-
-    public void hideAllSelectedSeqs()
-    {
-    if (selectionGroup == null || selectionGroup.getSize()<1)
-    {
-        return;
-    }
-
-      SequenceI[] seqs = selectionGroup.getSequencesInOrder(alignment);
+  public boolean getCentreColumnLabels()
+  {
+    return centreColumnLabels;
+  }
 
-      hideSequence(seqs);
+  public void setCentreColumnLabels(boolean centrecolumnlabels)
+  {
+    centreColumnLabels = centrecolumnlabels;
+  }
 
-      setSelectionGroup(null);
-    }
 
-    public void hideSequence(SequenceI [] seq)
-    {
-      if(seq!=null)
-      {
-        for (int i = 0; i < seq.length; i++)
-        {
-          alignment.getHiddenSequences().hideSequence(seq[i]);
-        }
-        hasHiddenRows = true;
-        firePropertyChange("alignment", null, alignment.getSequences());
-      }
-    }
+  /**
+   * enable or disable the display of Database Cross References in the sequence
+   * ID tooltip
+   */
+  public void setShowDbRefs(boolean show)
+  {
+    showdbrefs = show;
+  }
 
-    public void showSequence(int index)
-    {
-      Vector tmp = alignment.getHiddenSequences().showSequence(index
-          , hiddenRepSequences);
-      if(tmp.size()>0)
-      {
-        if(selectionGroup==null)
-        {
-          selectionGroup = new SequenceGroup();
-          selectionGroup.setEndRes(alignment.getWidth()-1);
-        }
+  /**
+   * 
+   * @return true if Database References are to be displayed on tooltips.
+   */
+  public boolean isShowDbRefs()
+  {
+    return showdbrefs;
+  }
 
-        for (int t = 0; t < tmp.size(); t++)
-        {
-          selectionGroup.addSequence(
-              (SequenceI) tmp.elementAt(t), false
-              );
-        }
-        firePropertyChange("alignment", null, alignment.getSequences());
-      }
+  /**
+   * 
+   * @return true if Non-positional features are to be displayed on tooltips.
+   */
+  public boolean isShowNpFeats()
+  {
+    return shownpfeats;
+  }
 
-      if(alignment.getHiddenSequences().getSize()<1)
-    {
-        hasHiddenRows = false;
-    }
+  /**
+   * enable or disable the display of Non-Positional sequence features in the
+   * sequence ID tooltip
+   * 
+   * @param show
+   */
+  public void setShowNpFeats(boolean show)
+  {
+    shownpfeats = show;
   }
 
-    public void showColumn(int col)
-    {
-      colSel.revealHiddenColumns(col);
-      if(colSel.getHiddenColumns()==null)
-    {
-        hasHiddenColumns = false;
-    }
+  /**
+   * 
+   * @return true if view has hidden rows
+   */
+  public boolean hasHiddenRows()
+  {
+    return hasHiddenRows;
   }
 
-    public void showAllHiddenColumns()
-    {
-      colSel.revealAllHiddenColumns();
-      hasHiddenColumns = false;
-    }
+  /**
+   * 
+   * @return true if view has hidden columns
+   */
+  public boolean hasHiddenColumns()
+  {
+    return hasHiddenColumns;
+  }
 
-    public void showAllHiddenSeqs()
-    {
-      if(alignment.getHiddenSequences().getSize()>0)
-      {
-        if(selectionGroup==null)
-        {
-          selectionGroup = new SequenceGroup();
-          selectionGroup.setEndRes(alignment.getWidth()-1);
-        }
-        Vector tmp = alignment.getHiddenSequences().showAll(hiddenRepSequences);
-        for(int t=0; t<tmp.size(); t++)
-        {
-          selectionGroup.addSequence(
-              (SequenceI)tmp.elementAt(t), false
-              );
-        }
-        firePropertyChange("alignment", null, alignment.getSequences());
-        hasHiddenRows = false;
-        hiddenRepSequences = null;
-      }
-    }
+  /**
+   * when set, view will scroll to show the highlighted position
+   */
+  public boolean followHighlight = true;
+
+  /**
+   * @return true if view should scroll to show the highlighted region of a
+   *         sequence
+   * @return
+   */
+  public boolean getFollowHighlight()
+  {
+    return followHighlight;
+  }
 
+  public boolean followSelection = true;
 
+  /**
+   * @return true if view selection should always follow the selections
+   *         broadcast by other selection sources
+   */
+  public boolean getFollowSelection()
+  {
+    return followSelection;
+  }
 
-    public void invertColumnSelection()
-    {
-      for(int i=0; i<alignment.getWidth(); i++)
-      {
-        if(colSel.contains(i))
-      {
-          colSel.removeElement(i);
-      }
-        else
-        {
-          if (!hasHiddenColumns || colSel.isVisible(i))
-          {
-            colSel.addElement(i);
-          }
-        }
-      }
-    }
+  boolean showSeqFeaturesHeight;
 
-    public int adjustForHiddenSeqs(int alignmentIndex)
-    {
-      return alignment.getHiddenSequences().adjustForHiddenSeqs(alignmentIndex);
-    }
+  public void sendSelection()
+  {
+    jalview.structure.StructureSelectionManager
+            .getStructureSelectionManager(Desktop.instance).sendSelection(
+                    new SequenceGroup(getSelectionGroup()),
+                    new ColumnSelection(getColumnSelection()), this);
+  }
 
-    /**
-     * This method returns an array of new SequenceI objects
-     * derived from the whole alignment or just the current
-     * selection with start and end points adjusted
-     * @note if you need references to the actual SequenceI objects in the alignment or currently selected then use getSequenceSelection()
-     * @return String[]
-     */
-    public SequenceI[] getSelectionAsNewSequence()
-    {
-      SequenceI[] sequences;
+  public void setShowSequenceFeaturesHeight(boolean selected)
+  {
+    showSeqFeaturesHeight = selected;
+  }
 
-      if (selectionGroup == null)
-    {
-        sequences = alignment.getSequencesArray();
-        AlignmentAnnotation[] annots = alignment.getAlignmentAnnotation();
-        for (int i=0; i<sequences.length; i++)
-        {
-          sequences[i] = new Sequence(sequences[i], annots); // construct new sequence with subset of visible annotation
-        }
-    }
-      else
-    {
-        sequences = selectionGroup.getSelectionAsNewSequences(alignment);
-    }
+  public boolean getShowSequenceFeaturesHeight()
+  {
+    return showSeqFeaturesHeight;
+  }
 
-      return sequences;
-    }
-    /**
-     * get the currently selected sequence objects or all the sequences in the alignment.
-     * @return array of references to sequence objects
-     */
-    public SequenceI[] getSequenceSelection()
+  /**
+   * return the alignPanel containing the given viewport. Use this to get the
+   * components currently handling the given viewport.
+   * 
+   * @param av
+   * @return null or an alignPanel guaranteed to have non-null alignFrame
+   *         reference
+   */
+  public AlignmentPanel getAlignPanel()
+  {
+    AlignmentPanel[] aps = PaintRefresher.getAssociatedPanels(this
+            .getSequenceSetId());
+    AlignmentPanel ap = null;
+    for (int p = 0; aps != null && p < aps.length; p++)
     {
-      SequenceI[] sequences;
-      if (selectionGroup==null)
-      {
-        sequences = alignment.getSequencesArray();
-      }
-      else
+      if (aps[p].av == this)
       {
-        sequences = selectionGroup.getSequencesInOrder(alignment);
+        return aps[p];
       }
-      return sequences;
     }
-    /**
-     * This method returns the visible alignment as text, as
-     * seen on the GUI, ie if columns are hidden they will not
-     * be returned in the result.
-     * Use this for calculating trees, PCA, redundancy etc on views
-     * which contain hidden columns.
-     * @return String[]
-     */
-  public jalview.datamodel.CigarArray getViewAsCigars(boolean
-      selectedRegionOnly)
-    {
-      CigarArray selection=null;
-      SequenceI [] seqs= null;
-      int i, iSize;
-      int start = 0, end = 0;
-      if(selectedRegionOnly && selectionGroup!=null)
-      {
-        iSize = selectionGroup.getSize();
-        seqs = selectionGroup.getSequencesInOrder(alignment);
-        start = selectionGroup.getStartRes();
-        end = selectionGroup.getEndRes(); // inclusive for start and end in SeqCigar constructor
-      }
-      else
-      {
-        iSize = alignment.getHeight();
-        seqs = alignment.getSequencesArray();
-        end = alignment.getWidth()-1;
-      }
-      SeqCigar[] selseqs = new SeqCigar[iSize];
-      for(i=0; i<iSize; i++)
-      {
-        selseqs[i] = new SeqCigar(seqs[i], start, end);
-      }
-      selection=new CigarArray(selseqs);
-      // now construct the CigarArray operations
-    if (hasHiddenColumns)
-    {
-        Vector regions = colSel.getHiddenColumns();
-        int [] region;
-        int hideStart, hideEnd;
-        int last=start;
-        for (int j = 0; last<end & j < regions.size(); j++)
-        {
-          region = (int[]) regions.elementAt(j);
-          hideStart = region[0];
-          hideEnd = region[1];
-          // edit hidden regions to selection range
-        if (hideStart < last)
-        {
-            if (hideEnd > last)
-            {
-              hideStart = last;
-          }
-          else
-          {
-              continue;
-          }
-        }
+    return null;
+  }
 
-          if (hideStart>end)
-        {
-            break;
-        }
+  public boolean getSortByTree()
+  {
+    return sortByTree;
+  }
 
-          if (hideEnd>end)
-        {
-            hideEnd=end;
-        }
+  public void setSortByTree(boolean sort)
+  {
+    sortByTree = sort;
+  }
 
-          if (hideStart>hideEnd)
-        {
-            break;
-        }
-          /**
-           * form operations...
-           */
-          if (last<hideStart)
-        {
-            selection.addOperation(CigarArray.M, hideStart-last);
-        }
-          selection.addOperation(CigarArray.D, 1+hideEnd-hideStart);
-          last = hideEnd+1;
-        }
-        // Final match if necessary.
-        if (last<end)
+  /**
+   * synthesize a column selection if none exists so it covers the given
+   * selection group. if wholewidth is false, no column selection is made if the
+   * selection group covers the whole alignment width.
+   * 
+   * @param sg
+   * @param wholewidth
+   */
+  public void expandColSelection(SequenceGroup sg, boolean wholewidth)
+  {
+    int sgs, sge;
+    if (sg != null
+            && (sgs = sg.getStartRes()) >= 0
+            && sg.getStartRes() <= (sge = sg.getEndRes())
+            && (colSel == null || colSel.getSelected() == null || colSel
+                    .getSelected().size() == 0))
+    {
+      if (!wholewidth && alignment.getWidth() == (1 + sge - sgs))
       {
-          selection.addOperation(CigarArray.M, end-last+1);
-      }
-    }
-    else
-    {
-        selection.addOperation(CigarArray.M, end-start+1);
-      }
-      return selection;
-    }
-    /**
-     * return a compact representation of the current alignment selection to
-     * pass to an analysis function
-     * @param selectedOnly boolean true to just return the selected view
-     * @return AlignmentView
-     */
-  jalview.datamodel.AlignmentView getAlignmentView(boolean selectedOnly)
-  {
-      // JBPNote:
-      // this is here because the AlignmentView constructor modifies the CigarArray
-      // object. Refactoring of Cigar and alignment view representation should
-      // be done to remove redundancy.
-      CigarArray aligview = getViewAsCigars(selectedOnly);
-    if (aligview != null)
-    {
-        return new AlignmentView(aligview,
-                               (selectedOnly && selectionGroup != null) ?
-                               selectionGroup.getStartRes() : 0);
+        // do nothing
+        return;
       }
-      return null;
-    }
-    /**
-     * This method returns the visible alignment as text, as
-     * seen on the GUI, ie if columns are hidden they will not
-     * be returned in the result.
-     * Use this for calculating trees, PCA, redundancy etc on views
-     * which contain hidden columns.
-     * @return String[]
-     */
-    public String [] getViewAsString(boolean selectedRegionOnly)
-    {
-      String [] selection = null;
-      SequenceI [] seqs= null;
-      int i, iSize;
-      int start = 0, end = 0;
-      if(selectedRegionOnly && selectionGroup!=null)
+      if (colSel == null)
       {
-        iSize = selectionGroup.getSize();
-        seqs = selectionGroup.getSequencesInOrder(alignment);
-        start = selectionGroup.getStartRes();
-        end = selectionGroup.getEndRes()+1;
+        colSel = new ColumnSelection();
       }
-      else
+      for (int cspos = sg.getStartRes(); cspos <= sg.getEndRes(); cspos++)
       {
-        iSize = alignment.getHeight();
-        seqs = alignment.getSequencesArray();
-        end = alignment.getWidth();
+        colSel.addElement(cspos);
       }
-
-      selection = new String[iSize];
-    if (hasHiddenColumns)
-    {
-        selection = colSel.getVisibleSequenceStrings(start, end, seqs);
-    }
-    else
-    {
-        for(i=0; i<iSize; i++)
-        {
-          selection[i] = seqs[i].getSequenceAsString(start, end);
-        }
-
-      }
-      return selection;
     }
+  }
 
-  public int [][] getVisibleRegionBoundaries(int min, int max)
+  public StructureSelectionManager getStructureSelectionManager()
   {
-    Vector regions = new Vector();
-    int start = min;
-    int end = max;
+    return StructureSelectionManager
+            .getStructureSelectionManager(Desktop.instance);
+  }
 
-    do
+  /**
+   * 
+   * @param pdbEntries
+   * @return a series of SequenceI arrays, one for each PDBEntry, listing which
+   *         sequence in the alignment holds a reference to it
+   */
+  public SequenceI[][] collateForPDB(PDBEntry[] pdbEntries)
+  {
+    ArrayList<SequenceI[]> seqvectors = new ArrayList<SequenceI[]>();
+    for (PDBEntry pdb : pdbEntries)
     {
-      if (hasHiddenColumns)
+      ArrayList<SequenceI> seqs = new ArrayList<SequenceI>();
+      for (int i = 0; i < alignment.getHeight(); i++)
       {
-        if (start == 0)
+        Vector pdbs = alignment.getSequenceAt(i).getDatasetSequence()
+                .getPDBId();
+        if (pdbs == null)
+          continue;
+        SequenceI sq;
+        for (int p = 0; p < pdbs.size(); p++)
         {
-          start = colSel.adjustForHiddenColumns(start);
-        }
+          PDBEntry p1 = (PDBEntry) pdbs.elementAt(p);
+          if (p1.getId().equals(pdb.getId()))
+          {
+            if (!seqs.contains(sq = alignment.getSequenceAt(i)))
+              seqs.add(sq);
 
-        end = colSel.getHiddenBoundaryRight(start);
-        if (start == end)
-        {
-          end = max;
-        }
-        if (end > max)
-        {
-          end = max;
+            continue;
+          }
         }
       }
-
-      regions.addElement(new int[]
-                         {start, end});
-
-      if (hasHiddenColumns)
-      {
-        start = colSel.adjustForHiddenColumns(end);
-        start = colSel.getHiddenBoundaryLeft(start) + 1;
-      }
+      seqvectors.add(seqs.toArray(new SequenceI[seqs.size()]));
     }
-    while (end < max);
-
-    int[][] startEnd = new int[regions.size()][2];
-
-    regions.copyInto(startEnd);
-
-    return startEnd;
-
+    return seqvectors.toArray(new SequenceI[seqvectors.size()][]);
   }
 
-    public boolean getShowHiddenMarkers()
-    {
-      return showHiddenMarkers;
-    }
-
-    public void setShowHiddenMarkers(boolean show)
-    {
-      showHiddenMarkers = show;
-    }
-
-    public String getSequenceSetId()
-    {
-      if(sequenceSetID==null)
-    {
-        sequenceSetID =  alignment.hashCode()+"";
-    }
-
-      return sequenceSetID;
-    }
-
-    public void alignmentChanged(AlignmentPanel ap)
-    {
-        if (padGaps)
-    {
-          alignment.padGaps();
-    }
-
-        if (hconsensus != null && autoCalculateConsensus)
-        {
-          updateConsensus(ap);
-          updateConservation(ap);
-        }
-
-        //Reset endRes of groups if beyond alignment width
-        int alWidth = alignment.getWidth();
-        Vector groups = alignment.getGroups();
-        if(groups!=null)
-        {
-          for(int i=0; i<groups.size(); i++)
-          {
-            SequenceGroup sg = (SequenceGroup)groups.elementAt(i);
-            if(sg.getEndRes()>alWidth)
-        {
-              sg.setEndRes(alWidth-1);
-          }
-        }
-    }
-
-        if(selectionGroup!=null && selectionGroup.getEndRes()>alWidth)
-    {
-          selectionGroup.setEndRes(alWidth-1);
-    }
-
-        resetAllColourSchemes();
-
-       // alignment.adjustSequenceAnnotations();
-    }
-
-
-    void resetAllColourSchemes()
-    {
-      ColourSchemeI cs = globalColourScheme;
-      if(cs!=null)
-      {
-        if (cs instanceof ClustalxColourScheme)
-        {
-          ( (ClustalxColourScheme) cs).
-              resetClustalX(alignment.getSequences(),
-                            alignment.getWidth());
-        }
+  public boolean isNormaliseSequenceLogo()
+  {
+    return normaliseSequenceLogo;
+  }
 
-        cs.setConsensus(hconsensus);
-        if (cs.conservationApplied())
-        {
-          Alignment al = (Alignment) alignment;
-          Conservation c = new Conservation("All",
-                                            ResidueProperties.propHash, 3,
-                                            al.getSequences(), 0,
-                                            al.getWidth() - 1);
-          c.calculate();
-          c.verdict(false, ConsPercGaps);
-
-          cs.setConservation(c);
-        }
-      }
+  public void setNormaliseSequenceLogo(boolean state)
+  {
+    normaliseSequenceLogo = state;
+  }
 
-      int s, sSize = alignment.getGroups().size();
-      for(s=0; s<sSize; s++)
-      {
-        SequenceGroup sg = (SequenceGroup)alignment.getGroups().elementAt(s);
-        if(sg.cs!=null && sg.cs instanceof ClustalxColourScheme)
-        {
-          ((ClustalxColourScheme)sg.cs).resetClustalX(
-              sg.getSequences(hiddenRepSequences), sg.getWidth());
-        }
-        sg.recalcConservation();
-      }
-    }
+  /**
+   * 
+   * @return true if alignment characters should be displayed
+   */
+  public boolean isValidCharWidth()
+  {
+    return validCharWidth;
+  }
 
+  private Hashtable<String, AutoCalcSetting> calcIdParams = new Hashtable<String, AutoCalcSetting>();
 
-    public Color getSequenceColour(SequenceI seq)
-    {
-      if(sequenceColours==null || !sequenceColours.containsKey(seq))
-    {
-        return Color.white;
-    }
-      else
-    {
-        return (Color)sequenceColours.get(seq);
-    }
+  public AutoCalcSetting getCalcIdSettingsFor(String calcId)
+  {
+    return calcIdParams.get(calcId);
   }
 
-    public void setSequenceColour(SequenceI seq, Color col)
-    {
-      if(sequenceColours==null)
-    {
-        sequenceColours = new Hashtable();
-    }
-
-      if(col == null)
-    {
-        sequenceColours.remove(seq);
-    }
-      else
+  public void setCalcIdSettingsFor(String calcId, AutoCalcSetting settings,
+          boolean needsUpdate)
+  {
+    calcIdParams.put(calcId, settings);
+    // TODO: create a restart list to trigger any calculations that need to be
+    // restarted after load
+    // calculator.getRegisteredWorkersOfClass(settings.getWorkerClass())
+    if (needsUpdate)
     {
-        sequenceColours.put(seq, col);
-    }
-    }
-    /**
-     * returns the visible column regions of the alignment
-     * @param selectedRegionOnly true to just return the contigs intersecting with the selected area
-     * @return
-     */
-    public int[] getViewAsVisibleContigs(boolean selectedRegionOnly) {
-      int[] viscontigs=null;
-      int start = 0, end = 0;
-      if(selectedRegionOnly && selectionGroup!=null)
-      {
-        start = selectionGroup.getStartRes();
-        end = selectionGroup.getEndRes()+1;
-      }
-      else
-      {
-        end = alignment.getWidth();
-      }
-      viscontigs = colSel.getVisibleContigs(start, end);
-      return viscontigs;
+      Cache.log.debug("trigger update for " + calcId);
     }
-
-
+  }
 }