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

Merge pull request #2262 from SiboVG/fix-stab-info-text

Browse Source 
Separate stability info text from rest
This commit is contained in:
Sibo Van Gool 2023-07-17 16:04:45 +02:00 committed by GitHub
commit 0b87241f03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,25 +226,31 @@ public class RocketInfo implements FigureElement {
Rectangle2D stabTextRect = stabText.getVisualBounds(); Rectangle2D stabTextRect = stabText.getVisualBounds();
Rectangle2D atTextRect = atText.getVisualBounds(); Rectangle2D atTextRect = atText.getVisualBounds();
double unitWidth = MathUtil.max(cpRect.getWidth(), cgRect.getWidth(), stabRect.getWidth()); double unitWidth = MathUtil.max(cpRect.getWidth(), cgRect.getWidth());
double stabUnitWidth = stabRect.getWidth();
double textWidth = Math.max(cpTextRect.getWidth(), cgTextRect.getWidth()); double textWidth = Math.max(cpTextRect.getWidth(), cgTextRect.getWidth());
// Add an extra space worth of width so the text doesn't run into the values // Add an extra space worth of width so the text doesn't run into the values
unitWidth = unitWidth + spaceWidth; unitWidth = unitWidth + spaceWidth;
stabUnitWidth = stabUnitWidth + spaceWidth;
g2.setColor(Color.BLACK); g2.setColor(Color.BLACK);
// Draw the stability, CG & CP values (and units)
g2.drawGlyphVector(stabValue, (float)(x2-stabRect.getWidth()), y1); g2.drawGlyphVector(stabValue, (float)(x2-stabRect.getWidth()), y1);
g2.drawGlyphVector(cgValue, (float)(x2-cgRect.getWidth()), y1+line); g2.drawGlyphVector(cgValue, (float)(x2-cgRect.getWidth()), y1+line);
g2.drawGlyphVector(cpValue, (float)(x2-cpRect.getWidth()), y1+2*line); g2.drawGlyphVector(cpValue, (float)(x2-cpRect.getWidth()), y1+2*line);
g2.drawGlyphVector(stabText, (float)(x2-unitWidth-stabTextRect.getWidth()), y1); // Draw the stability, CG & CP labels
g2.drawGlyphVector(stabText, (float)(x2-stabUnitWidth-stabTextRect.getWidth()), y1);
g2.drawGlyphVector(cgText, (float)(x2-unitWidth-cgTextRect.getWidth()), y1+line); g2.drawGlyphVector(cgText, (float)(x2-unitWidth-cgTextRect.getWidth()), y1+line);
g2.drawGlyphVector(cpText, (float)(x2-unitWidth-cpTextRect.getWidth()), y1+2*line); g2.drawGlyphVector(cpText, (float)(x2-unitWidth-cpTextRect.getWidth()), y1+2*line);
// Draw the CG caret
cgCaret.setPosition(x2 - unitWidth - textWidth - 10, y1+line-0.3*line); cgCaret.setPosition(x2 - unitWidth - textWidth - 10, y1+line-0.3*line);
cgCaret.paint(g2, 1.7); cgCaret.paint(g2, 1.7);
// Draw the CP caret
cpCaret.setPosition(x2 - unitWidth - textWidth - 10, y1+2*line-0.3*line); cpCaret.setPosition(x2 - unitWidth - textWidth - 10, y1+2*line-0.3*line);
cpCaret.paint(g2, 1.7); cpCaret.paint(g2, 1.7);