Fire alignment changed if seqs hidden / revealed

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

diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java
index 10df56d..64423b0 100755 (executable)
--- a/src/jalview/appletgui/AlignFrame.java
+++ b/src/jalview/appletgui/AlignFrame.java
@@ -110,6 +110,8 @@ public class AlignFrame extends Frame implements ActionListener,
    this.addKeyListener(this);\r
    alignPanel.seqPanel.seqCanvas.addKeyListener(this);\r
    alignPanel.idPanel.idCanvas.addKeyListener(this);\r
+   alignPanel.scalePanel.addKeyListener(this);\r
+   alignPanel.annotationPanel.addKeyListener(this);\r
 \r
     viewport.addPropertyChangeListener(new java.beans.PropertyChangeListener()\r
     {\r
@@ -327,6 +329,27 @@ public class AlignFrame extends Frame implements ActionListener,
           findMenuItem_actionPerformed();\r
         }\r
         break;\r
+      case KeyEvent.VK_H:\r
+      {\r
+        SequenceGroup sg = viewport.getSelectionGroup();\r
+        boolean hide = false;\r
+        if (sg != null && sg.getSize(false) != viewport.alignment.getHeight())\r
+        {\r
+          hide = true;\r
+          viewport.hideAllSelectedSeqs();\r
+        }\r
+        else if (viewport.colSel.getSelected().size() < 1)\r
+          viewport.showAllHiddenSeqs();\r
+\r
+        if (viewport.colSel.getSelected().size() > 0)\r
+          viewport.hideSelectedColumns();\r
+        else if (!hide)\r
+          viewport.showAllHiddenColumns();\r
+\r
+        alignPanel.repaint();\r
+        break;\r
+      }\r
+\r
     }\r
   }\r
   public void keyReleased(KeyEvent evt)\r
@@ -430,28 +453,19 @@ public void itemStateChanged(ItemEvent evt)
             font_actionPerformed();\r
     else if(source==showColumns)\r
     {\r
-      viewport.showAllHiddenColumns(); repaint();\r
+      viewport.showAllHiddenColumns(); alignPanel.repaint();\r
     }\r
     else if(source==showSeqs)\r
     {\r
-      viewport.showAllHiddenSeqs(); repaint();\r
+      viewport.showAllHiddenSeqs();\r
     }\r
     else if(source == hideColumns)\r
     {\r
-      viewport.hideSelectedColumns(); repaint();\r
+      viewport.hideSelectedColumns(); alignPanel.repaint();\r
     }\r
     else if(source == hideSequences && viewport.getSelectionGroup()!=null)\r
     {\r
-      SequenceI[] seqs = viewport.getSelectionGroup().getSequencesInOrder(\r
-          viewport.alignment\r
-          );\r
-\r
-      for (int i = 0; i < seqs.length; i++)\r
-      {\r
-        viewport.hideSequence(seqs[i]);\r
-      }\r
-\r
-      alignPanel.repaint();\r
+      viewport.hideAllSelectedSeqs();\r
     }\r
     else if(source==featureSettings)\r
             featureSettings_actionPerformed();\r
@@ -1257,6 +1271,7 @@ public void itemStateChanged(ItemEvent evt)
     alignPanel.repaint();\r
   }\r
 \r
+\r
   protected void scaleAbove_actionPerformed()\r
   {\r
     viewport.setScaleAboveWrapped(scaleAbove.getState());\r
@@ -1937,12 +1952,11 @@ public void itemStateChanged(ItemEvent evt)
       MenuItem item;\r
 \r
       // dynamically fill save as menu with available formats\r
-      for (int i = 0; i < jalview.io.AppletFormatAdapter.formats.size(); i++)\r
+      for (int i = 0; i < jalview.io.AppletFormatAdapter.WRITEABLE_FORMATS.length; i++)\r
       {\r
 \r
-        item = new MenuItem( (String) jalview.io.AppletFormatAdapter.formats.\r
-                            elementAt(\r
-                                i));\r
+        item = new MenuItem( jalview.io.AppletFormatAdapter.WRITEABLE_FORMATS[i]);\r
+\r
         item.addActionListener(new java.awt.event.ActionListener()\r
         {\r
           public void actionPerformed(ActionEvent e)\r