JAL-842; Give Varna frames name for window organizer; always display

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

diff --git a/src/jalview/gui/AppVarna.java b/src/jalview/gui/AppVarna.java
index d1772c7..012d0d1 100644 (file)
--- a/src/jalview/gui/AppVarna.java
+++ b/src/jalview/gui/AppVarna.java
@@ -32,53 +32,90 @@ import jalview.gui.ViewSelectionMenu.ViewSetProvider;
 import jalview.structure.*;
 import jalview.io.*;
 import jalview.schemes.*;
+import fr.orsay.lri.varna.VARNAPanel;
+import fr.orsay.lri.varna.exceptions.ExceptionFileFormatOrSyntax;
+import fr.orsay.lri.varna.exceptions.ExceptionNonEqualLength;
+import fr.orsay.lri.varna.exceptions.ExceptionUnmatchedClosingParentheses;
+import fr.orsay.lri.varna.interfaces.InterfaceVARNAListener;
+import fr.orsay.lri.varna.models.VARNAConfig;
+import fr.orsay.lri.varna.models.rna.RNA;
 
-public class AppVarna extends JInternalFrame // implements Runnable,SequenceStructureBinding, ViewSetProvider
+
+public class AppVarna extends JInternalFrame implements InterfaceVARNAListener// implements Runnable,SequenceStructureBinding, ViewSetProvider
 
 {
   AppVarnaBinding vab;
 
-  JPanel varnaPanel;
+  VARNAPanel varnaPanel;
   
-  String name;
-
-  //JSplitPane splitPane;
-
-  //RenderPanel renderPanel;
-
-  //AlignmentPanel ap;
-
-  //Vector atomsPicked = new Vector();
+  public String name;
   
-  public AppVarna(){
+  /*public AppVarna(){
          vab = new AppVarnaBinding(); 
          initVarna();
-  }
+  }*/
   
   public AppVarna(String seq,String struc,String name){
-         vab = new AppVarnaBinding(seq,struc);
-         name=this.name;
+         ArrayList<RNA> rnaList = new ArrayList<RNA>();
+         RNA rna1 = new RNA(name);
+         try {
+                 rna1.setRNA(seq,struc);
+         } catch (ExceptionUnmatchedClosingParentheses e2) {
+               e2.printStackTrace();
+         } catch (ExceptionFileFormatOrSyntax e3) {
+               e3.printStackTrace();
+         }
+         rnaList.add(rna1);
+         rnaList.add(trimRNA(rna1));
+         
+         vab = new AppVarnaBinding(rnaList);
+         //vab = new AppVarnaBinding(seq,struc);
+         //System.out.println("Hallo: "+name);
+         this.name=name;
          initVarna();    
   }
   
   public void initVarna(){
-         //TODO: Why is it not possible to include varnaPanel in the AppVarna-Jframe?
          //vab.setFinishedInit(false);
          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);  
+         setBackground(Color.white);
+         JSplitPane split = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,true,vab.getListPanel(),varnaPanel);
+         getContentPane().setLayout(new BorderLayout());
+         getContentPane().add(split, BorderLayout.CENTER);
+         //getContentPane().add(vab.getTools(), BorderLayout.NORTH);   
+         varnaPanel.addVARNAListener(this);
+         jalview.gui.Desktop.addInternalFrame(this,"VARNA -"+name,getBounds().width, getBounds().height);
+         this.pack();
          showPanel(true);
   }
   
+  public RNA trimRNA(RNA rna){
+         RNA rnaTrim = new RNA(rna.getName()+"_trim");
+         String seq=rna.getSeq();
+         String struc=rna.getStructDBN();
+         String newSeq="";
+         String newStruc="";
+         for(int i=0;i<seq.length();i++){
+                 if(seq.substring(i, i+1).compareTo("-")!=0){
+                         newSeq=newSeq+seq.substring(i, i+1);
+                         newStruc=newStruc+struc.substring(i,i+1);
+                 }
+         }
+         try {
+               rnaTrim.setRNA(newSeq,newStruc);
+       } catch (ExceptionUnmatchedClosingParentheses e) {
+               // TODO Auto-generated catch block
+               e.printStackTrace();
+       } catch (ExceptionFileFormatOrSyntax e) {
+               // TODO Auto-generated catch block
+               e.printStackTrace();
+       }
+       //System.out.println(newSeq+"\t"+newStruc);
+       return rnaTrim;
+  }
+
   public void showPanel(boolean show){
-         vab.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-         vab.pack();
-         vab.setVisible(show);
-           
-         //varnaPanel.setVisible(show);
+         this.setVisible(show);
   }
   
   private boolean _started = false;
@@ -97,6 +134,25 @@ public class AppVarna extends JInternalFrame // implements Runnable,SequenceStru
         Cache.log.error("Couldn't open Varna viewer!", ex);
       }
   }
+
+@Override
+public void onLayoutChanged() {
+       // TODO Auto-generated method stub
+       
+}
+
+@Override
+public void onUINewStructure(VARNAConfig v, RNA r) {
+       //TODO _rnaList.add(v, r,"",true);
+       // TODO Auto-generated method stub
+       
+}
+
+@Override
+public void onWarningEmitted(String s) {
+       // TODO Auto-generated method stub
+       
+}
   
 
 }