public static MainFrame createUnboundInstance(final Phylogeny aptxTree)
{
Phylogeny[] aptxTrees = { aptxTree };
- return createBoundAptxFrame(aptxTrees, null);
+ return createAptxFrame(aptxTrees);
}
- public static MainFrame createInstance(final Phylogeny[] aptxTrees,
- AlignmentViewport jalviewAlignmentView)
- {
- return createBoundAptxFrame(aptxTrees, jalviewAlignmentView);
-
- }
-
- public static MainFrame createInstance(final Phylogeny aptxTree,
- final AlignmentViewport jalviewAlignmentView)
- {
- Phylogeny[] aptxTrees = { aptxTree }; // future possibility to load in
- // several trees simultaneously
- return createBoundAptxFrame(aptxTrees, jalviewAlignmentView);
-
- }
+ // public static MainFrame createInstance(final Phylogeny[] aptxTrees,
+ // AlignmentViewport jalviewAlignmentView)
+ // {
+ // return createAptxFrameInJalview(aptxTrees);
+ //
+ // }
+ //
+ // public static MainFrame createInstance(final Phylogeny aptxTree,
+ // final AlignmentViewport jalviewAlignmentView)
+ // {
+ // Phylogeny[] aptxTrees = { aptxTree }; // future possibility to load in
+ // // several trees simultaneously
+ // return createAptxFrameInJalview(aptxTrees);
+ //
+ // }
public static MainFrame createInstance(
final TreeBuilder calculatedTree) // very dense method, to be split up
{
- ArchaeopteryxTreeConverter aptxTreeBuilder = new ArchaeopteryxTreeConverter(
+ ExternalTreeBuilderI<Phylogeny, PhylogenyNode> aptxTreeBuilder = new ArchaeopteryxTreeBuilder(
calculatedTree);
- Phylogeny aptxTree = aptxTreeBuilder.buildAptxTree();
+ Phylogeny aptxTree = aptxTreeBuilder.buildTree();
Phylogeny[] aptxTrees = { aptxTree }; // future possibility to load in
// several trees simultaneously
- MainFrame aptxApp = createBoundAptxFrame(aptxTrees,
- calculatedTree.getAvport());
+ MainFrame aptxApp = createAptxFrame(aptxTrees);
+
bindNodesToJalviewSequences(aptxApp, calculatedTree.getAvport(),
aptxTreeBuilder.getAlignmentBoundNodes(),
aptxTreeBuilder.getNodesBoundAlignment());
- private static MainFrame createBoundAptxFrame(final Phylogeny[] aptxTrees,
- final AlignmentViewport jalviewAlignmentView)
+ public static MainFrame createAptxFrame(
+ final Phylogeny[] aptxTrees)
{
MainFrame aptxApp = Archaeopteryx.createApplication(aptxTrees,
"_aptx_jalview_configuration_file", null);
-
return aptxApp;
}
- private static void bindNodesToJalviewSequences(final MainFrame aptxApp,
+ public static JalviewTreeViewerBindingI<?> bindNodesToJalviewSequences(
+ final MainFrame aptxApp,
final AlignmentViewport jalviewAlignViewport,
final Map<SequenceI, PhylogenyNode> alignMappedToNodes,
final Map<PhylogenyNode, SequenceI> nodesMappedToAlign)
{
- new JalviewAptxBinding(aptxApp, jalviewAlignViewport,
+ return new JalviewAptxBinding(aptxApp, jalviewAlignViewport,
alignMappedToNodes, nodesMappedToAlign);
}
- private static MainFrame bindFrameToJalview(final MainFrame aptxApp)
+ public static MainFrame bindFrameToJalview(final MainFrame aptxApp)
{
int width = 400;
int height = 550;