X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fpymol%2FPymolCommands.java;h=08521a28aab9255f373b6788de26b6279739dd81;hb=ae3fad8019274ca3ab1258a480ba15dd9adac1e9;hp=b69d3e390c4007d0141da778d972da55e187518f;hpb=966baa18c09b8fb041b874acdb8a850ad143d205;p=jalview.git
diff --git a/src/jalview/ext/pymol/PymolCommands.java b/src/jalview/ext/pymol/PymolCommands.java
index b69d3e3..08521a2 100644
--- a/src/jalview/ext/pymol/PymolCommands.java
+++ b/src/jalview/ext/pymol/PymolCommands.java
@@ -1,3 +1,23 @@
+/*
+ * 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.ext.pymol;
import java.awt.Color;
@@ -108,18 +128,20 @@ public class PymolCommands extends StructureCommandsBase
public List superposeStructures(AtomSpecModel refAtoms,
AtomSpecModel atomSpec, AtomSpecType specType)
{
-
+
// https://pymolwiki.org/index.php/Super
List commands = new ArrayList<>();
- String refAtomsAlphaOnly = "("+getAtomSpec(refAtoms, specType)+" and (altloc '' or altloc 'a'))";
- String atomSpec2AlphaOnly = "("+getAtomSpec(atomSpec, specType)+" and (altloc '' or altloc 'a'))";
+ String refAtomsAlphaOnly = "(" + getAtomSpec(refAtoms, specType)
+ + " and (altloc '' or altloc 'a'))";
+ String atomSpec2AlphaOnly = "(" + getAtomSpec(atomSpec, specType)
+ + " and (altloc '' or altloc 'a'))";
// pair_fit mobile -> reference
// crashes when undo is enabled on 2.5.2 (incentive)
commands.add(new StructureCommand("undo_disable"));
- commands.add(new StructureCommand("pair_fit",
- atomSpec2AlphaOnly, refAtomsAlphaOnly));
+ commands.add(new StructureCommand("pair_fit", atomSpec2AlphaOnly,
+ refAtomsAlphaOnly));
commands.add(new StructureCommand("undo_enable"));
-
+
/*
* and show superposed residues as cartoon
*/
@@ -341,4 +363,11 @@ public class PymolCommands extends StructureCommandsBase
return CLOSE_PYMOL;
}
+ @Override
+ public List centerViewOn(List residues)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}