Merge branch 'feature/JAL-3551Pymol' into feature/JAL-2422ChimeraX

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

diff --git a/src/jalview/gui/ChimeraXViewFrame.java b/src/jalview/gui/ChimeraXViewFrame.java
index b33ccd6..d0353f3 100644 (file)
--- a/src/jalview/gui/ChimeraXViewFrame.java
+++ b/src/jalview/gui/ChimeraXViewFrame.java
@@ -27,6 +27,26 @@ public class ChimeraXViewFrame extends ChimeraViewFrame
     super(pdbsForFile, superposeAdded, theSeqs, ap);
   }
 
+  /**
+   * Constructor given a session file to be loaded
+   * 
+   * @param chimeraSessionFile
+   * @param alignPanel
+   * @param pdbArray
+   * @param seqsArray
+   * @param colourByChimera
+   * @param colourBySequence
+   * @param newViewId
+   */
+  public ChimeraXViewFrame(String chimeraSessionFile,
+          AlignmentPanel alignPanel, PDBEntry[] pdbArray,
+          SequenceI[][] seqsArray, boolean colourByChimera,
+          boolean colourBySequence, String newViewId)
+  {
+    super(chimeraSessionFile, alignPanel, pdbArray, seqsArray,
+            colourByChimera, colourBySequence, newViewId);
+  }
+
   @Override
   public ViewerType getViewerType()
   {
@@ -47,4 +67,12 @@ public class ChimeraXViewFrame extends ChimeraViewFrame
             ap.getStructureSelectionManager(), pdbentrys, seqs, null);
   }
 
+  @Override
+  protected void initMenus()
+  {
+    super.initMenus();
+
+    viewerActionMenu.setText("ChimeraX");
+  }
+
 }