X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Frbvi%2Fchimera%2FJalviewChimeraBinding.java;h=381bbea0711847f51ec97ecf6571375eeeaa41e1;hb=6bf5604d306cbcd55289639967411ddbafcac682;hp=44bcbe40432599fdc0bfb3b3c6b059de7dd3e881;hpb=2d62933ef95beb94c1ec2444bcced4a3a7ec42c0;p=jalview.git diff --git a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java index 44bcbe4..381bbea 100644 --- a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java +++ b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java @@ -650,32 +650,32 @@ public abstract class JalviewChimeraBinding extends AAStructureBindingModel /** * Sends a set of colour commands to the structure viewer * - * @param colourBySequenceCommands + * @param commands */ @Override - protected void colourBySequence( - StructureMappingcommandSet[] colourBySequenceCommands) + protected void colourBySequence(String[] commands) { - for (StructureMappingcommandSet cpdbbyseq : colourBySequenceCommands) + for (String command : commands) { - for (String command : cpdbbyseq.commands) - { - sendAsynchronousCommand(command, COLOURING_CHIMERA); - } + sendAsynchronousCommand(command, COLOURING_CHIMERA); } } /** + * Computes and returns a set of commands to colour residues in Chimera the same + * as mapped residues in the alignment + * * @param files * @param viewPanel * @return */ @Override - protected StructureMappingcommandSet[] getColourBySequenceCommands( + protected String[] getColourBySequenceCommands( String[] files, AlignmentViewPanel viewPanel) { - return ChimeraCommands.getColourBySequenceCommand(files, viewPanel, - this); + Map colourMap = buildColoursMap(viewPanel); + + return ChimeraCommands.getColourBySequenceCommand(colourMap, this); } /**