fixing vector size issue...

diff --git a/forester/java/src/org/forester/archaeopteryx/Constants.java b/forester/java/src/org/forester/archaeopteryx/Constants.java
index 51ace82..e4d2d12 100644 (file)
--- a/forester/java/src/org/forester/archaeopteryx/Constants.java
+++ b/forester/java/src/org/forester/archaeopteryx/Constants.java
@@ -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                                                      = "140801";
+    final static String         PRG_DATE                                                      = "140803";
     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"  };

diff --git a/forester/java/src/org/forester/archaeopteryx/TreePanel.java b/forester/java/src/org/forester/archaeopteryx/TreePanel.java
index d58befb..6fa5da8 100644 (file)
--- a/forester/java/src/org/forester/archaeopteryx/TreePanel.java
+++ b/forester/java/src/org/forester/archaeopteryx/TreePanel.java
@@ -625,7 +625,12 @@ public final class TreePanel extends JPanel implements ActionListener, MouseWhee
             }
             
             if ( getControlPanel().isShowVectorData() && node.getNodeData().getVector() != null &&  node.getNodeData().getVector().size() > 0 ) {
-                sum += RenderableVector.VECTOR_DEFAULT_WIDTH + 10;
+                if ( getConfiguration() != null ) {
+                    sum += getConfiguration().getVectorDataWidth() + 10;
+                }
+                else {
+                    sum += RenderableVector.VECTOR_DEFAULT_WIDTH + 10;
+                }  
             }
             
             if ( sum >= max_length ) {

diff --git a/forester/java/src/org/forester/archaeopteryx/phylogeny/data/RenderableVector.java b/forester/java/src/org/forester/archaeopteryx/phylogeny/data/RenderableVector.java
index c39cf8d..02782ff 100644 (file)
--- a/forester/java/src/org/forester/archaeopteryx/phylogeny/data/RenderableVector.java
+++ b/forester/java/src/org/forester/archaeopteryx/phylogeny/data/RenderableVector.java
@@ -44,7 +44,7 @@ import org.forester.util.ForesterUtil;
 public final class RenderableVector implements RenderablePhylogenyData {
 
     final static int         VECTOR_DEFAULT_HEIGHT          = 12;
-    final static public int         VECTOR_DEFAULT_WIDTH           = 120;
+    public final static  int         VECTOR_DEFAULT_WIDTH           = 120;
     private double                  _rendering_factor_width = 1.0;
     private List<Double>            _values;
     private final Rectangle2D       _rectangle              = new Rectangle2D.Float();
@@ -167,7 +167,7 @@ public final class RenderableVector implements RenderablePhylogenyData {
         if ( _instance == null ) {
             _instance = new RenderableVector();
         }
-        //_instance.setRenderingHeight( VECTOR_DEFAULT_HEIGHT );
+       
         _instance._values = values;
         
         if ( configuration != null ) {