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

The deleted methods (setTotalThrustEstimate(), setBurnTimeEstimate(), setAverageThrustEstimate(), and setMaxThrustEstimate()) were never called. The member variables maxThrust, burnTimeEstimate, averageThrust, totalImpulse are all calculated by computeStatistics() and the values (if any) from the thrustcurve file are ignored.

Browse Source
This commit is contained in:
JoePfeiffer 2020-04-19 10:47:28 -06:00
parent 58b92be39e
commit b9a881c5c9
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/net/sf/openrocket/motor/ThrustCurveMotor.java
View File

@ -60,16 +60,6 @@ public class ThrustCurveMotor implements Motor, Comparable<ThrustCurveMotor>, Se
ThrustCurveMotor motor = new ThrustCurveMotor();
public Builder setAverageThrustEstimate(double v) {
motor.averageThrust = v;
return this;
}
public Builder setBurnTimeEstimate(double v) {
motor.burnTimeEstimate = v;
return this;
}
public Builder setCaseInfo(String v) {
motor.caseInfo = v;
return this;
@ -115,11 +105,6 @@ public class ThrustCurveMotor implements Motor, Comparable<ThrustCurveMotor>, Se
return this;
}
public Builder setMaxThrustEstimate(double v) {
motor.maxThrust = v;
return this;
}
public Builder setMotorType(Motor.Type t) {
motor.type = t;
return this;
@ -145,11 +130,6 @@ public class ThrustCurveMotor implements Motor, Comparable<ThrustCurveMotor>, Se
return this;
}
public Builder setTotalThrustEstimate(double v) {
motor.totalImpulse = v;
return this;
}
public Builder setAvailablity(boolean avail) {
motor.available = avail;
return this;

4
swing/test/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorRowFilterTest.java
View File

@ -177,8 +177,6 @@ public class MotorRowFilterTest {
// create a motor with all fields explicitly defined
// This is the Aerotech H123 from thrustcurve.org, motor ID 917
final ThrustCurveMotor fullMotor = new ThrustCurveMotor.Builder()
.setAverageThrustEstimate(83.5)
.setBurnTimeEstimate(2.5)
.setCaseInfo("Aerotech 38/240")
.setCGPoints(new Coordinate[] {new Coordinate(0.077, 0, 0, 125.0),
new Coordinate(0.077, 0, 0, 109.93),
@ -199,13 +197,11 @@ public class MotorRowFilterTest {
.setInitialMass(293.3)
.setLength(0.152)
.setManufacturer(Manufacturer.getManufacturer("AeroTech"))
.setMaxThrustEstimate(174.2)
.setMotorType(Motor.Type.RELOAD)
.setPropellantInfo("White Lightning")
.setStandardDelays(new double[] {6, 10, 14})
.setThrustPoints(new double[] {138.42, 116.45, 116.45, 112.18, 107.82, 86.29, 81.93, 64.72, 47.46, 43.15, 30.2, 0.0})
.setTimePoints(new double[] {0.0, 0.2, 0.6, 0.7, 0.8, 1.3, 1.5, 1.8, 2.1, 2.2, 2.3, 2.6})
.setTotalThrustEstimate(211.4)
.build();
// two search terms, both present, one only a substring of a column