X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignViewport.java;h=350921722fa2d3a56ac8053787e15543340f1841;hb=6fc9aca27f606f6e3a0121597896e1a5dae35c36;hp=2922f0910e5b23904b95946ab7f6d96cd4601067;hpb=92f934a3ed429a46227cf829f985d72cb7e86fb7;p=jalview.git

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 2922f09..3509217 100755
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -43,7 +43,7 @@ public class AlignViewport
     int endRes;
     int startSeq;
     int endSeq;
-    boolean showFullId = false;
+    boolean showJVSuffix = true;
     boolean showText = true;
     boolean showColourText = false;
     boolean showBoxes = true;
@@ -62,7 +62,7 @@ public class AlignViewport
     int charHeight;
     int charWidth;
     int wrappedWidth;
-    Font font = new Font("SansSerif", Font.PLAIN, 10);
+    Font font;
     AlignmentI alignment;
     ColumnSelection colSel = new ColumnSelection();
     int threshold;
@@ -71,12 +71,22 @@ public class AlignViewport
     boolean scaleAboveWrapped = false;
     boolean scaleLeftWrapped = true;
     boolean scaleRightWrapped = true;
+    boolean hasHiddenColumns = false;
+    boolean hasHiddenRows = false;
+
+    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 Vector vconsensus;
     AlignmentAnnotation consensus;
     AlignmentAnnotation conservation;
     AlignmentAnnotation quality;
+    boolean autoCalculateConsensus = true;
 
     /** DOCUMENT ME!! */
     public int ConsPercGaps = 25; // JBPNote : This should be a scalable property!
@@ -86,6 +96,19 @@ public class AlignViewport
 
     boolean ignoreGapsInConsensusCalculation = false;
 
+    boolean isDataset = false;
+
+    boolean antiAlias = false;
+
+    boolean padGaps = false;
+
+
+    public AlignViewport(AlignmentI al, boolean dataset)
+    {
+      isDataset = dataset;
+      setAlignment(al);
+      init();
+    }
     /**
      * Creates a new AlignViewport object.
      *
@@ -94,26 +117,29 @@ public class AlignViewport
     public AlignViewport(AlignmentI al)
     {
         setAlignment(al);
+        init();
+    }
+
+    void init()
+    {
         this.startRes = 0;
-        this.endRes = al.getWidth() - 1;
+        this.endRes = alignment.getWidth() - 1;
         this.startSeq = 0;
-        this.endSeq = al.getHeight() - 1;
+        this.endSeq = alignment.getHeight() - 1;
 
-        updateFromPreferences();
-    }
+      antiAlias = Cache.getDefault("ANTI_ALIAS", false);
 
-    /**
-     * DOCUMENT ME!
-     */
-    public void updateFromPreferences()
-    {
-      showFullId = Cache.getDefault("SHOW_FULL_ID", true);
+      showJVSuffix = Cache.getDefault("SHOW_JVSUFFIX", true);
       showAnnotation = Cache.getDefault("SHOW_ANNOTATIONS", true);
       showConservation = Cache.getDefault("SHOW_CONSERVATION", true);
 
       showQuality = Cache.getDefault("SHOW_QUALITY", true);
       showIdentity = Cache.getDefault("SHOW_IDENTITY", true);
 
+      autoCalculateConsensus = Cache.getDefault("AUTO_CALC_CONSENSUS", true);
+
+      padGaps = Cache.getDefault("PAD_GAPS", false);
+
        String fontName = Cache.getDefault("FONT_NAME", "SansSerif");
        String fontStyle = Cache.getDefault("FONT_STYLE", Font.PLAIN + "") ;
        String fontSize = Cache.getDefault("FONT_SIZE", "10");
@@ -137,9 +163,11 @@ public class AlignViewport
 
         // We must set conservation and consensus before setting colour,
         // as Blosum and Clustal require this to be done
-        updateConservation();
-
-        updateConsensus();
+        if(vconsensus==null && !isDataset)
+        {
+          updateConservation();
+          updateConsensus();
+        }
 
         if (jalview.bin.Cache.getProperty("DEFAULT_COLOUR") != null)
         {
@@ -166,11 +194,16 @@ public class AlignViewport
      *
      * @param b DOCUMENT ME!
      */
-    public void showSequenceFeatures(boolean b)
+    public void setShowSequenceFeatures(boolean b)
     {
         showSequenceFeatures = b;
     }
 
+    public boolean getShowSequenceFeatures()
+    {
+      return showSequenceFeatures;
+    }
+
     /**
      * DOCUMENT ME!
      */
@@ -256,7 +289,7 @@ public class AlignViewport
                                                  ConsPercGaps + "% gaps",
                                                  annotations, 0f, // cons.qualityRange[0].floatValue(),
                                                  11f, // cons.qualityRange[1].floatValue()
-                                                 1);
+                                                 AlignmentAnnotation.BAR_GRAPH);
 
           if (showConservation)
           {
@@ -268,7 +301,7 @@ public class AlignViewport
                                             qannotations,
                                             cons.qualityRange[0].floatValue(),
                                             cons.qualityRange[1].floatValue(),
-                                            1);
+                                            AlignmentAnnotation.BAR_GRAPH);
 
           if (showQuality)
           {
@@ -352,7 +385,7 @@ public class AlignViewport
         if (consensus == null)
         {
           consensus = new AlignmentAnnotation("Consensus", "PID",
-                                              annotations, 0f, 100f, 1);
+                                              annotations, 0f, 100f,AlignmentAnnotation.BAR_GRAPH);
 
           if (showIdentity)
           {
@@ -914,9 +947,9 @@ public class AlignViewport
      *
      * @return DOCUMENT ME!
      */
-    public boolean getShowFullId()
+    public boolean getShowJVSuffix()
     {
-        return showFullId;
+        return showJVSuffix;
     }
 
     /**
@@ -924,11 +957,12 @@ public class AlignViewport
      *
      * @param b DOCUMENT ME!
      */
-    public void setShowFullId(boolean b)
+    public void setShowJVSuffix(boolean b)
     {
-        showFullId = b;
+        showJVSuffix = b;
     }
 
+
     /**
      * DOCUMENT ME!
      *
@@ -1051,11 +1085,39 @@ public class AlignViewport
       {
         globalColourScheme.setThreshold(globalColourScheme.getThreshold(), ignoreGapsInConsensusCalculation);
       }
-
     }
 
     public boolean getIgnoreGapsConsensus()
     {
      return ignoreGapsInConsensusCalculation;
     }
+
+    public void setDataset(boolean b)
+    {
+      isDataset = b;
+    }
+
+    public boolean isDataset()
+    {
+      return isDataset;
+    }
+
+    public void hideSequence(SequenceI seq)
+    {
+      alignment.getHiddenSequences().hideSequence(seq);
+      hasHiddenRows = true;
+    }
+
+    public void showSequence(int index)
+    {
+      alignment.getHiddenSequences().showSequence(index);
+
+      if(alignment.getHiddenSequences().getSize()<1)
+        hasHiddenRows = false;
+    }
+
+    public int adjustForHiddenSeqs(int alignmentIndex)
+    {
+      return alignment.getHiddenSequences().adjustForHiddenSeqs(alignmentIndex);
+    }
 }