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

[#1643] Round motor filter panel diameter labels

Browse Source
This commit is contained in:
SiboVG 2022-09-08 23:31:05 +02:00
parent 9b5baa4020
commit 54ca2bbe0e
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,7 @@ import net.sf.openrocket.motor.Manufacturer;
import net.sf.openrocket.rocketcomponent.MotorMount; import net.sf.openrocket.rocketcomponent.MotorMount;
import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.unit.Unit;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.gui.widgets.SelectColorButton; import net.sf.openrocket.gui.widgets.SelectColorButton;
@ -64,8 +65,13 @@ public abstract class MotorFilterPanel extends JPanel {
* updates: motorDiameters, diameterLabels * updates: motorDiameters, diameterLabels
*/ */
private static void scaleDiameterLabels(){ private static void scaleDiameterLabels(){
Unit unit = UnitGroup.UNITS_MOTOR_DIMENSIONS.getDefaultUnit();
for( int i = 0; i < motorDiameters.length; i++ ) { for( int i = 0; i < motorDiameters.length; i++ ) {
diameterLabels.put( i, new JLabel(UnitGroup.UNITS_MOTOR_DIMENSIONS.getDefaultUnit().toString(motorDiameters[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)));
} }
diameterLabels.get( motorDiameters.length-1).setText("+"); diameterLabels.get( motorDiameters.length-1).setText("+");
} }