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

Merge pull request #820 from wolsen/bug/776

Browse Source 
Only draw carets in 3d when length > 0
This commit is contained in:
Joe Pfeiffer 2020-12-03 11:25:03 -07:00 committed by GitHub
commit a6d4425c28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
View File

@ -616,9 +616,6 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
cgy = cg.y * Math.cos(rotation) + cg.z*Math.sin(rotation);
}
figure3d.setCG(cg);
figure3d.setCP(cp);
double length = curConfig.getLength();
double diameter = Double.NaN;
@ -640,6 +637,14 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
extraText.setMassWithoutMotors( emptyInfo.getMass() );
extraText.setWarnings(warnings);
if (length > 0) {
figure3d.setCG(cg);
figure3d.setCP(cp);
} else {
figure3d.setCG(new Coordinate(Double.NaN, Double.NaN));
figure3d.setCP(new Coordinate(Double.NaN, Double.NaN));
}
if (figure.getType() == RocketPanel.VIEW_TYPE.SideView && length > 0) {
extraCP.setPosition(cpx, cpy);
extraCG.setPosition(cgx, cgy);