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

[#2083] Account for uom in material database loader

Browse Source
This commit is contained in:
SiboVG 2023-04-10 23:44:12 +02:00
parent 731cd76ba0
commit e47d6481b2
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/net/sf/openrocket/preset/xml/MaterialDTO.java
View File

@ -10,6 +10,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import net.sf.openrocket.database.Databases; import net.sf.openrocket.database.Databases;
import net.sf.openrocket.material.Material; import net.sf.openrocket.material.Material;
import net.sf.openrocket.unit.Unit;
import net.sf.openrocket.util.Chars; import net.sf.openrocket.util.Chars;
/** /**
@ -98,6 +99,13 @@ public class MaterialDTO {
if (uom != null) { if (uom != null) {
uom = uom.replace('2', Chars.SQUARED); uom = uom.replace('2', Chars.SQUARED);
uom = uom.replace('3', Chars.CUBED); uom = uom.replace('3', Chars.CUBED);
if (type != null) {
// The density value is stored in the XML file in the units of measure, but OR expects the density to be
// in SI units, so we need to convert it to SI units
Unit uomUnit = type.getORMaterialType().getUnitGroup().getUnit(getUom());
density = uomUnit.fromUnit(density);
//type.getORMaterialType().getUnitGroup().setDefaultUnit(uomUnit);
}
} }
} }