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

Use double-precision diameter labels

Browse Source
This commit is contained in:
SiboVG 2022-09-21 01:57:48 +02:00
parent 9d3c6d8364
commit 5cafd87608
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java
View File

@ -69,9 +69,14 @@ public abstract class MotorFilterPanel extends JPanel {
for( int i = 0; i < motorDiameters.length; i++ ) {
// Round the labels, because for imperial units, the labels can otherwise overlap
double diam = unit.toUnit(motorDiameters[i]);
diam = unit.round(diam);
diam = unit.fromUnit(diam);
diameterLabels.put( i, new JLabel(unit.toString(diam)));
double diamRounded = unit.round(diam * 10) / 10; // 10 multiplication for 2-decimal precision
diam = unit.fromUnit(diamRounded);
String formatted = unit.toString(diam);
// Remove the leading zero for numbers between 0 and 1
if (diamRounded > 0 && diamRounded < 1) {
formatted = formatted.substring(1);
}
diameterLabels.put( i, new JLabel(formatted));
}
diameterLabels.get( motorDiameters.length-1).setText("+");
}