fr.setColour(type, ucs.findColour("A"));\r
}\r
\r
- sf = new SequenceFeature(type, desc, "", start, end);\r
- sf.setFeatureGroup(featureGroup);\r
+ sf = new SequenceFeature(type, desc, "", start, end, featureGroup);\r
\r
seq.addSequenceFeature(sf);\r
}\r
\r
public void keyPressed(KeyEvent evt)\r
{\r
+ if (viewport.cursorMode\r
+ && evt.getKeyCode() >= KeyEvent.VK_0\r
+ && evt.getKeyCode() <= KeyEvent.VK_9)\r
+ {\r
+ alignPanel.seqPanel.numberPressed(evt.getKeyChar());\r
+ }\r
+\r
switch (evt.getKeyCode())\r
{\r
case 27: // escape key\r
}\r
break;\r
case KeyEvent.VK_C:\r
+ if (viewport.cursorMode)\r
+ {\r
+ alignPanel.seqPanel.setCursorColumn();\r
+ }\r
if (evt.isControlDown() || evt.isMetaDown())\r
{\r
copy_actionPerformed();\r
}\r
break;\r
case KeyEvent.VK_DOWN:\r
- moveSelectedSequences(false);\r
+ if(viewport.cursorMode)\r
+ {\r
+ alignPanel.seqPanel.moveCursor(0,1);\r
+ }\r
+ else\r
+ moveSelectedSequences(false);\r
break;\r
+\r
case KeyEvent.VK_UP:\r
- moveSelectedSequences(true);\r
+ if (viewport.cursorMode)\r
+ {\r
+ alignPanel.seqPanel.moveCursor(0,-1);\r
+ }\r
+ else\r
+ moveSelectedSequences(true);\r
+ break;\r
+\r
+ case KeyEvent.VK_LEFT:\r
+ if(viewport.cursorMode)\r
+ {\r
+ alignPanel.seqPanel.moveCursor(-1,0);\r
+ }\r
+ break;\r
+\r
+ case KeyEvent.VK_RIGHT:\r
+ if (viewport.cursorMode)\r
+ {\r
+ alignPanel.seqPanel.moveCursor(1,0);\r
+ }\r
+ break;\r
+ case KeyEvent.VK_SPACE:\r
+ if(viewport.cursorMode)\r
+ {\r
+ alignPanel.seqPanel.insertGapAtCursor(evt.isControlDown());\r
+ }\r
+ break;\r
+\r
+ case KeyEvent.VK_DELETE:\r
+ case KeyEvent.VK_BACK_SPACE:\r
+ if(viewport.cursorMode)\r
+ {\r
+ alignPanel.seqPanel.deleteGapAtCursor(evt.isControlDown());\r
+ }\r
+ else\r
+ {\r
+ cut_actionPerformed();\r
+ alignPanel.seqPanel.seqCanvas.repaint();\r
+ }\r
+ break;\r
+\r
+ case KeyEvent.VK_S:\r
+ if(viewport.cursorMode)\r
+ {\r
+ alignPanel.seqPanel.setCursorRow();\r
+ }\r
+ break;\r
+ case KeyEvent.VK_P:\r
+ if(viewport.cursorMode)\r
+ {\r
+ alignPanel.seqPanel.setCursorPosition();\r
+ }\r
+ break;\r
+\r
+ case KeyEvent.VK_ENTER:\r
+ case KeyEvent.VK_COMMA:\r
+ if(viewport.cursorMode)\r
+ {\r
+ alignPanel.seqPanel.setCursorRowAndColumn();\r
+ }\r
+ break;\r
+\r
+ case KeyEvent.VK_Q:\r
+ if(viewport.cursorMode)\r
+ {\r
+ alignPanel.seqPanel.setSelectionAreaAtCursor(true);\r
+ }\r
break;\r
+ case KeyEvent.VK_M:\r
+ if(viewport.cursorMode)\r
+ {\r
+ alignPanel.seqPanel.setSelectionAreaAtCursor(false);\r
+ }\r
+ break;\r
+\r
+ case KeyEvent.VK_F2:\r
+ viewport.cursorMode = ! viewport.cursorMode;\r
+ statusBar.setText("Keyboard editing mode is "+\r
+ (viewport.cursorMode ? "on" : "off"));\r
+ if(viewport.cursorMode)\r
+ {\r
+ alignPanel.seqPanel.seqCanvas.cursorX = viewport.startRes;\r
+ alignPanel.seqPanel.seqCanvas.cursorY = viewport.startSeq;\r
+ }\r
+ alignPanel.seqPanel.seqCanvas.repaint();\r
+ break;\r
+\r
case KeyEvent.VK_F:\r
if (evt.isControlDown())\r
{\r
findMenuItem_actionPerformed();\r
}\r
break;\r
- case KeyEvent.VK_BACK_SPACE:\r
- case KeyEvent.VK_DELETE:\r
- cut_actionPerformed();\r
- break;\r
}\r
}\r
public void keyReleased(KeyEvent evt)\r
abovePIDThreshold_actionPerformed();\r
else if(evt.getSource()==applyToAllGroups)\r
applyToAllGroups_actionPerformed();\r
+ else if(evt.getSource()==autoCalculate)\r
+ viewport.autocalculateConsensus = autoCalculate.getState();\r
}\r
public void actionPerformed(ActionEvent evt)\r
{\r
PIDColour_actionPerformed();\r
else if(evt.getSource()==BLOSUM62Colour)\r
BLOSUM62Colour_actionPerformed();\r
+ else if(evt.getSource()==annotationColour)\r
+ new AnnotationColourChooser(viewport, alignPanel);\r
else if(evt.getSource()==sortPairwiseMenuItem)\r
sortPairwiseMenuItem_actionPerformed();\r
else if(evt.getSource()==sortIDMenuItem)\r
\r
public void deselectAllSequenceMenuItem_actionPerformed()\r
{\r
+ if(viewport.cursorMode)\r
+ {\r
+ alignPanel.seqPanel.keyboardNo1=null;\r
+ alignPanel.seqPanel.keyboardNo2=null;\r
+ }\r
viewport.setSelectionGroup(null);\r
viewport.getColumnSelection().clear();\r
viewport.setSelectionGroup(null);\r
\r
public void alignmentChanged()\r
{\r
- viewport.updateConsensus();\r
- viewport.updateConservation ();\r
+ viewport.alignment.padGaps();\r
+ if(viewport.autocalculateConsensus)\r
+ {\r
+ viewport.updateConsensus();\r
+ viewport.updateConservation();\r
+ }\r
+\r
resetAllColourSchemes();\r
if(alignPanel.overviewPanel!=null)\r
alignPanel.overviewPanel.updateOverviewImage();\r
protected Menu colourMenu = new Menu("Colour");\r
protected Menu calculateMenu = new Menu("Calculate");\r
protected MenuItem selectAllSequenceMenuItem = new MenuItem("Select all");\r
- protected MenuItem deselectAllSequenceMenuItem = new MenuItem();\r
- protected MenuItem invertSequenceMenuItem = new MenuItem();\r
+ protected MenuItem deselectAllSequenceMenuItem = new MenuItem("Deselect All");\r
+ protected MenuItem invertSequenceMenuItem = new MenuItem("Invert Selection");\r
protected MenuItem remove2LeftMenuItem = new MenuItem();\r
protected MenuItem remove2RightMenuItem = new MenuItem();\r
protected MenuItem removeGappedColumnMenuItem = new MenuItem();\r
protected CheckboxMenuItem scaleRight = new CheckboxMenuItem();\r
MenuItem modifyPID = new MenuItem();\r
MenuItem modifyConservation = new MenuItem();\r
+ protected CheckboxMenuItem autoCalculate\r
+ = new CheckboxMenuItem("Autocalculate Consensus", true);\r
protected Menu sortByTreeMenu = new Menu();\r
Menu sort = new Menu();\r
Menu calculate = new Menu();\r
\r
loadTree.addActionListener(this);\r
selectAllSequenceMenuItem.addActionListener(this);\r
- deselectAllSequenceMenuItem.setLabel("Deselect All");\r
deselectAllSequenceMenuItem.addActionListener(this);\r
- invertSequenceMenuItem.setLabel("Invert Selection");\r
invertSequenceMenuItem.addActionListener(this);\r
remove2LeftMenuItem.setLabel("Remove Left");\r
remove2LeftMenuItem.addActionListener(this);\r
sortByTreeMenu.setLabel("By Tree Order");\r
sort.setLabel("Sort");\r
calculate.setLabel("Calculate Tree");\r
+ autoCalculate.addItemListener(this);\r
inputText.setLabel("Input from textbox");\r
inputText.addActionListener(this);\r
\r
sequenceFeatures.setLabel("Sequence Features");\r
sequenceFeatures.addItemListener(this);\r
sequenceFeatures.setState(false);\r
+ annotationColour.setLabel("by Annotation...");\r
+ annotationColour.addActionListener(this);\r
\r
alignFrameMenuBar.add(fileMenu);\r
alignFrameMenuBar.add(editMenu);\r
colourMenu.add(modifyConservation);\r
colourMenu.add(abovePIDThreshold);\r
colourMenu.add(modifyPID);\r
- calculateMenu.add(sort);\r
+ colourMenu.add(annotationColour);\r
+ calculateMenu.add(sort);\r
calculateMenu.add(calculate);\r
calculateMenu.addSeparator();\r
calculateMenu.add(pairwiseAlignmentMenuItem);\r
calculateMenu.add(PCAMenuItem);\r
+ calculateMenu.add(autoCalculate);\r
this.add(statusBar, BorderLayout.SOUTH);\r
pasteMenu.add(pasteNew);\r
pasteMenu.add(pasteThis);\r
viewPopup, colourPopup, calculatePopup, helpPopup;\r
MenuItem featureSettings = new MenuItem();\r
CheckboxMenuItem sequenceFeatures = new CheckboxMenuItem();\r
+ MenuItem annotationColour = new MenuItem();\r
\r
public void mousePressed(MouseEvent evt)\r
{\r