X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FTreeBuilder.java;h=c4a94eb87763acc47f216fc860f8f82a1fcd99cf;hb=98b3b695032b6af0c35443044b6d3d00390b3c22;hp=36a8cafbe9379181f9879cf9e9cb00f4082285fc;hpb=36a2657b35e7ffb32352485538d1ddd725c409fa;p=jalview.git diff --git a/src/jalview/analysis/TreeBuilder.java b/src/jalview/analysis/TreeBuilder.java index 36a8caf..c4a94eb 100644 --- a/src/jalview/analysis/TreeBuilder.java +++ b/src/jalview/analysis/TreeBuilder.java @@ -73,6 +73,12 @@ public abstract class TreeBuilder Vector node; + protected ScoreModelI scoreModel; + + protected SimilarityParamsI scoreParams; + + private AlignmentViewport avport; + private AlignmentView seqStrings; // redundant? (see seqData) /** @@ -86,6 +92,7 @@ public abstract class TreeBuilder SimilarityParamsI scoreParameters) { int start, end; + avport = av; boolean selview = av.getSelectionGroup() != null && av.getSelectionGroup().getSize() > 1; seqStrings = av.getAlignmentView(selview); @@ -295,7 +302,11 @@ public abstract class TreeBuilder */ protected void computeTree(ScoreModelI sm, SimilarityParamsI scoreOptions) { - distances = sm.findDistances(seqData, scoreOptions); + + this.scoreModel = sm; + this.scoreParams = scoreOptions; + + distances = scoreModel.findDistances(seqData, scoreParams); makeLeaves(); @@ -484,9 +495,19 @@ public abstract class TreeBuilder return distances; } - public AlignmentView getSeqData() + public ScoreModelI getScoreModel() + { + return scoreModel; + } + + public SimilarityParamsI getScoreParams() + { + return scoreParams; + } + + public AlignmentViewport getAvport() { - return seqData; + return avport; } }