From bc19dc163b76392ff7f786d1d7e00b53b98e5288 Mon Sep 17 00:00:00 2001 From: kjvdheide Date: Mon, 29 Jan 2018 17:51:12 +0000 Subject: [PATCH] JAL-2800 added tree calc frame to AlignmentPanel --- src/jalview/gui/AlignmentPanel.java | 12 ++++++++++++ src/jalview/gui/TreeCalculationFrame.java | 10 ++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java index 3a1dbe8..547825f 100644 --- a/src/jalview/gui/AlignmentPanel.java +++ b/src/jalview/gui/AlignmentPanel.java @@ -108,6 +108,8 @@ public class AlignmentPanel extends GAlignmentPanel implements private PropertyChangeListener propertyChangeListener; private CalculationChooser calculationDialog; + + private TreeCalculationFrame treeCalcDialog; /** * Creates a new AlignmentPanel object. @@ -1929,4 +1931,14 @@ public class AlignmentPanel extends GAlignmentPanel implements { return calculationDialog; } + + public TreeCalculationFrame getTreeCalcPanel() + { + return treeCalcDialog; + } + + public void setTreeCalcPanel(TreeCalculationFrame treeCalcFrame) + { + this.treeCalcDialog = treeCalcFrame; + } } diff --git a/src/jalview/gui/TreeCalculationFrame.java b/src/jalview/gui/TreeCalculationFrame.java index b4459e1..3a3208c 100644 --- a/src/jalview/gui/TreeCalculationFrame.java +++ b/src/jalview/gui/TreeCalculationFrame.java @@ -12,6 +12,7 @@ public class TreeCalculationFrame extends JInternalFrame { treeCalcPanel = new TreeCalculationPanel(alignFrame); init(); + alignFrame.alignPanel.setTreeCalcPanel(this); } @@ -25,5 +26,14 @@ public class TreeCalculationFrame extends JInternalFrame } + public TreeCalculationPanel getTreeCalcPanel() + { + return treeCalcPanel; + } + + public void setTreeCalcPanel(TreeCalculationPanel treeCalcPanel) + { + this.treeCalcPanel = treeCalcPanel; + } } -- 1.7.10.2