RepresentGroup count items

[jalview.git] / src / jalview / appletgui / APopupMenu.java

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index 9429671..dca9da4 100755 (executable)
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -197,7 +197,7 @@ public class APopupMenu
       helixColour_actionPerformed();\r
     else if(source==strandColour)\r
       strandColour_actionPerformed();\r
-    else if(source==clustalColour)\r
+    else if(source==turnColour)\r
       turnColour_actionPerformed();\r
     else if(source==buriedColour)\r
       buriedColour_actionPerformed();\r
@@ -239,13 +239,35 @@ public class APopupMenu
       {\r
         for (int g = 0; g < sg.getSize(true); g++)\r
         {\r
-          if (source == toggleCase)\r
-           ((SequenceI) sg.getSequences(true).elementAt(g))\r
-          .toggleCase(sg.getStartRes(), sg.getEndRes() + 1);\r
-          else\r
-            ((SequenceI) sg.getSequences(true).elementAt(g))\r
-                .changeCase(source == toUpper, sg.getStartRes(),\r
-                                           sg.getEndRes() + 1);\r
+          int start = sg.getStartRes();\r
+          int end = sg.getEndRes() + 1;\r
+\r
+          do\r
+          {\r
+            if (ap.av.hasHiddenColumns)\r
+            {\r
+              end = ap.av.colSel.getHiddenBoundaryRight(start);\r
+              if (start == end)\r
+                end = sg.getEndRes() + 1;\r
+              if (end > sg.getEndRes())\r
+                end = sg.getEndRes() + 1;\r
+            }\r
+\r
+            if (source == toggleCase)\r
+              ( (SequenceI) sg.getSequences(true).elementAt(g))\r
+                  .toggleCase(start, end);\r
+            else\r
+              ( (SequenceI) sg.getSequences(true).elementAt(g))\r
+                  .changeCase(source == toUpper, start, end);\r
+\r
+            if (ap.av.hasHiddenColumns)\r
+            {\r
+              start = ap.av.colSel.adjustForHiddenColumns(end);\r
+              start = ap.av.colSel.getHiddenBoundaryLeft(start) + 1;\r
+            }\r
+\r
+          }\r
+        while (end < sg.getEndRes());\r
         }\r
         ap.seqPanel.seqCanvas.repaint();\r
       }\r
@@ -598,24 +620,30 @@ public class APopupMenu
     SequenceGroup sg = ap.av.getSelectionGroup();\r
     if(sg==null || sg.getSize(false)<1)\r
     {\r
-      ap.av.hideSequence(seq);\r
+      ap.av.hideSequence(new SequenceI[]{seq});\r
       return;\r
     }\r
 \r
+    int gsize = sg.getSize(false);\r
+    SequenceI [] hseqs;\r
+\r
+    hseqs = new SequenceI[ representGroup ? gsize-1 : gsize ];\r
+\r
       int index = 0;\r
-      while(index < sg.getSize(false))\r
+      for(int i=0; i<gsize; i++)\r
       {\r
-        if(representGroup && sg.getSequenceAt(index)!=seq)\r
+        if(representGroup && sg.getSequenceAt(i)!=seq)\r
         {\r
-          seq.addHiddenSequence(sg.getSequenceAt(index));\r
-          ap.av.hideSequence(sg.getSequenceAt(index));\r
+          seq.addHiddenSequence(sg.getSequenceAt(i));\r
+          hseqs[index++] = sg.getSequenceAt(i);\r
         }\r
         else if(!representGroup)\r
         {\r
-          ap.av.hideSequence(sg.getSequenceAt(index));\r
+          hseqs[index++] = sg.getSequenceAt(index);\r
         }\r
-        index ++;\r
-      }\r
+        }\r
+\r
+      ap.av.hideSequence(hseqs);\r
 \r
       ap.av.setSelectionGroup(null);\r
     }\r