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

Merge pull request #1343 from SiboVG/issue-1340

Browse Source 
[fixes #1340] Clear Transition preset on shape and type change
This commit is contained in:
SiboVG 2022-05-10 22:59:58 +02:00 committed by GitHub
commit e521755956
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,6 +262,10 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
this.type = type; this.type = type;
this.clipped = type.isClippable(); this.clipped = type.isClippable();
this.shapeParameter = type.defaultParameter(); this.shapeParameter = type.defaultParameter();
// Need to clearPreset when shape type changes.
clearPreset();
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE); fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
} }
@ -279,6 +283,10 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
if (shapeParameter == n) if (shapeParameter == n)
return; return;
this.shapeParameter = MathUtil.clamp(n, type.minParameter(), type.maxParameter()); this.shapeParameter = MathUtil.clamp(n, type.minParameter(), type.maxParameter());
// Need to clearPreset when shape type changes.
clearPreset();
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE); fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
} }

4
install4j/22.xx/openrocket-22.xx.install4j
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<install4j version="9.0.6" transformSequenceNumber="9"> <install4j version="9.0.6" transformSequenceNumber="9">
<directoryPresets config="./macOS_resources" /> <directoryPresets config="./macOS_resources" />
<application name="OpenRocket 22.02.beta.03" applicationId="8434-9327-1469-6373" mediaDir="media" shortName="OpenRocket" publisher="OpenRocket" publisherWeb="http://openrocket.info" version="22.02.beta.03" allPathsRelative="true" macVolumeId="5f58a2be20d8e22f" javaMinVersion="11.0" javaMaxVersion="13.0" jdkMode="jdk" jdkName="JDK 11.0"> <application name="OpenRocket 22.02.beta.03" applicationId="8434-9327-1469-6373" mediaDir="media" shortName="OpenRocket" publisher="OpenRocket" publisherWeb="http://openrocket.info" version="22.02.beta.03" allPathsRelative="true" macVolumeId="5f58a2be20d8e22f" javaMinVersion="17" javaMaxVersion="17" jdkMode="jdk" jdkName="JDK 11.0">
<jreBundles jdkProviderId="Liberica" release="11/11.0.14.1+1"> <jreBundles jdkProviderId="Liberica" release="17/17+35">
<modules> <modules>
<defaultModules set="jre" /> <defaultModules set="jre" />
<module name="java.scripting" /> <module name="java.scripting" />