X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fstructure%2FStructureCommandsBase.java;h=ec6032de9c38c6e8a1b0e71ff8b789c0065ca2ea;hb=ac2ed85d81f322445555e01b67f758a77f2ede74;hp=8c6ea4e69312966904cca953148c89f82930d0ef;hpb=42f4227ed213d422a87d3b22fc9e85d14ffaf53f;p=jalview.git
diff --git a/src/jalview/structure/StructureCommandsBase.java b/src/jalview/structure/StructureCommandsBase.java
index 8c6ea4e..ec6032d 100644
--- a/src/jalview/structure/StructureCommandsBase.java
+++ b/src/jalview/structure/StructureCommandsBase.java
@@ -1,14 +1,33 @@
+/*
+ * 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 .
+ * 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;
import java.util.Map;
import java.util.Map.Entry;
+import jalview.bin.Console;
+
/**
* A base class holding methods useful to all classes that implement commands
* for structure viewers
@@ -18,6 +37,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 +46,11 @@ public abstract class StructureCommandsBase implements StructureCommandsI
*
* @return
*/
- protected static String getCommandSeparator()
+ protected String getCommandSeparator()
{
return CMD_SEPARATOR;
}
- @Override
- public List 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 +63,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
*
*
a colour, when building a 'colour structure by sequence' command
*
a feature value, when building a 'set Chimera attributes from features'
@@ -79,14 +92,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.
+ *
+ * The default implementation returns a single command containing one command
+ * per colour, concatenated.
*
* @param colourMap
* @return
@@ -95,18 +133,23 @@ public abstract class StructureCommandsBase implements StructureCommandsI
public List colourBySequence(
Map