import org.forester.archaeopteryx.Options.NODE_LABEL_DIRECTION;
import org.forester.archaeopteryx.Options.PHYLOGENY_GRAPHICS_TYPE;
import org.forester.archaeopteryx.phylogeny.data.RenderableDomainArchitecture;
+import org.forester.archaeopteryx.phylogeny.data.RenderableMsaSequence;
import org.forester.archaeopteryx.phylogeny.data.RenderableVector;
import org.forester.archaeopteryx.tools.Blast;
import org.forester.archaeopteryx.tools.ImageLoader;
public final class TreePanel extends JPanel implements ActionListener, MouseWheelListener, Printable {
+ public final static boolean SPECIAL_DOMAIN_COLORING = true;
final static Cursor ARROW_CURSOR = Cursor.getPredefinedCursor( Cursor.DEFAULT_CURSOR );
final static Cursor CUT_CURSOR = Cursor.getPredefinedCursor( Cursor.CROSSHAIR_CURSOR );
final static Cursor HAND_CURSOR = Cursor.getPredefinedCursor( Cursor.HAND_CURSOR );
12 );
private static final float ROUNDED_D = 8;
private final static long serialVersionUID = -978349745916505029L;
+ private static final BasicStroke STROKE_0025 = new BasicStroke( 0.025f );
private static final BasicStroke STROKE_005 = new BasicStroke( 0.05f );
private static final BasicStroke STROKE_01 = new BasicStroke( 0.1f );
private static final BasicStroke STROKE_025 = new BasicStroke( 0.25f );
private static final BasicStroke STROKE_2 = new BasicStroke( 2f );
private static final double TWO_PI = 2 * Math.PI;
private final static int WIGGLE = 2;
+ private static final String SHOW_ONLY_THIS_CONF_TYPE = "posterior probability"; //TODO remove me
HashMap<Long, Short> _nodeid_dist_to_leaf = new HashMap<Long, Short>();
final private Arc2D _arc = new Arc2D.Double();
private AffineTransform _at;
private float _x_correction_factor = 0.0f;
private float _x_distance = 0.0f;
private float _y_distance = 0.0f;
+ private int _length_of_longest_text;
+ private int _longest_domain;
// private Image offscreenImage;
// private Graphics offscreenGraphics;
// private Dimension offscreenDimension;
calculateScaleDistance();
FORMATTER_CONFIDENCE.setMaximumFractionDigits( configuration.getNumberOfDigitsAfterCommaForConfidenceValues() );
FORMATTER_BRANCH_LENGTH.setMaximumFractionDigits( configuration
- .getNumberOfDigitsAfterCommaForBranchLengthValues() );
+ .getNumberOfDigitsAfterCommaForBranchLengthValues() );
}
@Override
}
/**
- * Get a pointer to the phylogeny
- *
+ * Get a pointer to the phylogeny
+ *
* @return a pointer to the phylogeny
*/
public final Phylogeny getPhylogeny() {
/**
* Set a phylogeny tree.
- *
+ *
* @param t
* an instance of a Phylogeny
*/
/**
* Set parameters for printing the displayed tree
- *
+ *
*/
- final void calcParametersForPainting( final int x, final int y, final boolean recalc_longest_ext_node_info ) {
+ final void calcParametersForPainting( final int x, final int y ) {
// updateStyle(); not needed?
if ( ( _phylogeny != null ) && !_phylogeny.isEmpty() ) {
initNodeData();
- if ( recalc_longest_ext_node_info ) {
- calculateLongestExtNodeInfo();
- if ( getOptions().isAllowFontSizeChange() ) {
- if ( ( getLongestExtNodeInfo() > ( x * 0.6 ) )
- && ( getTreeFontSet().getLargeFont().getSize() > ( 2 + TreeFontSet.FONT_SIZE_CHANGE_STEP ) ) ) {
- while ( ( getLongestExtNodeInfo() > ( x * 0.7 ) )
- && ( getTreeFontSet().getLargeFont().getSize() > 2 ) ) {
- getMainPanel().getTreeFontSet().decreaseFontSize( getConfiguration().getMinBaseFontSize(),
- true );
- calculateLongestExtNodeInfo();
- }
- }
- else {
- while ( ( getLongestExtNodeInfo() < ( x * 0.6 ) )
- && ( getTreeFontSet().getLargeFont().getSize() <= ( getTreeFontSet()
- .getLargeFontMemory().getSize() - TreeFontSet.FONT_SIZE_CHANGE_STEP ) ) ) {
- getMainPanel().getTreeFontSet().increaseFontSize();
- calculateLongestExtNodeInfo();
- }
- }
+ calculateLongestExtNodeInfo();
+ if ( ( getLongestExtNodeInfo() > ( x * 0.6 ) )
+ && ( getTreeFontSet().getLargeFont().getSize() > ( 2 + TreeFontSet.FONT_SIZE_CHANGE_STEP ) ) ) {
+ while ( ( getLongestExtNodeInfo() > ( x * 0.7 ) ) && ( getTreeFontSet().getLargeFont().getSize() > 2 ) ) {
+ getMainPanel().getTreeFontSet().decreaseFontSize( getConfiguration().getMinBaseFontSize(), true );
+ calculateLongestExtNodeInfo();
+ }
+ }
+ else {
+ while ( ( getLongestExtNodeInfo() < ( x * 0.6 ) )
+ && ( getTreeFontSet().getLargeFont().getSize() <= ( getTreeFontSet().getLargeFontMemory()
+ .getSize() - TreeFontSet.FONT_SIZE_CHANGE_STEP ) ) ) {
+ getMainPanel().getTreeFontSet().increaseFontSize();
+ calculateLongestExtNodeInfo();
}
}
+ //_length_of_longest_text = calcLengthOfLongestText();
int ext_nodes = _phylogeny.getRoot().getNumberOfExternalNodes();
final int max_depth = PhylogenyMethods.calculateMaxDepth( _phylogeny );
if ( ext_nodes == 1 ) {
_circ_max_depth = max_depth;
setUpUrtFactor();
//
- if ( getOptions().isAllowFontSizeChange() ) {
- if ( ( getPhylogenyGraphicsType() != PHYLOGENY_GRAPHICS_TYPE.UNROOTED )
- && ( getPhylogenyGraphicsType() != PHYLOGENY_GRAPHICS_TYPE.CIRCULAR ) ) {
- // int dynamic_hiding_factor = calcDynamicHidingFactor();
- // if ( dynamic_hiding_factor > 1 ) {
- // while ( dynamic_hiding_factor > 1
- // && getTreeFontSet()._fm_large.getHeight() > TreeFontSet.SMALL_FONTS_BASE ) {
- // getTreeFontSet().decreaseFontSize( 1, true );
- // dynamic_hiding_factor = calcDynamicHidingFactor();
- // }
- // }
- // else if ( getTreeFontSet().isDecreasedSizeBySystem() ) {
- // while ( dynamic_hiding_factor < 1 && getTreeFontSet()._fm_large.getHeight() < 12 ) {
- // getTreeFontSet().increaseFontSize();
- // dynamic_hiding_factor = calcDynamicHidingFactor();
- // }
- // }
- }
+ if ( ( getPhylogenyGraphicsType() != PHYLOGENY_GRAPHICS_TYPE.UNROOTED )
+ && ( getPhylogenyGraphicsType() != PHYLOGENY_GRAPHICS_TYPE.CIRCULAR ) ) {
+ // int dynamic_hiding_factor = calcDynamicHidingFactor();
+ // if ( dynamic_hiding_factor > 1 ) {
+ // while ( dynamic_hiding_factor > 1
+ // && getTreeFontSet()._fm_large.getHeight() > TreeFontSet.SMALL_FONTS_BASE ) {
+ // getTreeFontSet().decreaseFontSize( 1, true );
+ // dynamic_hiding_factor = calcDynamicHidingFactor();
+ // }
+ // }
+ // else if ( getTreeFontSet().isDecreasedSizeBySystem() ) {
+ // while ( dynamic_hiding_factor < 1 && getTreeFontSet()._fm_large.getHeight() < 12 ) {
+ // getTreeFontSet().increaseFontSize();
+ // dynamic_hiding_factor = calcDynamicHidingFactor();
+ // }
+ // }
}
//
}
return;
}
int max_length = ForesterUtil.roundToInt( ( getSize().getWidth() - MOVE )
- * Constants.EXT_NODE_INFO_LENGTH_MAX_RATIO );
+ * Constants.EXT_NODE_INFO_LENGTH_MAX_RATIO );
if ( max_length < 40 ) {
max_length = 40;
}
int longest = 30;
int longest_txt = 0;
+ _longest_domain = 0;
PhylogenyNode longest_txt_node = _phylogeny.getFirstExternalNode();
for( final PhylogenyNode node : _phylogeny.getExternalNodes() ) {
int sum = 0;
}
if ( getControlPanel().isShowBinaryCharacters() && node.getNodeData().isHasBinaryCharacters() ) {
sum += getFontMetricsForLargeDefaultFont().stringWidth( node.getNodeData().getBinaryCharacters()
- .getGainedCharactersAsStringBuffer().toString() );
+ .getGainedCharactersAsStringBuffer().toString() );
}
if ( getControlPanel().isShowVectorData() && ( node.getNodeData().getVector() != null )
&& ( node.getNodeData().getVector().size() > 0 ) ) {
}
if ( getControlPanel().isShowDomainArchitectures() && node.getNodeData().isHasSequence()
&& ( node.getNodeData().getSequence().getDomainArchitecture() != null ) ) {
- // FIXME
+ // FIXME
// TODO this might need some clean up
final DomainArchitecture d = node.getNodeData().getSequence().getDomainArchitecture();
sum += ( ( _domain_structure_width / ( ( RenderableDomainArchitecture ) d ).getOriginalSize()
.getWidth() ) * d.getTotalLength() ) + 10;
+ if ( d.getTotalLength() > _longest_domain ) {
+ _longest_domain = d.getTotalLength();
+ }
+ }
+ if ( getControlPanel().isShowMolSequences() && ( node.getNodeData().isHasSequence() )
+ && ( node.getNodeData().getSequence().isMolecularSequenceAligned() )
+ && ( !ForesterUtil.isEmpty( node.getNodeData().getSequence().getMolecularSequence() ) ) ) {
+ // FIXME
+ sum += RenderableMsaSequence.DEFAULT_WIDTH + 30;
}
if ( sum >= max_length ) {
_longest_ext_node_info = max_length;
- return;
+ // return; //FIXME why?
}
if ( sum > longest ) {
longest = sum;
else {
_longest_ext_node_info = longest;
}
+ _length_of_longest_text = calcLengthOfLongestText();
}
final void calculateScaleDistance() {
}
catch ( final NumberFormatException e ) {
JOptionPane.showMessageDialog( this, "Could not parse \"" + value_str
- + "\" into a decimal value", "Problem with Vector Data", JOptionPane.ERROR_MESSAGE );
+ + "\" into a decimal value", "Problem with Vector Data", JOptionPane.ERROR_MESSAGE );
return;
}
int i = -1;
catch ( final NumberFormatException e ) {
JOptionPane.showMessageDialog( this,
"Could not parse \"" + index_str
- + "\" into index for vector data",
+ + "\" into index for vector data",
"Problem with Vector Data",
JOptionPane.ERROR_MESSAGE );
return;
/**
* Collapse the tree from the given node
- *
+ *
* @param node
* a PhylogenyNode
*/
/**
* Find the node, if any, at the given location
- *
+ *
* @param x
* @param y
* @return pointer to the node at x,y, null if not found
}
final Color getTaxonomyBasedColor( final PhylogenyNode node ) {
- if ( node.getNodeData().isHasTaxonomy() ) {
+ if ( node.isExternal() && node.getNodeData().isHasTaxonomy() ) {
return calculateTaxonomyBasedColor( node.getNodeData().getTaxonomy() );
}
// return non-colorized color
&& ( node.getNodeData().getSequence().getDomainArchitecture() != null ) ) {
RenderableDomainArchitecture rds = null;
if ( !( node.getNodeData().getSequence().getDomainArchitecture() instanceof RenderableDomainArchitecture ) ) {
- rds = new RenderableDomainArchitecture( node.getNodeData().getSequence().getDomainArchitecture() );
+ if ( SPECIAL_DOMAIN_COLORING ) {
+ rds = new RenderableDomainArchitecture( node.getNodeData().getSequence()
+ .getDomainArchitecture(), node.getName() );
+ }
+ else {
+ rds = new RenderableDomainArchitecture( node.getNodeData().getSequence()
+ .getDomainArchitecture() );
+ }
node.getNodeData().getSequence().setDomainArchitecture( rds );
}
else {
}
}
if ( getControlPanel().isShowDomainArchitectures() ) {
- final double ds_factor_width = _domain_structure_width / _max_original_domain_structure_width;
+ final float ds_factor_width = ( float ) ( _domain_structure_width / _max_original_domain_structure_width );
for( final PhylogenyNode node : _phylogeny.getExternalNodes() ) {
if ( node.getNodeData().isHasSequence()
&& ( node.getNodeData().getSequence().getDomainArchitecture() != null ) ) {
return ( ( e.getX() > ( getVisibleRect().x + getOvXPosition() + 1 ) )
&& ( e.getX() < ( ( getVisibleRect().x + getOvXPosition() + getOvMaxWidth() ) - 1 ) )
&& ( e.getY() > ( getVisibleRect().y + getOvYPosition() + 1 ) ) && ( e.getY() < ( ( getVisibleRect().y
- + getOvYPosition() + getOvMaxHeight() ) - 1 ) ) );
+ + getOvYPosition() + getOvMaxHeight() ) - 1 ) ) );
}
final boolean inOvRectangle( final MouseEvent e ) {
return ( ( e.getX() >= ( getOvRectangle().getX() - 1 ) )
&& ( e.getX() <= ( getOvRectangle().getX() + getOvRectangle().getWidth() + 1 ) )
&& ( e.getY() >= ( getOvRectangle().getY() - 1 ) ) && ( e.getY() <= ( getOvRectangle().getY()
- + getOvRectangle().getHeight() + 1 ) ) );
+ + getOvRectangle().getHeight() + 1 ) ) );
}
final boolean isApplet() {
y = max_y;
}
getMainPanel().getCurrentScrollPane().getViewport()
- .setViewPosition( new Point( ForesterUtil.roundToInt( x ), ForesterUtil.roundToInt( y ) ) );
+ .setViewPosition( new Point( ForesterUtil.roundToInt( x ), ForesterUtil.roundToInt( y ) ) );
setInOvRect( true );
repaint();
}
if ( isInFoundNodes( c ) || isInCurrentExternalNodes( c ) ) {
g.setColor( getColorForFoundNode( c ) );
drawRectFilled( c.getXSecondary() - OVERVIEW_FOUND_NODE_BOX_SIZE_HALF, c.getYSecondary()
- - OVERVIEW_FOUND_NODE_BOX_SIZE_HALF, OVERVIEW_FOUND_NODE_BOX_SIZE, OVERVIEW_FOUND_NODE_BOX_SIZE, g );
+ - OVERVIEW_FOUND_NODE_BOX_SIZE_HALF, OVERVIEW_FOUND_NODE_BOX_SIZE, OVERVIEW_FOUND_NODE_BOX_SIZE, g );
}
}
else {
if ( !to_graphics_file ) {
g.setPaint( new GradientPaint( r.x, r.y, getTreeColorSet().getBackgroundColor(), r.x, r.y
- + r.height, getTreeColorSet().getBackgroundColorGradientBottom() ) );
+ + r.height, getTreeColorSet().getBackgroundColorGradientBottom() ) );
g.fill( r );
}
else {
}
// Position starting Y of tree
_phylogeny.getRoot().setYcoord( ( getYdistance() * _phylogeny.getRoot().getNumberOfExternalNodes() )
- + ( TreePanel.MOVE / 2.0f ) );
+ + ( TreePanel.MOVE / 2.0f ) );
final int dynamic_hiding_factor = calcDynamicHidingFactor();
if ( getControlPanel().isDynamicallyHideData() ) {
if ( dynamic_hiding_factor > 1 ) {
_nodes_in_preorder[ i++ ] = it.next();
}
}
- //final PhylogenyNodeIterator it;
- //for( it = _phylogeny.iteratorPreorder(); it.hasNext(); ) {
- // paintNodeRectangular( g, it.next(), to_pdf, getControlPanel().isDynamicallyHideData()
- // && ( dynamic_hiding_factor > 1 ), dynamic_hiding_factor, to_graphics_file );
- //}
+ final boolean disallow_shortcutting = ( dynamic_hiding_factor < 40 )
+ || getControlPanel().isUseVisualStyles() || getOptions().isShowDefaultNodeShapesForMarkedNodes()
+ || ( ( getFoundNodes0() != null ) && !getFoundNodes0().isEmpty() )
+ || ( ( getFoundNodes1() != null ) && !getFoundNodes1().isEmpty() )
+ || ( ( getCurrentExternalNodes() != null ) && !getCurrentExternalNodes().isEmpty() )
+ || to_graphics_file || to_pdf;
for( final PhylogenyNode element : _nodes_in_preorder ) {
- paintNodeRectangular( g, element, to_pdf, getControlPanel().isDynamicallyHideData()
- && ( dynamic_hiding_factor > 1 ), dynamic_hiding_factor, to_graphics_file );
+ paintNodeRectangular( g,
+ element,
+ to_pdf,
+ getControlPanel().isDynamicallyHideData() && ( dynamic_hiding_factor > 1 ),
+ dynamic_hiding_factor,
+ to_graphics_file,
+ disallow_shortcutting );
}
if ( getOptions().isShowScale() && getControlPanel().isDrawPhylogram() && ( getScaleDistance() > 0.0 ) ) {
if ( !( to_graphics_file || to_pdf ) ) {
y_pos + radius_ov,
( int ) ( radius_ov - ( getLongestExtNodeInfo() / ( getVisibleRect().width / getOvRectangle()
.getWidth() ) ) ),
- g );
+ g );
g.setTransform( _at );
paintOvRectangle( g );
}
x = TreePanel.MOVE
+ getLongestExtNodeInfo()
+ ForesterUtil
- .roundToInt( ( getXcorrectionFactor() * getPhylogeny().getHeight() ) + getXdistance() );
+ .roundToInt( ( getXcorrectionFactor() * getPhylogeny().getHeight() ) + getXdistance() );
}
else {
if ( !isNonLinedUpCladogram() && !isUniformBranchLengthsForCladogram() ) {
x = TreePanel.MOVE
+ getLongestExtNodeInfo()
+ ForesterUtil.roundToInt( getXdistance()
- * ( getPhylogeny().getRoot().getNumberOfExternalNodes() + 2 ) );
+ * ( getPhylogeny().getRoot().getNumberOfExternalNodes() + 2 ) );
}
else {
x = TreePanel.MOVE
+ getLongestExtNodeInfo()
+ ForesterUtil.roundToInt( getXdistance()
- * ( PhylogenyMethods.calculateMaxDepth( getPhylogeny() ) + 1 ) );
+ * ( PhylogenyMethods.calculateMaxDepth( getPhylogeny() ) + 1 ) );
}
}
setPreferredSize( new Dimension( x, y ) );
final void sortDescendants( final PhylogenyNode node ) {
if ( !node.isExternal() ) {
- DESCENDANT_SORT_PRIORITY pri = DESCENDANT_SORT_PRIORITY.TAXONOMY;
- if ( ( !getControlPanel().isShowTaxonomyScientificNames() && !getControlPanel().isShowTaxonomyCode() && !getControlPanel()
- .isShowTaxonomyCommonNames() ) ) {
- if ( ( getControlPanel().isShowSequenceAcc() || getControlPanel().isShowSeqNames() || getControlPanel()
- .isShowSeqSymbols() ) ) {
- pri = DESCENDANT_SORT_PRIORITY.SEQUENCE;
- }
- else if ( getControlPanel().isShowNodeNames() ) {
- pri = DESCENDANT_SORT_PRIORITY.NODE_NAME;
- }
+ DESCENDANT_SORT_PRIORITY pri = DESCENDANT_SORT_PRIORITY.NODE_NAME;
+ if ( getControlPanel().isShowTaxonomyScientificNames() || getControlPanel().isShowTaxonomyCode() ) {
+ pri = DESCENDANT_SORT_PRIORITY.TAXONOMY;
+ }
+ else if ( getControlPanel().isShowSeqNames() || getControlPanel().isShowSeqSymbols()
+ || getControlPanel().isShowGeneNames() ) {
+ pri = DESCENDANT_SORT_PRIORITY.SEQUENCE;
}
PhylogenyMethods.sortNodeDescendents( node, pri );
setNodeInPreorderToNull();
/**
* Calculate the length of the distance between the given node and its
* parent.
- *
+ *
* @param node
* @param ext_node_x
* @factor
else {
fc.setFont( getMainPanel().getTreeFontSet().getLargeFont() );
}
- fc.showDialog( this, "Select Font" );
- if ( ( fc.getFont() != null ) && !ForesterUtil.isEmpty( fc.getFont().getFamily().trim() ) ) {
- List<PhylogenyNode> nodes = new ArrayList<PhylogenyNode>();
- if ( ( getFoundNodes0() != null ) || ( getFoundNodes1() != null ) ) {
- nodes = getFoundNodesAsListOfPhylogenyNodes();
- }
+ List<PhylogenyNode> nodes = new ArrayList<PhylogenyNode>();
+ if ( ( getFoundNodes0() != null ) || ( getFoundNodes1() != null ) ) {
+ nodes = getFoundNodesAsListOfPhylogenyNodes();
+ }
+ if ( !nodes.contains( node ) ) {
nodes.add( node );
+ }
+ final int count = nodes.size();
+ String title = "Change the font for ";
+ if ( count == 1 ) {
+ title += "one node";
+ }
+ else {
+ title += ( count + " nodes" );
+ }
+ fc.showDialog( this, title );
+ if ( ( fc.getFont() != null ) && !ForesterUtil.isEmpty( fc.getFont().getFamily().trim() ) ) {
for( final PhylogenyNode n : nodes ) {
if ( n.getNodeData().getNodeVisualData() == null ) {
n.getNodeData().setNodeVisualData( new NodeVisualData() );
getControlPanel().getUseVisualStylesCb().setSelected( true );
}
}
+ setEdited( true );
repaint();
}
+ private void colorNodeFont( final PhylogenyNode node ) {
+ _color_chooser.setPreviewPanel( new JPanel() );
+ NodeColorizationActionListener al;
+ int count = 1;
+ if ( ( getFoundNodes0() != null ) || ( getFoundNodes1() != null ) ) {
+ final List<PhylogenyNode> additional_nodes = getFoundNodesAsListOfPhylogenyNodes();
+ al = new NodeColorizationActionListener( _color_chooser, node, additional_nodes );
+ count = additional_nodes.size();
+ if ( !additional_nodes.contains( node ) ) {
+ count++;
+ }
+ }
+ else {
+ al = new NodeColorizationActionListener( _color_chooser, node );
+ }
+ String title = "Change the (node and font) color for ";
+ if ( count == 1 ) {
+ title += "one node";
+ }
+ else {
+ title += ( count + " nodes" );
+ }
+ final JDialog dialog = JColorChooser.createDialog( this, title, true, _color_chooser, al, null );
+ setEdited( true );
+ dialog.setVisible( true );
+ }
+
final private void colorizeNodes( final Color c,
final PhylogenyNode node,
final List<PhylogenyNode> additional_nodes ) {
repaint();
}
- private void colorNodeFont( final PhylogenyNode node ) {
- _color_chooser.setPreviewPanel( new JPanel() );
- NodeColorizationActionListener al;
- if ( ( getFoundNodes0() != null ) || ( getFoundNodes1() != null ) ) {
- final List<PhylogenyNode> additional_nodes = getFoundNodesAsListOfPhylogenyNodes();
- al = new NodeColorizationActionListener( _color_chooser, node, additional_nodes );
- }
- else {
- al = new NodeColorizationActionListener( _color_chooser, node );
- }
- final JDialog dialog = JColorChooser.createDialog( this, "Node colorization", true, _color_chooser, al, null );
- dialog.setVisible( true );
- }
-
final private void colorSubtree( final PhylogenyNode node ) {
if ( getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.UNROOTED ) {
JOptionPane.showMessageDialog( this,
}
final JDialog dialog = JColorChooser
.createDialog( this, "Subtree colorization", true, _color_chooser, al, null );
+ setEdited( true );
dialog.setVisible( true );
}
final List<PhylogenyNode> additional_nodes = new ArrayList<PhylogenyNode>();
if ( getFoundNodes0() != null ) {
for( final Long id : getFoundNodes0() ) {
- additional_nodes.add( _phylogeny.getNode( id ) );
+ final PhylogenyNode n = _phylogeny.getNode( id );
+ if ( n != null ) {
+ additional_nodes.add( n );
+ }
}
}
if ( getFoundNodes1() != null ) {
for( final Long id : getFoundNodes1() ) {
if ( ( getFoundNodes0() == null ) || !getFoundNodes0().contains( id ) ) {
- additional_nodes.add( _phylogeny.getNode( id ) );
+ final PhylogenyNode n = _phylogeny.getNode( id );
+ if ( n != null ) {
+ additional_nodes.add( n );
+ }
}
}
}
return ( ( x >= ( getOvVirtualRectangle().x - 1 ) )
&& ( x <= ( getOvVirtualRectangle().x + getOvVirtualRectangle().width + 1 ) )
&& ( y >= ( getOvVirtualRectangle().y - 1 ) ) && ( y <= ( getOvVirtualRectangle().y
- + getOvVirtualRectangle().height + 1 ) ) );
+ + getOvVirtualRectangle().height + 1 ) ) );
}
final private boolean inOvVirtualRectangle( final MouseEvent e ) {
&& ( ( !ForesterUtil.isEmpty( node.getNodeData().getTaxonomy().getScientificName() ) )
|| ( !ForesterUtil.isEmpty( node.getNodeData().getTaxonomy().getTaxonomyCode() ) )
|| ( !ForesterUtil.isEmpty( node.getNodeData().getTaxonomy().getCommonName() ) ) || ( ( node
- .getNodeData().getTaxonomy().getIdentifier() != null ) && !ForesterUtil.isEmpty( node
- .getNodeData().getTaxonomy().getIdentifier().getValue() ) ) ) ) {
+ .getNodeData().getTaxonomy().getIdentifier() != null ) && !ForesterUtil.isEmpty( node
+ .getNodeData().getTaxonomy().getIdentifier().getValue() ) ) ) ) {
return true;
}
else {
}
return ( ( node.getYcoord() < ( getVisibleRect().getMinY() - y_dist ) )
|| ( node.getYcoord() > ( getVisibleRect().getMaxY() + y_dist ) ) || ( ( node.getParent() != null ) && ( node
- .getParent().getXcoord() > getVisibleRect().getMaxX() ) ) );
+ .getParent().getXcoord() > getVisibleRect().getMaxX() ) ) );
}
final private boolean isNodeDataInvisibleUnrootedCirc( final PhylogenyNode node ) {
return ( ( node.getYcoord() < ( getVisibleRect().getMinY() - 20 ) )
|| ( node.getYcoord() > ( getVisibleRect().getMaxY() + 20 ) )
|| ( node.getXcoord() < ( getVisibleRect().getMinX() - 20 ) ) || ( node.getXcoord() > ( getVisibleRect()
- .getMaxX() + 20 ) ) );
+ .getMaxX() + 20 ) ) );
}
final private boolean isNonLinedUpCladogram() {
}
private final void nodeDataAsSB( final PhylogenyNode node, final StringBuilder sb ) {
- if ( getControlPanel().isShowNodeNames() && ( node.getName().length() > 0 ) ) {
- if ( sb.length() > 0 ) {
- sb.append( " " );
- }
- sb.append( node.getName() );
- }
- if ( node.getNodeData().isHasSequence() ) {
- if ( getControlPanel().isShowSeqSymbols() && ( node.getNodeData().getSequence().getSymbol().length() > 0 ) ) {
+ if ( node != null ) {
+ if ( getControlPanel().isShowNodeNames() && ( !ForesterUtil.isEmpty( node.getName() ) ) ) {
if ( sb.length() > 0 ) {
sb.append( " " );
}
- sb.append( node.getNodeData().getSequence().getSymbol() );
+ sb.append( node.getName() );
}
- if ( getControlPanel().isShowGeneNames() && ( node.getNodeData().getSequence().getGeneName().length() > 0 ) ) {
- if ( sb.length() > 0 ) {
- sb.append( " " );
+ if ( node.getNodeData().isHasSequence() ) {
+ if ( getControlPanel().isShowSeqSymbols()
+ && ( node.getNodeData().getSequence().getSymbol().length() > 0 ) ) {
+ if ( sb.length() > 0 ) {
+ sb.append( " " );
+ }
+ sb.append( node.getNodeData().getSequence().getSymbol() );
}
- sb.append( node.getNodeData().getSequence().getGeneName() );
- }
- if ( getControlPanel().isShowSeqNames() && ( node.getNodeData().getSequence().getName().length() > 0 ) ) {
- if ( sb.length() > 0 ) {
- sb.append( " " );
+ if ( getControlPanel().isShowGeneNames()
+ && ( node.getNodeData().getSequence().getGeneName().length() > 0 ) ) {
+ if ( sb.length() > 0 ) {
+ sb.append( " " );
+ }
+ sb.append( node.getNodeData().getSequence().getGeneName() );
+ }
+ if ( getControlPanel().isShowSeqNames() && ( node.getNodeData().getSequence().getName().length() > 0 ) ) {
+ if ( sb.length() > 0 ) {
+ sb.append( " " );
+ }
+ sb.append( node.getNodeData().getSequence().getName() );
+ }
+ if ( getControlPanel().isShowSequenceAcc()
+ && ( node.getNodeData().getSequence().getAccession() != null ) ) {
+ if ( sb.length() > 0 ) {
+ sb.append( " " );
+ }
+ if ( !ForesterUtil.isEmpty( node.getNodeData().getSequence().getAccession().getSource() ) ) {
+ sb.append( node.getNodeData().getSequence().getAccession().getSource() );
+ sb.append( ":" );
+ }
+ sb.append( node.getNodeData().getSequence().getAccession().getValue() );
}
- sb.append( node.getNodeData().getSequence().getName() );
}
- if ( getControlPanel().isShowSequenceAcc() && ( node.getNodeData().getSequence().getAccession() != null ) ) {
+ if ( getControlPanel().isShowProperties() && node.getNodeData().isHasProperties() ) {
if ( sb.length() > 0 ) {
sb.append( " " );
}
- if ( !ForesterUtil.isEmpty( node.getNodeData().getSequence().getAccession().getSource() ) ) {
- sb.append( node.getNodeData().getSequence().getAccession().getSource() );
- sb.append( ":" );
- }
- sb.append( node.getNodeData().getSequence().getAccession().getValue() );
- }
- }
- if ( getControlPanel().isShowProperties() && node.getNodeData().isHasProperties() ) {
- if ( sb.length() > 0 ) {
- sb.append( " " );
+ sb.append( propertiesToString( node ) );
}
- sb.append( propertiesToString( node ) );
}
}
AptxUtil.launchWebBrowser( new URI( uri_str ),
isApplet(),
isApplet() ? obtainApplet() : null,
- "_aptx_seq" );
+ "_aptx_seq" );
}
catch ( final IOException e ) {
AptxUtil.showErrorMessage( this, e.toString() );
AptxUtil.launchWebBrowser( new URI( uri_str ),
isApplet(),
isApplet() ? obtainApplet() : null,
- "_aptx_seq" );
+ "_aptx_seq" );
}
catch ( final IOException e ) {
AptxUtil.showErrorMessage( this, e.toString() );
AptxUtil.launchWebBrowser( new URI( uri_str ),
isApplet(),
isApplet() ? obtainApplet() : null,
- "_aptx_tax" );
+ "_aptx_tax" );
}
catch ( final IOException e ) {
AptxUtil.showErrorMessage( this, e.toString() );
if ( !node.isRoot() ) {
if ( getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.EURO_STYLE ) {
TreePanel.drawString( FORMATTER_BRANCH_LENGTH.format( node.getDistanceToParent() ), node.getParent()
- .getXcoord() + EURO_D, node.getYcoord() - getTreeFontSet().getSmallMaxDescent(), g );
+ .getXcoord() + EURO_D, node.getYcoord() - getTreeFontSet().getSmallMaxDescent(), g );
}
else if ( getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.ROUNDED ) {
TreePanel.drawString( FORMATTER_BRANCH_LENGTH.format( node.getDistanceToParent() ), node.getParent()
- .getXcoord() + ROUNDED_D, node.getYcoord() - getTreeFontSet().getSmallMaxDescent(), g );
+ .getXcoord() + ROUNDED_D, node.getYcoord() - getTreeFontSet().getSmallMaxDescent(), g );
}
else {
TreePanel.drawString( FORMATTER_BRANCH_LENGTH.format( node.getDistanceToParent() ), node.getParent()
- .getXcoord() + 3, node.getYcoord() - getTreeFontSet().getSmallMaxDescent(), g );
+ .getXcoord() + 3, node.getYcoord() - getTreeFontSet().getSmallMaxDescent(), g );
}
}
else {
TreePanel.drawString( FORMATTER_BRANCH_LENGTH.format( node.getDistanceToParent() ), 3, node.getYcoord()
- - getTreeFontSet().getSmallMaxDescent(), g );
+ - getTreeFontSet().getSmallMaxDescent(), g );
}
}
final float dx = x2 - x1;
final float dy = y2 - y1;
_cubic_curve.setCurve( x1, y1, x1 + ( dx * 0.4f ), y1 + ( dy * 0.2f ), x1 + ( dx * 0.6f ), y1
- + ( dy * 0.8f ), x2, y2 );
+ + ( dy * 0.8f ), x2, y2 );
( g ).draw( _cubic_curve );
}
else {
/**
* Paint a branch which consists of a vertical and a horizontal bar
- * @param is_ind_found_nodes
+ * @param is_ind_found_nodes
*/
final private void paintBranchRectangular( final Graphics2D g,
final float x1,
final float dx = x2 - x1;
final float dy = y2 - y1;
_cubic_curve.setCurve( x1, y1, x1 + ( dx * 0.4f ), y1 + ( dy * 0.2f ), x1 + ( dx * 0.6f ), y1
- + ( dy * 0.8f ), x2, y2 );
+ + ( dy * 0.8f ), x2, y2 );
g.draw( _cubic_curve );
}
else {
Collections.sort( confidences );
final StringBuilder sb = new StringBuilder();
for( final Confidence confidence : confidences ) {
- final double value = confidence.getValue();
- if ( value != Confidence.CONFIDENCE_DEFAULT_VALUE ) {
- if ( value < getOptions().getMinConfidenceValue() ) {
- return;
- }
- if ( not_first ) {
- sb.append( "/" );
- }
- else {
- not_first = true;
- }
- sb.append( FORMATTER_CONFIDENCE.format( ForesterUtil.round( value, getOptions()
- .getNumberOfDigitsAfterCommaForConfidenceValues() ) ) );
- if ( getOptions().isShowConfidenceStddev() ) {
- if ( confidence.getStandardDeviation() != Confidence.CONFIDENCE_DEFAULT_VALUE ) {
- sb.append( "(" );
- sb.append( FORMATTER_CONFIDENCE.format( ForesterUtil.round( confidence.getStandardDeviation(),
- getOptions()
- .getNumberOfDigitsAfterCommaForConfidenceValues() ) ) );
- sb.append( ")" );
+ if ( ForesterUtil.isEmpty( SHOW_ONLY_THIS_CONF_TYPE )
+ || ( !ForesterUtil.isEmpty( confidence.getType() ) && confidence.getType()
+ .equalsIgnoreCase( SHOW_ONLY_THIS_CONF_TYPE ) ) ) {
+ final double value = confidence.getValue();
+ if ( value != Confidence.CONFIDENCE_DEFAULT_VALUE ) {
+ if ( value < getOptions().getMinConfidenceValue() ) {
+ return;
+ }
+ if ( not_first ) {
+ sb.append( "/" );
+ }
+ else {
+ not_first = true;
+ }
+ sb.append( FORMATTER_CONFIDENCE.format( ForesterUtil.round( value, getOptions()
+ .getNumberOfDigitsAfterCommaForConfidenceValues() ) ) );
+ if ( getOptions().isShowConfidenceStddev() ) {
+ if ( confidence.getStandardDeviation() != Confidence.CONFIDENCE_DEFAULT_VALUE ) {
+ sb.append( "(" );
+ sb.append( FORMATTER_CONFIDENCE.format( ForesterUtil.round( confidence
+ .getStandardDeviation(), getOptions()
+ .getNumberOfDigitsAfterCommaForConfidenceValues() ) ) );
+ sb.append( ")" );
+ }
}
}
}
final String conf_str = sb.toString();
TreePanel.drawString( conf_str,
parent_x
- + ( ( x - parent_x - getTreeFontSet().getFontMetricsSmall()
- .stringWidth( conf_str ) ) / 2 ),
- ( node.getYcoord() + getTreeFontSet().getSmallMaxAscent() ) - 1,
- g );
+ + ( ( x - parent_x - getTreeFontSet().getFontMetricsSmall()
+ .stringWidth( conf_str ) ) / 2 ),
+ ( node.getYcoord() + getTreeFontSet().getSmallMaxAscent() ) - 1,
+ g );
}
}
g.setColor( Color.BLUE );
}
TreePanel
- .drawString( gained,
- parent_x
- + ( ( x - parent_x - getFontMetricsForLargeDefaultFont().stringWidth( gained ) ) / 2 ),
- ( node.getYcoord() - getFontMetricsForLargeDefaultFont().getMaxDescent() ),
- g );
+ .drawString( gained,
+ parent_x
+ + ( ( x - parent_x - getFontMetricsForLargeDefaultFont().stringWidth( gained ) ) / 2 ),
+ ( node.getYcoord() - getFontMetricsForLargeDefaultFont().getMaxDescent() ),
+ g );
g.setColor( getTreeColorSet().getLostCharactersColor() );
TreePanel
- .drawString( lost,
- parent_x
- + ( ( x - parent_x - getFontMetricsForLargeDefaultFont().stringWidth( lost ) ) / 2 ),
- ( node.getYcoord() + getFontMetricsForLargeDefaultFont().getMaxAscent() ),
- g );
+ .drawString( lost,
+ parent_x
+ + ( ( x - parent_x - getFontMetricsForLargeDefaultFont().stringWidth( lost ) ) / 2 ),
+ ( node.getYcoord() + getFontMetricsForLargeDefaultFont().getMaxAscent() ),
+ g );
}
}
/**
* Draw a box at the indicated node.
- *
+ *
* @param x
* @param y
* @param node
if ( ( isInFoundNodes( node ) || isInCurrentExternalNodes( node ) )
|| ( getOptions().isShowDefaultNodeShapesExternal() && node.isExternal() )
|| ( getOptions().isShowDefaultNodeShapesInternal() && node.isInternal() )
- || ( getControlPanel().isUseVisualStyles() && ( ( node.getNodeData().getNodeVisualData() != null ) && ( ( node
- .getNodeData().getNodeVisualData().getNodeColor() != null )
- || ( node.getNodeData().getNodeVisualData().getSize() != NodeVisualData.DEFAULT_SIZE )
- || ( node.getNodeData().getNodeVisualData().getFillType() != NodeFill.DEFAULT ) || ( node
- .getNodeData().getNodeVisualData().getShape() != NodeShape.DEFAULT ) ) ) )
- || ( getControlPanel().isEvents() && node.isHasAssignedEvent() && ( node.getNodeData().getEvent()
- .isDuplication()
- || node.getNodeData().getEvent().isSpeciation() || node.getNodeData().getEvent()
- .isSpeciationOrDuplication() ) ) ) {
+ || ( getOptions().isShowDefaultNodeShapesForMarkedNodes()
+ && ( node.getNodeData().getNodeVisualData() != null ) && ( !node.getNodeData()
+ .getNodeVisualData().isEmpty() ) )
+ || ( getControlPanel().isUseVisualStyles() && ( ( node.getNodeData().getNodeVisualData() != null ) && ( ( node
+ .getNodeData().getNodeVisualData().getNodeColor() != null )
+ || ( node.getNodeData().getNodeVisualData().getSize() != NodeVisualData.DEFAULT_SIZE )
+ || ( node.getNodeData().getNodeVisualData().getFillType() != NodeFill.DEFAULT ) || ( node
+ .getNodeData().getNodeVisualData().getShape() != NodeShape.DEFAULT ) ) ) )
+ || ( getControlPanel().isEvents() && node.isHasAssignedEvent() && ( node.getNodeData().getEvent()
+ .isDuplication()
+ || node.getNodeData().getEvent().isSpeciation() || node.getNodeData().getEvent()
+ .isSpeciationOrDuplication() ) ) ) {
NodeVisualData vis = null;
if ( getControlPanel().isUseVisualStyles() && ( node.getNodeData().getNodeVisualData() != null )
&& ( !node.getNodeData().getNodeVisualData().isEmpty() ) ) {
if ( isNodeDataInvisible( node ) && !to_graphics_file && !to_pdf ) {
return 0;
}
- if ( getOptions().isShowBranchLengthValues()
+ if ( getControlPanel().isWriteBranchLengthValues()
&& ( ( getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.RECTANGULAR )
|| ( getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.ROUNDED ) || ( getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.EURO_STYLE ) )
- && ( !node.isRoot() ) && ( node.getDistanceToParent() != PhylogenyDataUtil.BRANCH_LENGTH_DEFAULT ) ) {
+ && ( !node.isRoot() ) && ( node.getDistanceToParent() != PhylogenyDataUtil.BRANCH_LENGTH_DEFAULT ) ) {
paintBranchLength( g, node, to_pdf, to_graphics_file );
}
if ( !getControlPanel().isShowInternalData() && !node.isExternal() && !node.isCollapse() ) {
final boolean fGotRelationWithQuery = ( seqRelation.getRef0().isEqual( _query_sequence ) || seqRelation
.getRef1().isEqual( _query_sequence ) )
&& seqRelation.getType().equals( getControlPanel().getSequenceRelationTypeBox()
- .getSelectedItem() );
+ .getSelectedItem() );
if ( fGotRelationWithQuery ) { // we will underline the text to show that this sequence is ortholog to the query
final double linePosX = node.getXcoord() + 2 + half_box_size;
final String sConfidence = ( !getControlPanel().isShowSequenceRelationConfidence() || ( seqRelation
.getConfidence() == null ) ) ? null : " (" + seqRelation.getConfidence().getValue()
- + ")";
+ + ")";
if ( sConfidence != null ) {
float confidenceX = pos_x;
if ( sb_str.length() > 0 ) {
confidenceX += new TextLayout( sb_str, g.getFont(), _frc ).getBounds().getWidth()
+ CONFIDENCE_LEFT_MARGIN;
}
- if ( confidenceX > linePosX ) { // let's only display confidence value if we are already displaying at least one of Prot/Gene Name and Taxonomy Code
+ if ( confidenceX > linePosX ) { // let's only display confidence value if we are already displaying at least one of Prot/Gene Name and Taxonomy Code
final int confidenceWidth = ( int ) new TextLayout( sConfidence, g.getFont(), _frc )
- .getBounds().getWidth();
+ .getBounds().getWidth();
TreePanel.drawString( sConfidence, confidenceX, pos_y, g );
x += CONFIDENCE_LEFT_MARGIN + confidenceWidth;
}
nodeTextBoundsWidth += 2;
}
g.drawLine( ( int ) linePosX + 1, 3 + ( int ) pos_y, ( int ) linePosX + x
- + nodeTextBoundsWidth, 3 + ( int ) pos_y );
+ + nodeTextBoundsWidth, 3 + ( int ) pos_y );
break;
}
}
}
final String ann_str = TreePanelUtil.createAnnotationString( ann, getOptions().isShowAnnotationRefSource() );
TreePanel.drawString( ann_str, node.getXcoord() + x + 3 + half_box_size, node.getYcoord()
- + ( getFontMetricsForLargeDefaultFont().getAscent() / down_shift_factor ), g );
+ + ( getFontMetricsForLargeDefaultFont().getAscent() / down_shift_factor ), g );
_sb.setLength( 0 );
_sb.append( ann_str );
if ( _sb.length() > 0 ) {
}
if ( getControlPanel().isShowBinaryCharacters() ) {
TreePanel.drawString( node.getNodeData().getBinaryCharacters().getPresentCharactersAsStringBuffer()
- .toString(), node.getXcoord() + x + 1 + half_box_size, node.getYcoord()
- + ( getFontMetricsForLargeDefaultFont().getAscent() / down_shift_factor ), g );
+ .toString(), node.getXcoord() + x + 1 + half_box_size, node.getYcoord()
+ + ( getFontMetricsForLargeDefaultFont().getAscent() / down_shift_factor ), g );
paintGainedAndLostCharacters( g, node, node.getNodeData().getBinaryCharacters()
- .getGainedCharactersAsStringBuffer().toString(), node.getNodeData().getBinaryCharacters()
- .getLostCharactersAsStringBuffer().toString() );
+ .getGainedCharactersAsStringBuffer().toString(), node.getNodeData().getBinaryCharacters()
+ .getLostCharactersAsStringBuffer().toString() );
}
else {
TreePanel
- .drawString( " " + node.getNodeData().getBinaryCharacters().getPresentCount(),
- node.getXcoord() + x + 4 + half_box_size,
- node.getYcoord()
- + ( getFontMetricsForLargeDefaultFont().getAscent() / down_shift_factor ),
- g );
+ .drawString( " " + node.getNodeData().getBinaryCharacters().getPresentCount(),
+ node.getXcoord() + x + 4 + half_box_size,
+ node.getYcoord()
+ + ( getFontMetricsForLargeDefaultFont().getAscent() / down_shift_factor ),
+ g );
paintGainedAndLostCharacters( g, node, "+"
+ node.getNodeData().getBinaryCharacters().getGainedCount(), "-"
- + node.getNodeData().getBinaryCharacters().getLostCount() );
+ + node.getNodeData().getBinaryCharacters().getLostCount() );
}
}
}
if ( isInFoundNodes( node ) || isInCurrentExternalNodes( node ) ) {
g.setColor( getColorForFoundNode( node ) );
drawRectFilled( node.getXSecondary() - OVERVIEW_FOUND_NODE_BOX_SIZE_HALF, node.getYSecondary()
- - OVERVIEW_FOUND_NODE_BOX_SIZE_HALF, OVERVIEW_FOUND_NODE_BOX_SIZE, OVERVIEW_FOUND_NODE_BOX_SIZE, g );
+ - OVERVIEW_FOUND_NODE_BOX_SIZE_HALF, OVERVIEW_FOUND_NODE_BOX_SIZE, OVERVIEW_FOUND_NODE_BOX_SIZE, g );
}
float new_x = 0;
if ( !node.isExternal() && !node.isCollapse() ) {
final boolean to_pdf,
final boolean dynamically_hide,
final int dynamic_hiding_factor,
- final boolean to_graphics_file ) {
+ final boolean to_graphics_file,
+ final boolean disallow_shortcutting ) {
final boolean is_in_found_nodes = isInFoundNodes( node ) || isInCurrentExternalNodes( node );
if ( node.isCollapse() ) {
if ( ( !node.isRoot() && !node.getParent().isCollapse() ) ) {
&& !node.isRoot()
&& ( ( getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.ROUNDED )
|| ( getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.RECTANGULAR ) || ( getPhylogenyGraphicsType() == PHYLOGENY_GRAPHICS_TYPE.EURO_STYLE ) )
- && node.getBranchData().isHasConfidences() ) {
+ && node.getBranchData().isHasConfidences() ) {
paintConfidenceValues( g, node, to_pdf, to_graphics_file );
}
// Draw a line to root:
}
float new_x = 0;
float new_x_min = Float.MAX_VALUE;
- final boolean disallow_shortcutting = ( dynamic_hiding_factor < 40 );
float min_dist = 1.5f;
if ( !disallow_shortcutting ) {
if ( dynamic_hiding_factor > 4000 ) {
final float diff_y = node.getYcoord() - y2;
final float diff_x = node.getXcoord() - new_x;
if ( disallow_shortcutting || ( diff_y > min_dist ) || ( diff_y < -min_dist ) || ( diff_x > min_dist )
- || ( diff_x < -min_dist ) || to_graphics_file || to_pdf ) {
+ || ( diff_x < -min_dist ) ) {
paintBranchRectangular( g,
node.getXcoord(),
new_x,
&& !is_in_found_nodes
&& ( ( node.isExternal() && ( ( _external_node_index % dynamic_hiding_factor ) != 1 ) ) || ( !node
.isExternal() && ( ( new_x_min < 20 ) || ( ( _y_distance * node.getNumberOfExternalNodes() ) < getFontMetricsForLargeDefaultFont()
- .getHeight() ) ) ) ) ) {
+ .getHeight() ) ) ) ) ) {
return;
}
final int x = paintNodeData( g, node, to_graphics_file, to_pdf, is_in_found_nodes );
if ( ( !getControlPanel().isShowInternalData() && !node.isExternal() ) ) {
return;
}
- int length_of_longest_text = -1;
if ( getControlPanel().isShowDomainArchitectures() && node.getNodeData().isHasSequence()
- && ( node.getNodeData().getSequence().getDomainArchitecture() != null ) ) {
+ && ( node.getNodeData().getSequence().getDomainArchitecture() != null )
+ && ( node.getNodeData().getSequence().getDomainArchitecture() instanceof RenderableDomainArchitecture ) ) {
RenderableDomainArchitecture rds = null;
try {
rds = ( RenderableDomainArchitecture ) node.getNodeData().getSequence().getDomainArchitecture();
rds.setRenderingHeight( h > 1 ? h : 2 );
if ( getControlPanel().isDrawPhylogram() ) {
if ( getOptions().isLineUpRendarableNodeData() ) {
- length_of_longest_text = calcLengthOfLongestText();
-
- rds.render( getMaxDistanceToRoot() * getXcorrectionFactor() + length_of_longest_text, node.getYcoord() - ( h / 2 ), g, this, to_pdf );
+ if ( getOptions().isRightLineUpDomains() ) {
+ rds.render( ( float ) ( ( getMaxDistanceToRoot() * getXcorrectionFactor() )
+ + _length_of_longest_text + ( ( _longest_domain - rds.getTotalLength() ) * rds
+ .getRenderingFactorWidth() ) ), node.getYcoord() - ( h / 2.0f ), g, this, to_pdf );
+ }
+ else {
+ rds.render( ( float ) ( ( getMaxDistanceToRoot() * getXcorrectionFactor() ) + _length_of_longest_text ),
+ node.getYcoord() - ( h / 2.0f ),
+ g,
+ this,
+ to_pdf );
+ }
}
else {
- rds.render( node.getXcoord() + x, node.getYcoord() - ( h / 2 ), g, this, to_pdf );
+ rds.render( node.getXcoord() + x, node.getYcoord() - ( h / 2.0f ), g, this, to_pdf );
}
}
else {
- length_of_longest_text = calcLengthOfLongestText();
- rds.render( getPhylogeny().getFirstExternalNode().getXcoord() + length_of_longest_text,
- node.getYcoord() - ( h / 2 ),
- g,
- this,
- to_pdf );
+ if ( getOptions().isRightLineUpDomains() ) {
+ rds.render( ( ( getPhylogeny().getFirstExternalNode().getXcoord() + _length_of_longest_text ) - 20 )
+ + ( ( _longest_domain - rds.getTotalLength() ) * rds
+ .getRenderingFactorWidth() ),
+ node.getYcoord() - ( h / 2.0f ),
+ g,
+ this,
+ to_pdf );
+ }
+ else {
+ rds.render( getPhylogeny().getFirstExternalNode().getXcoord() + _length_of_longest_text,
+ node.getYcoord() - ( h / 2.0f ),
+ g,
+ this,
+ to_pdf );
+ }
}
}
}
domain_add = _domain_structure_width + 10;
}
if ( getControlPanel().isDrawPhylogram() ) {
- rv.render( node.getXcoord() + x + domain_add, node.getYcoord() - 3, g, this, to_pdf );
+ rv.render( ( float ) ( node.getXcoord() + x + domain_add ), node.getYcoord() - 3, g, this, to_pdf );
}
else {
- if ( length_of_longest_text < 0 ) {
- length_of_longest_text = calcLengthOfLongestText();
- }
- rv.render( getPhylogeny().getFirstExternalNode().getXcoord() + length_of_longest_text + domain_add,
+ rv.render( ( float ) ( getPhylogeny().getFirstExternalNode().getXcoord() + _length_of_longest_text + domain_add ),
node.getYcoord() - 3,
g,
this,
}
}
}
+ if ( getControlPanel().isShowMolSequences() && ( node.getNodeData().isHasSequence() )
+ && ( node.getNodeData().getSequence().isMolecularSequenceAligned() )
+ && ( !ForesterUtil.isEmpty( node.getNodeData().getSequence().getMolecularSequence() ) ) ) {
+ final RenderableMsaSequence rs = RenderableMsaSequence.createInstance( node.getNodeData().getSequence()
+ .getMolecularSequence(), node.getNodeData().getSequence().getType(), getConfiguration() );
+ if ( rs != null ) {
+ final int default_height = 7;
+ float y = getYdistance();
+ if ( getControlPanel().isDynamicallyHideData() ) {
+ y = getTreeFontSet().getFontMetricsLarge().getHeight();
+ }
+ final int h = y < default_height ? ForesterUtil.roundToInt( y ) : default_height;
+ rs.setRenderingHeight( h > 1 ? h : 2 );
+ if ( getControlPanel().isDrawPhylogram() ) {
+ rs.render( ( float ) ( ( getMaxDistanceToRoot() * getXcorrectionFactor() ) + _length_of_longest_text ),
+ node.getYcoord() - ( h / 2.0f ),
+ g,
+ this,
+ to_pdf );
+ }
+ else {
+ rs.render( getPhylogeny().getFirstExternalNode().getXcoord() + _length_of_longest_text,
+ node.getYcoord() - ( h / 2.0f ),
+ g,
+ this,
+ to_pdf );
+ }
+ }
+ }
}
- private int calcLengthOfLongestText() {
+ final private int calcLengthOfLongestText() {
final StringBuilder sb = new StringBuilder();
- nodeDataAsSB( _ext_node_with_longest_txt_info, sb );
- if ( _ext_node_with_longest_txt_info.getNodeData().isHasTaxonomy() ) {
- nodeTaxonomyDataAsSB( _ext_node_with_longest_txt_info.getNodeData().getTaxonomy(), sb );
+ if ( _ext_node_with_longest_txt_info != null ) {
+ nodeDataAsSB( _ext_node_with_longest_txt_info, sb );
+ if ( _ext_node_with_longest_txt_info.getNodeData().isHasTaxonomy() ) {
+ nodeTaxonomyDataAsSB( _ext_node_with_longest_txt_info.getNodeData().getTaxonomy(), sb );
+ }
}
- return getFontMetricsForLargeDefaultFont().stringWidth( sb.toString() + " " );
+ return getFontMetricsForLargeDefaultFont().stringWidth( sb.toString() );
}
final private void paintOvRectangle( final Graphics2D g ) {
final private void paintPhylogenyLite( final Graphics2D g ) {
_phylogeny
- .getRoot()
- .setXSecondary( ( float ) ( getVisibleRect().x + getOvXPosition() + ( MOVE / ( getVisibleRect().width / getOvRectangle()
- .getWidth() ) ) ) );
+ .getRoot()
+ .setXSecondary( ( float ) ( getVisibleRect().x + getOvXPosition() + ( MOVE / ( getVisibleRect().width / getOvRectangle()
+ .getWidth() ) ) ) );
_phylogeny.getRoot().setYSecondary( ( getVisibleRect().y + getOvYStart() ) );
final Stroke s = g.getStroke();
g.setStroke( STROKE_05 );
/**
* Paint the root branch. (Differs from others because it will always be a
* single horizontal line).
- * @param to_graphics_file
- *
+ * @param to_graphics_file
+ *
* @return new x1 value
*/
final private void paintRootBranch( final Graphics2D g,
final Rectangle2D nodeTextBounds = new TextLayout( label, g.getFont(), new FontRenderContext( null,
false,
false ) )
- .getBounds();
+ .getBounds();
g.fillRect( ( int ) start_x - 1, ( int ) start_y - 8, ( int ) nodeTextBounds.getWidth() + 4, 11 );
g.setColor( getTreeColorSet().getBackgroundColor() );
}
}
private final void setupStroke( final Graphics2D g ) {
+ if ( getYdistance() < 0.0001 ) {
+ g.setStroke( STROKE_0025 );
+ }
if ( getYdistance() < 0.001 ) {
g.setStroke( STROKE_005 );
}
else if ( getYdistance() < 2 ) {
g.setStroke( STROKE_075 );
}
- else if ( getYdistance() < 20 ) {
+ else if ( ( getYdistance() < 20 ) || !getConfiguration().isAllowThickStrokes() ) {
g.setStroke( STROKE_1 );
}
else {
ann_str = ann.toString();
}
sb.append( SequenceWriter.toFasta( ann_str, n.getNodeData().getSequence()
- .getMolecularSequence(), 60 ) );
+ .getMolecularSequence(), 60 ) );
data.add( sb.toString() );
}
break;
else if ( getConfiguration().getExtNodeDataReturnOn() == EXT_NODE_DATA_RETURN_ON.WINODW ) {
if ( sb.length() < 1 ) {
TreePanelUtil.showInformationMessage( this, "No Appropriate Data (" + obtainTitleForExtDescNodeData()
- + ")", "Descendants of selected node do not contain selected data" );
+ + ")", "Descendants of selected node do not contain selected data" );
clearCurrentExternalNodesDataBuffer();
}
else {
try {
if ( ( node.getName().length() > 0 )
|| ( node.getNodeData().isHasTaxonomy() && !TreePanelUtil.isTaxonomyEmpty( node.getNodeData()
- .getTaxonomy() ) )
- || ( node.getNodeData().isHasSequence() && !TreePanelUtil.isSequenceEmpty( node.getNodeData()
- .getSequence() ) ) || ( node.getNodeData().isHasDate() )
- || ( node.getNodeData().isHasDistribution() ) || node.getBranchData().isHasConfidences() ) {
+ .getTaxonomy() ) )
+ || ( node.getNodeData().isHasSequence() && !TreePanelUtil.isSequenceEmpty( node.getNodeData()
+ .getSequence() ) ) || ( node.getNodeData().isHasDate() )
+ || ( node.getNodeData().isHasDistribution() ) || node.getBranchData().isHasConfidences() ) {
_popup_buffer.setLength( 0 );
short lines = 0;
if ( node.getName().length() > 0 ) {
_popup_buffer.append( "] " );
}
_popup_buffer
- .append( FORMATTER_CONFIDENCE.format( ForesterUtil.round( confidence.getValue(),
- getOptions()
- .getNumberOfDigitsAfterCommaForConfidenceValues() ) ) );
+ .append( FORMATTER_CONFIDENCE.format( ForesterUtil.round( confidence.getValue(),
+ getOptions()
+ .getNumberOfDigitsAfterCommaForConfidenceValues() ) ) );
if ( confidence.getStandardDeviation() != Confidence.CONFIDENCE_DEFAULT_VALUE ) {
_popup_buffer.append( " (sd=" );
_popup_buffer.append( FORMATTER_CONFIDENCE.format( ForesterUtil.round( confidence
- .getStandardDeviation(), getOptions()
- .getNumberOfDigitsAfterCommaForConfidenceValues() ) ) );
+ .getStandardDeviation(), getOptions()
+ .getNumberOfDigitsAfterCommaForConfidenceValues() ) ) );
_popup_buffer.append( ")" );
}
}
if ( _popup_buffer.length() > 0 ) {
if ( !getConfiguration().isUseNativeUI() ) {
_rollover_popup
- .setBorder( BorderFactory.createLineBorder( getTreeColorSet().getBranchColor() ) );
+ .setBorder( BorderFactory.createLineBorder( getTreeColorSet().getBranchColor() ) );
_rollover_popup.setBackground( getTreeColorSet().getBackgroundColor() );
if ( isInFoundNodes0( node ) && !isInFoundNodes1( node ) ) {
_rollover_popup.setForeground( getTreeColorSet().getFoundColor0() );
_rollover_popup,
e.getLocationOnScreen().x + 10,
e.getLocationOnScreen().y
- - ( lines * 20 ) );
+ - ( lines * 20 ) );
_node_desc_popup.show();
}
}
if ( getMainPanel().getMainFrame() == null ) {
// Must be "E" applet version.
( ( ArchaeopteryxE ) ( ( MainPanelApplets ) getMainPanel() ).getApplet() )
- .setSelectedTypeInTypeMenu( getPhylogenyGraphicsType() );
+ .setSelectedTypeInTypeMenu( getPhylogenyGraphicsType() );
}
else {
getMainPanel().getMainFrame().setSelectedTypeInTypeMenu( getPhylogenyGraphicsType() );
git://source.jalview.org / jalview.git / blobdiff