X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2FMainPanel.java;h=6551f1bd01ee4b3c387d4dc5f7a326eb05073aad;hb=4e20c9132065232b26afd38e8ce371b353a2686d;hp=42332d4f3b72f08b3cd54c98bba7d10794225489;hpb=ccf4c584032d16ed0ed8d0678f01305887724f96;p=jalview.git diff --git a/forester/java/src/org/forester/archaeopteryx/MainPanel.java b/forester/java/src/org/forester/archaeopteryx/MainPanel.java index 42332d4..6551f1b 100644 --- a/forester/java/src/org/forester/archaeopteryx/MainPanel.java +++ b/forester/java/src/org/forester/archaeopteryx/MainPanel.java @@ -8,7 +8,7 @@ // and Howard Hughes Medical Institute // Copyright (C) 2003-2007 Ethalinda K.S. Cannon // All rights reserved -// +// // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either @@ -18,13 +18,13 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. -// +// // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // 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 _copied_and_pasted_nodes; + private Set _copied_and_pasted_nodes; private Hashtable _image_map; + private static Map _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,10 +88,10 @@ 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() ); @@ -135,10 +138,7 @@ public class MainPanel extends JPanel implements ComponentListener { treegraphic_scroll_pane_panel.add( treegraphic_scroll_pane, BorderLayout.CENTER ); _treegraphic_scroll_pane_panels.add( treegraphic_scroll_pane_panel ); _treegraphic_scroll_panes.add( treegraphic_scroll_pane ); - getTabbedPane().addTab( name, - null, - treegraphic_scroll_pane_panel, - Util.createDescriptionForTab( phy, full_path ) ); + getTabbedPane().addTab( name, null, treegraphic_scroll_pane_panel, "" ); getTabbedPane().setSelectedIndex( getTabbedPane().getTabCount() - 1 ); getControlPanel().showWhole(); } @@ -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 getCopiedAndPastedNodes() { + public Set getCopiedAndPastedNodes() { return _copied_and_pasted_nodes; } @@ -224,7 +243,7 @@ public class MainPanel extends JPanel implements ComponentListener { JScrollPane getCurrentScrollPane() { if ( _treegraphic_scroll_panes.size() > 0 ) { - final int selected = _tabbed_pane.getSelectedIndex(); + final int selected = getTabbedPane().getSelectedIndex(); if ( selected >= 0 ) { return _treegraphic_scroll_panes.get( selected ); } @@ -238,7 +257,7 @@ public class MainPanel extends JPanel implements ComponentListener { } JPanel getCurrentScrollPanePanel() { - final int selected = _tabbed_pane.getSelectedIndex(); + final int selected = getTabbedPane().getSelectedIndex(); if ( selected >= 0 ) { return _treegraphic_scroll_pane_panels.get( selected ); } @@ -248,7 +267,7 @@ public class MainPanel extends JPanel implements ComponentListener { } int getCurrentTabIndex() { - final int selected = _tabbed_pane.getSelectedIndex(); + final int selected = getTabbedPane().getSelectedIndex(); if ( selected >= 0 ) { return selected; } @@ -257,7 +276,14 @@ public class MainPanel extends JPanel implements ComponentListener { } } - TreePanel getCurrentTreePanel() { + void setTitleOfSelectedTab( final String title ) { + final int selected = getTabbedPane().getSelectedIndex(); + if ( selected >= 0 ) { + getTabbedPane().setTitleAt( selected, title ); + } + } + + public TreePanel getCurrentTreePanel() { final int selected = getTabbedPane().getSelectedIndex(); if ( selected >= 0 ) { return _treepanels.get( selected ); @@ -295,7 +321,7 @@ public class MainPanel extends JPanel implements ComponentListener { return getCurrentScrollPane().getViewport().getExtentSize(); } - JTabbedPane getTabbedPane() { + public JTabbedPane getTabbedPane() { return _tabbed_pane; } @@ -329,6 +355,7 @@ public class MainPanel extends JPanel implements ComponentListener { _tabbed_pane.addChangeListener( new ChangeListener() { // This method is called whenever the selected tab changes + @Override public void stateChanged( final ChangeEvent evt ) { final JTabbedPane pane = ( JTabbedPane ) evt.getSource(); getControlPanel().tabChanged(); @@ -361,7 +388,7 @@ public class MainPanel extends JPanel implements ComponentListener { repaint(); } - public void setCopiedAndPastedNodes( final Set node_ids ) { + public void setCopiedAndPastedNodes( final Set node_ids ) { _copied_and_pasted_nodes = node_ids; } @@ -382,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() ); } @@ -404,4 +432,11 @@ public class MainPanel extends JPanel implements ComponentListener { synchronized Hashtable getImageMap() { return _image_map; } + + public synchronized static Map getLineageToRankMap() { + if ( _lineage_to_rank_map == null ) { + _lineage_to_rank_map = new HashMap(); + } + return _lineage_to_rank_map; + } }