X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fstructures%2Fmodels%2FAAStructureBindingModel.java;h=7d578869b93fb697a661df4320095243ae040553;hb=799c26111d6936a2e70cb5f1fd7d7312311e6db9;hp=bb9ee8541fe758f334391c08084b025fe696703f;hpb=bdf1428136ce701e58a90f346973dbdf9d42b316;p=jalview.git diff --git a/src/jalview/structures/models/AAStructureBindingModel.java b/src/jalview/structures/models/AAStructureBindingModel.java index bb9ee85..7d57886 100644 --- a/src/jalview/structures/models/AAStructureBindingModel.java +++ b/src/jalview/structures/models/AAStructureBindingModel.java @@ -20,6 +20,7 @@ */ package jalview.structures.models; +import jalview.api.AlignViewportI; import jalview.api.AlignmentViewPanel; import jalview.api.FeatureRenderer; import jalview.api.SequenceRenderer; @@ -724,7 +725,7 @@ public abstract class AAStructureBindingModel extends protected abstract StructureMappingcommandSet[] getColourBySequenceCommands( String[] files, SequenceRenderer sr, FeatureRenderer fr, - AlignmentI alignment); + AlignViewportI alignViewportI); /** * returns the current featureRenderer that should be used to colour the @@ -760,8 +761,6 @@ public abstract class AAStructureBindingModel extends */ public void colourBySequence(AlignmentViewPanel alignmentv) { - boolean showFeatures = alignmentv.getAlignViewport() - .isShowSequenceFeatures(); if (!colourBySequence || !isLoadingFinished()) { return; @@ -775,14 +774,15 @@ public abstract class AAStructureBindingModel extends SequenceRenderer sr = getSequenceRenderer(alignmentv); FeatureRenderer fr = null; + boolean showFeatures = alignmentv.getAlignViewport() + .isShowSequenceFeatures(); if (showFeatures) { fr = getFeatureRenderer(alignmentv); } - AlignmentI alignment = alignmentv.getAlignment(); StructureMappingcommandSet[] colourBySequenceCommands = getColourBySequenceCommands( - files, sr, fr, alignment); + files, sr, fr, alignmentv.getAlignViewport()); colourBySequence(colourBySequenceCommands); }