import jalview.datamodel.AlignmentI;
import jalview.datamodel.AlignmentView;
import jalview.datamodel.BinaryNode;
-import jalview.datamodel.ColumnSelection;
import jalview.datamodel.DBRefEntry;
+import jalview.datamodel.HiddenColumns;
import jalview.datamodel.NodeTransformI;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
}
else
{
- ScoreModelI sm = configureScoreModel();
+ ScoreModelI sm = ScoreModels.getInstance().getScoreModel(
+ scoreModelName, treeCanvas.ap);
TreeBuilder njtree = treeType.equals(TreeBuilder.NEIGHBOUR_JOINING) ? new NJTree(
av, sm, similarityParams) : new AverageDistanceTree(av, sm,
similarityParams);
{
}
- Object[] alAndColsel = originalData
- .getAlignmentAndColumnSelection(gc);
+ Object[] alAndColsel = originalData.getAlignmentAndHiddenColumns(gc);
if (alAndColsel != null && alAndColsel[0] != null)
{
if (true)
{
// make a new frame!
- AlignFrame af = new AlignFrame(al,
- (ColumnSelection) alAndColsel[1], AlignFrame.DEFAULT_WIDTH,
+ AlignFrame af = new AlignFrame(al, (HiddenColumns) alAndColsel[1],
+ AlignFrame.DEFAULT_WIDTH,
AlignFrame.DEFAULT_HEIGHT);
// >>>This is a fix for the moment, until a better solution is
treecalcnm, smn);
return ttl;
}
-
- /**
- * Instantiate an instance of the score model, configured for the current view
- * if applicable
- *
- * @return
- */
- protected ScoreModelI configureScoreModel()
- {
- return ScoreModels.getInstance().getScoreModel(scoreModelName,
- treeCanvas.ap);
- }
}