git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into task/JAL-4001_migrate_googleanalytics_to_GA4
[jalview.git]
/
src
/
jalview
/
gui
/
TreePanel.java
diff --git
a/src/jalview/gui/TreePanel.java
b/src/jalview/gui/TreePanel.java
index
0e1fd42
..
5ccd68d
100755
(executable)
--- a/
src/jalview/gui/TreePanel.java
+++ b/
src/jalview/gui/TreePanel.java
@@
-24,6
+24,8
@@
import java.awt.Font;
import java.awt.Graphics;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.Graphics;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
@@
-67,6
+69,7
@@
import jalview.gui.ImageExporter.ImageWriterI;
import jalview.io.JalviewFileChooser;
import jalview.io.JalviewFileView;
import jalview.io.NewickFile;
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;
import jalview.jbgui.GTreePanel;
import jalview.util.ImageMaker.TYPE;
import jalview.util.MessageManager;
@@
-188,6
+191,22
@@
public class TreePanel extends GTreePanel
treeCanvas = new TreeCanvas(this, ap, scrollPane);
scrollPane.setViewportView(treeCanvas);
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());
buildAssociatedViewMenu();
PaintRefresher.Register(this, ap.av.getSequenceSetId());
buildAssociatedViewMenu();
@@
-739,8
+758,12
@@
public class TreePanel extends GTreePanel
String tree = MessageManager.getString("label.tree");
ImageExporter exporter = new ImageExporter(writer, null, imageFormat,
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));
exporter.doExport(null, this, width, height,
tree.toLowerCase(Locale.ROOT));
+ } catch (ImageOutputException ioex) {
+ Console.error("Unexpected error whilst writing "+imageFormat.toString(),ioex);
+ }
}
/**
}
/**