From 52d04b647ce1ca1cb9652e72e42972b9c8ad748c Mon Sep 17 00:00:00 2001 From: "cmzmasek@gmail.com" Date: Thu, 6 Dec 2012 01:53:37 +0000 Subject: [PATCH] work on taxonomy extraction for applets for aLeaves MAFFT suite --- .../org/forester/archaeopteryx/Configuration.java | 2 +- .../src/org/forester/archaeopteryx/Constants.java | 4 ++-- .../src/org/forester/archaeopteryx/MainPanel.java | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/forester/java/src/org/forester/archaeopteryx/Configuration.java b/forester/java/src/org/forester/archaeopteryx/Configuration.java index 7c84054..03af1c1 100644 --- a/forester/java/src/org/forester/archaeopteryx/Configuration.java +++ b/forester/java/src/org/forester/archaeopteryx/Configuration.java @@ -164,7 +164,7 @@ public final class Configuration { final static String display_options[][] = { { "Phylogram", "display", "?" }, { "Node Name", "display", "yes" }, { "Taxonomy Code", "display", "yes" }, { "Annotation", "nodisplay", "no" }, { "Confidence Values", "display", "?" }, { "Event", "display", "?" }, - { "Taxonomy Colorize", "display", "no" }, { "Colorize Branches", "display", "no" }, + { "Taxonomy Colorize", "display", "yes" }, { "Colorize Branches", "display", "no" }, { "Use Branch-Widths", "display", "no" }, { "Show Custom Nodes", "display", "yes" }, { "Domains", "nodisplay", "no" }, { "Binary Characters", "nodisplay", "no" }, { "Binary Char Counts", "nodisplay", "no" }, { "Prot/Gene Name", "display", "yes" }, diff --git a/forester/java/src/org/forester/archaeopteryx/Constants.java b/forester/java/src/org/forester/archaeopteryx/Constants.java index bd37537..a7c9f18 100644 --- a/forester/java/src/org/forester/archaeopteryx/Constants.java +++ b/forester/java/src/org/forester/archaeopteryx/Constants.java @@ -42,8 +42,8 @@ public final class Constants { public final static boolean __SYNTH_LF = false; // TODO remove me public final static boolean ALLOW_DDBJ_BLAST = false; public final static String PRG_NAME = "Archaeopteryx"; - final static String VERSION = "0.975+"; - final static String PRG_DATE = "121204"; + final static String VERSION = "0.976"; + final static String PRG_DATE = "121205"; final static String DEFAULT_CONFIGURATION_FILE_NAME = "_aptx_configuration_file"; final static String[] DEFAULT_FONT_CHOICES = { "Verdana", "Tahoma", "Arial", "Helvetica", "Dialog", "Lucida Sans", "SansSerif", "Sans-serif", "Sans" }; diff --git a/forester/java/src/org/forester/archaeopteryx/MainPanel.java b/forester/java/src/org/forester/archaeopteryx/MainPanel.java index 59fda58..62b7d00 100644 --- a/forester/java/src/org/forester/archaeopteryx/MainPanel.java +++ b/forester/java/src/org/forester/archaeopteryx/MainPanel.java @@ -149,6 +149,25 @@ public class MainPanel extends JPanel implements ComponentListener { treepanel.setControlPanel( getControlPanel() ); _treepanels.add( treepanel ); final JScrollPane treegraphic_scroll_pane = new JScrollPane( treepanel ); + treegraphic_scroll_pane.getHorizontalScrollBar().addAdjustmentListener( new AdjustmentListener() { + + @Override + public void adjustmentValueChanged( final AdjustmentEvent e ) { + if ( treepanel.isOvOn() || getOptions().isShowScale() ) { + treepanel.repaint(); + } + } + } ); + treegraphic_scroll_pane.getVerticalScrollBar().addAdjustmentListener( new AdjustmentListener() { + + @Override + public void adjustmentValueChanged( final AdjustmentEvent e ) { + if ( treepanel.isOvOn() || getOptions().isShowScale() ) { + treepanel.repaint(); + //System.out.println( e.getValue() ); + } + } + } ); treegraphic_scroll_pane.getHorizontalScrollBar().setUnitIncrement( 20 ); treegraphic_scroll_pane.getHorizontalScrollBar().setBlockIncrement( 50 ); treegraphic_scroll_pane.getVerticalScrollBar().setUnitIncrement( 20 ); -- 1.7.10.2