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

Refactor

Browse Source
This commit is contained in:
SiboVG 2023-05-24 01:51:54 +02:00
parent 6f3f1ed67d
commit 57469e940e
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
swing/src/net/sf/openrocket/gui/figureelements/RocketInfo.java
View File

@ -189,16 +189,6 @@ public class RocketInfo implements FigureElement {
private void drawStabilityInfo() { private void drawStabilityInfo() {
String at;
//// at M=
at = trans.get("RocketInfo.at")+UnitGroup.UNITS_COEFFICIENT.getDefaultUnit().toStringUnit(this.mach);
if (!Double.isNaN(aoa)) {
at += " "+ALPHA+"=" + UnitGroup.UNITS_ANGLE.getDefaultUnit().toStringUnit(aoa);
}
if (!Double.isNaN(theta)) {
at += " "+THETA+"=" + UnitGroup.UNITS_ANGLE.getDefaultUnit().toStringUnit(theta);
}
GlyphVector cgValue = createText(getCg()); GlyphVector cgValue = createText(getCg());
GlyphVector cpValue = createText(getCp()); GlyphVector cpValue = createText(getCp());
GlyphVector stabValue = createText(getStabilityCombined()); GlyphVector stabValue = createText(getStabilityCombined());
@ -209,6 +199,15 @@ public class RocketInfo implements FigureElement {
GlyphVector cpText = createText(trans.get("RocketInfo.cpText")); GlyphVector cpText = createText(trans.get("RocketInfo.cpText"));
//// Stability: //// Stability:
GlyphVector stabText = createText(trans.get("RocketInfo.stabText")); GlyphVector stabText = createText(trans.get("RocketInfo.stabText"));
//// at M=...
String at = trans.get("RocketInfo.at")+UnitGroup.UNITS_COEFFICIENT.getDefaultUnit().toStringUnit(this.mach);
if (!Double.isNaN(aoa)) {
at += " "+ALPHA+"=" + UnitGroup.UNITS_ANGLE.getDefaultUnit().toStringUnit(aoa);
}
if (!Double.isNaN(theta)) {
at += " "+THETA+"=" + UnitGroup.UNITS_ANGLE.getDefaultUnit().toStringUnit(theta);
}
GlyphVector atText = createSmallText(at); GlyphVector atText = createSmallText(at);
// GlyphVector visual bounds drops the spaces, so we'll add them // GlyphVector visual bounds drops the spaces, so we'll add them