From: James Procter <j.procter@dundee.ac.uk>
Date: Tue, 17 Oct 2023 10:40:18 +0000 (+0100)
Subject: Merge branch 'bug/JAL-4089_selectedcolshiddenregions' into develop
X-Git-Tag: Release_2_11_3_0~4^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b34bed9b5b3e975fc833d25de862dc3ee574b151;hp=2f0c43f4ed7f79cee649873401dc4dc3aa7cf406;p=jalview.git

Merge branch 'bug/JAL-4089_selectedcolshiddenregions' into develop
---

diff --git a/src/jalview/datamodel/ColumnSelection.java b/src/jalview/datamodel/ColumnSelection.java
index 4a38ec0..b427739 100644
--- a/src/jalview/datamodel/ColumnSelection.java
+++ b/src/jalview/datamodel/ColumnSelection.java
@@ -340,10 +340,12 @@ public class ColumnSelection
 
   /**
    * Returns a read-only view of the (possibly empty) list of selected columns
+   * (base 1)
    * <p>
-   * The list contains no duplicates but is not necessarily ordered. It also may
-   * include columns hidden from the current view. To modify (for example sort)
-   * the list, you should first make a copy.
+   * The list contains no duplicates but is not necessarily ordered. Columns are
+   * reported in alignment coordinates (base 1), so may also include columns
+   * hidden from the current view. To modify (for example sort) the list, you
+   * should first make a copy.
    * <p>
    * The list is not thread-safe: iterating over it could result in
    * ConcurrentModificationException if it is modified by another thread.
diff --git a/src/jalview/structures/models/AAStructureBindingModel.java b/src/jalview/structures/models/AAStructureBindingModel.java
index 4b11494..dcedafa 100644
--- a/src/jalview/structures/models/AAStructureBindingModel.java
+++ b/src/jalview/structures/models/AAStructureBindingModel.java
@@ -884,14 +884,7 @@ public abstract class AAStructureBindingModel
       {
         for (int s : cs.getSelected())
         {
-          if (hiddenCols == null)
-          {
             matched.set(s);
-          }
-          else
-          {
-            matched.set(hiddenCols.visibleToAbsoluteColumn(s));
-          }
         }
       }
       else