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

[fix] Changing the AxialMethod on a RocketComponent now mantains the same position, but changes the internal offset

Browse Source
This commit is contained in:
Daniel_M_Williams 2020-08-01 16:42:58 -04:00
parent 908cd3e619
commit dc9dc3ed63
3 changed files with 69 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
View File

@ -934,11 +934,14 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
// no change.
return;
}
// this variable does not change the internal representation
// this variable changes the internal representation, but not the physical position
// the relativePosition (method) is just the lens through which external code may view this component's position.
this.axialMethod = newAxialMethod;
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
this.axialOffset = getAxialOffset(newAxialMethod);
// // this doesn't cause any physical change-- just how it's described.
// fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
}
/**

2
core/test/net/sf/openrocket/rocketcomponent/FreeformFinSetTest.java
View File

@ -55,8 +55,8 @@ public class FreeformFinSetTest extends BaseTestCase {
sourceSet.setOverrideCGX(0.012);
sourceSet.setOverrideMass(0.0123);
sourceSet.setOverrideSubcomponents(true);
sourceSet.setAxialOffset(0.1);
sourceSet.setAxialMethod(AxialMethod.ABSOLUTE);
sourceSet.setAxialOffset(0.1);
sourceSet.setTabHeight(0.01);
sourceSet.setTabLength(0.02);
sourceSet.setTabOffsetMethod(AxialMethod.BOTTOM);

64
core/test/net/sf/openrocket/rocketcomponent/RocketTest.java
View File

@ -2,15 +2,18 @@ package net.sf.openrocket.rocketcomponent;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.Matchers.closeTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import net.sf.openrocket.rocketcomponent.position.AxialMethod;
import net.sf.openrocket.util.BoundingBox;
import net.sf.openrocket.util.ArrayList;
import org.junit.Test;
import net.sf.openrocket.rocketcomponent.position.AxialMethod;
import net.sf.openrocket.rocketcomponent.position.AngleMethod;
import net.sf.openrocket.rocketcomponent.position.RadiusMethod;
import net.sf.openrocket.util.BoundingBox;
import net.sf.openrocket.util.Coordinate;
import net.sf.openrocket.util.MathUtil;
import net.sf.openrocket.util.TestRockets;
@ -147,6 +150,63 @@ public class RocketTest extends BaseTestCase {
assertEquals( 0.062000000, bounds.max.y, EPSILON);
assertEquals( 0.052893575, bounds.max.z, EPSILON);
}
@Test
public void testChangeAxialMethod(){
class AxialPositionTestCase {
final public AxialMethod beginMethod;
final public double beginOffset;
final public AxialMethod endMethod;
final public double endOffset;
final public double endPosition;
public AxialPositionTestCase( AxialMethod _begMeth, double _begOffs, AxialMethod _endMeth, double _endOffs, double _endPos){
beginMethod = _begMeth; beginOffset = _begOffs; endMethod = _endMeth; endOffset = _endOffs; endPosition = _endPos;
}
}
final Rocket rocket = TestRockets.makeEstesAlphaIII();
final AxialStage stage= (AxialStage)rocket.getChild(0);
final BodyTube body = (BodyTube)stage.getChild(1);
final FinSet fins = (FinSet) body.getChild(0);
{ // verify construction:
assertEquals("incorrect body length:", 0.20, body.getLength(), EPSILON);
assertEquals("incorrect fin length:", 0.05, fins.getLength(), EPSILON);
{ // fin #1
final Coordinate expLoc = new Coordinate(0.22, 0.012, 0);
final Coordinate actLocs[] = fins.getComponentLocations();
assertThat(fins.getName() + " not positioned correctly: ", actLocs[0], equalTo(expLoc));
}
}
final ArrayList<AxialPositionTestCase> allTestCases = new ArrayList<>(10);
allTestCases.add(0, new AxialPositionTestCase(AxialMethod.BOTTOM, 0.0, AxialMethod.TOP, 0.15, 0.15));
allTestCases.add(1, new AxialPositionTestCase(AxialMethod.TOP, 0.0, AxialMethod.BOTTOM, -0.15, 0.0));
allTestCases.add(2, new AxialPositionTestCase(AxialMethod.BOTTOM, -0.03, AxialMethod.TOP, 0.12, 0.12));
allTestCases.add(3, new AxialPositionTestCase(AxialMethod.BOTTOM, 0.03, AxialMethod.TOP, 0.18, 0.18));
allTestCases.add(4, new AxialPositionTestCase(AxialMethod.BOTTOM, 0.03, AxialMethod.MIDDLE, 0.105, 0.18));
allTestCases.add(5, new AxialPositionTestCase(AxialMethod.MIDDLE, 0.0, AxialMethod.TOP, 0.075, 0.075));
allTestCases.add(6, new AxialPositionTestCase(AxialMethod.MIDDLE, 0.0, AxialMethod.BOTTOM, -0.075, 0.075));
allTestCases.add(7, new AxialPositionTestCase(AxialMethod.MIDDLE, 0.005, AxialMethod.TOP, 0.08, 0.08));
for( int caseIndex=0; caseIndex < allTestCases.size(); ++caseIndex ){
final AxialPositionTestCase cur = allTestCases.get(caseIndex);
// test repositioning
fins.setAxialOffset(cur.beginMethod, cur.beginOffset);
assertEquals(fins.getName() + " incorrect start axial-position-method: ", fins.getAxialMethod(), cur.beginMethod);
assertEquals(fins.getName() + " incorrect start axial-position-value: ", cur.beginOffset, fins.getAxialOffset(), EPSILON);
{
// System.err.println(String.format("## Running Test case # %d :", caseIndex));
fins.setAxialMethod(cur.endMethod);
assertEquals(String.format(" Test Case # %d // offset doesn't match!", caseIndex), cur.endOffset, fins.getAxialOffset(), EPSILON);
assertEquals(String.format(" Test Case # %d // position doesn't match!", caseIndex), cur.endPosition, fins.getPosition().x, EPSILON);
}
}
}
@Test
public void testRemoveReadjustLocation() {