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

[#2019] Add per-instance CD column to component analysis dialog

Browse Source
This commit is contained in:
SiboVG 2024-09-07 11:06:24 +02:00
parent 4f7b3bb452
commit 86aec4e22e
6 changed files with 102 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/info/openrocket/core/aerodynamics/AerodynamicForces.java
View File

@ -234,6 +234,10 @@ public class AerodynamicForces implements Cloneable, Monitorable {
modID = new ModID();
}
/**
* Get the drag coefficient <b>per instance</b>.
* @return The drag coefficient.
*/
public double getCD() {
if (component == null)
return CD;
@ -245,6 +249,10 @@ public class AerodynamicForces implements Cloneable, Monitorable {
return CD;
}
public double getCDTotal() {
return getCD() * component.getInstanceCount();
}
public void setPressureCD(double pressureCD) {
if (this.pressureCD == pressureCD)
return;

13
core/src/main/java/info/openrocket/core/componentanalysis/CADataType.java
View File

@ -39,8 +39,10 @@ public class CADataType implements Comparable<CADataType>, Groupable<CADataTypeG
"CD,base", UnitGroup.UNITS_NONE, CADataTypeGroup.DRAG, 21);
public static final CADataType FRICTION_CD = new CADataType(trans.get("ComponentAnalysisGeneralTab.dragTableModel.Col.friction"),
"CD,friction", UnitGroup.UNITS_NONE, CADataTypeGroup.DRAG, 22);
public static final CADataType PER_INSTANCE_CD = new CADataType(trans.get("ComponentAnalysisGeneralTab.dragTableModel.Col.perInstance"),
"CD,instance", UnitGroup.UNITS_NONE, CADataTypeGroup.DRAG, 23);
public static final CADataType TOTAL_CD = new CADataType(trans.get("ComponentAnalysisGeneralTab.dragTableModel.Col.total"),
"CD,total", UnitGroup.UNITS_NONE, CADataTypeGroup.DRAG, 23);
"CD,total", UnitGroup.UNITS_NONE, CADataTypeGroup.DRAG, 24);
//// Roll
public static final CADataType ROLL_FORCING_COEFFICIENT = new CADataType(trans.get("ComponentAnalysisGeneralTab.rollTableModel.Col.rollforc"),
@ -53,7 +55,7 @@ public class CADataType implements Comparable<CADataType>, Groupable<CADataTypeG
public static final CADataType[] ALL_TYPES = {
CP_X, CNa,
PRESSURE_CD, BASE_CD, FRICTION_CD, TOTAL_CD,
PRESSURE_CD, BASE_CD, FRICTION_CD, PER_INSTANCE_CD, TOTAL_CD,
ROLL_FORCING_COEFFICIENT, ROLL_DAMPING_COEFFICIENT, TOTAL_ROLL_COEFFICIENT
};
@ -124,9 +126,14 @@ public class CADataType implements Comparable<CADataType>, Groupable<CADataTypeG
return false;
}
// Doesn't make sense to calculate per-instance drag for rockets
if (component instanceof Rocket && type.equals(CADataType.PER_INSTANCE_CD)) {
return false;
}
if (type.equals(CADataType.CP_X) || type.equals(CADataType.CNa) ||
type.equals(CADataType.PRESSURE_CD) || type.equals(CADataType.BASE_CD) ||
type.equals(CADataType.FRICTION_CD) || type.equals(CADataType.TOTAL_CD)) {
type.equals(CADataType.FRICTION_CD) || type.equals(CADataType.PER_INSTANCE_CD) || type.equals(CADataType.TOTAL_CD)) {
return true;
} else if (type.equals(CADataType.ROLL_FORCING_COEFFICIENT) || type.equals(CADataType.ROLL_DAMPING_COEFFICIENT) ||
type.equals(CADataType.TOTAL_ROLL_COEFFICIENT)) {

6
core/src/main/java/info/openrocket/core/componentanalysis/CAParameterSweep.java
View File

@ -129,7 +129,8 @@ public class CAParameterSweep {
dataBranch.setValue(CADataType.PRESSURE_CD, component, forces.getPressureCD());
dataBranch.setValue(CADataType.BASE_CD, component, forces.getBaseCD());
dataBranch.setValue(CADataType.FRICTION_CD, component, forces.getFrictionCD());
dataBranch.setValue(CADataType.TOTAL_CD, component, forces.getCD());
dataBranch.setValue(CADataType.PER_INSTANCE_CD, component, forces.getCD());
dataBranch.setValue(CADataType.TOTAL_CD, component, forces.getCDTotal());
}
if (component instanceof FinSet) {
@ -154,7 +155,8 @@ public class CAParameterSweep {
dataBranch.setValue(CADataType.PRESSURE_CD, rocket, totalForces.getPressureCD());
dataBranch.setValue(CADataType.BASE_CD, rocket, totalForces.getBaseCD());
dataBranch.setValue(CADataType.FRICTION_CD, rocket, totalForces.getFrictionCD());
dataBranch.setValue(CADataType.TOTAL_CD, rocket, totalForces.getCD());
dataBranch.setValue(CADataType.PER_INSTANCE_CD, rocket, totalForces.getCD());
dataBranch.setValue(CADataType.TOTAL_CD, rocket, totalForces.getCDTotal());
}
}

1
core/src/main/resources/l10n/messages.properties
View File

@ -937,6 +937,7 @@ ComponentAnalysisGeneralTab.dragTableModel.Col.Component = Component
ComponentAnalysisGeneralTab.dragTableModel.Col.Pressure = <html>Pressure C<sub>D</sub>
ComponentAnalysisGeneralTab.dragTableModel.Col.Base = <html>Base C<sub>D</sub>
ComponentAnalysisGeneralTab.dragTableModel.Col.friction = <html>Friction C<sub>D</sub>
ComponentAnalysisGeneralTab.dragTableModel.Col.perInstance = <html>Per instance C<sub>D</sub>
ComponentAnalysisGeneralTab.dragTableModel.Col.total = <html>Total C<sub>D</sub>
ComponentAnalysisGeneralTab.dragTabchar = Drag characteristics
ComponentAnalysisGeneralTab.dragTabchar.ttip = Drag characteristics

2
swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/CAPlotTypeSelector.java
View File

@ -33,7 +33,7 @@ public class CAPlotTypeSelector extends PlotTypeSelector<CADataType, CADataTypeG
componentSelector = new JComboBox<>(componentsForType.toArray(new RocketComponent[0]));
componentSelector.setSelectedItem(selectedComponent);
configuration.setPlotDataComponent(plotIndex, selectedComponent);
this.add(componentSelector, "gapright para");
this.add(componentSelector, "growx, gapright para");
addRemoveButton();

83
swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/ComponentAnalysisGeneralPanel.java
View File

@ -38,6 +38,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.swing.BorderFactory;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JPanel;
@ -52,12 +53,17 @@ import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.plaf.LabelUI;
import javax.swing.plaf.basic.BasicLabelUI;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableModel;
import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Window;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@ -333,11 +339,18 @@ public class ComponentAnalysisGeneralPanel extends JPanel implements StateChange
return dragData.get(row).getFrictionCD();
}
},
//// <html>Per instance C<sub>D</sub>
new Column(trans.get("ComponentAnalysisGeneralTab.dragTableModel.Col.perInstance")) {
@Override
public Object getValueAt(int row) {
return dragData.get(row).getCD();
}
},
//// <html>Total C<sub>D</sub>
new Column(trans.get("ComponentAnalysisGeneralTab.dragTableModel.Col.total")) {
@Override
public Object getValueAt(int row) {
return dragData.get(row).getCD();
return dragData.get(row).getCDTotal();
}
}
) {
@ -666,7 +679,8 @@ public class ComponentAnalysisGeneralPanel extends JPanel implements StateChange
private final List<?> data;
protected final int decimalPlaces;
private static Color backgroundColor;
protected static Color backgroundColor;
protected static Color foregroundColor;
static {
initColors();
@ -687,6 +701,7 @@ public class ComponentAnalysisGeneralPanel extends JPanel implements StateChange
private static void updateColors() {
backgroundColor = GUIUtil.getUITheme().getBackgroundColor();
foregroundColor = GUIUtil.getUITheme().getTextColor();
}
@Override
@ -748,9 +763,12 @@ public class ComponentAnalysisGeneralPanel extends JPanel implements StateChange
private class DragCellRenderer extends CustomCellRenderer {
private static final long serialVersionUID = 1L;
private final StripedLabelUI stripedUI;
private final LabelUI defaultUI = new BasicLabelUI();
public DragCellRenderer() {
super(dragData, 3);
this.stripedUI = new StripedLabelUI(1, 12);
}
@Override
@ -758,6 +776,9 @@ public class ComponentAnalysisGeneralPanel extends JPanel implements StateChange
boolean isSelected, boolean hasFocus, int row, int column) {
JLabel label = (JLabel) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
// Reset to default UI
label.setUI(defaultUI);
if (!isSelected && (value instanceof Double)) {
double cd = (Double) value;
float r = (float) (cd / 1.5);
@ -770,10 +791,26 @@ public class ComponentAnalysisGeneralPanel extends JPanel implements StateChange
label.setForeground(Color.BLACK);
}
// For the per instance CD, we want to use a different formatting, because the relative percentages
// don't matter, and the total instance CD for the rocket makes no sense.
if (column == 4) {
if (row == 0) {
label.setText("");
label.setOpaque(true);
label.setBackground(backgroundColor);
label.setForeground(foregroundColor);
label.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
label.setUI(stripedUI);
} else {
label.setText(decimalFormat(dragData.get(row).getCD()));
}
return label;
}
if ((row < 0) || (row >= dragData.size()))
return label;
if ((dragData.get(row).getComponent() instanceof Rocket) || (column == 4)) {
if ((dragData.get(row).getComponent() instanceof Rocket) || (column == 5)) {
label.setFont(boldFont);
} else {
label.setFont(normalFont);
@ -786,10 +823,46 @@ public class ComponentAnalysisGeneralPanel extends JPanel implements StateChange
protected String formatDouble(Double cd) {
final double totalCD = dragData.get(0).getCD();
DecimalFormat df = new DecimalFormat("0." + "#".repeat(Math.max(0, decimalPlaces)));
String cdFormatted = df.format(cd);
String cdFormatted = decimalFormat(cd);
return String.format(cdFormatted + " (%.0f%%)", 100 * cd / totalCD);
}
private String decimalFormat(Double cd) {
DecimalFormat df = new DecimalFormat("0." + "#".repeat(Math.max(0, decimalPlaces)));
return df.format(cd);
}
private static class StripedLabelUI extends BasicLabelUI {
private final int lineWidth;
private final int lineSpacing;
public StripedLabelUI(int lineWidth, int lineSpacing) {
this.lineWidth = lineWidth;
this.lineSpacing = lineSpacing;
}
@Override
public void paint(Graphics g, JComponent c) {
Graphics2D g2d = (Graphics2D) g.create();
int width = c.getWidth();
int height = c.getHeight();
// Paint background
g2d.setColor(c.getBackground());
g2d.fillRect(0, 0, width, height);
// Paint thin lines
g2d.setColor(c.getForeground());
g2d.setStroke(new BasicStroke(lineWidth));
for (int x = -height; x < width; x += (lineWidth + lineSpacing)) {
g2d.drawLine(x, height, x + height, 0);
}
g2d.dispose();
super.paint(g, c);
}
}
}
private class RollDynamicsCellRenderer extends CustomCellRenderer {