X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fstructure%2FStructureCommandsBase.java;h=0b5874ac58b03797eab3a294926c7ec5165bf705;hb=1affe472184986c9957f6af61a746d8c275c8580;hp=8c6ea4e69312966904cca953148c89f82930d0ef;hpb=42f4227ed213d422a87d3b22fc9e85d14ffaf53f;p=jalview.git

diff --git a/src/jalview/structure/StructureCommandsBase.java b/src/jalview/structure/StructureCommandsBase.java
index 8c6ea4e..0b5874a 100644
--- a/src/jalview/structure/StructureCommandsBase.java
+++ b/src/jalview/structure/StructureCommandsBase.java
@@ -1,8 +1,25 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.structure;
 
-import jalview.api.AlignmentViewPanel;
-import jalview.datamodel.SequenceI;
-
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
@@ -18,6 +35,8 @@ import java.util.Map.Entry;
  */
 public abstract class StructureCommandsBase implements StructureCommandsI
 {
+  public static final String NAMESPACE_PREFIX = "jv_";
+
   private static final String CMD_SEPARATOR = ";";
 
   /**
@@ -25,20 +44,11 @@ public abstract class StructureCommandsBase implements StructureCommandsI
    * 
    * @return
    */
-  protected static String getCommandSeparator()
+  protected String getCommandSeparator()
   {
     return CMD_SEPARATOR;
   }
 
-  @Override
-  public List<StructureCommandI> setAttributesForFeatures(
-          StructureSelectionManager ssm,
-          String[] files, SequenceI[][] sequence, AlignmentViewPanel avp)
-  {
-    // default does nothing, override where this is implemented
-    return null;
-  }
-
   /**
    * Returns the lowest model number used by the structure viewer
    * 
@@ -51,8 +61,9 @@ public abstract class StructureCommandsBase implements StructureCommandsI
   }
 
   /**
-   * Helper method to add one contiguous range to the AtomSpec model for the given
-   * value (creating the model if necessary). As used by Jalview, {@code value} is
+   * Helper method to add one contiguous range to the AtomSpec model for the
+   * given value (creating the model if necessary). As used by Jalview,
+   * {@code value} is
    * <ul>
    * <li>a colour, when building a 'colour structure by sequence' command</li>
    * <li>a feature value, when building a 'set Chimera attributes from features'
@@ -79,14 +90,39 @@ public abstract class StructureCommandsBase implements StructureCommandsI
       atomSpec = new AtomSpecModel();
       map.put(value, atomSpec);
     }
-  
+
     atomSpec.addRange(model, startPos, endPos, chain);
   }
 
   /**
+   * Makes a structure viewer attribute name for a Jalview feature type by
+   * prefixing it with "jv_", and replacing any non-alphanumeric characters with
+   * an underscore
+   * 
+   * @param featureType
+   * @return
+   */
+  protected String makeAttributeName(String featureType)
+  {
+    StringBuilder sb = new StringBuilder();
+    if (featureType != null)
+    {
+      for (char c : featureType.toCharArray())
+      {
+        sb.append(Character.isLetterOrDigit(c) ? c : '_');
+      }
+    }
+    String attName = NAMESPACE_PREFIX + sb.toString();
+    return attName;
+  }
+
+  /**
    * Traverse the map of colours/models/chains/positions to construct a list of
    * 'color' commands (one per distinct colour used). The format of each command
    * is specific to the structure viewer.
+   * <p>
+   * The default implementation returns a single command containing one command
+   * per colour, concatenated.
    * 
    * @param colourMap
    * @return
@@ -95,18 +131,23 @@ public abstract class StructureCommandsBase implements StructureCommandsI
   public List<StructureCommandI> colourBySequence(
           Map<Object, AtomSpecModel> colourMap)
   {
-    /*
-     * default implementation creates one command per colour;
-     * override to concatenate colour commands if wanted
-     */
     List<StructureCommandI> commands = new ArrayList<>();
+    StringBuilder sb = new StringBuilder(colourMap.size() * 20);
+    boolean first = true;
     for (Object key : colourMap.keySet())
     {
       Color colour = (Color) key;
       final AtomSpecModel colourData = colourMap.get(colour);
-      commands.add(getColourCommand(colourData, colour));
+      StructureCommandI command = getColourCommand(colourData, colour);
+      if (!first)
+      {
+        sb.append(getCommandSeparator());
+      }
+      first = false;
+      sb.append(command.getCommand());
     }
 
+    commands.add(new StructureCommand(sb.toString()));
     return commands;
   }
 
@@ -121,8 +162,8 @@ public abstract class StructureCommandsBase implements StructureCommandsI
   protected StructureCommandI getColourCommand(AtomSpecModel atomSpecModel,
           Color colour)
   {
-    String atomSpec = getAtomSpec(atomSpecModel, false);
-    return getColourCommand(atomSpec, colour);
+    String atomSpec = getAtomSpec(atomSpecModel, AtomSpecType.RESIDUE_ONLY);
+    return colourResidues(atomSpec, colour);
   }
 
   /**
@@ -133,7 +174,7 @@ public abstract class StructureCommandsBase implements StructureCommandsI
    * @param colour
    * @return
    */
-  protected abstract StructureCommandI getColourCommand(String atomSpec,
+  protected abstract StructureCommandI colourResidues(String atomSpec,
           Color colour);
 
   @Override
@@ -151,7 +192,7 @@ public abstract class StructureCommandsBase implements StructureCommandsI
   private StructureCommandI colourResidue(String resName, Color col)
   {
     String atomSpec = getResidueSpec(resName);
-    return getColourCommand(atomSpec, col);
+    return colourResidues(atomSpec, col);
   }
 
   /**
@@ -196,4 +237,42 @@ public abstract class StructureCommandsBase implements StructureCommandsI
    * @return
    */
   protected abstract String getResidueSpec(String residue);
+
+  @Override
+  public List<StructureCommandI> setAttributes(
+          Map<String, Map<Object, AtomSpecModel>> featureValues)
+  {
+    // default does nothing, override where this is implemented
+    return null;
+  }
+
+  @Override
+  public List<StructureCommandI> startNotifications(String uri)
+  {
+    return null;
+  }
+
+  @Override
+  public List<StructureCommandI> stopNotifications()
+  {
+    return null;
+  }
+
+  @Override
+  public StructureCommandI getSelectedResidues()
+  {
+    return null;
+  }
+
+  @Override
+  public StructureCommandI listResidueAttributes()
+  {
+    return null;
+  }
+
+  @Override
+  public StructureCommandI getResidueAttributes(String attName)
+  {
+    return null;
+  }
 }