JAL-3404 explicit getModelForPdbFile lookup

[jalview.git] / src / jalview / ext / rbvi / chimera / JalviewChimeraBinding.java

diff --git a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
index 2846f32..3498f23 100644 (file)
--- a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
+++ b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
@@ -1275,7 +1275,7 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel
     cmd.append("ribbon ").append(atomSpec);
     if (!isShowAlignmentOnly())
     {
-      cmd.append("chain @CA|P; ribbon");
+      cmd.append("; chain @CA|P");
     }
     if (refocus)
     {
@@ -1283,4 +1283,18 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel
     }
     sendChimeraCommand(cmd.toString(), false);
   }
+
+  @Override
+  public int getModelForPdbFile(String fileName, int fileIndex)
+  {
+    if (chimeraMaps.containsKey(fileName))
+    {
+      List<ChimeraModel> models = chimeraMaps.get(fileName);
+      if (!models.isEmpty())
+      {
+        return models.get(0).getModelNumber();
+      }
+    }
+    return -1;
+  }
 }