X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTreePanel.java;h=bd619a3436cd94095386df9e2c00f9a945129bee;hb=32ce9ddb7ce1a68add53dd81785ae428ca136a83;hp=8d13e93c2c591dd1f453c4b9c671e5e202e6c3ad;hpb=8a5c39442bced20fc95272efe6d3176719ca3f15;p=jalview.git diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java index 8d13e93..bd619a3 100755 --- a/src/jalview/gui/TreePanel.java +++ b/src/jalview/gui/TreePanel.java @@ -26,19 +26,15 @@ import jalview.io.*; import jalview.jbgui.*; -import org.jibble.epsgraphics.*; import java.awt.*; import java.awt.event.*; -import java.awt.image.*; import java.io.*; import java.util.*; -import javax.imageio.*; - -import javax.swing.*; +import java.beans.PropertyChangeEvent; /** @@ -74,7 +70,7 @@ public class TreePanel extends GTreePanel initTreePanel(av, seqVector, type, pwtype, s, e, null); // We know this tree has distances. JBPNote TODO: prolly should add this as a userdefined default - treeCanvas.setShowDistances(true); + showDistances(true); } /** @@ -93,6 +89,11 @@ public class TreePanel extends GTreePanel initTreePanel(av, seqVector, type, pwtype, 0, seqVector.size(), newtree); } + public AlignmentI getAlignment() + { + return treeCanvas.av.getAlignment(); + } + void initTreePanel(AlignViewport av, Vector seqVector, String type, String pwtype, int s, int e, NewickFile newTree) @@ -111,6 +112,25 @@ public class TreePanel extends GTreePanel treeCanvas = new TreeCanvas(av, scrollPane); scrollPane.setViewportView(treeCanvas); + av.addPropertyChangeListener(new java.beans.PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) + { + if (evt.getPropertyName().equals("alignment")) + { + if(tree==null) + System.out.println("tree is null"); + if(evt.getNewValue()==null) + System.out.println("new value is null"); + + tree.UpdatePlaceHolders( (Vector) evt.getNewValue()); + + repaint(); + } + } + }); + + TreeLoader tl = new TreeLoader(newTree); tl.start(); @@ -123,11 +143,18 @@ public class TreePanel extends GTreePanel public TreeLoader(NewickFile newtree) { this.newtree = newtree; + if (newtree != null) + { + // Must be outside run(), as Jalview2XML tries to + // update distance/bootstrap visibility at the same time + showBootstrap(newtree.HasBootstrap()); + showDistances(newtree.HasDistances()); + showPlaceholders(true); + } } public void run() { - NJTree tree; if(newtree!=null) tree = new NJTree(seq, newtree); else @@ -136,56 +163,44 @@ public class TreePanel extends GTreePanel tree.reCount(tree.getTopNode()); tree.findHeight(tree.getTopNode()); treeCanvas.setTree(tree); - if(newtree!=null) - { - treeCanvas.setShowBootstrap(newtree.HasBootstrap()); - treeCanvas.setShowDistances(newtree.HasDistances()); - } - - setViewStateFromTreeCanvas(treeCanvas); treeCanvas.repaint(); - } + } + public void showDistances(boolean b) + { + treeCanvas.setShowDistances(b); + distanceMenu.setSelected(b); + } - /** - * DOCUMENT ME! - * - * @return DOCUMENT ME! - */ - public NJTree getTree() + public void showBootstrap(boolean b) { - return tree; + treeCanvas.setShowBootstrap(b); + bootstrapMenu.setSelected(b); } - /** - * DOCUMENT ME! - * - * @param tree DOCUMENT ME! - */ - private void setViewStateFromTreeCanvas(TreeCanvas tree) + public void showPlaceholders(boolean b) { - // update view menu state from treeCanvas render state - distanceMenu.setSelected(tree.showDistances); - bootstrapMenu.setSelected(tree.showBootstrap); - placeholdersMenu.setSelected(tree.markPlaceholders); + placeholdersMenu.setState(b); + treeCanvas.setMarkPlaceholders(b); } + + + /** * DOCUMENT ME! * - * @param tree DOCUMENT ME! + * @return DOCUMENT ME! */ - private void setTreeCanvasFromViewState(TreeCanvas tree) + public NJTree getTree() { - // update view menu state from treeCanvas render state - tree.showDistances = distanceMenu.isSelected(); - tree.showBootstrap = bootstrapMenu.isSelected(); - tree.markPlaceholders = placeholdersMenu.isSelected(); + return tree; } + /** * DOCUMENT ME! * @@ -285,33 +300,25 @@ public class TreePanel extends GTreePanel * * @param e DOCUMENT ME! */ - public void fontSize_actionPerformed(ActionEvent e) + public void font_actionPerformed(ActionEvent e) { if (treeCanvas == null) { return; } - String size = fontSize.getText().substring(fontSize.getText().indexOf("-") + - 1); - - Object selection = JOptionPane.showInternalInputDialog(Desktop.desktop, - "Select font size", "Font size", JOptionPane.QUESTION_MESSAGE, - null, - new String[] - { - "1", "2", "4", "6", "8", "10", "12", "14", "16", "18", "20" - }, "Font Size - " + size); - - if (selection != null) - { - fontSize.setText("Font Size - " + selection); + new FontChooser(this); + } - int i = Integer.parseInt(selection.toString()); - treeCanvas.setFontSize(i); - } + public Font getTreeFont() + { + return treeCanvas.font; + } - scrollPane.setViewportView(treeCanvas); + public void setTreeFont(Font font) + { + if(treeCanvas!=null) + treeCanvas.setFont(font); } /** @@ -344,6 +351,7 @@ public class TreePanel extends GTreePanel treeCanvas.setMarkPlaceholders(placeholdersMenu.isSelected()); } + /** * DOCUMENT ME! * @@ -351,42 +359,7 @@ public class TreePanel extends GTreePanel */ public void epsTree_actionPerformed(ActionEvent e) { - int width = treeCanvas.getWidth(); - int height = treeCanvas.getHeight(); - - try - { - jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(jalview.bin.Cache.getProperty( - "LAST_DIRECTORY"), new String[] { "eps" }, - new String[] { "Encapsulated Postscript" }, - "Encapsulated Postscript"); - chooser.setFileView(new jalview.io.JalviewFileView()); - chooser.setDialogTitle("Create EPS file from tree"); - chooser.setToolTipText("Save"); - - int value = chooser.showSaveDialog(this); - - if (value != jalview.io.JalviewFileChooser.APPROVE_OPTION) - { - return; - } - - jalview.bin.Cache.setProperty("LAST_DIRECTORY", - chooser.getSelectedFile().getParent()); - - FileOutputStream out = new FileOutputStream(chooser.getSelectedFile()); - EpsGraphics2D pg = new EpsGraphics2D("Tree", out, 0, 0, width, - height); - - treeCanvas.draw(pg, width, height); - - pg.flush(); - pg.close(); - } - catch (Exception ex) - { - ex.printStackTrace(); - } + makeTreeImage(jalview.util.ImageMaker.EPS); } /** @@ -396,44 +369,34 @@ public class TreePanel extends GTreePanel */ public void pngTree_actionPerformed(ActionEvent e) { - int width = treeCanvas.getWidth(); - int height = treeCanvas.getHeight(); - - try - { - jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(jalview.bin.Cache.getProperty( - "LAST_DIRECTORY"), new String[] { "png" }, - new String[] { "Portable network graphics" }, - "Portable network graphics"); - - chooser.setFileView(new jalview.io.JalviewFileView()); - chooser.setDialogTitle("Create PNG image from tree"); - chooser.setToolTipText("Save"); - - int value = chooser.showSaveDialog(this); - - if (value != jalview.io.JalviewFileChooser.APPROVE_OPTION) - { - return; - } - - jalview.bin.Cache.setProperty("LAST_DIRECTORY", - chooser.getSelectedFile().getParent()); + makeTreeImage(jalview.util.ImageMaker.PNG); + } - FileOutputStream out = new FileOutputStream(chooser.getSelectedFile()); + void makeTreeImage(int type) + { + int width = treeCanvas.getWidth(); + int height = treeCanvas.getHeight(); - BufferedImage bi = new BufferedImage(width, height, - BufferedImage.TYPE_INT_RGB); - Graphics png = bi.getGraphics(); + jalview.util.ImageMaker im; - treeCanvas.draw(png, width, height); + if(type == jalview.util.ImageMaker.PNG) + im = new jalview.util.ImageMaker(this, + jalview.util.ImageMaker.PNG, + "Make PNG image from tree", + width, height, + null, null); + else + im = new jalview.util.ImageMaker(this, + jalview.util.ImageMaker.EPS, + "Make EPS file from tree", + width, height, + null, this.getTitle()); - ImageIO.write(bi, "png", out); - out.close(); - } - catch (Exception ex) - { - ex.printStackTrace(); - } + if(im.getGraphics()!=null) + { + treeCanvas.draw(im.getGraphics(), width, height); + im.writeImage(); + } } + }