X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignFrame.java;h=1ecf25453756a18794214d8b7281749fd5ed6a13;hb=476d13d644d3bf2886519b13bc7f02d1ae9729f9;hp=496a8bb94247e43897b4858469f8742ad11044c9;hpb=59183747dbffe3ab6b141c5440d2f70799ae360b;p=jalview.git diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java index 496a8bb..1ecf254 100755 --- a/src/jalview/appletgui/AlignFrame.java +++ b/src/jalview/appletgui/AlignFrame.java @@ -41,7 +41,10 @@ public class AlignFrame extends Frame implements ActionListener, jalview.bin.JalviewLite applet; - public AlignFrame(AlignmentI al, jalview.bin.JalviewLite applet, String title) + public AlignFrame(AlignmentI al, + jalview.bin.JalviewLite applet, + String title, + boolean embedded) { try{ jbInit(); @@ -115,9 +118,16 @@ public class AlignFrame extends Frame implements ActionListener, }); - add(alignPanel, BorderLayout.CENTER); - jalview.bin.JalviewLite.addFrame(this, title, NEW_WINDOW_WIDTH, NEW_WINDOW_HEIGHT); - + if(embedded) + { + setEmbedded(); + } + else + { + add(alignPanel, BorderLayout.CENTER); + jalview.bin.JalviewLite.addFrame(this, title, NEW_WINDOW_WIDTH, + NEW_WINDOW_HEIGHT); + } alignPanel.validate(); alignPanel.repaint(); } @@ -140,19 +150,30 @@ public class AlignFrame extends Frame implements ActionListener, public void parseFeaturesFile(String file) { + String line = null; try { - URL url = new URL(file); + BufferedReader in = null; + java.io.InputStream is = getClass().getResourceAsStream("/" + file); + if (is != null) + { + in = new BufferedReader(new java.io.InputStreamReader(is)); + } + else + { + URL url = new URL(file); + in = new BufferedReader(new InputStreamReader(url.openStream())); + } - BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream())); SequenceI seq = null; - String line, type, desc, token; + String type, desc, token; int index, start, end; StringTokenizer st; SequenceFeature sf; FeatureRenderer fr = alignPanel.seqPanel.seqCanvas.getFeatureRenderer(); int lineNo = 0; + String featureGroup = null; while ( (line = in.readLine()) != null) { lineNo++; @@ -160,8 +181,22 @@ public class AlignFrame extends Frame implements ActionListener, if (st.countTokens() == 2) { type = st.nextToken(); - UserColourScheme ucs = new UserColourScheme(st.nextToken()); - fr.setColour(type, ucs.findColour("A")); + if(type.equalsIgnoreCase("startgroup")) + { + featureGroup = st.nextToken(); + } + else if(type.equalsIgnoreCase("endgroup")) + { + //We should check whether this is the current group, + //but at present theres no way of showing more than 1 group + st.nextToken(); + featureGroup = null; + } + else + { + UserColourScheme ucs = new UserColourScheme(st.nextToken()); + fr.setColour(type, ucs.findColour("A")); + } continue; } @@ -184,8 +219,6 @@ public class AlignFrame extends Frame implements ActionListener, end = Integer.parseInt(st.nextToken()); seq = viewport.alignment.getSequenceAt(index); - start = seq.findIndex(start) - 1; - end = seq.findIndex(end) - 1; type = st.nextToken(); @@ -196,25 +229,34 @@ public class AlignFrame extends Frame implements ActionListener, fr.setColour(type, ucs.findColour("A")); } - sf = new SequenceFeature(type, desc, "", start, end); + sf = new SequenceFeature(type, desc, "", start, end, featureGroup); seq.addSequenceFeature(sf); } } viewport.showSequenceFeatures = true; + sequenceFeatures.setState(true); alignPanel.repaint(); } catch (Exception ex) { - System.out.println("Error parsing groups file: " + ex); + ex.printStackTrace(); + System.out.println("Error parsing groups file: " + ex +"\n"+line); } } public void keyPressed(KeyEvent evt) { + if (viewport.cursorMode + && evt.getKeyCode() >= KeyEvent.VK_0 + && evt.getKeyCode() <= KeyEvent.VK_9) + { + alignPanel.seqPanel.numberPressed(evt.getKeyChar()); + } + switch (evt.getKeyCode()) { case 27: // escape key @@ -227,6 +269,10 @@ public class AlignFrame extends Frame implements ActionListener, } break; case KeyEvent.VK_C: + if (viewport.cursorMode) + { + alignPanel.seqPanel.setCursorColumn(); + } if (evt.isControlDown() || evt.isMetaDown()) { copy_actionPerformed(); @@ -245,21 +291,108 @@ public class AlignFrame extends Frame implements ActionListener, } break; case KeyEvent.VK_DOWN: - moveSelectedSequences(false); + if(viewport.cursorMode) + { + alignPanel.seqPanel.moveCursor(0,1); + } + else + moveSelectedSequences(false); break; + case KeyEvent.VK_UP: - moveSelectedSequences(true); + if (viewport.cursorMode) + { + alignPanel.seqPanel.moveCursor(0,-1); + } + else + moveSelectedSequences(true); + break; + + case KeyEvent.VK_LEFT: + if(viewport.cursorMode) + { + alignPanel.seqPanel.moveCursor(-1,0); + } + break; + + case KeyEvent.VK_RIGHT: + if (viewport.cursorMode) + { + alignPanel.seqPanel.moveCursor(1,0); + } + break; + case KeyEvent.VK_SPACE: + if(viewport.cursorMode) + { + alignPanel.seqPanel.insertGapAtCursor(evt.isControlDown()); + } + break; + + case KeyEvent.VK_DELETE: + case KeyEvent.VK_BACK_SPACE: + if(viewport.cursorMode) + { + alignPanel.seqPanel.deleteGapAtCursor(evt.isControlDown()); + } + else + { + cut_actionPerformed(); + alignPanel.seqPanel.seqCanvas.repaint(); + } + break; + + case KeyEvent.VK_S: + if(viewport.cursorMode) + { + alignPanel.seqPanel.setCursorRow(); + } + break; + case KeyEvent.VK_P: + if(viewport.cursorMode) + { + alignPanel.seqPanel.setCursorPosition(); + } + break; + + case KeyEvent.VK_ENTER: + case KeyEvent.VK_COMMA: + if(viewport.cursorMode) + { + alignPanel.seqPanel.setCursorRowAndColumn(); + } + break; + + case KeyEvent.VK_Q: + if(viewport.cursorMode) + { + alignPanel.seqPanel.setSelectionAreaAtCursor(true); + } break; + case KeyEvent.VK_M: + if(viewport.cursorMode) + { + alignPanel.seqPanel.setSelectionAreaAtCursor(false); + } + break; + + case KeyEvent.VK_F2: + viewport.cursorMode = ! viewport.cursorMode; + statusBar.setText("Keyboard editing mode is "+ + (viewport.cursorMode ? "on" : "off")); + if(viewport.cursorMode) + { + alignPanel.seqPanel.seqCanvas.cursorX = viewport.startRes; + alignPanel.seqPanel.seqCanvas.cursorY = viewport.startSeq; + } + alignPanel.seqPanel.seqCanvas.repaint(); + break; + case KeyEvent.VK_F: if (evt.isControlDown()) { findMenuItem_actionPerformed(); } break; - case KeyEvent.VK_BACK_SPACE: - case KeyEvent.VK_DELETE: - cut_actionPerformed(); - break; } } public void keyReleased(KeyEvent evt) @@ -289,17 +422,26 @@ public void itemStateChanged(ItemEvent evt) renderGapsMenuItem_actionPerformed(); else if(evt.getSource()==annotationPanelMenuItem) annotationPanelMenuItem_actionPerformed(); + else if(evt.getSource()==sequenceFeatures) + { + viewport.showSequenceFeatures(sequenceFeatures.getState()); + alignPanel.seqPanel.seqCanvas.repaint(); + } else if(evt.getSource()==conservationMenuItem) conservationMenuItem_actionPerformed(); else if(evt.getSource()==abovePIDThreshold) abovePIDThreshold_actionPerformed(); else if(evt.getSource()==applyToAllGroups) applyToAllGroups_actionPerformed(); + else if(evt.getSource()==autoCalculate) + viewport.autocalculateConsensus = autoCalculate.getState(); } public void actionPerformed(ActionEvent evt) { if(evt.getSource()==inputText) inputText_actionPerformed(); + else if(evt.getSource()==loadTree) + loadTree_actionPerformed(); else if(evt.getSource()==closeMenuItem) closeMenuItem_actionPerformed(); else if(evt.getSource()==copy) @@ -346,6 +488,8 @@ public void itemStateChanged(ItemEvent evt) findMenuItem_actionPerformed(); else if(evt.getSource()==font) font_actionPerformed(); + else if(evt.getSource()==featureSettings) + featureSettings_actionPerformed(); else if(evt.getSource()==overviewMenuItem) overviewMenuItem_actionPerformed(); else if(evt.getSource()==noColourmenuItem) @@ -378,6 +522,8 @@ public void itemStateChanged(ItemEvent evt) PIDColour_actionPerformed(); else if(evt.getSource()==BLOSUM62Colour) BLOSUM62Colour_actionPerformed(); + else if(evt.getSource()==annotationColour) + new AnnotationColourChooser(viewport, alignPanel); else if(evt.getSource()==sortPairwiseMenuItem) sortPairwiseMenuItem_actionPerformed(); else if(evt.getSource()==sortIDMenuItem) @@ -407,7 +553,7 @@ public void itemStateChanged(ItemEvent evt) public void inputText_actionPerformed() { - CutAndPasteTransfer cap = new CutAndPasteTransfer(true, applet); + CutAndPasteTransfer cap = new CutAndPasteTransfer(true, this); Frame frame = new Frame(); frame.add(cap); jalview.bin.JalviewLite.addFrame(frame, "Cut & Paste Input", 500, 500); @@ -415,7 +561,7 @@ public void itemStateChanged(ItemEvent evt) protected void outputText_actionPerformed(ActionEvent e) { - CutAndPasteTransfer cap = new CutAndPasteTransfer(false, applet); + CutAndPasteTransfer cap = new CutAndPasteTransfer(false, this); Frame frame = new Frame(); frame.add(cap); jalview.bin.JalviewLite.addFrame(frame, @@ -491,41 +637,7 @@ public void itemStateChanged(ItemEvent evt) // used by undo and redo void restoreHistoryItem(HistoryItem hi) { - if (hi.getType() == HistoryItem.SORT) - { - for (int i = 0; i < hi.getSequences().size(); i++) - { - viewport.alignment.getSequences().setElementAt(hi.getSequences(). - elementAt(i), i); - } - } - else - { - for (int i = 0; i < hi.getSequences().size(); i++) - { - SequenceI restore = (SequenceI) hi.getSequences().elementAt(i); - if (restore.getLength() == 0) - { - // log.System.out.println(hi.getHidden().elementAt(i)); - restore.setSequence(hi.getHidden().elementAt(i).toString()); - viewport.alignment.getSequences().insertElementAt( - restore, - hi.getAlignIndex(i)); - } - else - { - restore.setSequence(hi.getHidden().elementAt(i).toString()); - } - } - if (hi.getType() == HistoryItem.PASTE) - { - for (int i = viewport.alignment.getHeight() - 1; - i > hi.getSequences().size() - 1; i--) - { - viewport.alignment.deleteSequence(i); - } - } - } + hi.restore(); updateEditMenuBar(); @@ -712,7 +824,10 @@ public void itemStateChanged(ItemEvent evt) { newtitle = newtitle.concat("- from " + getTitle()); } - AlignFrame af = new AlignFrame(new Alignment(newSeqs), applet, newtitle); + AlignFrame af = new AlignFrame(new Alignment(newSeqs), + applet, + newtitle, + false); jalview.bin.JalviewLite.addFrame(af, newtitle, NEW_WINDOW_WIDTH, NEW_WINDOW_HEIGHT); @@ -814,9 +929,15 @@ public void itemStateChanged(ItemEvent evt) public void deselectAllSequenceMenuItem_actionPerformed() { + if(viewport.cursorMode) + { + alignPanel.seqPanel.keyboardNo1=null; + alignPanel.seqPanel.keyboardNo2=null; + } viewport.setSelectionGroup(null); viewport.getColumnSelection().clear(); viewport.setSelectionGroup(null); + alignPanel.idPanel.idCanvas.searchResults = null; alignPanel.seqPanel.seqCanvas.highlightSearchResults(null); alignPanel.repaint(); PaintRefresher.Refresh(null, viewport.alignment); @@ -987,8 +1108,13 @@ public void itemStateChanged(ItemEvent evt) public void alignmentChanged() { - viewport.updateConsensus(); - viewport.updateConservation (); + viewport.alignment.padGaps(); + if(viewport.autocalculateConsensus) + { + viewport.updateConsensus(); + viewport.updateConservation(); + } + resetAllColourSchemes(); if(alignPanel.overviewPanel!=null) alignPanel.overviewPanel.updateOverviewImage(); @@ -1115,6 +1241,11 @@ public void itemStateChanged(ItemEvent evt) alignPanel.setAnnotationVisible(annotationPanelMenuItem.getState()); } + public void featureSettings_actionPerformed() + { + new FeatureSettings(viewport, alignPanel); + } + public void overviewMenuItem_actionPerformed() { if (alignPanel.overviewPanel != null) @@ -1521,7 +1652,28 @@ public void itemStateChanged(ItemEvent evt) jalview.bin.JalviewLite.addFrame(tp, title, 600, 500); } - public void addTreeMenuItem(final TreePanel treePanel, String title) + void loadTree_actionPerformed() + { + TreePanel tp = null; + + CutAndPasteTransfer cap = new CutAndPasteTransfer(true, this); + cap.setText("Paste your Newick tree file here."); + cap.treeImport = true; + Frame frame = new Frame(); + frame.add(cap); + jalview.bin.JalviewLite.addFrame(frame, "Paste Newick file ", 400, 300); + } + + public void loadTree(jalview.io.NewickFile tree, String treeFile) + { + TreePanel tp = new TreePanel(viewport, + viewport.getAlignment().getSequences(), + tree, "From File - ", treeFile); + jalview.bin.JalviewLite.addFrame(tp, treeFile, 600, 500); + addTreeMenuItem(tp, treeFile); + } + + void addTreeMenuItem(final TreePanel treePanel, String title) { final MenuItem item = new MenuItem(title); sortByTreeMenu.add(item); @@ -1640,15 +1792,16 @@ public void itemStateChanged(ItemEvent evt) //JBuilder Graphics here protected MenuBar alignFrameMenuBar = new MenuBar(); - protected Menu fileMenu = new Menu(); - protected MenuItem closeMenuItem = new MenuItem(); - protected Menu editMenu = new Menu(); - protected Menu viewMenu = new Menu(); - protected Menu colourMenu = new Menu(); - protected Menu calculateMenu = new Menu(); - protected MenuItem selectAllSequenceMenuItem = new MenuItem(); - protected MenuItem deselectAllSequenceMenuItem = new MenuItem(); - protected MenuItem invertSequenceMenuItem = new MenuItem(); + protected Menu fileMenu = new Menu("File"); + protected MenuItem loadTree = new MenuItem("Load Associated Tree"); + protected MenuItem closeMenuItem = new MenuItem("Close"); + protected Menu editMenu = new Menu("Edit"); + protected Menu viewMenu = new Menu("View"); + protected Menu colourMenu = new Menu("Colour"); + protected Menu calculateMenu = new Menu("Calculate"); + protected MenuItem selectAllSequenceMenuItem = new MenuItem("Select all"); + protected MenuItem deselectAllSequenceMenuItem = new MenuItem("Deselect All"); + protected MenuItem invertSequenceMenuItem = new MenuItem("Invert Selection"); protected MenuItem remove2LeftMenuItem = new MenuItem(); protected MenuItem remove2RightMenuItem = new MenuItem(); protected MenuItem removeGappedColumnMenuItem = new MenuItem(); @@ -1706,6 +1859,8 @@ public void itemStateChanged(ItemEvent evt) protected CheckboxMenuItem scaleRight = new CheckboxMenuItem(); MenuItem modifyPID = new MenuItem(); MenuItem modifyConservation = new MenuItem(); + protected CheckboxMenuItem autoCalculate + = new CheckboxMenuItem("Autocalculate Consensus", true); protected Menu sortByTreeMenu = new Menu(); Menu sort = new Menu(); Menu calculate = new Menu(); @@ -1747,19 +1902,11 @@ public void itemStateChanged(ItemEvent evt) outputTextboxMenu.add(item); } - - fileMenu.setLabel("File"); - closeMenuItem.setLabel("Close"); closeMenuItem.addActionListener(this); - editMenu.setLabel("Edit"); - viewMenu.setLabel("View"); - colourMenu.setLabel("Colour"); - calculateMenu.setLabel("Calculate"); - selectAllSequenceMenuItem.setLabel("Select all"); + + loadTree.addActionListener(this); selectAllSequenceMenuItem.addActionListener(this); - deselectAllSequenceMenuItem.setLabel("Deselect All"); deselectAllSequenceMenuItem.addActionListener(this); - invertSequenceMenuItem.setLabel("Invert Selection"); invertSequenceMenuItem.addActionListener(this); remove2LeftMenuItem.setLabel("Remove Left"); remove2LeftMenuItem.addActionListener(this); @@ -1891,6 +2038,7 @@ public void itemStateChanged(ItemEvent evt) sortByTreeMenu.setLabel("By Tree Order"); sort.setLabel("Sort"); calculate.setLabel("Calculate Tree"); + autoCalculate.addItemListener(this); inputText.setLabel("Input from textbox"); inputText.addActionListener(this); @@ -1903,6 +2051,13 @@ public void itemStateChanged(ItemEvent evt) seqLimits.setState(true); seqLimits.setLabel("Show Sequence Limits"); seqLimits.addItemListener(this); + featureSettings.setLabel("Feature Settings..."); + featureSettings.addActionListener(this); + sequenceFeatures.setLabel("Sequence Features"); + sequenceFeatures.addItemListener(this); + sequenceFeatures.setState(false); + annotationColour.setLabel("by Annotation..."); + annotationColour.addActionListener(this); alignFrameMenuBar.add(fileMenu); alignFrameMenuBar.add(editMenu); @@ -1914,6 +2069,7 @@ public void itemStateChanged(ItemEvent evt) fileMenu.add(inputText); fileMenu.add(outputTextboxMenu); fileMenu.addSeparator(); + fileMenu.add(loadTree); fileMenu.add(closeMenuItem); editMenu.add(undoMenuItem); editMenu.add(redoMenuItem); @@ -1935,7 +2091,7 @@ public void itemStateChanged(ItemEvent evt) searchMenu.add(findMenuItem); viewMenu.add(font); viewMenu.addSeparator(); - viewMenu.add(seqLimits); + viewMenu.add(seqLimits); viewMenu.addSeparator(); viewMenu.add(wrapMenuItem); viewMenu.add(scaleAbove); @@ -1947,7 +2103,10 @@ public void itemStateChanged(ItemEvent evt) viewMenu.add(colourTextMenuItem); viewMenu.add(renderGapsMenuItem); viewMenu.add(annotationPanelMenuItem); - viewMenu.addSeparator(); + viewMenu.addSeparator(); + viewMenu.add(sequenceFeatures); + viewMenu.add(featureSettings); + viewMenu.addSeparator(); viewMenu.add(overviewMenuItem); colourMenu.add(applyToAllGroups); colourMenu.addSeparator(); @@ -1969,11 +2128,13 @@ public void itemStateChanged(ItemEvent evt) colourMenu.add(modifyConservation); colourMenu.add(abovePIDThreshold); colourMenu.add(modifyPID); - calculateMenu.add(sort); + colourMenu.add(annotationColour); + calculateMenu.add(sort); calculateMenu.add(calculate); calculateMenu.addSeparator(); calculateMenu.add(pairwiseAlignmentMenuItem); calculateMenu.add(PCAMenuItem); + calculateMenu.add(autoCalculate); this.add(statusBar, BorderLayout.SOUTH); pasteMenu.add(pasteNew); pasteMenu.add(pasteThis); @@ -2035,27 +2196,30 @@ public void itemStateChanged(ItemEvent evt) embeddedCalculate.addMouseListener(this); embeddedHelp.addMouseListener(this); - setVisible(false); + // setVisible(false); fileMenu.remove(closeMenuItem); fileMenu.remove(2); // Seperator applet.setLayout(new BorderLayout()); applet.add(embeddedMenu, BorderLayout.NORTH); applet.add(statusBar, BorderLayout.SOUTH); - applet.validate(); - + // applet.validate(); alignPanel.setSize(applet.size().width, applet.size().height - embeddedMenu.HEIGHT - statusBar.HEIGHT); applet.add(alignPanel, BorderLayout.CENTER); applet.validate(); + } PopupMenu filePopup, editPopup, searchPopup, viewPopup, colourPopup, calculatePopup, helpPopup; + MenuItem featureSettings = new MenuItem(); + CheckboxMenuItem sequenceFeatures = new CheckboxMenuItem(); + MenuItem annotationColour = new MenuItem(); public void mousePressed(MouseEvent evt) {