Invert col sel with hidden cols bug fixed

diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java
index 5eb5e46..40d67b0 100755 (executable)
--- a/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@ -926,16 +926,17 @@ public class AlignViewport
 \r
   public void invertColumnSelection()\r
   {\r
-    int column;\r
     for (int i = 0; i < alignment.getWidth(); i++)\r
     {\r
-      column = i;\r
-\r
-      if (colSel.contains(column))\r
-        colSel.removeElement(column);\r
+      if (colSel.contains(i))\r
+        colSel.removeElement(i);\r
       else\r
-        colSel.addElement(column);\r
-\r
+      {\r
+        if (!hasHiddenColumns || colSel.isVisible(i))\r
+        {\r
+          colSel.addElement(i);\r
+        }\r
+      }\r
     }\r
   }\r
 \r

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 358d00d..fb2047e 100755 (executable)
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -1346,15 +1346,17 @@ public class AlignViewport
 
     public void invertColumnSelection()
     {
-      int column;
       for(int i=0; i<alignment.getWidth(); i++)
       {
-        column = i;
-
-        if(colSel.contains(column))
-          colSel.removeElement(column);
+        if(colSel.contains(i))
+          colSel.removeElement(i);
         else
-          colSel.addElement(column);
+        {
+          if (!hasHiddenColumns || colSel.isVisible(i))
+          {
+            colSel.addElement(i);
+          }
+        }
 
       }