X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTreePanel.java;h=35998eb440506407485b5a82bb243bcf1ed361c9;hb=4a9a2fc8a1b1a66b21e66429083f27a6fc8541b9;hp=3bb910807ca54f4ac22f8ff6d43574f0a1b6c3cc;hpb=7b3241c464d774516c4295a5023f4aef7939298e;p=jalview.git diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java index 3bb9108..35998eb 100755 --- a/src/jalview/gui/TreePanel.java +++ b/src/jalview/gui/TreePanel.java @@ -1,613 +1,853 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors + * + * This file is part of Jalview. + * + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * + * + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; -import jalview.analysis.*; +import jalview.analysis.AlignmentSorter; +import jalview.analysis.AverageDistanceTree; +import jalview.analysis.NJTree; +import jalview.analysis.TreeBuilder; +import jalview.analysis.TreeModel; +import jalview.analysis.scoremodels.ScoreModels; +import jalview.api.analysis.ScoreModelI; +import jalview.api.analysis.SimilarityParamsI; +import jalview.bin.Cache; +import jalview.commands.CommandI; +import jalview.commands.OrderCommand; +import jalview.datamodel.Alignment; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.AlignmentView; +import jalview.datamodel.BinaryNode; +import jalview.datamodel.DBRefEntry; +import jalview.datamodel.HiddenColumns; +import jalview.datamodel.NodeTransformI; +import jalview.datamodel.SequenceFeature; +import jalview.datamodel.SequenceI; +import jalview.datamodel.SequenceNode; +import jalview.io.JalviewFileChooser; +import jalview.io.JalviewFileView; +import jalview.io.NewickFile; +import jalview.jbgui.GTreePanel; +import jalview.util.ImageMaker; +import jalview.util.MessageManager; +import jalview.viewmodel.AlignmentViewport; + +import java.awt.Font; +import java.awt.Graphics; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.image.BufferedImage; +import java.beans.PropertyChangeEvent; +import java.io.FileOutputStream; +import java.util.ArrayList; +import java.util.List; -import jalview.datamodel.*; +import javax.imageio.ImageIO; +import javax.swing.ButtonGroup; +import javax.swing.JMenuItem; +import javax.swing.JRadioButtonMenuItem; -import jalview.io.*; +import org.jibble.epsgraphics.EpsGraphics2D; -import jalview.jbgui.*; +/** + * DOCUMENT ME! + * + * @author $author$ + * @version $Revision$ + */ +public class TreePanel extends GTreePanel +{ + String treeType; -import org.jibble.epsgraphics.*; + String scoreModelName; // if tree computed -import java.awt.*; -import java.awt.event.*; -import java.awt.image.*; + String treeTitle; // if tree loaded -import java.io.*; + SimilarityParamsI similarityParams; -import java.util.*; + TreeCanvas treeCanvas; -import javax.swing.*; -import javax.imageio.*; + TreeModel tree; -import java.beans.PropertyChangeEvent; + AlignViewport av; + /** + * Creates a new TreePanel object. + * + * @param ap + * @param type + * @param modelName + * @param options + */ + public TreePanel(AlignmentPanel ap, String type, String modelName, + SimilarityParamsI options) + { + super(); + this.similarityParams = options; + initTreePanel(ap, type, modelName, null, null); -/** - * DOCUMENT ME! - * - * @author $author$ - * @version $Revision$ - */ -public class TreePanel extends GTreePanel -{ - String type; - String pwtype; - TreeCanvas treeCanvas; - NJTree tree; - AlignViewport av; - - /** - * Creates a new TreePanel object. - * - * @param av DOCUMENT ME! - * @param seqVector DOCUMENT ME! - * @param type DOCUMENT ME! - * @param pwtype DOCUMENT ME! - * @param s DOCUMENT ME! - * @param e DOCUMENT ME! - */ - public TreePanel(AlignmentPanel ap, String type, String pwtype) - { - super(); - initTreePanel(ap, type, pwtype, null, null); + // We know this tree has distances. JBPNote TODO: prolly should add this as + // a userdefined default + // showDistances(true); + } - // We know this tree has distances. JBPNote TODO: prolly should add this as a userdefined default - // showDistances(true); - } + public TreePanel(AlignmentPanel alignPanel, NewickFile newtree, + String theTitle, AlignmentView inputData) + { + super(); + this.treeTitle = theTitle; + initTreePanel(alignPanel, null, null, newtree, inputData); + } - /** - * Creates a new TreePanel object. - * - * @param av DOCUMENT ME! - * @param seqVector DOCUMENT ME! - * @param newtree DOCUMENT ME! - * @param type DOCUMENT ME! - * @param pwtype DOCUMENT ME! - */ - public TreePanel(AlignmentPanel ap, - String type, - String pwtype, - NewickFile newtree) - { - super(); - initTreePanel(ap, type, pwtype, newtree, null); - } + public AlignmentI getAlignment() + { + return treeCanvas.av.getAlignment(); + } - public TreePanel(AlignmentPanel av, - String type, - String pwtype, - NewickFile newtree, AlignmentView inputData) { - super(); - initTreePanel(av,type,pwtype,newtree,inputData); - } + public AlignmentViewport getViewPort() + { + return treeCanvas.av; + } - public AlignmentI getAlignment() - { - return treeCanvas.av.getAlignment(); - } - public AlignViewport getViewPort() { - return treeCanvas.av; - } + void initTreePanel(AlignmentPanel ap, String type, String modelName, + NewickFile newTree, AlignmentView inputData) + { - void initTreePanel(AlignmentPanel ap, String type, String pwtype, - NewickFile newTree, AlignmentView inputData) - { + av = ap.av; + this.treeType = type; + this.scoreModelName = modelName; - av = ap.av; - this.type = type; - this.pwtype = pwtype; + treeCanvas = new TreeCanvas(this, ap, scrollPane); + scrollPane.setViewportView(treeCanvas); - buildAssociatedViewMenu(); + PaintRefresher.Register(this, ap.av.getSequenceSetId()); - treeCanvas = new TreeCanvas(ap, scrollPane); - scrollPane.setViewportView(treeCanvas); + buildAssociatedViewMenu(); - av.addPropertyChangeListener(new java.beans.PropertyChangeListener() + av.addPropertyChangeListener(new java.beans.PropertyChangeListener() + { + @Override + public void propertyChange(PropertyChangeEvent evt) { - public void propertyChange(PropertyChangeEvent evt) + if (evt.getPropertyName().equals("alignment")) { - if (evt.getPropertyName().equals("alignment")) + if (tree == null) { - if(tree==null) - System.out.println("tree is null"); - if(evt.getNewValue()==null) - System.out.println("new alignment sequences vector value is null"); - - tree.UpdatePlaceHolders( (Vector) evt.getNewValue()); - treeCanvas.nameHash.clear(); // reset the mapping between canvas rectangles and leafnodes - repaint(); + System.out.println("tree is null"); + // TODO: deal with case when a change event is received whilst a + // tree is still being calculated - should save reference for + // processing message later. + return; + } + if (evt.getNewValue() == null) + { + System.out + .println("new alignment sequences vector value is null"); } - } - }); - TreeLoader tl = new TreeLoader(newTree); - if (inputData!=null) { - tl.odata=inputData; + tree.updatePlaceHolders((List) evt.getNewValue()); + treeCanvas.nameHash.clear(); // reset the mapping between canvas + // rectangles and leafnodes + repaint(); + } } - tl.start(); + }); - } + TreeLoader tl = new TreeLoader(newTree, inputData); + tl.start(); + + } - void buildAssociatedViewMenu() + @Override + public void viewMenu_menuSelected() + { + buildAssociatedViewMenu(); + } + + void buildAssociatedViewMenu() + { + AlignmentPanel[] aps = PaintRefresher.getAssociatedPanels(av + .getSequenceSetId()); + if (aps.length == 1 && treeCanvas.ap == aps[0]) { - AlignmentPanel [] aps = PaintRefresher.getAssociatedPanels(av.getSequenceSetId()); - if(aps.length<2) - { - associateLeavesMenu.setVisible(false); - return; - } - associateLeavesMenu.addSeparator(); + associateLeavesMenu.setVisible(false); + return; + } - JRadioButtonMenuItem item; - ButtonGroup buttonGroup = new ButtonGroup(); - int i, iSize = aps.length; - for(i=0; i