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()
{
@Override
public void keyPressed(KeyEvent e)
{
switch (e.getKeyCode())
- {
+ {
case 27: // escape
treeCanvas.clearSelectedLeaves();
e.consume();
break;
-
+
}
-
+
}
});
PaintRefresher.Register(this, ap.av.getSequenceSetId());
{
if (tree == null)
{
- System.out.println("tree is null");
+ jalview.bin.Console.outPrintln("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.
}
if (evt.getNewValue() == null)
{
- System.out.println(
+ jalview.bin.Console.outPrintln(
"new alignment sequences vector value is null");
}
? 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);
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);
+ try
+ {
+ exporter.doExport(null, this, width, height,
+ tree.toLowerCase(Locale.ROOT));
+ } catch (ImageOutputException ioex)
+ {
+ Console.error(
+ "Unexpected error whilst writing " + imageFormat.toString(),
+ ioex);
}
}
pg.close();
} catch (Exception ex)
{
- System.err.println("Error writing tree as EPS");
+ jalview.bin.Console.errPrintln("Error writing tree as EPS");
ex.printStackTrace();
}
}