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

Merge pull request #626 from teyrana/fix/555/fff/update

Browse Source 
[Resolves #555] editing FreeformFins now updates main window
This commit is contained in:
Daniel Williams 2020-04-25 18:01:05 -04:00 committed by GitHub
commit 1c7171eff2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/net/sf/openrocket/rocketcomponent/FreeformFinSet.java
View File

@ -222,6 +222,8 @@ public class FreeformFinSet extends FinSet {
log.error(String.format("ERROR: found an intersection while setting fin point #%d to [%6.4g, %6.4g] <body frame> : ABORTING setPoint(..) !! ", index, xRequest, yRequest));
return;
}
fireComponentChangeEvent(ComponentChangeEvent.AEROMASS_CHANGE);
}
private void movePoints(final double delta_x, final double delta_y) {

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

@ -505,6 +505,7 @@ public class FreeformFinSetTest extends BaseTestCase {
}{ // case 3:
fins.setAxialOffset( AxialMethod.MIDDLE, 0.0);
fins.setPoints(initialPoints);
assertEquals(0.0, fins.getAxialOffset(), EPSILON);
assertEquals(0.3, fins.getFinFront().x, EPSILON);
// vvvv function under test vvvv
@ -514,8 +515,8 @@ public class FreeformFinSetTest extends BaseTestCase {
assertEquals(0.05, fins.getAxialOffset(), EPSILON);
assertEquals(0.3, fins.getLength(), EPSILON);
assertEquals(0.35, fins.getFinFront().x, EPSILON);
assertEquals(0.825, fins.getFinFront().y, EPSILON);
assertEquals(0.4, fins.getFinFront().x, EPSILON);
assertEquals(0.8, fins.getFinFront().y, EPSILON);
final Coordinate[] postPoints = fins.getFinPoints();
assertEquals(postPoints.length, 3);
@ -530,13 +531,15 @@ public class FreeformFinSetTest extends BaseTestCase {
}{ // case 4:
fins.setAxialOffset( AxialMethod.MIDDLE, 0.0);
fins.setPoints(initialPoints);
assertEquals(0.3, fins.getFinFront().x, EPSILON);
assertEquals(0.85, fins.getFinFront().y, EPSILON);
// vvvv function under test vvvv
fins.setPoint( 0, -0.1, 0.1f);
fins.setPoint( 0, -0.1, 0.1f);
// ^^^^ function under test ^^^^
assertEquals(0.25, fins.getFinFront().x, EPSILON);
assertEquals(0.875, fins.getFinFront().y, EPSILON);
assertEquals(0.2, fins.getFinFront().x, EPSILON);
assertEquals(0.9, fins.getFinFront().y, EPSILON);
final Coordinate[] postPoints = fins.getFinPoints();
assertEquals(postPoints.length, 3);