From: Jim Procter <j.procter@dundee.ac.uk>
Date: Wed, 8 Jun 2022 14:11:27 +0000 (+0100)
Subject: Merge branch 'improvement/JAL-4023_snotation_for_trees' into develop
X-Git-Tag: Release_2_11_2_6~60
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=d1e20f6a5654ea6baf378afa3277b4e751c69a96;hp=5a0f398fd4bab96dd3cba085ffe77b010cfe24eb

Merge branch 'improvement/JAL-4023_snotation_for_trees' into develop
---

diff --git a/src/jalview/datamodel/SequenceNode.java b/src/jalview/datamodel/SequenceNode.java
index fa12419..0a694c2 100755
--- a/src/jalview/datamodel/SequenceNode.java
+++ b/src/jalview/datamodel/SequenceNode.java
@@ -70,7 +70,7 @@ public class SequenceNode extends BinaryNode
    * @param name
    *          DOCUMENT ME!
    */
-  public SequenceNode(Object val, SequenceNode parent, float dist,
+  public SequenceNode(Object val, SequenceNode parent, double dist,
           String name)
   {
     super(val, parent, name);
@@ -94,7 +94,7 @@ public class SequenceNode extends BinaryNode
    *          DOCUMENT ME!
    */
   public SequenceNode(Object val, SequenceNode parent, String name,
-          float dist, int bootstrap, boolean dummy)
+          double dist, int bootstrap, boolean dummy)
   {
     super(val, parent, name);
     this.dist = dist;
diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index 0012888..6f143db 100755
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -259,7 +259,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
 
       if (showDistances && (node.dist > 0))
       {
-        nodeLabel = new Format("%-.2f").form(node.dist);
+        nodeLabel = new Format("%g").form(node.dist);
       }
 
       if (showBootstrap && node.bootstrap > -1)
@@ -347,7 +347,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
 
       if (showDistances && (node.dist > 0))
       {
-        nodeLabel = new Format("%-.2f").form(node.dist);
+        nodeLabel = new Format("%g").form(node.dist);
       }
 
       if (showBootstrap && node.bootstrap > -1)
diff --git a/src/jalview/io/NewickFile.java b/src/jalview/io/NewickFile.java
index 4a30d73..027390a 100755
--- a/src/jalview/io/NewickFile.java
+++ b/src/jalview/io/NewickFile.java
@@ -286,11 +286,11 @@ public class NewickFile extends FileParse
     String nodename = null;
     String commentString2 = null; // comments after simple node props
 
-    float DefDistance = (float) 0.001; // @param Default distance for a node -
+    double DefDistance = (float) 0.001; // @param Default distance for a node -
     // very very small
     int DefBootstrap = -1; // @param Default bootstrap for a node
 
-    float distance = DefDistance;
+    double distance = DefDistance;
     int bootstrap = DefBootstrap;
 
     boolean ascending = false; // flag indicating that we are leaving the
@@ -487,7 +487,7 @@ public class NewickFile extends FileParse
         {
           try
           {
-            distance = (Float.valueOf(ndist.stringMatched(1))).floatValue();
+            distance = (Double.valueOf(ndist.stringMatched(1))).floatValue();
             HasDistances = true;
             nodehasdistance = true;
           } catch (Exception e)