spelling err

[jalview.git] / src / jalview / gui / AlignmentPanel.java

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 7ef6763..364be5d 100755 (executable)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -106,6 +106,13 @@ public class AlignmentPanel extends GAlignmentPanel
     {\r
       public void keyPressed(KeyEvent evt)\r
       {\r
+        if(av.cursorMode\r
+           && evt.getKeyCode()>=KeyEvent.VK_0\r
+           && evt.getKeyCode()<=KeyEvent.VK_9)\r
+        {\r
+          seqPanel.numberPressed(evt.getKeyChar());\r
+        }\r
+\r
         switch (evt.getKeyCode())\r
         {\r
           case 27: // escape key\r
@@ -115,26 +122,125 @@ public class AlignmentPanel extends GAlignmentPanel
             break;\r
 \r
           case KeyEvent.VK_DOWN:\r
-            alignFrame.moveSelectedSequences(false);\r
-\r
+            if(av.cursorMode)\r
+            {\r
+              seqPanel.moveCursor(0,1);\r
+            }\r
+            else\r
+              alignFrame.moveSelectedSequences(false);\r
             break;\r
 \r
           case KeyEvent.VK_UP:\r
-            alignFrame.moveSelectedSequences(true);\r
+            if (av.cursorMode)\r
+            {\r
+              seqPanel.moveCursor(0,-1);\r
+            }\r
+            else\r
+              alignFrame.moveSelectedSequences(true);\r
+            break;\r
 \r
+          case KeyEvent.VK_LEFT:\r
+            if(av.cursorMode)\r
+            {\r
+              seqPanel.moveCursor(-1,0);\r
+            }\r
+            break;\r
+\r
+          case KeyEvent.VK_RIGHT:\r
+            if (av.cursorMode)\r
+            {\r
+              seqPanel.moveCursor(1,0);\r
+            }\r
+            break;\r
+\r
+          case KeyEvent.VK_SPACE:\r
+            if(av.cursorMode)\r
+            {\r
+              seqPanel.insertGapAtCursor(evt.isControlDown() || evt.isShiftDown());\r
+            }\r
             break;\r
 \r
-          case KeyEvent.VK_BACK_SPACE:\r
           case KeyEvent.VK_DELETE:\r
-            alignFrame.cut_actionPerformed(null);\r
+          case KeyEvent.VK_BACK_SPACE:\r
+            if(!av.cursorMode)\r
+            {\r
+              alignFrame.cut_actionPerformed(null);\r
+              seqPanel.seqCanvas.repaint();\r
+            }\r
+            else\r
+              seqPanel.deleteGapAtCursor(evt.isControlDown() || evt.isShiftDown());\r
+\r
             break;\r
 \r
+          case KeyEvent.VK_S:\r
+            if(av.cursorMode)\r
+            {\r
+              seqPanel.setCursorRow();\r
+            }\r
+            break;\r
+          case KeyEvent.VK_C:\r
+            if(av.cursorMode)\r
+            {\r
+              seqPanel.setCursorColumn();\r
+            }\r
+            break;\r
           case KeyEvent.VK_P:\r
-            seqPanel.seqCanvas.increaseAARatio();\r
+            if(av.cursorMode)\r
+            {\r
+              seqPanel.setCursorPosition();\r
+            }\r
+            break;\r
+\r
+          case KeyEvent.VK_ENTER:\r
+          case KeyEvent.VK_COMMA:\r
+            if(av.cursorMode)\r
+            {\r
+              seqPanel.setCursorRowAndColumn();\r
+            }\r
+            break;\r
+\r
+          case KeyEvent.VK_Q:\r
+            if(av.cursorMode)\r
+            {\r
+              seqPanel.setSelectionAreaAtCursor(true);\r
+            }\r
+            break;\r
+          case KeyEvent.VK_M:\r
+            if(av.cursorMode)\r
+            {\r
+              seqPanel.setSelectionAreaAtCursor(false);\r
+            }\r
             break;\r
-          case KeyEvent.VK_L:\r
-            seqPanel.seqCanvas.decreaseAARation();\r
+\r
+         case KeyEvent.VK_F2:\r
+           av.cursorMode = ! av.cursorMode;\r
+           alignFrame.statusBar.setText("Keyboard editing mode is "+\r
+               (av.cursorMode ? "on" : "off"));\r
+           if(av.cursorMode)\r
+           {\r
+             seqPanel.seqCanvas.cursorX = av.startRes;\r
+             seqPanel.seqCanvas.cursorY = av.startSeq;\r
+           }\r
+           seqPanel.seqCanvas.repaint();\r
+           break;\r
+\r
+          case KeyEvent.VK_F1:\r
+            try\r
+            {\r
+              ClassLoader cl = jalview.gui.Desktop.class.getClassLoader();\r
+              java.net.URL url = javax.help.HelpSet.findHelpSet(cl, "help/help");\r
+              javax.help.HelpSet hs = new javax.help.HelpSet(cl, url);\r
+\r
+              javax.help.HelpBroker hb = hs.createHelpBroker();\r
+              hb.setCurrentID("home");\r
+              hb.setDisplayed(true);\r
+            }\r
+            catch (Exception ex)\r
+            {\r
+              ex.printStackTrace();\r
+            }\r
             break;\r
+\r
         }\r
       }\r
     });\r
@@ -262,16 +368,21 @@ public class AlignmentPanel extends GAlignmentPanel
       }\r
       else\r
       {\r
-        int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());\r
-        if( start<av.getStartRes() || start>(av.getStartRes()+cwidth) )\r
-        {\r
-          vscroll.setValue(start / cwidth);\r
-          av.startRes = vscroll.getValue() * cwidth;\r
-        }\r
+        scrollToWrappedVisible(start);\r
       }\r
     }\r
   }\r
 \r
+  void scrollToWrappedVisible(int res)\r
+  {\r
+    int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());\r
+    if( res<=av.getStartRes() || res>=(av.getStartRes()+cwidth) )\r
+    {\r
+      vscroll.setValue(res / cwidth);\r
+      av.startRes = vscroll.getValue() * cwidth;\r
+    }\r
+  }\r
+\r
   /**\r
    * DOCUMENT ME!\r
    *\r
@@ -373,7 +484,7 @@ public class AlignmentPanel extends GAlignmentPanel
    */\r
   public boolean scrollRight(boolean right)\r
   {\r
-    if (right)\r
+    if (!right)\r
     {\r
       if (hscroll.getValue() < 1)\r
       {\r