Further structure accessing feature

[jalview.git] / src / jalview / gui / AppVarna.java

diff --git a/src/jalview/gui/AppVarna.java b/src/jalview/gui/AppVarna.java
index 19b19cd..d1772c7 100644 (file)
--- a/src/jalview/gui/AppVarna.java
+++ b/src/jalview/gui/AppVarna.java
@@ -39,6 +39,8 @@ public class AppVarna extends JInternalFrame // implements Runnable,SequenceStru
   AppVarnaBinding vab;
 
   JPanel varnaPanel;
+  
+  String name;
 
   //JSplitPane splitPane;
 
@@ -53,24 +55,30 @@ public class AppVarna extends JInternalFrame // implements Runnable,SequenceStru
          initVarna();
   }
   
-  public AppVarna(String seq){
-         vab = new AppVarnaBinding(seq);
+  public AppVarna(String seq,String struc,String name){
+         vab = new AppVarnaBinding(seq,struc);
+         name=this.name;
          initVarna();    
   }
   
   public void initVarna(){
+         //TODO: Why is it not possible to include varnaPanel in the AppVarna-Jframe?
          //vab.setFinishedInit(false);
-         varnaPanel=vab.vp;
-         this.getContentPane().add(varnaPanel);
-         jalview.gui.Desktop.addInternalFrame(this,"test",200,200);
+         varnaPanel=vab.get_varnaPanel();
+         //varnaPanel.setVisible(true);
+         //getContentPane().setLayout(new BorderLayout());
+         //getContentPane().add(varnaPanel, BorderLayout.CENTER);
+         //setVisible(true);
+         //jalview.gui.Desktop.addInternalFrame(this,name,getBounds().width, getBounds().height);  
          showPanel(true);
   }
   
   public void showPanel(boolean show){
-         //vab.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-         //vab.pack();
-         //vab.setVisible(show);
-         varnaPanel.setVisible(show);
+         vab.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+         vab.pack();
+         vab.setVisible(show);
+           
+         //varnaPanel.setVisible(show);
   }
   
   private boolean _started = false;