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

[Rename] Changed variable names for clarity.

Browse Source
This commit is contained in:
Daniel_M_Williams 2016-03-11 18:36:26 -05:00
parent 2215d41cc2
commit 7029dd0c3c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/net/sf/openrocket/masscalc/MassCalculator.java
View File

@ -373,18 +373,18 @@ public class MassCalculator implements Monitorable {
private MassData calculateAssemblyMassData(RocketComponent component, String indent) { private MassData calculateAssemblyMassData(RocketComponent component, String indent) {
Coordinate parentCM = component.getComponentCG(); Coordinate compCM = component.getComponentCG();
double parentIx = component.getRotationalUnitInertia() * parentCM.weight; double compIx = component.getRotationalUnitInertia() * compCM.weight;
double parentIt = component.getLongitudinalUnitInertia() * parentCM.weight; double compIt = component.getLongitudinalUnitInertia() * compCM.weight;
MassData parentData = new MassData( parentCM, parentIx, parentIt); MassData parentData = new MassData( compCM, compIx, compIt);
if (!component.getOverrideSubcomponents()) { if (!component.getOverrideSubcomponents()) {
if (component.isMassOverridden()) if (component.isMassOverridden())
parentCM = parentCM.setWeight(MathUtil.max(component.getOverrideMass(), MIN_MASS)); compCM = compCM.setWeight(MathUtil.max(component.getOverrideMass(), MIN_MASS));
if (component.isCGOverridden()) if (component.isCGOverridden())
parentCM = parentCM.setXYZ(component.getOverrideCG()); compCM = compCM.setXYZ(component.getOverrideCG());
} }
if(( debug) &&( 0 < component.getChildCount()) && (MIN_MASS < parentCM.weight)){ if(( debug) &&( 0 < component.getChildCount()) && (MIN_MASS < compCM.weight)){
System.err.println(String.format("%-32s: %s ",indent+">>["+ component.getName()+"]", parentData.toDebug() )); System.err.println(String.format("%-32s: %s ",indent+">>["+ component.getName()+"]", parentData.toDebug() ));
} }