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

[#1826] Fill in gaps in multi-sim editing

Browse Source
This commit is contained in:
SiboVG 2023-03-28 18:37:32 +02:00
parent f7a66472d5
commit fa7f7635ca
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/net/sf/openrocket/simulation/SimulationOptions.java
View File

@ -442,10 +442,6 @@ public class SimulationOptions implements ChangeSource, Cloneable {
isChanged = true;
this.launchLongitude = src.launchLongitude;
}
if (this.launchPressure != src.launchPressure) {
isChanged = true;
this.launchPressure = src.launchPressure;
}
if (this.launchRodAngle != src.launchRodAngle) {
isChanged = true;
this.launchRodAngle = src.launchRodAngle;
@ -458,19 +454,26 @@ public class SimulationOptions implements ChangeSource, Cloneable {
isChanged = true;
this.launchRodLength = src.launchRodLength;
}
if (this.launchIntoWind != src.launchIntoWind) {
isChanged = true;
this.launchIntoWind = src.launchIntoWind;
}
if (this.useISA != src.useISA) {
isChanged = true;
this.useISA = src.useISA;
}
if (this.launchTemperature != src.launchTemperature) {
isChanged = true;
this.launchTemperature = src.launchTemperature;
}
if (this.launchPressure != src.launchPressure) {
isChanged = true;
this.launchPressure = src.launchPressure;
}
if (this.maximumAngle != src.maximumAngle) {
isChanged = true;
this.maximumAngle = src.maximumAngle;
}
this.maximumAngle = src.maximumAngle;
if (this.timeStep != src.timeStep) {
isChanged = true;
this.timeStep = src.timeStep;
}
if (this.windAverage != src.windAverage) {
isChanged = true;
this.windAverage = src.windAverage;
@ -487,6 +490,14 @@ public class SimulationOptions implements ChangeSource, Cloneable {
isChanged = true;
this.calculateExtras = src.calculateExtras;
}
if (this.timeStep != src.timeStep) {
isChanged = true;
this.timeStep = src.timeStep;
}
if (this.geodeticComputation != src.geodeticComputation) {
isChanged = true;
this.geodeticComputation = src.geodeticComputation;
}
if (isChanged) {
// Only copy the randomSeed if something else has changed.