X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignViewport.java;h=9e4f0716caa5dd7ac786bc5682662d640891fbea;hb=6235128370382f0fecdf3ba1cc683052c5aa11e7;hp=e0a6a71008fbf2c6034b1a97b80bc20c2e5bae5e;hpb=0b9d0f8eba1cec46c0b31fdd402a826e26244ff5;p=jalview.git

diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java
index e0a6a71..9e4f071 100644
--- a/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@ -1,13 +1,13 @@
 /*
- * 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)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
  * 
  * 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 
@@ -22,7 +22,6 @@ import java.util.*;
 import java.awt.*;
 
 import jalview.analysis.*;
-import jalview.api.AlignCalcManagerI;
 import jalview.api.AlignViewportI;
 import jalview.bin.*;
 import jalview.datamodel.*;
@@ -30,10 +29,9 @@ import jalview.schemes.*;
 import jalview.structure.SelectionSource;
 import jalview.structure.VamsasSource;
 import jalview.viewmodel.AlignmentViewport;
-import jalview.workers.ConservationThread;
-import jalview.workers.ConsensusThread;
 
-public class AlignViewport extends AlignmentViewport implements AlignViewportI, SelectionSource, VamsasSource 
+public class AlignViewport extends AlignmentViewport implements
+        AlignViewportI, SelectionSource, VamsasSource
 {
   int startRes;
 
@@ -63,7 +61,6 @@ public class AlignViewport extends AlignmentViewport implements AlignViewportI,
 
   boolean upperCasebold = false;
 
-
   int charHeight;
 
   int charWidth;
@@ -90,24 +87,22 @@ public class AlignViewport extends AlignmentViewport implements AlignViewportI,
   // currently visible, in the correct order or rendering
   public Hashtable featuresDisplayed;
 
-
   boolean showHiddenMarkers = true;
 
   public jalview.bin.JalviewLite applet;
 
-  Hashtable sequenceColours;
-
   boolean MAC = false;
 
   Stack historyList = new Stack();
 
   Stack redoList = new Stack();
-    
-  public void finalize() {
-    applet=null;
-    quality=null;
-    alignment=null;
-    colSel=null;
+
+  public void finalize()
+  {
+    applet = null;
+    quality = null;
+    alignment = null;
+    colSel = null;
   }
 
   public AlignViewport(AlignmentI al, JalviewLite applet)
@@ -179,15 +174,19 @@ public class AlignViewport extends AlignmentViewport implements AlignViewportI,
     {
       showJVSuffix = applet.getDefaultParameter("showFullId", showJVSuffix);
 
-      showAnnotation = applet.getDefaultParameter("showAnnotation", showAnnotation);
-      
-      showConservation = applet.getDefaultParameter("showConservation", showConservation);
-      
+      showAnnotation = applet.getDefaultParameter("showAnnotation",
+              showAnnotation);
+
+      showConservation = applet.getDefaultParameter("showConservation",
+              showConservation);
+
       showQuality = applet.getDefaultParameter("showQuality", showQuality);
 
-      showConsensus = applet.getDefaultParameter("showConsensus", showConsensus);
+      showConsensus = applet.getDefaultParameter("showConsensus",
+              showConsensus);
 
-      showUnconserved = applet.getDefaultParameter("showUnconserved", showUnconserved);
+      showUnconserved = applet.getDefaultParameter("showUnconserved",
+              showUnconserved);
 
       String param = applet.getParameter("upperCase");
       if (param != null)
@@ -199,19 +198,26 @@ public class AlignViewport extends AlignmentViewport implements AlignViewportI,
       }
       sortByTree = applet.getDefaultParameter("sortByTree", sortByTree);
 
-      followHighlight = applet.getDefaultParameter("automaticScrolling",followHighlight);
+      followHighlight = applet.getDefaultParameter("automaticScrolling",
+              followHighlight);
       followSelection = followHighlight;
 
-      showSequenceLogo = applet.getDefaultParameter("showSequenceLogo", showSequenceLogo);
+      showSequenceLogo = applet.getDefaultParameter("showSequenceLogo",
+              showSequenceLogo);
+
+      normaliseSequenceLogo = applet.getDefaultParameter(
+              "normaliseSequenceLogo", applet.getDefaultParameter(
+                      "normaliseLogo", normaliseSequenceLogo));
 
-      normaliseSequenceLogo = applet.getDefaultParameter("normaliseSequenceLogo", normaliseSequenceLogo);
+      showGroupConsensus = applet.getDefaultParameter("showGroupConsensus",
+              showGroupConsensus);
+
+      showGroupConservation = applet.getDefaultParameter(
+              "showGroupConservation", showGroupConservation);
+
+      showConsensusHistogram = applet.getDefaultParameter(
+              "showConsensusHistogram", showConsensusHistogram);
 
-      showGroupConsensus = applet.getDefaultParameter("showGroupConsensus", showGroupConsensus);
-      
-      showGroupConservation = applet.getDefaultParameter("showGroupConservation", showGroupConservation);
-        
-      showConsensusHistogram = applet.getDefaultParameter("showConsensusHistogram", showConsensusHistogram);
-      
     }
 
     if (applet != null)
@@ -257,7 +263,6 @@ public class AlignViewport extends AlignmentViewport implements AlignViewportI,
     return showSequenceFeatures;
   }
 
-
   /**
    * get the consensus sequence as displayed under the PID consensus annotation
    * row.
@@ -575,10 +580,6 @@ public class AlignViewport extends AlignmentViewport implements AlignViewportI,
     }
   }
 
-
- 
-
-
   public boolean getShowHiddenMarkers()
   {
     return showHiddenMarkers;
@@ -589,35 +590,6 @@ public class AlignViewport extends AlignmentViewport implements AlignViewportI,
     showHiddenMarkers = show;
   }
 
-  public Color getSequenceColour(SequenceI seq)
-  {
-    if (sequenceColours == null || !sequenceColours.containsKey(seq))
-    {
-      return Color.white;
-    }
-    else
-    {
-      return (Color) sequenceColours.get(seq);
-    }
-  }
-
-  public void setSequenceColour(SequenceI seq, Color col)
-  {
-    if (sequenceColours == null)
-    {
-      sequenceColours = new Hashtable();
-    }
-
-    if (col == null)
-    {
-      sequenceColours.remove(seq);
-    }
-    else
-    {
-      sequenceColours.put(seq, col);
-    }
-  }
-
   boolean centreColumnLabels;
 
   public boolean getCentreColumnLabels()
@@ -625,21 +597,6 @@ public class AlignViewport extends AlignmentViewport implements AlignViewportI,
     return centreColumnLabels;
   }
 
-  public void updateSequenceIdColours()
-  {
-    
-    for (SequenceGroup sg:alignment.getGroups())
-    {
-      if (sg.idColour != null)
-      {
-        for (SequenceI s:sg.getSequences(getHiddenRepSequences()))
-        {
-          this.setSequenceColour(s, sg.idColour);
-        }
-      }
-    }
-  }
-
   public boolean followHighlight = true;
 
   public boolean getFollowHighlight()
@@ -657,6 +614,7 @@ public class AlignViewport extends AlignmentViewport implements AlignViewportI,
   {
     return followSelection;
   }
+
   public void sendSelection()
   {
     jalview.structure.StructureSelectionManager
@@ -665,9 +623,6 @@ public class AlignViewport extends AlignmentViewport implements AlignViewportI,
                     new ColumnSelection(getColumnSelection()), this);
   }
 
-
-
-
   /**
    * 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
@@ -706,7 +661,7 @@ public class AlignViewport extends AlignmentViewport implements AlignViewportI,
   {
     return hasHiddenColumns;
   }
-  
+
   public boolean isNormaliseSequenceLogo()
   {
     return normaliseSequenceLogo;
@@ -719,7 +674,7 @@ public class AlignViewport extends AlignmentViewport implements AlignViewportI,
 
   /**
    * 
-   * @return true if alignment characters should be displayed 
+   * @return true if alignment characters should be displayed
    */
   public boolean isValidCharWidth()
   {