in progress
authorcmzmasek <cmzmasek@ca865154-3058-d1c3-3e42-d8f55a55bdbd>
Fri, 1 Aug 2014 13:02:46 +0000 (13:02 +0000)
committercmzmasek <cmzmasek@ca865154-3058-d1c3-3e42-d8f55a55bdbd>
Fri, 1 Aug 2014 13:02:46 +0000 (13:02 +0000)
forester/java/src/org/forester/archaeopteryx/Constants.java
forester/java/src/org/forester/archaeopteryx/TreePanel.java

index 27b1f7a..51ace82 100644 (file)
@@ -43,7 +43,7 @@ public final class Constants {
     public final static boolean ALLOW_DDBJ_BLAST                                              = false;
     public final static String  PRG_NAME                                                      = "Archaeopteryx";
     final static String         VERSION                                                       = "0.9893 beta";
-    final static String         PRG_DATE                                                      = "140730";
+    final static String         PRG_DATE                                                      = "140801";
     final static String         DEFAULT_CONFIGURATION_FILE_NAME                               = "_aptx_configuration_file";
     final static String[]       DEFAULT_FONT_CHOICES                                          = { "Arial", "Helvetica",
             "Verdana", "Tahoma", "Dialog", "Lucida Sans", "SansSerif", "Sans-serif", "Sans"  };
index 3b0abfe..24cb223 100644 (file)
@@ -4674,7 +4674,7 @@ 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 );
         float min_dist = 1.5f;
         if ( !disallow_shortcutting ) {
             //   System.out.println( dynamic_hiding_factor );
@@ -4749,7 +4749,7 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee
                                                     final PhylogenyNode node,
                                                     final boolean to_graphics_file,
                                                     final boolean to_pdf ) {
-        if ( isNodeDataInvisible( node ) && !to_graphics_file ) {
+        if ( isNodeDataInvisible( node ) && !( to_graphics_file || to_pdf ) ) {
             return;
         }
         if ( ( !getControlPanel().isShowInternalData() && !node.isExternal() ) ) {