JAL-2629 tweaks to Information annotation updating

[jalview.git] / src / jalview / viewmodel / AlignmentViewport.java

diff --git a/src/jalview/viewmodel/AlignmentViewport.java b/src/jalview/viewmodel/AlignmentViewport.java
index ab67202..1cd4a31 100644 (file)
--- a/src/jalview/viewmodel/AlignmentViewport.java
+++ b/src/jalview/viewmodel/AlignmentViewport.java
@@ -900,18 +900,14 @@ public abstract class AlignmentViewport
     }
   }
 
-  /**
-   * trigger update of information annotation
-   */
   @Override
-  public void updateInformation(final AlignmentViewPanel ap)
+  public void initInformationWorker(final AlignmentViewPanel ap)
   {
     if (calculator
             .getRegisteredWorkersOfClass(InformationThread.class) == null)
     {
       calculator.registerWorker(new InformationThread(this, ap));
     }
-
   }
 
   // --------START Structure Conservation
@@ -1313,7 +1309,6 @@ public abstract class AlignmentViewport
     ignoreGapsInConsensusCalculation = b;
     if (ap != null)
     {
-      updateConsensus(ap);
       if (residueShading != null)
       {
         residueShading.setThreshold(residueShading.getThreshold(),
@@ -1324,22 +1319,12 @@ public abstract class AlignmentViewport
 
   public void setIgnoreBelowBackground(boolean b, AlignmentViewPanel ap)
   {
-    boolean was = ignoreBelowBackGroundFrequencyCalculation;
     ignoreBelowBackGroundFrequencyCalculation = b;
-    if (ap != null && was != b)
-    {
-      updateInformation(ap);
-    }
   }
 
   public void setInfoLetterHeight(boolean b, AlignmentViewPanel ap)
   {
-    boolean was = infoLetterHeight;
     infoLetterHeight = b;
-    if (ap != null && was != b)
-    {
-      updateInformation(ap);
-    }
   }
 
   private long sgrouphash = -1, colselhash = -1;
@@ -1967,20 +1952,20 @@ public abstract class AlignmentViewport
     {
       alignment.padGaps();
     }
-    if (autoCalculateConsensus)
-    {
-      updateConsensus(ap);
-    }
-    if (consensusProfiles != null && autoCalculateConsensus)
-    {
-      updateConservation(ap);
-    }
-    if (autoCalculateStrucConsensus)
-    {
-      updateStrucConsensus(ap);
-    }
-    // initInformation();
-    updateInformation(ap);
+    // if (autoCalculateConsensus)
+    // {
+    // updateConsensus(ap);
+    // }
+    // if (consensusProfiles != null && autoCalculateConsensus)
+    // {
+    // updateConservation(ap);
+    // }
+    // if (autoCalculateStrucConsensus)
+    // {
+    // updateStrucConsensus(ap);
+    // }
+    //
+    // updateInformation(ap);
 
     // Reset endRes of groups if beyond alignment width
     int alWidth = alignment.getWidth();
@@ -2003,7 +1988,6 @@ public abstract class AlignmentViewport
 
     updateAllColourSchemes();
     calculator.restartWorkers();
-    // alignment.adjustSequenceAnnotations();
   }
 
   /**