hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try really hard to always show three digits right of the decimal point. There had been numerous complaints by users that in 12.09 when using inches, the lengths would frequently show only two digits. This is most likely related to the change to SpinnerAdapter which were needed to support in/64.

Browse Source
This commit is contained in:
Kevin Ruland 2012-09-21 02:29:15 +00:00
parent 03d9a295a5
commit 9d2c51a0b1
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/net/sf/openrocket/unit/Unit.java
View File

@ -78,8 +78,7 @@ public abstract class Unit {
// TODO: Should this use grouping separator ("#,##0.##")?
private static final DecimalFormat intFormat = new DecimalFormat("#");
private static final DecimalFormat decFormat = new DecimalFormat("0.##");
private static final DecimalFormat smallFormat = new DecimalFormat("0.###");
private static final DecimalFormat decFormat = new DecimalFormat("0.0##");
private static final DecimalFormat expFormat = new DecimalFormat("0.00E0");
/**
@ -102,18 +101,10 @@ public abstract class Unit {
if (Math.abs(val) <= 0.0005) {
return "0";
}
if ( Math.abs(val) < 0.095) {
return smallFormat.format(val);
}
double sign = Math.signum(val);
double mul = 1000.0;
val = Math.abs(val);
double mul = 1.0;
while (val < 100) {
mul *= 10;
val *= 10;
}
val = Math.rint(val) / mul * sign;
val = Math.rint(val*mul) / mul * sign;
return decFormat.format(val);
}