X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJalviewChimeraXBindingModel.java;h=cfd44c7f8806ccec41a71b887af8b37e17fa87c6;hb=bb9efbe53b2e92a1e3fcc78d7a6b6f5563e43e97;hp=d7b5a9478056fa822141c4269a517543b5d1727a;hpb=1dd1e3cd8272449af3fe4dfa3f69239ca4ae471b;p=jalview.git diff --git a/src/jalview/gui/JalviewChimeraXBindingModel.java b/src/jalview/gui/JalviewChimeraXBindingModel.java index d7b5a94..cfd44c7 100644 --- a/src/jalview/gui/JalviewChimeraXBindingModel.java +++ b/src/jalview/gui/JalviewChimeraXBindingModel.java @@ -10,11 +10,13 @@ import jalview.datamodel.SequenceI; import jalview.ext.rbvi.chimera.ChimeraXCommands; import jalview.gui.StructureViewer.ViewerType; import jalview.io.DataSourceType; +import jalview.structure.AtomSpec; import jalview.structure.StructureCommand; import jalview.structure.StructureSelectionManager; public class JalviewChimeraXBindingModel extends JalviewChimeraBindingModel { + public static final String CHIMERAX_SESSION_EXTENSION = ".cxs"; public JalviewChimeraXBindingModel(ChimeraViewFrame chimeraViewFrame, StructureSelectionManager ssm, PDBEntry[] pdbentry, @@ -40,7 +42,7 @@ public class JalviewChimeraXBindingModel extends JalviewChimeraBindingModel int modelNumber = chimeraMaps.size() + 1; String command = "setattr #" + modelNumber + " models name " + pe.getId(); - executeCommand(new StructureCommand(command), false); + executeCommand(new StructureCommand(command), false); modelsToMap.add(new ChimeraModel(pe.getId(), ModelType.PDB_MODEL, modelNumber, 0)); } @@ -65,7 +67,7 @@ public class JalviewChimeraXBindingModel extends JalviewChimeraBindingModel @Override public String getSessionFileExtension() { - return ".cxs"; + return CHIMERAX_SESSION_EXTENSION; } @Override @@ -86,4 +88,15 @@ public class JalviewChimeraXBindingModel extends JalviewChimeraBindingModel return String.valueOf(pdbfnum + 1); } + /** + * Returns a model of the structure positions described by the ChimeraX format atomspec + * @param atomSpec + * @return + */ + @Override + protected AtomSpec parseAtomSpec(String atomSpec) + { + return AtomSpec.fromChimeraXAtomspec(atomSpec); + } + }