X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2FMainPanel.java;h=6551f1bd01ee4b3c387d4dc5f7a326eb05073aad;hb=9673231c870387fffa4516124d802ee47bbdaf45;hp=8062491812a5ae979a7692d1581574a2e99fe681;hpb=14957af9a5402acadbd477347006e2b392491403;p=jalview.git

diff --git a/forester/java/src/org/forester/archaeopteryx/MainPanel.java b/forester/java/src/org/forester/archaeopteryx/MainPanel.java
index 8062491..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;
 
@@ -36,8 +36,10 @@ import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import javax.swing.JPanel;
@@ -64,13 +66,14 @@ 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;
 
     MainPanel() {
     }
 
-    MainPanel( final Configuration configuration, final MainFrame parent ) {
+    public MainPanel( final Configuration configuration, final MainFrame parent ) {
         if ( configuration == null ) {
             throw new IllegalArgumentException( "configuration is null" );
         }
@@ -85,23 +88,22 @@ public class MainPanel extends JPanel implements ComponentListener {
         getControlPanel().showWhole();
     }
 
-    void addPhylogenyInNewTab( final Phylogeny phy,
-                               final Configuration config,
-                               final String default_name,
-                               final String full_path ) {
+    public void addPhylogenyInNewTab( final Phylogeny phy,
+                                      final Configuration config,
+                                      final String default_name,
+                                      final String full_path ) {
         final TreePanel treepanel = new TreePanel( phy, config, this );
         getControlPanel().phylogenyAdded( config );
         treepanel.setControlPanel( getControlPanel() );
         _treepanels.add( treepanel );
         String name = "";
-        //  if ( !ForesterUtil.isEmpty( phy.getName() ) ) {
-        //      name = phy.getName();
-        //  }
-        //  else if ( phy.getIdentifier() != null ) {
-        //      name = phy.getIdentifier().toString();
-        //  }
-        /* else */
-        if ( !ForesterUtil.isEmpty( default_name ) ) {
+        if ( !ForesterUtil.isEmpty( phy.getName() ) ) {
+            name = phy.getName();
+        }
+        else if ( phy.getIdentifier() != null ) {
+            name = phy.getIdentifier().toString();
+        }
+        else if ( !ForesterUtil.isEmpty( default_name ) ) {
             name = default_name;
         }
         else {
@@ -147,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 );
@@ -201,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;
     }
 
@@ -262,7 +283,7 @@ public class MainPanel extends JPanel implements ComponentListener {
         }
     }
 
-    TreePanel getCurrentTreePanel() {
+    public TreePanel getCurrentTreePanel() {
         final int selected = getTabbedPane().getSelectedIndex();
         if ( selected >= 0 ) {
             return _treepanels.get( selected );
@@ -300,7 +321,7 @@ public class MainPanel extends JPanel implements ComponentListener {
         return getCurrentScrollPane().getViewport().getExtentSize();
     }
 
-    JTabbedPane getTabbedPane() {
+    public JTabbedPane getTabbedPane() {
         return _tabbed_pane;
     }
 
@@ -367,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;
     }
 
@@ -388,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() );
     }
@@ -410,4 +432,11 @@ public class MainPanel extends JPanel implements ComponentListener {
     synchronized Hashtable<String, BufferedImage> getImageMap() {
         return _image_map;
     }
+
+    public synchronized static Map<String, String> getLineageToRankMap() {
+        if ( _lineage_to_rank_map == null ) {
+            _lineage_to_rank_map = new HashMap<String, String>();
+        }
+        return _lineage_to_rank_map;
+    }
 }