0)
- cmd.setLength(cmd.length() - 4);
-
- viewer.evalStringQuiet("select *;restrict "
- +cmd+";cartoon;center "+cmd);
+ openNewJmol(ap, alignAddedStructures, new PDBEntry[] { pdbentry },
+ new SequenceI[][]
+ { seq });
}
- void closeViewer()
+ private void openNewJmol(AlignmentPanel ap, boolean alignAdded,
+ PDBEntry[] pdbentrys, SequenceI[][] seqs)
{
- viewer.setModeMouse(org.jmol.viewer.JmolConstants.MOUSE_NONE);
- viewer.evalStringQuiet("zap");
- viewer.setJmolStatusListener(null);
- viewer = null;
-
- //We'll need to find out what other
- // listeners need to be shut down in Jmol
- StructureSelectionManager
- .getStructureSelectionManager()
- .removeStructureViewerListener(this, pdbentry.getFile());
- }
+ setProgressIndicator(ap.alignFrame);
+ jmb = new AppJmolBinding(this, ap.getStructureSelectionManager(),
+ pdbentrys, seqs, null);
+ addAlignmentPanel(ap);
+ useAlignmentPanelForColourbyseq(ap);
- public void run()
- {
- try
- {
- EBIFetchClient ebi = new EBIFetchClient();
- String query = "pdb:" + pdbentry.getId();
- pdbentry.setFile(ebi.fetchDataAsFile(query, "default", "raw")
- .getAbsolutePath());
- initJmol("load "+pdbentry.getFile());
- }
- catch (Exception ex)
+ alignAddedStructures = alignAdded;
+ if (pdbentrys.length > 1)
{
- ex.printStackTrace();
+ useAlignmentPanelForSuperposition(ap);
}
- }
-
- public void pdbFile_actionPerformed(ActionEvent actionEvent)
- {
- JalviewFileChooser chooser = new JalviewFileChooser(
- jalview.bin.Cache.getProperty(
- "LAST_DIRECTORY"));
- chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle("Save PDB File");
- chooser.setToolTipText("Save");
+ jmb.setColourBySequence(true);
+ setSize(400, 400); // probably should be a configurable/dynamic default here
+ initMenus();
+ addingStructures = false;
+ worker = new Thread(this);
+ worker.start();
- int value = chooser.showSaveDialog(this);
-
- if (value == JalviewFileChooser.APPROVE_OPTION)
+ this.addInternalFrameListener(new InternalFrameAdapter()
{
- try
+ @Override
+ public void internalFrameClosing(
+ InternalFrameEvent internalFrameEvent)
{
- BufferedReader in = new BufferedReader(new FileReader(pdbentry.getFile()));
- File outFile = chooser.getSelectedFile();
-
- PrintWriter out = new PrintWriter(new FileOutputStream(outFile));
- String data;
- while ( (data = in.readLine()) != null)
- {
- if (
- ! (data.indexOf("") > -1 || data.indexOf("
") > -1)
- )
- {
- out.println(data);
- }
- }
- out.close();
+ closeViewer(false);
}
- catch (Exception ex)
- {
- ex.printStackTrace();
- }
- }
- }
-
- public void viewMapping_actionPerformed(ActionEvent actionEvent)
- {
- jalview.gui.CutAndPasteTransfer cap = new jalview.gui.CutAndPasteTransfer();
- jalview.gui.Desktop.addInternalFrame(cap, "PDB - Sequence Mapping", 550,
- 600);
- cap.setText(
- StructureSelectionManager.getStructureSelectionManager().printMapping(
- pdbentry.getFile())
- );
- }
+ });
- /**
- * DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
- */
- public void eps_actionPerformed(ActionEvent e)
- {
- makePDBImage(jalview.util.ImageMaker.EPS);
}
/**
- * DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ * create a new Jmol containing several structures optionally superimposed
+ * using the given alignPanel.
+ *
+ * @param ap
+ * @param alignAdded
+ * - true to superimpose
+ * @param pe
+ * @param seqs
*/
- public void png_actionPerformed(ActionEvent e)
+ public AppJmol(AlignmentPanel ap, boolean alignAdded, PDBEntry[] pe,
+ SequenceI[][] seqs)
{
- makePDBImage(jalview.util.ImageMaker.PNG);
+ openNewJmol(ap, alignAdded, pe, seqs);
}
- void makePDBImage(int type)
+ void initJmol(String command)
{
- int width = getWidth();
- int height = getHeight();
-
- jalview.util.ImageMaker im;
-
- if (type == jalview.util.ImageMaker.PNG)
- {
- im = new jalview.util.ImageMaker(this,
- jalview.util.ImageMaker.PNG,
- "Make PNG image from view",
- width, height,
- null, null);
- }
- else
+ jmb.setFinishedInit(false);
+ renderPanel = new RenderPanel();
+ // TODO: consider waiting until the structure/view is fully loaded before
+ // displaying
+ this.getContentPane().add(renderPanel, java.awt.BorderLayout.CENTER);
+ jalview.gui.Desktop.addInternalFrame(this, jmb.getViewerTitle(),
+ getBounds().width, getBounds().height);
+ if (scriptWindow == null)
{
- im = new jalview.util.ImageMaker(this,
- jalview.util.ImageMaker.EPS,
- "Make EPS file from view",
- width, height,
- null, this.getTitle());
+ BorderLayout bl = new BorderLayout();
+ bl.setHgap(0);
+ bl.setVgap(0);
+ scriptWindow = new JPanel(bl);
+ scriptWindow.setVisible(false);
}
- if (im.getGraphics() != null)
+ jmb.allocateViewer(renderPanel, true, "", null, null, "", scriptWindow,
+ null);
+ // jmb.newJmolPopup("Jmol");
+ if (command == null)
{
- Rectangle rect = new Rectangle(width, height);
- viewer.renderScreenImage(im.getGraphics(),
- rect.getSize(), rect);
- im.writeImage();
+ command = "";
}
+ jmb.executeCommand(new StructureCommand(command), false);
+ jmb.executeCommand(new StructureCommand("set hoverDelay=0.1"), false);
+ jmb.setFinishedInit(true);
}
-
- public void seqColour_actionPerformed(ActionEvent actionEvent)
- {
- lastCommand = null;
- colourBySequence = seqColour.isSelected();
- colourBySequence(ap.alignFrame.alignPanel);
- }
-
- public void chainColour_actionPerformed(ActionEvent actionEvent)
- {
- colourBySequence = false;
- seqColour.setSelected(false);
- viewer.evalStringQuiet("select *;color chain");
- }
-
- public void chargeColour_actionPerformed(ActionEvent actionEvent)
- {
- colourBySequence = false;
- seqColour.setSelected(false);
- viewer.evalStringQuiet("select *;color white;select ASP,GLU;color red;"
- +"select LYS,ARG;color blue;select CYS;color yellow");
- }
-
- public void zappoColour_actionPerformed(ActionEvent actionEvent)
- {
- setJalviewColourScheme(new ZappoColourScheme());
- }
-
- public void taylorColour_actionPerformed(ActionEvent actionEvent)
- {
- setJalviewColourScheme(new TaylorColourScheme());
- }
-
- public void hydroColour_actionPerformed(ActionEvent actionEvent)
- {
- setJalviewColourScheme(new HydrophobicColourScheme());
- }
-
- public void helixColour_actionPerformed(ActionEvent actionEvent)
- {
- setJalviewColourScheme(new HelixColourScheme());
- }
-
- public void strandColour_actionPerformed(ActionEvent actionEvent)
- {
- setJalviewColourScheme(new StrandColourScheme());
- }
-
- public void turnColour_actionPerformed(ActionEvent actionEvent)
- {
- setJalviewColourScheme(new TurnColourScheme());
- }
-
- public void buriedColour_actionPerformed(ActionEvent actionEvent)
- {
- setJalviewColourScheme(new BuriedColourScheme());
- }
-
- public void setJalviewColourScheme(ColourSchemeI cs)
+ @Override
+ public void run()
{
- colourBySequence = false;
- seqColour.setSelected(false);
-
- if(cs==null)
- return;
-
- String res;
- int index;
- Color col;
-
- Enumeration en = ResidueProperties.aa3Hash.keys();
- StringBuffer command = new StringBuffer("select *;color white;");
- while(en.hasMoreElements())
+ _started = true;
+ try
{
- res = en.nextElement().toString();
- index = ((Integer) ResidueProperties.aa3Hash.get(res)).intValue();
- if(index>20)
- continue;
-
- col = cs.findColour(ResidueProperties.aa[index].charAt(0));
-
- command.append("select "+res+";color["
- + col.getRed() + ","
- + col.getGreen() + ","
- + col.getBlue() + "];");
- }
-
- viewer.evalStringQuiet(command.toString());
- }
-
- public void userColour_actionPerformed(ActionEvent actionEvent)
- {
- new UserDefinedColours(this, null);
- }
-
- public void backGround_actionPerformed(ActionEvent actionEvent)
- {
- java.awt.Color col = JColorChooser.showDialog(this,
- "Select Background Colour",
- null);
-
- if (col != null)
+ List files = jmb.fetchPdbFiles(this);
+ if (files.size() > 0)
+ {
+ showFilesInViewer(files);
+ }
+ } finally
{
- viewer.evalStringQuiet("background ["
- + col.getRed() + ","
- + col.getGreen() + ","
- + col.getBlue() + "];");
+ _started = false;
+ worker = null;
}
}
-
- public void jmolHelp_actionPerformed(ActionEvent actionEvent)
- {
- try{
- jalview.util.BrowserLauncher.openURL(
- "http://jmol.sourceforge.net/docs/JmolUserGuide/");
- }catch(Exception ex){}
- }
-
-
- //////////////////////////////////
- ///StructureListener
- public String getPdbFile()
- {
- return pdbentry.getFile();
- }
-
- Pattern pattern = Pattern.compile(
- "\\[(.*)\\]([0-9]+)(:[a-zA-Z]*)?\\.([a-zA-Z]+)(/[0-9]*)?"
- );
-
- String lastMessage;
- public void mouseOverStructure(int atomIndex, String strInfo)
+ /**
+ * Either adds the given files to a structure viewer or opens a new viewer to
+ * show them
+ *
+ * @param files
+ * list of absolute paths to structure files
+ */
+ void showFilesInViewer(List files)
{
- Matcher matcher = pattern.matcher(strInfo);
- matcher.find();
- matcher.group(1);
- int pdbResNum = Integer.parseInt(matcher.group(2));
- String chainId = matcher.group(3);
-
- if (chainId != null)
- chainId = chainId.substring(1, chainId.length());
- else
+ long lastnotify = jmb.getLoadNotifiesHandled();
+ StringBuilder fileList = new StringBuilder();
+ for (String s : files)
{
- chainId = " ";
+ fileList.append(SPACE).append(QUOTE)
+ .append(Platform.escapeBackslashes(s)).append(QUOTE);
}
+ String filesString = fileList.toString();
- if (lastMessage == null || !lastMessage.equals(strInfo))
- {
- ssm.mouseOverStructure(pdbResNum, chainId, pdbentry.getFile());
- }
- lastMessage = strInfo;
- }
-
- StringBuffer resetLastRes = new StringBuffer();
- StringBuffer eval = new StringBuffer();
-
- public void highlightAtom(int atomIndex, int pdbResNum, String chain, String pdbfile)
- {
- if (!pdbfile.equals(pdbentry.getFile()))
- return;
-
- if (resetLastRes.length() > 0)
+ if (!addingStructures)
{
- viewer.evalStringQuiet(resetLastRes.toString());
+ try
+ {
+ initJmol("load FILES " + filesString);
+ } catch (OutOfMemoryError oomerror)
+ {
+ new OOMWarning("When trying to open the Jmol viewer!", oomerror);
+ Console.debug("File locations are " + filesString);
+ } catch (Exception ex)
+ {
+ Console.error("Couldn't open Jmol viewer!", ex);
+ ex.printStackTrace();
+ return;
+ }
}
-
- eval.setLength(0);
- eval.append("select " + pdbResNum);
-
- resetLastRes.setLength(0);
- resetLastRes.append("select " + pdbResNum);
-
- if (!chain.equals(" "))
+ else
{
- eval.append(":" + chain);
- resetLastRes.append(":" + chain);
- }
-
- eval.append(";wireframe 100;"+eval.toString()+".CA;");
-
- resetLastRes.append(";wireframe 0;"+resetLastRes.toString()+".CA;spacefill 0;");
-
- eval.append("spacefill 200;select none");
-
- viewer.evalStringQuiet(eval.toString());
- }
-
- public Color getColour(int atomIndex, int pdbResNum, String chain, String pdbfile)
- {
- if (!pdbfile.equals(pdbentry.getFile()))
- return null;
-
- return new Color(viewer.getAtomArgb(atomIndex));
- }
-
- public void updateColours(Object source)
- {
- colourBySequence( (AlignmentPanel) source);
- }
-
-
-//End StructureListener
-////////////////////////////
-
- String lastCommand;
- FeatureRenderer fr=null;
- public void colourBySequence(AlignmentPanel sourceap)
- {
- this.ap = sourceap;
-
- if(!colourBySequence || ap.alignFrame.getCurrentView()!=ap.av)
- return;
-
- StructureMapping[] mapping = ssm.getMapping(pdbentry.getFile());
-
- if (mapping.length < 1)
- return;
+ StringBuilder cmd = new StringBuilder();
+ cmd.append("loadingJalviewdata=true\nload APPEND ");
+ cmd.append(filesString);
+ cmd.append("\nloadingJalviewdata=null");
+ final StructureCommand command = new StructureCommand(cmd.toString());
+ lastnotify = jmb.getLoadNotifiesHandled();
-
- SequenceRenderer sr = new SequenceRenderer(ap.av);
-
- boolean showFeatures = false;
-
- if (ap.av.showSequenceFeatures)
- {
- showFeatures = true;
- if (fr == null)
+ try
+ {
+ jmb.executeCommand(command, false);
+ } catch (OutOfMemoryError oomerror)
{
- fr = new jalview.gui.FeatureRenderer(ap);
+ new OOMWarning("When trying to add structures to the Jmol viewer!",
+ oomerror);
+ Console.debug("File locations are " + filesString);
+ return;
+ } catch (Exception ex)
+ {
+ Console.error("Couldn't add files to Jmol viewer!", ex);
+ ex.printStackTrace();
+ return;
}
-
- fr.transferSettings(ap.seqPanel.seqCanvas.getFeatureRenderer());
}
- StringBuffer command = new StringBuffer();
-
- int lastPos = -1;
- for (int sp,s = 0; s < sequence.length; s++)
+ // need to wait around until script has finished
+ int waitMax = JMOL_LOAD_TIMEOUT;
+ int waitFor = 35;
+ int waitTotal = 0;
+ while (addingStructures ? lastnotify >= jmb.getLoadNotifiesHandled()
+ : !(jmb.isFinishedInit() && jmb.getStructureFiles() != null
+ && jmb.getStructureFiles().length == files.size()))
{
- for (int m = 0; m < mapping.length; m++)
+ try
{
- if (mapping[m].getSequence() == sequence[s]
- && (sp=ap.av.alignment.findIndex(sequence[s]))>-1)
- {
- SequenceI asp = ap.av.alignment.getSequenceAt(sp);
- for (int r = 0; r < asp.getLength(); r++)
- {
- // No mapping to gaps in sequence.
- if (jalview.util.Comparison.isGap(asp.getCharAt(r)))
- {
- continue;
- }
- int pos = mapping[m].getPDBResNum(
- asp.findPosition(r));
-
- if (pos < 1 || pos==lastPos)
- continue;
-
- lastPos = pos;
-
- Color col = sr.getResidueBoxColour(asp, r);
-
- if (showFeatures)
- col = fr.findFeatureColour(col, asp, r);
-
- if (command.toString().endsWith(":" + mapping[m].getChain()+
- ";color["
- + col.getRed() + ","
- + col.getGreen() + ","
- + col.getBlue() + "]"))
- {
- command = condenseCommand(command, pos);
- continue;
- }
-
- command.append(";select " + pos);
-
- if (!mapping[m].getChain().equals(" "))
- {
- command.append(":" + mapping[m].getChain());
- }
-
- command.append(";color["
- + col.getRed() + ","
- + col.getGreen() + ","
- + col.getBlue() + "]");
+ Console.debug("Waiting around for jmb notify.");
+ waitTotal += waitFor;
- }
- break;
- }
+ // Thread.sleep() throws an exception in JS
+ Thread.sleep(waitFor);
+ } catch (Exception e)
+ {
+ }
+ if (waitTotal > waitMax)
+ {
+ System.err.println("Timed out waiting for Jmol to load files after "
+ + waitTotal + "ms");
+ // System.err.println("finished: " + jmb.isFinishedInit()
+ // + "; loaded: " + Arrays.toString(jmb.getPdbFile())
+ // + "; files: " + files.toString());
+ jmb.getStructureFiles();
+ break;
}
}
- if (lastCommand == null || !lastCommand.equals(command.toString()))
- {
- viewer.evalStringQuiet(command.toString());
- }
- lastCommand = command.toString();
- }
-
- StringBuffer condenseCommand(StringBuffer command, int pos)
- {
- StringBuffer sb = new StringBuffer(command.substring(0, command.lastIndexOf("select")+7));
-
- command.delete(0, sb.length());
-
- String start;
-
- if (command.indexOf("-") > -1)
+ // refresh the sequence colours for the new structure(s)
+ for (AlignmentViewPanel ap : _colourwith)
{
- start = command.substring(0,command.indexOf("-"));
+ jmb.updateColours(ap);
}
- else
+ // do superposition if asked to
+ if (alignAddedStructures)
{
- start = command.substring(0, command.indexOf(":"));
+ alignAddedStructures();
}
-
- sb.append(start+"-"+pos+command.substring(command.indexOf(":")));
-
- return sb;
+ addingStructures = false;
}
- /////////////////////////////////
- //JmolStatusListener
-
- public String eval(String strEval)
- {
- // System.out.println(strEval);
- //"# 'eval' is implemented only for the applet.";
- return null;
- }
-
- public void createImage(String file, String type, int quality)
- {
- System.out.println("JMOL CREATE IMAGE");
- }
-
- public void setCallbackFunction(String callbackType,
- String callbackFunction)
- {}
-
- public void notifyFileLoaded(String fullPathName, String fileName,
- String modelName, Object clientFile,
- String errorMsg)
+ /**
+ * Queues a thread to align structures with Jalview alignments
+ */
+ void alignAddedStructures()
{
- if(errorMsg!=null)
+ javax.swing.SwingUtilities.invokeLater(new Runnable()
{
- fileLoadingError = errorMsg;
- repaint();
- return;
- }
-
- fileLoadingError = null;
-
- if (fileName != null)
- {
-
- //FILE LOADED OK
- ssm = StructureSelectionManager.getStructureSelectionManager();
- MCview.PDBfile pdbFile = ssm.setMapping(sequence,chains,pdbentry.getFile(), AppletFormatAdapter.FILE);
- ssm.addStructureViewerListener(this);
- Vector chains = new Vector();
- for(int i=0; i 20)
+ {
+ lines++;
+ g.drawString(sb.toString(), 20, currentSize.height / 2
+ - lines * g.getFontMetrics().getHeight());
+ }
+ }
}
- else if(fileLoadingError!=null)
+ else if (jmb == null || jmb.jmolViewer == null
+ || !jmb.isFinishedInit())
{
g.setColor(Color.black);
g.fillRect(0, 0, currentSize.width, currentSize.height);
g.setColor(Color.white);
g.setFont(new Font("Verdana", Font.BOLD, 14));
- g.drawString("Error loading file..." + pdbentry.getId(), 20,
- currentSize.height / 2);
+ g.drawString(MessageManager.getString("label.retrieving_pdb_data"),
+ 20, currentSize.height / 2);
}
else
{
- viewer.renderScreenImage(g, currentSize, rectClip);
+ jmb.jmolViewer.renderScreenImage(g, currentSize.width,
+ currentSize.height);
}
}
}
+ @Override
+ public AAStructureBindingModel getBinding()
+ {
+ return this.jmb;
+ }
+
+ @Override
+ public ViewerType getViewerType()
+ {
+ return ViewerType.JMOL;
+ }
+
+ @Override
+ protected String getViewerName()
+ {
+ return "Jmol";
+ }
}