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

Fix component tooltip when subcomponents overridden

Browse Source
This commit is contained in:
SiboVG 2022-11-09 01:55:49 +01:00
parent a3776ddec0
commit 072616468e
7 changed files with 81 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/resources/l10n/messages.properties
View File

@ -932,7 +932,7 @@ RocketCompCfg.checkbox.OverrideSubcomponents.CG.ttip = <html>Overrides the cente
RocketCompCfg.checkbox.OverrideSubcomponents.CD.ttip = <html>Overrides the coefficient of drag (C<sub>D</sub>) of this component<br>and its subcomponents with the C<sub>D</sub> of this component.</html> RocketCompCfg.checkbox.OverrideSubcomponents.CD.ttip = <html>Overrides the coefficient of drag (C<sub>D</sub>) of this component<br>and its subcomponents with the C<sub>D</sub> of this component.</html>
RocketCompCfg.lbl.MassOverriddenBy = Mass overridden by %s RocketCompCfg.lbl.MassOverriddenBy = Mass overridden by %s
RocketCompCfg.lbl.CGOverriddenBy = CG overridden by %s RocketCompCfg.lbl.CGOverriddenBy = CG overridden by %s
RocketCompCfg.lbl.CDOverriddenBy = <html>C<sub>D</sub> overridden by %s</html> RocketCompCfg.lbl.CDOverriddenBy = <html>C<sub>D</sub> overridden by %s
RocketCompCfg.lbl.MassOverriddenBy.ttip = The mass of this component is determined by the mass override value of %s RocketCompCfg.lbl.MassOverriddenBy.ttip = The mass of this component is determined by the mass override value of %s
RocketCompCfg.lbl.CGOverriddenBy.ttip = The CG of this component is determined by the CG override value of %s RocketCompCfg.lbl.CGOverriddenBy.ttip = The CG of this component is determined by the CG override value of %s
RocketCompCfg.lbl.CDOverriddenBy.ttip = <html>The C<sub>D</sub> of this component is determined by the C<sub>D</sub> override value of %s</html> RocketCompCfg.lbl.CDOverriddenBy.ttip = <html>The C<sub>D</sub> of this component is determined by the C<sub>D</sub> override value of %s</html>
@ -1360,10 +1360,13 @@ PlotDialog.CheckBox.Showdatapoints = Show data points
PlotDialog.lbl.Chart = left click drag to zoom area. mouse wheel to zoom. ctrl-mouse wheel to zoom x axis only. ctrl-left click drag to pan. right click drag to zoom dynamically. PlotDialog.lbl.Chart = left click drag to zoom area. mouse wheel to zoom. ctrl-mouse wheel to zoom x axis only. ctrl-left click drag to pan. right click drag to zoom dynamically.
PlotDialog.btn.exportImage = Export Image PlotDialog.btn.exportImage = Export Image
ComponentTree.ttip.massoverride = mass override ComponentTree.ttip.massoverride = mass overriden
ComponentTree.ttip.cgoverride = cg override ComponentTree.ttip.cgoverride = CG overriden
ComponentTree.ttip.cdoverride = <html>C<sub>D</sub> overriden</html>
! "main" prefix is used for the main application dialog ! "main" prefix is used for the main application dialog
ComponentTreeRenderer.total = total
# FIXME: Rename the description keys # FIXME: Rename the description keys
main.menu.file = File main.menu.file = File

1
core/resources/l10n/messages_de.properties
View File

@ -1024,6 +1024,7 @@ PlotDialog.Chart.Simulatedflight = Simulierter Flug
PlotDialog.CheckBox.Showdatapoints = Datenpunkte anzeigen PlotDialog.CheckBox.Showdatapoints = Datenpunkte anzeigen
PlotDialog.lbl.Chart = Klicken+ziehen: runter+rechts um hinein zu zoomen, hoch+links um heraus zu zoomen PlotDialog.lbl.Chart = Klicken+ziehen: runter+rechts um hinein zu zoomen, hoch+links um heraus zu zoomen
ComponentTreeRenderer.total = gesamt
! "main" prefix is used for the main application dialog ! "main" prefix is used for the main application dialog

2
core/resources/l10n/messages_es.properties
View File

@ -732,6 +732,8 @@ PlotDialog.CheckBox.Showdatapoints = Mostrar los datos de los puntos
PlotDialog.lbl.Chart = Arastrar con bot\u00f3n-izq rat\u00f3n para zoom del \u00e1rea. Rueda rat\u00f3n para zoom. Ctrl+rueda rat\u00f3n para zoom eje x. Ctrl+arrastrar con bot\u00f3n-izq rat\u00f3n para desplazar. Arrastrar con bot\u00f3n-der para zoom din\u00e1mico PlotDialog.lbl.Chart = Arastrar con bot\u00f3n-izq rat\u00f3n para zoom del \u00e1rea. Rueda rat\u00f3n para zoom. Ctrl+rueda rat\u00f3n para zoom eje x. Ctrl+arrastrar con bot\u00f3n-izq rat\u00f3n para desplazar. Arrastrar con bot\u00f3n-der para zoom din\u00e1mico
PlotDialog.title.Flightdataplot = Representaci\u00f3n de los datos de vuelo PlotDialog.title.Flightdataplot = Representaci\u00f3n de los datos de vuelo
ComponentTreeRenderer.total = total
PreferencesDialog.languages.default = Idioma por defecto PreferencesDialog.languages.default = Idioma por defecto
PreferencesDialog.lbl.language = Idioma de la interfaz: PreferencesDialog.lbl.language = Idioma de la interfaz:
PreferencesDialog.lbl.languageEffect = El idioma cambiar\u00e1 la pr\u00f3xima vez que abra OpenRocket. PreferencesDialog.lbl.languageEffect = El idioma cambiar\u00e1 la pr\u00f3xima vez que abra OpenRocket.

2
core/resources/l10n/messages_fr.properties
View File

@ -724,6 +724,8 @@ PlotDialog.lbl.Chart = Cliquer+d\u00E9placer en bas +droite pour a
! PlotDialog ! PlotDialog
PlotDialog.title.Flightdataplot = Trac\u00E9 du vol PlotDialog.title.Flightdataplot = Trac\u00E9 du vol
ComponentTreeRenderer.total = total
PreferencesDialog.languages.default = Valeur syst\u00E8me par d\u00E9faut PreferencesDialog.languages.default = Valeur syst\u00E8me par d\u00E9faut
PreferencesDialog.lbl.language = Langue du programme: PreferencesDialog.lbl.language = Langue du programme:
PreferencesDialog.lbl.languageEffect = La langue sera chang\u00E9e apr\u00E8s avoir red\u00E9marr\u00E9 OpenRocket. PreferencesDialog.lbl.languageEffect = La langue sera chang\u00E9e apr\u00E8s avoir red\u00E9marr\u00E9 OpenRocket.

1
core/resources/l10n/messages_it.properties
View File

@ -1025,6 +1025,7 @@ PlotDialog.Chart.Simulatedflight = Volo simulato
PlotDialog.CheckBox.Showdatapoints = Mostra i punti PlotDialog.CheckBox.Showdatapoints = Mostra i punti
PlotDialog.lbl.Chart = Clicca e trascina giu'-dx per ingrandire, su-sx per rimpicciolire PlotDialog.lbl.Chart = Clicca e trascina giu'-dx per ingrandire, su-sx per rimpicciolire
ComponentTreeRenderer.total = totali
! "main" prefix is used for the main application dialog ! "main" prefix is used for the main application dialog

4
core/resources/l10n/messages_nl.properties
View File

@ -1224,10 +1224,12 @@ TCMotorSelPan.btn.close = Sluit
PlotDialog.CheckBox.Showdatapoints = Toon datapunten PlotDialog.CheckBox.Showdatapoints = Toon datapunten
PlotDialog.lbl.Chart = Linksklik+sleep om in te zoomen op omgeving. Muiswiel om te zoomen. Ctrl-muiswiel om enkel x-as te zoomen. Ctrl-linksklik om te bewegen. Rechtsklik+sleep om dynamisch te zoomen. PlotDialog.lbl.Chart = Linksklik+sleep om in te zoomen op omgeving. Muiswiel om te zoomen. Ctrl-muiswiel om enkel x-as te zoomen. Ctrl-linksklik om te bewegen. Rechtsklik+sleep om dynamisch te zoomen.
ComponentTree.ttip.massoverride = Massa overschrijven ComponentTree.ttip.massoverride = Massa overschreven
ComponentTree.ttip.cgoverride = ZP overschrijven ComponentTree.ttip.cgoverride = ZP overschrijven
! "main" prefix is used for the main application dialog ! "main" prefix is used for the main application dialog
ComponentTreeRenderer.total = totaal
# FIXME: Rename the description keys # FIXME: Rename the description keys
main.menu.file = Bestand main.menu.file = Bestand

57
swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java
View File

@ -96,32 +96,60 @@ public class ComponentTreeRenderer extends DefaultTreeCellRenderer {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("<html>"); sb.append("<html>");
// Component name title
sb.append("<b>").append(c.getName()).append("</b>"); sb.append("<b>").append(c.getName()).append("</b>");
// Only add mass information if mass is not overridden by a parent component
RocketComponent overriddenBy = c.getMassOverriddenBy();
if (overriddenBy == null) {
if (c.isMassive() || c.isMassOverridden()) { if (c.isMassive() || c.isMassOverridden()) {
sb.append(" (").append( sb.append(" (").append(
UnitGroup.UNITS_MASS.toStringUnit(c.getMass())); UnitGroup.UNITS_MASS.toStringUnit(c.getMass()));
if (c.getChildCount() > 0) { if (c.getChildCount() > 0) {
sb.append(" of ") sb.append(" of ")
.append(UnitGroup.UNITS_MASS.toStringUnit(c .append(UnitGroup.UNITS_MASS.toStringUnit(c
.getSectionMass())).append(" total"); .getSectionMass())).append(" ").append(trans.get("ComponentTreeRenderer.total"));
} }
sb.append(")"); sb.append(")");
} else { } else {
if ((c.getChildCount() > 0) && (c.getSectionMass() > 0)) { if ((c.getChildCount() > 0) && (c.getSectionMass() > 0)) {
sb.append(" (") sb.append(" (")
.append(UnitGroup.UNITS_MASS.toStringUnit(c .append(UnitGroup.UNITS_MASS.toStringUnit(c
.getSectionMass())).append(" total)"); .getSectionMass())).append(" ").append(trans.get("ComponentTreeRenderer.total")).append(")");
}
} }
} }
if (c.isMassOverridden()) { // Add component override information in title
sb.append(" ").append(trans.get("ComponentTree.ttip.massoverride")); if (c.isMassOverridden() && c.getMassOverriddenBy() == null) {
sb.append(", ").append(trans.get("ComponentTree.ttip.massoverride"));
}
if (c.isCGOverridden() && c.getCGOverriddenBy() == null) {
sb.append(", ").append(trans.get("ComponentTree.ttip.cgoverride"));
}
if (c.isCDOverridden() && c.getCDOverriddenBy() == null) {
sb.append(", ").append(trans.get("ComponentTree.ttip.cdoverride"));
} }
if (c.isCGOverridden()) { // Add parent component override information on new lines
sb.append(" ").append(trans.get("ComponentTree.ttip.cgoverride")); if (overriddenBy != null) {
sb.append("<br>").append(String.format(trans.get("RocketCompCfg.lbl.MassOverriddenBy"), overriddenBy.getName()));
sb.append(" (").append(
UnitGroup.UNITS_MASS.toStringUnit(overriddenBy.getMass())).append(")");
}
overriddenBy = c.getCGOverriddenBy();
if (overriddenBy != null) {
sb.append("<br>").append(String.format(trans.get("RocketCompCfg.lbl.CGOverriddenBy"), overriddenBy.getName()));
sb.append(" (").append(
UnitGroup.UNITS_LENGTH.toStringUnit(overriddenBy.getOverrideCGX())).append(")");
}
overriddenBy = c.getCDOverriddenBy();
if (overriddenBy != null) {
sb.append("<br>").append(String.format(trans.get("RocketCompCfg.lbl.CDOverriddenBy"), overriddenBy.getName()));
sb.append(" (").append(overriddenBy.getOverrideCD()).append(")");
} }
// Add component comment on new line
String comment = c.getComment().trim(); String comment = c.getComment().trim();
if (comment.length() > 0) { if (comment.length() > 0) {
comment = TextUtil.escapeXML(comment); comment = TextUtil.escapeXML(comment);
@ -140,11 +168,24 @@ public class ComponentTreeRenderer extends DefaultTreeCellRenderer {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("<html>"); sb.append("<html>");
// Components title
sb.append("<b>Components</b>"); sb.append("<b>Components</b>");
// Calculate the total mass of the selected components
double totalMass = 0; double totalMass = 0;
double totalSectionMass = 0; double totalSectionMass = 0;
boolean containsSectionMass = false; boolean containsSectionMass = false;
List<RocketComponent> overriddenByComponents = new java.util.ArrayList<>(); // Components that override the mass of the selected components
for (RocketComponent c : components) { for (RocketComponent c : components) {
RocketComponent overriddenBy = c.getMassOverriddenBy();
if (overriddenBy != null) {
if (!components.contains(overriddenBy) && !overriddenByComponents.contains(overriddenBy)) {
totalMass += overriddenBy.getMass();
overriddenByComponents.add(overriddenBy);
}
continue;
}
if (c.isMassive() || c.isMassOverridden()) { if (c.isMassive() || c.isMassOverridden()) {
totalMass += c.getMass(); totalMass += c.getMass();
// Don't add this component's mass to the section mass if its parent is in the list, otherwise you add up duplicate mass // Don't add this component's mass to the section mass if its parent is in the list, otherwise you add up duplicate mass
@ -163,9 +204,11 @@ public class ComponentTreeRenderer extends DefaultTreeCellRenderer {
} }
} }
// Add total mass of the selected components in the title
sb.append(" (").append(UnitGroup.UNITS_MASS.toStringUnit(totalMass)); sb.append(" (").append(UnitGroup.UNITS_MASS.toStringUnit(totalMass));
if (containsSectionMass) { if (containsSectionMass) {
sb.append(" of ").append(UnitGroup.UNITS_MASS.toStringUnit(totalSectionMass)).append(" total)"); sb.append(" of ").append(UnitGroup.UNITS_MASS.toStringUnit(totalSectionMass))
.append(" ").append(trans.get("ComponentTreeRenderer.total")).append(")");
} else { } else {
sb.append(")"); sb.append(")");
} }