X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fstructures%2Fmodels%2FAAStructureBindingModel.java;h=9f15e55c139ca5d6eca6a01ec8ced47c1f2074b8;hb=0393ac2e7941f0afaae4d4947f400291b7abd82c;hp=906cb5931577284b6bbf53831bab8375d73db3d1;hpb=1778cdd563831459f049be5864f04581c2f32187;p=jalview.git

diff --git a/src/jalview/structures/models/AAStructureBindingModel.java b/src/jalview/structures/models/AAStructureBindingModel.java
index 906cb59..9f15e55 100644
--- a/src/jalview/structures/models/AAStructureBindingModel.java
+++ b/src/jalview/structures/models/AAStructureBindingModel.java
@@ -42,6 +42,7 @@ import jalview.api.StructureSelectionManagerProvider;
 import jalview.api.structures.JalviewStructureDisplayI;
 import jalview.bin.Console;
 import jalview.datamodel.AlignmentI;
+import jalview.datamodel.ColumnSelection;
 import jalview.datamodel.HiddenColumns;
 import jalview.datamodel.MappedFeatures;
 import jalview.datamodel.PDBEntry;
@@ -779,7 +780,7 @@ public abstract class AAStructureBindingModel
 
     if (waiting)
     {
-      System.err.println(
+      jalview.bin.Console.errPrintln(
               "Timed out waiting for structure viewer to load file "
                       + notLoaded);
       return false;
@@ -870,21 +871,39 @@ public abstract class AAStructureBindingModel
     {
       AlignmentI alignment = view.getAlignment();
       HiddenColumns hiddenCols = alignment.getHiddenColumns();
-
       /*
        * 'matched' bit i will be set for visible alignment columns i where
        * all sequences have a residue with a mapping to their PDB structure
        */
-      BitSet matched = new BitSet();
       final int width = alignment.getWidth();
-      for (int m = 0; m < width; m++)
+      BitSet matched = new BitSet();
+      ColumnSelection cs = view.getAlignViewport().getColumnSelection();
+      // restrict to active column selection, if there is one
+      if (cs != null && cs.hasSelectedColumns()
+              && cs.getSelected().size() >= 4)
       {
-        if (hiddenCols == null || hiddenCols.isVisible(m))
+        for (int s : cs.getSelected())
         {
-          matched.set(m);
+          if (hiddenCols == null)
+          {
+            matched.set(s);
+          }
+          else
+          {
+            matched.set(hiddenCols.visibleToAbsoluteColumn(s));
+          }
+        }
+      }
+      else
+      {
+        for (int m = 0; m < width; m++)
+        {
+          if (hiddenCols == null || hiddenCols.isVisible(m))
+          {
+            matched.set(m);
+          }
         }
       }
-
       AAStructureBindingModel.SuperposeData[] structures = new AAStructureBindingModel.SuperposeData[files.length];
       for (int f = 0; f < files.length; f++)
       {
@@ -927,6 +946,8 @@ public abstract class AAStructureBindingModel
       AtomSpecType backbone = structures[refStructure].isRna
               ? AtomSpecType.PHOSPHATE
               : AtomSpecType.ALPHA;
+      List<AtomSpecModel> models = new ArrayList<AtomSpecModel>();
+      models.add(refAtoms);
       /*
        * superpose each (other) structure to the reference in turn
        */
@@ -947,10 +968,16 @@ public abstract class AAStructureBindingModel
               error += "; " + reply;
             }
           }
+          models.add(atomSpec);
         }
       }
+      List<StructureCommandI> finalView = commandGenerator
+              .centerViewOn(models);
+      if (finalView != null && finalView.size() > 0)
+      {
+        executeCommands(finalView, false, "Centered on Superposition");
+      }
     }
-
     return error;
   }