X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Frbvi%2Fchimera%2FJalviewChimeraBinding.java;h=af87e445ba5138f746196c8a5268a27c1e024839;hb=9da6fa6166a6cb1ca3725bea4d58029b8605fa5b;hp=cae245731b887f2706612a9401b7e21ba2982bf7;hpb=d787bb9555e6ad57ae4e10a89f842345ff05ec77;p=jalview.git

diff --git a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
index cae2457..af87e44 100644
--- a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
+++ b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
@@ -108,7 +108,7 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel
    */
   String[] modelFileNames = null;
 
-  String lastMousedOverAtomSpec;
+  String lastHighlightCommand;
 
   private List<String> lastReply;
 
@@ -818,8 +818,8 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel
    * Construct and send a command to highlight zero, one or more atoms.
    * 
    * <pre>
-   * Done by generating a command like (to 'highlight' position 44)
-   *   show #0:44.C
+   * Done by generating a command like (to 'highlight' positions 44 and 46)
+   *   show #0:44,46.C
    * </pre>
    */
   @Override
@@ -829,8 +829,9 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel
     {
       return;
     }
-    StringBuilder atomSpecs = new StringBuilder();
+    StringBuilder cmd = new StringBuilder(128);
     boolean first = true;
+    boolean found = false;
 
     for (AtomSpec atom : atoms)
     {
@@ -840,39 +841,42 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel
       List<ChimeraModel> cms = chimeraMaps.get(pdbfile);
       if (cms != null && !cms.isEmpty())
       {
-        /*
-         * Formatting as #0:34.A,#1:33.A doesn't work as desired, so instead we
-         * concatenate multiple 'show' commands
-         */
-        atomSpecs.append(first ? "" : ",");
+        if (first)
+        {
+          cmd.append("show #").append(cms.get(0).getModelNumber())
+                  .append(":");
+        }
+        else
+        {
+          cmd.append(",");
+        }
         first = false;
-        atomSpecs.append(cms.get(0).getModelNumber());
-        atomSpecs.append(":" + pdbResNum);
+        cmd.append(cms.get(0).getModelNumber()).append(":");
+        cmd.append(pdbResNum);
         if (!chain.equals(" "))
         {
-          atomSpecs.append("." + chain);
+          cmd.append(".").append(chain);
         }
+        found = true;
       }
     }
-    String atomSpec = atomSpecs.toString();
+    String command = cmd.toString();
 
     /*
      * Avoid repeated commands for the same residue
      */
-    if (atomSpec.equals(lastMousedOverAtomSpec))
+    if (command.equals(lastHighlightCommand))
     {
       return;
     }
 
-    StringBuilder command = new StringBuilder(32);
     viewerCommandHistory(false);
-    if (atomSpec.length() > 0)
+    if (found)
     {
-      command.append("show #").append(atomSpec);
       viewer.sendChimeraCommand(command.toString(), false);
     }
     viewerCommandHistory(true);
-    this.lastMousedOverAtomSpec = atomSpec;
+    this.lastHighlightCommand = command;
   }
 
   /**
@@ -1119,4 +1123,30 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel
   {
     sendChimeraCommand("focus", false);
   }
+
+  /**
+   * Send a 'show' command for all atoms in the currently selected columns
+   * 
+   * @param vp
+   */
+  public void highlightSelection(AlignmentViewPanel vp)
+  {
+    List<Integer> cols = vp.getAlignViewport().getColumnSelection()
+            .getSelected();
+    AlignmentI alignment = vp.getAlignment();
+    StructureSelectionManager sm = getSsm();
+    for (SequenceI seq : alignment.getSequences())
+    {
+      /*
+       * convert selected columns into sequence positions
+       */
+      int[] positions = new int[cols.size()];
+      int i = 0;
+      for (Integer col : cols)
+      {
+        positions[i++] = seq.findPosition(col);
+      }
+      sm.highlightStructure(this, seq, positions);
+    }
+  }
 }