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

Merge pull request #1726 from SiboVG/issue-1723

Browse Source 
[#1723] Import MassObject length with NoAuto
This commit is contained in:
Sibo Van Gool 2022-10-10 01:01:04 +02:00 committed by GitHub
commit e8f6074b86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/net/sf/openrocket/file/openrocket/importt/DocumentConfig.java
View File

@ -374,7 +374,7 @@ class DocumentConfig {
// MassObject // MassObject
setters.put("MassObject:packedlength", new DoubleSetter( setters.put("MassObject:packedlength", new DoubleSetter(
Reflection.findMethod(MassObject.class, "setLength", double.class))); Reflection.findMethod(MassObject.class, "setLengthNoAuto", double.class)));
setters.put("MassObject:packedradius", new DoubleSetter( setters.put("MassObject:packedradius", new DoubleSetter(
Reflection.findMethod(MassObject.class, "setRadius", double.class), Reflection.findMethod(MassObject.class, "setRadius", double.class),
"auto", " ", "auto", " ",

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

@ -248,8 +248,8 @@ public abstract class MassObject extends InternalComponent {
@Override @Override
public final Collection<Coordinate> getComponentBounds() { public final Collection<Coordinate> getComponentBounds() {
Collection<Coordinate> c = new ArrayList<Coordinate>(); Collection<Coordinate> c = new ArrayList<Coordinate>();
addBound(c, 0, radius); addBound(c, 0, getRadius());
addBound(c, length, radius); addBound(c, getLength(), getRadius());
return c; return c;
} }