Release 0.9.3

[debian/openrocket] / src / net / sf / openrocket / util / TextUtil.java

diff --git a/src/net/sf/openrocket/util/TextUtil.java b/src/net/sf/openrocket/util/TextUtil.java
index 7d2ee85355bd6d85c4534fea0802771f3c55891c..f554dc73ba0fbf4111928ca4fbc5280c2f97d670 100644 (file)
--- a/src/net/sf/openrocket/util/TextUtil.java
+++ b/src/net/sf/openrocket/util/TextUtil.java
@@ -93,15 +93,21 @@ public class TextUtil {
         */
        private static String shortDecimal(double value, int decimals) {
                
+               // Calculate rounding and limit values (rounding slightly smaller)
+               int rounding = 1;
+               double limit = 0.5;
+               for (int i=0; i<decimals; i++) {
+                       rounding *= 10;
+                       limit /= 10;
+               }
+
+               // Round value
+               value = (Math.rint(value * rounding)+0.1) / rounding;
+               
+               
                int whole = (int)value;
                value -= whole;
                
-               // Calculate limit, return when remaining value less than this
-               double limit;
-               limit = 0.5;
-               for (int i=0; i<decimals; i++)
-                       limit /= 10;
-               
                
                if (value < limit)
                        return "" + whole; 
@@ -115,8 +121,6 @@ public class TextUtil {
                for (int i = 0; i<decimals; i++) {
                        
                        value *= 10;
-                       if (i == decimals-1)
-                               value += 0.5;
                        whole = (int)value;
                        value -= whole;
                        sb.append((char)('0' + whole));