Read in Hetatms, allow for models, highlight in canvas

[jalview.git] / src / MCview / PDBViewer.java

diff --git a/src/MCview/PDBViewer.java b/src/MCview/PDBViewer.java
index 06b6f65..082ce6e 100755 (executable)
--- a/src/MCview/PDBViewer.java
+++ b/src/MCview/PDBViewer.java
@@ -19,9 +19,13 @@ public class PDBViewer extends JInternalFrame implements Runnable
                    Sequence seq,\r
                    SeqCanvas seqcanvas)\r
   {\r
+\r
     pdb = entry;\r
     sequence = seq;\r
 \r
+    Thread worker = new Thread(this);\r
+    worker.start();\r
+\r
     try\r
     {\r
       jbInit();\r
@@ -42,10 +46,8 @@ public class PDBViewer extends JInternalFrame implements Runnable
       title.append( " Chain:" );\r
       title.append( pdb.getProperty().get("chains"));\r
     }\r
-    Desktop.addInternalFrame(this,title.toString(),400, 400);\r
 \r
-     Thread worker = new Thread(this);\r
-     worker.start();\r
+     Desktop.addInternalFrame(this,title.toString(),400, 400);\r
   }\r
 \r
   public void run()\r
@@ -53,8 +55,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     try\r
     {\r
       EBIFetchClient ebi = new EBIFetchClient();\r
-      String[] result = ebi.fetchData("pdb:" + pdb.getId(), null,\r
-                                      null);\r
+      String[] result = ebi.fetchData("pdb:" + pdb.getId(), "default","raw");\r
 \r
       PDBfile pdbfile = new PDBfile(result);\r
 \r
@@ -337,7 +338,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
   public void mapping_actionPerformed(ActionEvent e)\r
   {\r
     jalview.gui.CutAndPasteTransfer cap = new jalview.gui.CutAndPasteTransfer();\r
-    Desktop.addInternalFrame(cap, "PDB - Sequence Mapping", 500, 600);\r
+    Desktop.addInternalFrame(cap, "PDB - Sequence Mapping", 550, 600);\r
     cap.setText(pdbcanvas.mappingDetails.toString());\r
   }\r
 \r