X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAppletJmol.java;h=d8b58fdd59a6e5fc0b40d2497ceaf8ef20b5c520;hb=323a457c9d0643be2406b6661246e8e988c0d0f6;hp=8606e2217ff0fac62ad78165da9c73adff7e3dfe;hpb=49b3cee21dcfbf55f628d9b1593a908ad76b5dfc;p=jalview.git diff --git a/src/jalview/appletgui/AppletJmol.java b/src/jalview/appletgui/AppletJmol.java index 8606e22..d8b58fd 100644 --- a/src/jalview/appletgui/AppletJmol.java +++ b/src/jalview/appletgui/AppletJmol.java @@ -1,5 +1,5 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5) + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle * * This file is part of Jalview. @@ -52,6 +52,8 @@ public class AppletJmol extends EmbmenuFrame implements CheckboxMenuItem seqColour = new CheckboxMenuItem("By Sequence", true); + CheckboxMenuItem jmolColour = new CheckboxMenuItem("Using Jmol", false); + MenuItem chain = new MenuItem("By Chain"); MenuItem charge = new MenuItem("Charge & Cysteine"); @@ -69,6 +71,8 @@ public class AppletJmol extends EmbmenuFrame implements MenuItem turn = new MenuItem("Turn Propensity"); MenuItem buried = new MenuItem("Buried Index"); + + MenuItem purinepyrimidine = new MenuItem("Purine/Pyrimidine"); MenuItem user = new MenuItem("User Defined Colours"); @@ -83,6 +87,7 @@ public class AppletJmol extends EmbmenuFrame implements RenderPanel renderPanel; AlignmentPanel ap; + ArrayList _aps = new ArrayList(); String fileLoadingError; @@ -99,12 +104,40 @@ public class AppletJmol extends EmbmenuFrame implements */ String protocol = null; + /** + * Load a bunch of pdb entries associated with sequences in the alignment and + * display them - aligning them if necessary. + * + * @param pdbentries + * each pdb file (at least one needed) + * @param boundseqs + * each set of sequences for each pdb file (must match number of pdb + * files) + * @param boundchains + * the target pdb chain corresponding with each sequence associated + * with each pdb file (may be null at any level) + * @param align + * true/false + * @param ap + * associated alignment + * @param protocol + * how to get pdb data + */ + public AppletJmol(PDBEntry[] pdbentries, SequenceI[][] boundseqs, + String[][] boundchains, boolean align, AlignmentPanel ap, + String protocol) + { + throw new Error("Not yet implemented."); + } + public AppletJmol(PDBEntry pdbentry, SequenceI[] seq, String[] chains, AlignmentPanel ap, String protocol) { this.ap = ap; - jmb = new AppletJmolBinding(this, new PDBEntry[] - { pdbentry }, seq, chains, protocol); + jmb = new AppletJmolBinding(this, ap.getStructureSelectionManager(), new PDBEntry[] + { pdbentry }, new SequenceI[][] + { seq }, new String[][] + { chains }, protocol); jmb.setColourBySequence(true); if (pdbentry.getId() == null || pdbentry.getId().length() < 1) { @@ -126,12 +159,12 @@ public class AppletJmol extends EmbmenuFrame implements } String alreadyMapped = StructureSelectionManager - .getStructureSelectionManager().alreadyMappedToFile( + .getStructureSelectionManager(ap.av.applet).alreadyMappedToFile( pdbentry.getId()); MCview.PDBfile reader = null; if (alreadyMapped != null) { - reader = StructureSelectionManager.getStructureSelectionManager() + reader = StructureSelectionManager.getStructureSelectionManager(ap.av.applet) .setMapping(seq, chains, pdbentry.getFile(), protocol); // PROMPT USER HERE TO ADD TO NEW OR EXISTING VIEW? // FOR NOW, LETS JUST OPEN A NEW WINDOW @@ -149,14 +182,16 @@ public class AppletJmol extends EmbmenuFrame implements hydro.addActionListener(this); chain.addActionListener(this); seqColour.addItemListener(this); + jmolColour.addItemListener(this); zappo.addActionListener(this); taylor.addActionListener(this); helix.addActionListener(this); strand.addActionListener(this); turn.addActionListener(this); buried.addActionListener(this); + purinepyrimidine.addActionListener(this); user.addActionListener(this); - + jmolHelp.addActionListener(this); coloursMenu.add(seqColour); @@ -169,20 +204,26 @@ public class AppletJmol extends EmbmenuFrame implements coloursMenu.add(strand); coloursMenu.add(turn); coloursMenu.add(buried); + coloursMenu.add(purinepyrimidine); coloursMenu.add(user); - + coloursMenu.add(jmolColour); helpMenu.add(jmolHelp); + this.setLayout(new BorderLayout()); setMenuBar(menuBar); renderPanel = new RenderPanel(); embedMenuIfNeeded(renderPanel); this.add(renderPanel, BorderLayout.CENTER); + scriptWindow = new Panel(); + scriptWindow.setVisible(false); + // this.add(scriptWindow, BorderLayout.SOUTH); + try { - jmb.allocateViewer(renderPanel, true, ap.av.applet.getName()+"_jmol_", - ap.av.applet.getDocumentBase(), ap.av.applet.getCodeBase(), - "-applet"); + jmb.allocateViewer(renderPanel, true, ap.av.applet.getName() + + "_jmol_", ap.av.applet.getDocumentBase(), + ap.av.applet.getCodeBase(), "-applet", scriptWindow, null); } catch (Exception e) { System.err @@ -203,12 +244,18 @@ public class AppletJmol extends EmbmenuFrame implements closeViewer(); } }); - + if (pdbentry.getProperty() == null) + { + pdbentry.setProperty(new Hashtable()); + pdbentry.getProperty().put("protocol", protocol); + } if (pdbentry.getFile() != null) { // import structure data from pdbentry.getFile based on given protocol if (protocol.equals(AppletFormatAdapter.PASTE)) { + // TODO: JAL-623 : correctly record file contents for matching up later + // pdbentry.getProperty().put("pdbfilehash",""+pdbentry.getFile().hashCode()); loadInline(pdbentry.getFile()); } else if (protocol.equals(AppletFormatAdapter.FILE) @@ -276,7 +323,7 @@ public class AppletJmol extends EmbmenuFrame implements public void loadInline(String string) { loadedInline = true; - jmb.viewer.openStringInline(string); + jmb.loadInline(string); } void setChainMenuItems(Vector chains) @@ -336,19 +383,20 @@ public class AppletJmol extends EmbmenuFrame implements frame.add(cap); StringBuffer sb = new StringBuffer(); - try { - for (int s = 0; s < jmb.pdbentry.length; s++) + try { - sb.append(StructureSelectionManager.getStructureSelectionManager() - .printMapping(jmb.pdbentry[s].getFile())); - sb.append("\n"); - } - cap.setText(sb.toString()); - } - catch (OutOfMemoryError ex) + for (int s = 0; s < jmb.pdbentry.length; s++) + { + sb.append(jmb.printMapping( + jmb.pdbentry[s].getFile())); + sb.append("\n"); + } + cap.setText(sb.toString()); + } catch (OutOfMemoryError ex) { frame.dispose(); - System.err.println("Out of memory when trying to create dialog box with sequence-structure mapping."); + System.err + .println("Out of memory when trying to create dialog box with sequence-structure mapping."); return; } jalview.bin.JalviewLite.addFrame(frame, "PDB - Sequence Mapping", @@ -400,6 +448,10 @@ public class AppletJmol extends EmbmenuFrame implements setEnabled(buried); jmb.setJalviewColourScheme(new BuriedColourScheme()); } + else if(evt.getSource() == purinepyrimidine) + { + jmb.setJalviewColourScheme(new PurinePyrimidineColourScheme()); + } else if (evt.getSource() == user) { setEnabled(user); @@ -432,23 +484,29 @@ public class AppletJmol extends EmbmenuFrame implements } /** - * tick or untick the seqColour menu entry depending upon if it was selected + * tick or untick the seqColour menu entry or jmoColour entry depending upon if it was selected * or not. * * @param itm */ private void setEnabled(MenuItem itm) { + jmolColour.setState(itm == jmolColour); seqColour.setState(itm == seqColour); jmb.setColourBySequence(itm == seqColour); } public void itemStateChanged(ItemEvent evt) { + if (evt.getSource() == jmolColour) + { + setEnabled(jmolColour); + jmb.setColourBySequence(false); + } else if (evt.getSource() == seqColour) { setEnabled(seqColour); - jmb.colourBySequence(ap.av.getShowSequenceFeatures(), ap.av.alignment); + jmb.colourBySequence(ap.av.getShowSequenceFeatures(), ap); } else if (!allChainsSelected) centerViewer(); @@ -476,7 +534,7 @@ public class AppletJmol extends EmbmenuFrame implements public void updateColours(Object source) { AlignmentPanel ap = (AlignmentPanel) source; - jmb.colourBySequence(ap.av.getShowSequenceFeatures(), ap.av.alignment); + jmb.colourBySequence(ap.av.getShowSequenceFeatures(), ap); } public void updateTitleAndMenus() @@ -487,7 +545,7 @@ public class AppletJmol extends EmbmenuFrame implements return; } setChainMenuItems(jmb.chainNames); - jmb.colourBySequence(ap.av.getShowSequenceFeatures(), ap.av.alignment); + jmb.colourBySequence(ap.av.getShowSequenceFeatures(), ap); setTitle(jmb.getViewerTitle()); } @@ -503,22 +561,30 @@ public class AppletJmol extends EmbmenuFrame implements } } + Panel splitPane = null; + public void showConsole(boolean showConsole) { - if (scriptWindow == null) - { - scriptWindow = new Panel(new BorderLayout()); - inputLine = new TextField(); - history = new TextArea(5, 40); - scriptWindow.add(history, BorderLayout.CENTER); - scriptWindow.add(inputLine, BorderLayout.SOUTH); - add(scriptWindow, BorderLayout.SOUTH); + if (showConsole) + { + remove(renderPanel); + splitPane = new Panel(); + + splitPane.setLayout(new java.awt.GridLayout(2, 1)); + splitPane.add(renderPanel); + splitPane.add(scriptWindow); + scriptWindow.setVisible(true); + this.add(splitPane, BorderLayout.CENTER); + splitPane.setVisible(true); + splitPane.validate(); + } + else + { scriptWindow.setVisible(false); - history.setEditable(false); - inputLine.addKeyListener(this); + remove(splitPane); + add(renderPanel, BorderLayout.CENTER); + splitPane = null; } - - scriptWindow.setVisible(!scriptWindow.isVisible()); validate(); } @@ -583,4 +649,16 @@ public class AppletJmol extends EmbmenuFrame implements { jmb.setJalviewColourScheme(ucs); } + + public AlignmentPanel getAlignmentPanelFor(AlignmentI alignment) + { + for (int i=0;i<_aps.size();i++) + { + if (((AlignmentPanel)_aps.get(i)).av.getAlignment()==alignment) + { + return ((AlignmentPanel)_aps.get(i)); + } + } + return ap; + } }