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

Fix computation of density for BULK_HEADs by using a more general way to compute the volume of a cylinder.

Browse Source
This commit is contained in:
Kevin Ruland 2012-04-20 15:42:08 +00:00
parent b782641e23
commit b7608c3729
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/net/sf/openrocket/preset/ComponentPresetFactory.java
View File

@ -152,7 +152,7 @@ public abstract class ComponentPresetFactory {
// FIXME - Bulkhead.getComponentVolume does not exist! // FIXME - Bulkhead.getComponentVolume does not exist!
// double density = mass / tr.getComponentVolume(); // double density = mass / tr.getComponentVolume();
double volume = Math.pow(preset.get(OUTER_DIAMETER),2) * Math.PI / 4.0; double volume = computeVolumeOfTube(preset);
double density = mass / volume; double density = mass / volume;
String materialName = "BulkHeadCustom"; String materialName = "BulkHeadCustom";
@ -271,7 +271,7 @@ public abstract class ComponentPresetFactory {
private static double computeVolumeOfTube(ComponentPreset preset) { private static double computeVolumeOfTube(ComponentPreset preset) {
double or = preset.get(OUTER_DIAMETER)/2.0; double or = preset.get(OUTER_DIAMETER)/2.0;
double ir = preset.get(INNER_DIAMETER)/2.0; double ir = preset.has(INNER_DIAMETER) ? preset.get(INNER_DIAMETER)/2.0 : 0.0;
double l = preset.get(LENGTH); double l = preset.get(LENGTH);
return Math.PI * (or*or - ir*ir) * l; return Math.PI * (or*or - ir*ir) * l;
} }