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

Merge branch 'openrocket:unstable' into Change-side-view-to-top-view

Browse Source
This commit is contained in:
H Craig Miller 2022-12-21 15:22:02 -08:00 committed by GitHub
commit 84278786b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/net/sf/openrocket/file/rocksim/export/FinSetDTO.java
View File

@ -6,6 +6,7 @@ import net.sf.openrocket.rocketcomponent.EllipticalFinSet;
import net.sf.openrocket.rocketcomponent.FinSet;
import net.sf.openrocket.rocketcomponent.FreeformFinSet;
import net.sf.openrocket.rocketcomponent.TrapezoidFinSet;
import net.sf.openrocket.rocketcomponent.position.AxialMethod;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@ -64,7 +65,7 @@ public class FinSetDTO extends BasePartDTO {
setCantAngle(theORFinSet.getCantAngle());
setTabDepth(theORFinSet.getTabHeight() * RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
setTabLength(theORFinSet.getTabLength() * RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
setTabOffset(theORFinSet.getTabOffset() * RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
setTabOffset(theORFinSet.getTabOffset(AxialMethod.TOP) * RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
setThickness(theORFinSet.getThickness() * RockSimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH);
setRadialAngle(theORFinSet.getBaseRotation());

6
core/src/net/sf/openrocket/rocketcomponent/FinSet.java
View File

@ -396,8 +396,12 @@ public abstract class FinSet extends ExternalComponent implements AxialPositiona
return tabPosition;
}
public double getTabOffset(AxialMethod method){
return method.getAsOffset(tabPosition, tabLength, length);
}
public double getTabOffset(){
return this.tabOffsetMethod.getAsOffset(tabPosition, tabLength, length);
return getTabOffset(this.tabOffsetMethod);
}
/**

2
swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java
View File

@ -349,7 +349,7 @@ public class FreeformFinSetConfig extends FinSetConfig {
// first row: main display
JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, tablePane, figurePane);
splitPane.setResizeWeight(0.1);
splitPane.setResizeWeight(0.15);
splitPane.setBorder(null);
panel.add(splitPane, "width 300lp:500lp:, gap unrel, grow, height 100lp:250lp:, wrap");
order.add(table);