X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2FMainPanel.java;h=6551f1bd01ee4b3c387d4dc5f7a326eb05073aad;hb=28cf1afacf61a15e72411b1e58c3694f78d6d0dd;hp=141488a87dbeb61e4d54feafa32a9e45909092f5;hpb=4e202b796a689419621ddc2c3934797c39af9026;p=jalview.git

diff --git a/forester/java/src/org/forester/archaeopteryx/MainPanel.java b/forester/java/src/org/forester/archaeopteryx/MainPanel.java
index 141488a..6551f1b 100644
--- a/forester/java/src/org/forester/archaeopteryx/MainPanel.java
+++ b/forester/java/src/org/forester/archaeopteryx/MainPanel.java
@@ -24,7 +24,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 //
 // Contact: phylosoft @ gmail . com
-// WWW: www.phylosoft.org/forester
+// WWW: https://sites.google.com/site/cmzmasek/home/software/forester
 
 package org.forester.archaeopteryx;
 
@@ -66,7 +66,7 @@ public class MainPanel extends JPanel implements ComponentListener {
     private TreeColorSet                     _colorset;
     private TreeFontSet                      _fontset;
     private Phylogeny                        _cut_or_copied_tree;
-    private Set<Integer>                     _copied_and_pasted_nodes;
+    private Set<Long>                        _copied_and_pasted_nodes;
     private Hashtable<String, BufferedImage> _image_map;
     private static Map<String, String>       _lineage_to_rank_map;
 
@@ -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 );
@@ -203,15 +222,15 @@ public class MainPanel extends JPanel implements ComponentListener {
         // Do nothing.
     }
 
-    private Configuration getConfiguration() {
+    Configuration getConfiguration() {
         return _configuration;
     }
 
-    ControlPanel getControlPanel() {
+    public ControlPanel getControlPanel() {
         return _control_panel;
     }
 
-    public Set<Integer> getCopiedAndPastedNodes() {
+    public Set<Long> getCopiedAndPastedNodes() {
         return _copied_and_pasted_nodes;
     }
 
@@ -369,7 +388,7 @@ public class MainPanel extends JPanel implements ComponentListener {
         repaint();
     }
 
-    public void setCopiedAndPastedNodes( final Set<Integer> node_ids ) {
+    public void setCopiedAndPastedNodes( final Set<Long> node_ids ) {
         _copied_and_pasted_nodes = node_ids;
     }
 
@@ -390,6 +409,7 @@ public class MainPanel extends JPanel implements ComponentListener {
 
     void setupTreeGraphic( final Configuration config_settings, final ControlPanel control ) {
         control.setSpeciesColors( config_settings.getSpeciesColors() );
+        control.setSequenceColors( config_settings.getSequenceColors() );
         control.setAnnotationColors( config_settings.getAnnotationColors() );
         RenderableDomainArchitecture.setColorMap( config_settings.getDomainColors() );
     }