X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPymolViewer.java;h=d7b423609d9fbe06720e89db95900e2c6171638c;hb=de40019833b21437690417bd67444d3da55a6d6c;hp=98582b21a38e98436981915f0a0d4bc57764f329;hpb=d85a2741994c169e1b81db8f9166f5214ff1f561;p=jalview.git

diff --git a/src/jalview/gui/PymolViewer.java b/src/jalview/gui/PymolViewer.java
index 98582b2..d7b4236 100644
--- a/src/jalview/gui/PymolViewer.java
+++ b/src/jalview/gui/PymolViewer.java
@@ -1,10 +1,14 @@
 package jalview.gui;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import javax.swing.JInternalFrame;
+import javax.swing.JMenuItem;
 import javax.swing.event.InternalFrameAdapter;
 import javax.swing.event.InternalFrameEvent;
 
@@ -13,6 +17,8 @@ import jalview.api.FeatureRenderer;
 import jalview.bin.Cache;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
+import jalview.datamodel.StructureViewerModel;
+import jalview.datamodel.StructureViewerModel.StructureData;
 import jalview.gui.StructureViewer.ViewerType;
 import jalview.io.DataSourceType;
 import jalview.io.StructureFile;
@@ -68,22 +74,36 @@ public class PymolViewer extends StructureViewerBase
    * @param colourBySequence
    * @param newViewId
    */
-  public PymolViewer(String sessionFile, AlignmentPanel alignPanel,
-          PDBEntry[] pdbArray, SequenceI[][] seqsArray,
-          boolean colourByPymol, boolean colourBySequence, String newViewId)
+  public PymolViewer(StructureViewerModel viewerModel,
+          AlignmentPanel alignPanel, String sessionFile, String vid)
   {
     // TODO convert to base/factory class method
     this();
-    setViewId(newViewId);
+    setViewId(vid);
     this.pymolSessionFile = sessionFile;
+    Map<File, StructureData> pdbData = viewerModel.getFileData();
+    PDBEntry[] pdbArray = new PDBEntry[pdbData.size()];
+    SequenceI[][] seqsArray = new SequenceI[pdbData.size()][];
+    int i = 0;
+    for (StructureData data : pdbData.values())
+    {
+      PDBEntry pdbentry = new PDBEntry(data.getPdbId(), null,
+              PDBEntry.Type.PDB, data.getFilePath());
+      pdbArray[i] = pdbentry;
+      List<SequenceI> sequencesForPdb = data.getSeqList();
+      seqsArray[i] = sequencesForPdb
+              .toArray(new SequenceI[sequencesForPdb.size()]);
+      i++;
+    }
+
     openNewPymol(alignPanel, pdbArray, seqsArray);
-    if (colourByPymol)
+    if (viewerModel.isColourByViewer())
     {
       binding.setColourBySequence(false);
       seqColour.setSelected(false);
       viewerColour.setSelected(true);
     }
-    else if (colourBySequence)
+    else if (viewerModel.isColourWithAlignPanel())
     {
       binding.setColourBySequence(true);
       seqColour.setSelected(true);
@@ -303,7 +323,8 @@ public class PymolViewer extends StructureViewerBase
       boolean opened = binding.openSession(pymolSessionFile);
       if (!opened)
       {
-        System.err.println("An error occurred opening PyMOL session file "
+        Cache.log.error(
+                "An error occurred opening PyMOL session file "
                 + pymolSessionFile);
       }
     }
@@ -327,5 +348,42 @@ public class PymolViewer extends StructureViewerBase
   {
     return "PyMOL";
   }
+  JMenuItem writeFeatures = null;
+  @Override
+  protected void initMenus()
+  {
+    super.initMenus();
+
+    savemenu.setVisible(false); // not yet implemented
+    viewMenu.add(fitToWindow);
+
+    writeFeatures = new JMenuItem(
+            MessageManager.getString("label.create_viewer_attributes"));
+    writeFeatures.setToolTipText(MessageManager
+            .getString("label.create_viewer_attributes_tip"));
+    writeFeatures.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        sendFeaturesToPymol();
+      }
+    });
+    viewerActionMenu.add(writeFeatures);
+  }
+  
+  @Override
+  protected void buildActionMenu()
+  {
+    super.buildActionMenu();
+    viewerActionMenu.add(writeFeatures);
+  }
+
+  protected void sendFeaturesToPymol()
+  {
+    int count = binding.sendFeaturesToViewer(getAlignmentPanel());
+    statusBar.setText(
+            MessageManager.formatMessage("label.attributes_set", count, getViewerName())); 
+  }
 
 }