X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fjmol%2FJmolCommands.java;fp=src%2Fjalview%2Fext%2Fjmol%2FJmolCommands.java;h=c98116536efe9808507fe0c00fc8300d058f09ce;hb=e34c8452beda2cf80c2a3224f236d3096db69ae9;hp=8fb0de6685e6f0078b854d2ab87604d11a42e873;hpb=e1a435a213f105bac3ea0258c6fe26f11df2a392;p=jalview.git diff --git a/src/jalview/ext/jmol/JmolCommands.java b/src/jalview/ext/jmol/JmolCommands.java index 8fb0de6..c981165 100644 --- a/src/jalview/ext/jmol/JmolCommands.java +++ b/src/jalview/ext/jmol/JmolCommands.java @@ -31,6 +31,7 @@ import jalview.renderer.seqfeatures.FeatureColourFinder; import jalview.structure.StructureMapping; import jalview.structure.StructureMappingcommandSet; import jalview.structure.StructureSelectionManager; +import jalview.structures.models.AAStructureBindingModel; import java.awt.Color; import java.util.ArrayList; @@ -55,6 +56,15 @@ public class JmolCommands */ public static StructureMappingcommandSet[] getColourBySequenceCommand( StructureSelectionManager ssm, String[] files, + AAStructureBindingModel binding, AlignmentViewPanel viewPanel) + { + SequenceRenderer sr = binding.getSequenceRenderer(viewPanel); + SequenceI[][] sequence = binding.getSequence(); + return getColourBySequenceCommand(ssm, files, sequence, sr, viewPanel); + } + + public static StructureMappingcommandSet[] getColourBySequenceCommand( + StructureSelectionManager ssm, String[] files, SequenceI[][] sequence, SequenceRenderer sr, AlignmentViewPanel viewPanel) { @@ -63,14 +73,14 @@ public class JmolCommands AlignViewportI viewport = viewPanel.getAlignViewport(); HiddenColumns cs = viewport.getAlignment().getHiddenColumns(); AlignmentI al = viewport.getAlignment(); - List cset = new ArrayList(); + List cset = new ArrayList<>(); for (int pdbfnum = 0; pdbfnum < files.length; pdbfnum++) { StructureMapping[] mapping = ssm.getMapping(files[pdbfnum]); StringBuffer command = new StringBuffer(); StructureMappingcommandSet smc; - ArrayList str = new ArrayList(); + ArrayList str = new ArrayList<>(); if (mapping == null || mapping.length < 1) {