From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 24 Nov 2006 10:13:51 +0000 (+0000)
Subject: Invert col sel with hidden cols bug fixed
X-Git-Tag: Release_2_2~36
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2947e06daee7e5b9d76be0d817dc45f0c8e94400;p=jalview.git

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
--- a/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@ -926,16 +926,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);
+        }
+      }
     }
   }
 
diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 358d00d..fb2047e 100755
--- 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);
+          }
+        }
 
       }