X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fviewmodel%2FAlignmentViewport.java;h=4116c3b49aa94211708088b8ed4258d8ff6eeef9;hb=29d9ea53569a9c0dfcd4aa53c871c455ebc45d24;hp=f2ab8a6a883044c20943dc8082cbd62d11afae9f;hpb=b1f1dafab890809e47d9b3e7b54aa300ebe6d7a1;p=jalview.git

diff --git a/src/jalview/viewmodel/AlignmentViewport.java b/src/jalview/viewmodel/AlignmentViewport.java
index f2ab8a6..4116c3b 100644
--- a/src/jalview/viewmodel/AlignmentViewport.java
+++ b/src/jalview/viewmodel/AlignmentViewport.java
@@ -605,10 +605,30 @@ public abstract class AlignmentViewport
 
   protected ColumnSelection colSel = new ColumnSelection();
 
-  public boolean autoCalculateConsensus = true;
+  protected boolean autoCalculateConsensusAndConservation = true;
+
+  public boolean getAutoCalculateConsensusAndConservation()
+  { // BH 2019.07.24
+    return autoCalculateConsensusAndConservation;
+  }
+
+  public void setAutoCalculateConsensusAndConservation(boolean b)
+  {
+    autoCalculateConsensusAndConservation = b;
+  }
 
   protected boolean autoCalculateStrucConsensus = true;
 
+  public boolean getAutoCalculateStrucConsensus()
+  { // BH 2019.07.24
+    return autoCalculateStrucConsensus;
+  }
+
+  public void setAutoCalculateStrucConsensus(boolean b)
+  {
+    autoCalculateStrucConsensus = b;
+  }
+
   protected boolean ignoreGapsInConsensusCalculation = false;
 
   protected ResidueShaderI residueShading = new ResidueShader();
@@ -824,7 +844,7 @@ public abstract class AlignmentViewport
     // see note in mantis : issue number 8585
     if (alignment.isNucleotide()
             || (conservation == null && quality == null)
-            || !autoCalculateConsensus)
+            || !autoCalculateConsensusAndConservation)
     {
       return;
     }
@@ -842,7 +862,7 @@ public abstract class AlignmentViewport
   public void updateConsensus(final AlignmentViewPanel ap)
   {
     // see note in mantis : issue number 8585
-    if (consensus == null || !autoCalculateConsensus)
+    if (consensus == null || !autoCalculateConsensusAndConservation)
     {
       return;
     }
@@ -1323,21 +1343,6 @@ public abstract class AlignmentViewport
    */
   private boolean followHighlight = true;
 
-  private boolean disableFastPaint; // BH 2019.04.18
-
-  /**
-   * BH 2019.04.18 When gap filling is on and a modification is made to fill
-   * those, we need to disallow fast painting for paste just once
-   * 
-   * @return
-   */
-  public boolean isFastPaintDisabled()
-  {
-    boolean ret = disableFastPaint;
-    disableFastPaint = false;
-    return ret;
-  }
-
   /**
    * Property change listener for changes in alignment
    * 
@@ -1872,17 +1877,13 @@ public abstract class AlignmentViewport
   {
     if (isPadGaps())
     {
-      if (alignment.padGaps())
-      {
-        // the new alignment has been modified -- can't fast paint
-        disableFastPaint = true;
-      }
+      alignment.padGaps();
     }
-    if (autoCalculateConsensus)
+    if (autoCalculateConsensusAndConservation)
     {
       updateConsensus(ap);
     }
-    if (hconsensus != null && autoCalculateConsensus)
+    if (hconsensus != null && autoCalculateConsensusAndConservation)
     {
       updateConservation(ap);
     }
@@ -2286,7 +2287,7 @@ public abstract class AlignmentViewport
   public void clearSequenceColours()
   {
     sequenceColours.clear();
-  };
+  }
 
   @Override
   public AlignViewportI getCodingComplement()