Merge branch 'features/JAL-3417_sdppred_calcs' into features/r2_11_2_JAL-3417_sdppred

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

diff --git a/src/jalview/viewmodel/AlignmentViewport.java b/src/jalview/viewmodel/AlignmentViewport.java
index 4f399f0..3691a69 100644 (file)
--- a/src/jalview/viewmodel/AlignmentViewport.java
+++ b/src/jalview/viewmodel/AlignmentViewport.java
@@ -724,6 +724,7 @@ public abstract class AlignmentViewport
   @Override
   public void setConservation(Conservation cons)
   {
+    alignment.setConservation(cons);
     hconservation = cons;
   }
 
@@ -742,6 +743,7 @@ public abstract class AlignmentViewport
   @Override
   public void setSequenceConsensusHash(ProfilesI hconsensus)
   {
+    alignment.setSequenceConsensusHash(hconsensus);
     this.hconsensus = hconsensus;
   }
 
@@ -749,6 +751,7 @@ public abstract class AlignmentViewport
   public void setComplementConsensusHash(
           Hashtable<String, Object>[] hconsensus)
   {
+    alignment.setComplementConsensusHash(hconsensus);
     this.hcomplementConsensus = hconsensus;
   }
 
@@ -774,6 +777,7 @@ public abstract class AlignmentViewport
   public void setRnaStructureConsensusHash(
           Hashtable<String, Object>[] hStrucConsensus)
   {
+    alignment.setRnaStructureConsensusHash(hStrucConsensus);
     this.hStrucConsensus = hStrucConsensus;
 
   }
@@ -963,6 +967,7 @@ public abstract class AlignmentViewport
     ranges = null;
     currentTree = null;
     selectionGroup = null;
+    colSel = null;
     setAlignment(null);
   }
 
@@ -3078,4 +3083,22 @@ public abstract class AlignmentViewport
       codingComplement.setUpdateStructures(needToUpdateStructureViews);
     }
   }
+
+  @Override
+  public Iterator<int[]> getViewAsVisibleContigs(boolean selectedRegionOnly)
+  {
+    int start = 0;
+    int end = 0;
+    if (selectedRegionOnly && selectionGroup != null)
+    {
+      start = selectionGroup.getStartRes();
+      end = selectionGroup.getEndRes() + 1;
+    }
+    else
+    {
+      end = alignment.getWidth();
+    }
+    return (alignment.getHiddenColumns().getVisContigsIterator(start, end,
+            false));
+  }
 }