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

[fixes #358] Fix some more issues...

Browse Source
This commit is contained in:
SiboVG 2022-02-17 17:28:16 +01:00
parent 161120855c
commit 6a9ce5d34a
4 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/net/sf/openrocket/motor/MotorConfiguration.java
View File

@ -226,6 +226,16 @@ public class MotorConfiguration implements FlightConfigurableParameter<MotorConf
return clone; return clone;
} }
public void copyFrom(MotorConfiguration configuration) {
if (configuration == null) return;
this.motor = configuration.motor;
this.ejectionDelay = configuration.ejectionDelay;
this.ignitionOveride = configuration.ignitionOveride;
this.ignitionDelay = configuration.ignitionDelay;
this.ignitionEvent = configuration.ignitionEvent;
}
public int getModID() { public int getModID() {

8
core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
View File

@ -390,7 +390,7 @@ public class BodyTube extends SymmetricComponent implements BoxBounded, MotorMou
} }
@Override @Override
public void setMotorConfig( final MotorConfiguration newMotorConfig, final FlightConfigurationId fcid){ public void setMotorConfig(MotorConfiguration newMotorConfig, FlightConfigurationId fcid){
if(null == newMotorConfig){ if(null == newMotorConfig){
this.motors.set( fcid, null); this.motors.set( fcid, null);
}else{ }else{
@ -405,7 +405,11 @@ public class BodyTube extends SymmetricComponent implements BoxBounded, MotorMou
for (RocketComponent listener : configListeners) { for (RocketComponent listener : configListeners) {
if (listener instanceof BodyTube) { if (listener instanceof BodyTube) {
((BodyTube) listener).setMotorConfig(newMotorConfig, fcid); if (newMotorConfig != null) {
BodyTube tube = (BodyTube) listener;
MotorConfiguration config = tube.getMotorConfig(fcid);
config.copyFrom(newMotorConfig);
}
} }
} }
} }

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

@ -1873,6 +1873,10 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
configListeners.clear(); configListeners.clear();
} }
public List<RocketComponent> getConfigListeners() {
return configListeners;
}
/** /**
* Checks whether this component has been invalidated and should no longer be used. * Checks whether this component has been invalidated and should no longer be used.

10
swing/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java
View File

@ -85,7 +85,15 @@ public abstract class FinSetConfig extends RocketComponentConfig {
document.addUndoPosition(trans.get("FinSetConfig.Convertfinset")); document.addUndoPosition(trans.get("FinSetConfig.Convertfinset"));
RocketComponent freeform = RocketComponent freeform =
FreeformFinSet.convertFinSet((FinSet) component); FreeformFinSet.convertFinSet((FinSet) component);
ComponentConfigDialog.showDialog(freeform);
List<RocketComponent> listeners = new ArrayList<>();
for (RocketComponent listener : component.getConfigListeners()) {
if (listener instanceof FinSet) {
listeners.add(FreeformFinSet.convertFinSet((FinSet) listener));
}
}
ComponentConfigDialog.showDialog(freeform, listeners);
} }
}); });