Sequence seq,\r
SeqCanvas seqcanvas)\r
{\r
- /*Uncomment this to modify in Jbuilder\r
try\r
{\r
jbInit();\r
catch (Exception ex)\r
{\r
ex.printStackTrace();\r
- }*/\r
+ }\r
\r
\r
+ if (entry==null)\r
+ return;\r
pdb = entry;\r
sequence = seq;\r
+ pdbcanvas = new PDBCanvas(seqcanvas, sequence);\r
+\r
+ if(pdb.getFile()!=null)\r
+ {\r
+ try{\r
+ PDBfile pdbfile = new PDBfile(pdb.getFile(),\r
+ jalview.io.AppletFormatAdapter.FILE);\r
+ pdbcanvas.setPDBFile(pdbfile);\r
+\r
+ }catch(java.io.IOException ex)\r
+ {\r
+ ex.printStackTrace();\r
+ }\r
+ }\r
+ else\r
+ {\r
+ Thread worker = new Thread(this);\r
+ worker.start();\r
+ }\r
\r
- Thread worker = new Thread(this);\r
- worker.start();\r
\r
- pdbcanvas = new PDBCanvas(seqcanvas, seq);\r
\r
setContentPane(pdbcanvas);\r
StringBuffer title = new StringBuffer(sequence.getName() + ":" + pdb.getId());\r
if(pdb.getProperty()!=null)\r
{\r
- title.append( " Method: " );\r
- title.append(pdb.getProperty().get("method"));\r
- title.append( " Chain:" );\r
- title.append( pdb.getProperty().get("chains"));\r
+ if (pdb.getProperty().get("method")!=null)\r
+ {\r
+ title.append(" Method: ");\r
+ title.append(pdb.getProperty().get("method"));\r
+ }\r
+ if (pdb.getProperty().get("chains") != null)\r
+ {\r
+ title.append(" Chain:");\r
+ title.append(pdb.getProperty().get("chains"));\r
+ }\r
}\r
-\r
Desktop.addInternalFrame(this,title.toString(),400, 400);\r
}\r
\r
{\r
try\r
{\r
- EBIFetchClient ebi = new EBIFetchClient();\r
- String[] result = ebi.fetchData("pdb:" + pdb.getId(), "default","raw");\r
-\r
- PDBfile pdbfile = new PDBfile(result);\r
-\r
- pdbcanvas.setPDBFile(pdbfile);\r
-\r
- try\r
- {\r
- jbInit();\r
- }\r
- catch (Exception ex)\r
- {\r
- ex.printStackTrace();\r
- }\r
+ EBIFetchClient ebi = new EBIFetchClient();\r
+ String query = "pdb:" + pdb.getId();\r
+ String file = ebi.fetchDataAsFile(query, "default", "raw").getAbsolutePath();\r
+ if (file != null)\r
+ {\r
+ PDBfile pdbfile = new PDBfile(file, jalview.io.AppletFormatAdapter.FILE);\r
+ pdbcanvas.setPDBFile(pdbfile);\r
+ }\r
+ else\r
+ {\r
+ throw new Exception("Empty result for WSDbFetch Query: " + query);\r
+ }\r
}\r
catch (Exception ex)\r
{\r
ex.printStackTrace();\r
+ showErrorMessage("Failed to retrieve PDB structure.");\r
+// this.dispose();\r
}\r
}\r
\r
}\r
});\r
viewMenu.setText("View");\r
+ background.setText("Background Colour...");\r
+ background.addActionListener(new ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ background_actionPerformed(e);\r
+ }\r
+ });\r
jMenuBar1.add(fileMenu);\r
jMenuBar1.add(coloursMenu);\r
jMenuBar1.add(viewMenu);\r
coloursMenu.add(turn);\r
coloursMenu.add(buried);\r
coloursMenu.add(user);\r
+ coloursMenu.add(background);\r
ButtonGroup bg = new ButtonGroup();\r
bg.add(seqButton);\r
bg.add(chain);\r
JRadioButtonMenuItem strand = new JRadioButtonMenuItem();\r
JRadioButtonMenuItem helix = new JRadioButtonMenuItem();\r
JMenu viewMenu = new JMenu();\r
+ JMenuItem background = new JMenuItem();\r
\r
/**\r
* DOCUMENT ME!\r
{\r
pdbcanvas.setAllchainsVisible(allchains.getState());\r
}\r
+ void showErrorMessage(String error)\r
+ {\r
+ JOptionPane.showInternalMessageDialog(Desktop.desktop,\r
+ error, "PDB Viewer Error", JOptionPane.WARNING_MESSAGE);\r
+ }\r
+\r
\r
public void zappo_actionPerformed(ActionEvent e)\r
{\r
pdbcanvas.repaint();\r
}\r
}\r
+\r
+ public void background_actionPerformed(ActionEvent e)\r
+ {\r
+ java.awt.Color col = JColorChooser.showDialog(this, "Select Background Colour",\r
+ pdbcanvas.backgroundColour);\r
+\r
+ if(col!=null)\r
+ {\r
+ pdbcanvas.backgroundColour = col;\r
+ pdbcanvas.redrawneeded = true;\r
+ pdbcanvas.repaint();\r
+ }\r
+ }\r
}\r