X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fnet%2Fsf%2Fopenrocket%2Futil%2FTextUtil.java;fp=src%2Fnet%2Fsf%2Fopenrocket%2Futil%2FTextUtil.java;h=f554dc73ba0fbf4111928ca4fbc5280c2f97d670;hb=365afb18eef3be3762b6f3e76ea8f6a6c0276797;hp=7d2ee85355bd6d85c4534fea0802771f3c55891c;hpb=dfc10c016c5f1bb4b7714dff414562f2f32e2866;p=debian%2Fopenrocket

diff --git a/src/net/sf/openrocket/util/TextUtil.java b/src/net/sf/openrocket/util/TextUtil.java
index 7d2ee853..f554dc73 100644
--- 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));