X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTreePanel.java;fp=src%2Fjalview%2Fgui%2FTreePanel.java;h=2eff542b9add1c86290ee8711466adf507d9a7e0;hb=cfd38a33612b73a5b050c9f19d0fb0d81a7b646a;hp=47372355f851f7e5e38cb711e41a863a544785bf;hpb=de9592c0781569ccefd4c115bb36524d6c9deaab;p=jalview.git diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java index 4737235..2eff542 100755 --- a/src/jalview/gui/TreePanel.java +++ b/src/jalview/gui/TreePanel.java @@ -69,6 +69,7 @@ import jalview.gui.ImageExporter.ImageWriterI; import jalview.io.JalviewFileChooser; import jalview.io.JalviewFileView; import jalview.io.NewickFile; +import jalview.io.exceptions.ImageOutputException; import jalview.jbgui.GTreePanel; import jalview.util.ImageMaker.TYPE; import jalview.util.MessageManager; @@ -178,17 +179,18 @@ public class TreePanel extends GTreePanel this.treeType = type; this.scoreModelName = modelName; + treeCanvas = new TreeCanvas(this, ap, scrollPane); + scrollPane.setViewportView(treeCanvas); + if (columnWise) { bootstrapMenu.setVisible(false); - placeholdersMenu.setSelected(false); + placeholdersMenu.setState(false); placeholdersMenu.setVisible(false); - fitToWindow.setSelected(false); + fitToWindow.setState(false); sortAssocViews.setVisible(false); } - treeCanvas = new TreeCanvas(this, ap, scrollPane); - scrollPane.setViewportView(treeCanvas); addKeyListener(new KeyAdapter() { @@ -390,9 +392,9 @@ public class TreePanel extends GTreePanel ? new NJTree(av, sm, similarityParams) : new AverageDistanceTree(av, sm, similarityParams); tree = new TreeModel(njtree); - showDistances(true); + // don't display distances for columnwise trees } - + showDistances(!columnWise); tree.reCount(tree.getTopNode()); tree.findHeight(tree.getTopNode()); treeCanvas.setTree(tree); @@ -757,8 +759,12 @@ public class TreePanel extends GTreePanel String tree = MessageManager.getString("label.tree"); ImageExporter exporter = new ImageExporter(writer, null, imageFormat, tree); + try { exporter.doExport(null, this, width, height, tree.toLowerCase(Locale.ROOT)); + } catch (ImageOutputException ioex) { + Console.error("Unexpected error whilst writing "+imageFormat.toString(),ioex); + } } /**