From 5c8d480b9b07d21d460ab95d2cf0044bf8d5c34b Mon Sep 17 00:00:00 2001 From: "cmzmasek@gmail.com" Date: Mon, 13 Oct 2014 19:14:41 +0000 Subject: [PATCH] in progress --- .../java/src/org/forester/archaeopteryx/TreePanel.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/forester/java/src/org/forester/archaeopteryx/TreePanel.java b/forester/java/src/org/forester/archaeopteryx/TreePanel.java index c33ad4e..c96f82f 100644 --- a/forester/java/src/org/forester/archaeopteryx/TreePanel.java +++ b/forester/java/src/org/forester/archaeopteryx/TreePanel.java @@ -1642,6 +1642,15 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee // 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() ); + + for( final PhylogenyNode element : _nodes_in_preorder ) { paintNodeRectangular( g, element, to_pdf, getControlPanel().isDynamicallyHideData() && ( dynamic_hiding_factor > 1 ), dynamic_hiding_factor, to_graphics_file ); @@ -4731,7 +4740,11 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee } float new_x = 0; float new_x_min = Float.MAX_VALUE; - final boolean disallow_shortcutting = ( dynamic_hiding_factor < 40 ); + final boolean disallow_shortcutting = ( dynamic_hiding_factor < 40 ) || getControlPanel().isUseVisualStyles() + || getOptions().isShowDefaultNodeShapesForMarkedNodes() + || ( ( getFoundNodes0() != null ) && !getFoundNodes0().isEmpty() ) + || ( ( getFoundNodes1() != null ) && !getFoundNodes1().isEmpty() ) + || ( ( getCurrentExternalNodes() != null ) && !getCurrentExternalNodes().isEmpty() ); float min_dist = 1.5f; if ( !disallow_shortcutting ) { if ( dynamic_hiding_factor > 4000 ) { -- 1.7.10.2