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

Fixed 3 issues kruland had with mass type.

Browse Source 
1.  Mass tooltip only displays totals for components that have children.
2.  setMassComponentType now fires NON_FUNCTIONAL change event.
3.  Label now reads "Mass Type" and default is "Unspecified".
This commit is contained in:
Craig Earls 2014-12-15 20:34:14 -07:00
parent 8d74ea9e6f
commit ded4df8103
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -921,7 +921,7 @@ MassComponentCfg.tab.ttip.Radialpos = Radial position configuration
MassComponentCfg.lbl.Radialdistance = Radial distance: MassComponentCfg.lbl.Radialdistance = Radial distance:
MassComponentCfg.lbl.Radialdirection = Radial direction: MassComponentCfg.lbl.Radialdirection = Radial direction:
MassComponentCfg.but.Reset = Reset MassComponentCfg.but.Reset = Reset
MassComponentCfg.lbl.type = Object type MassComponentCfg.lbl.type = Mass type
! MotorConfig ! MotorConfig
MotorCfg.checkbox.compmotormount = This component is a motor mount MotorCfg.checkbox.compmotormount = This component is a motor mount
@ -1328,7 +1328,7 @@ TrapezoidFinSet.TrapezoidFinSet = Trapezoidal fin set
! FreeformFinSet ! FreeformFinSet
FreeformFinSet.FreeformFinSet = Freeform fin set FreeformFinSet.FreeformFinSet = Freeform fin set
!MassComponent !MassComponent
MassComponent.MassComponent = Mass component MassComponent.MassComponent = Unspecified
MassComponent.Altimeter = Altimeter MassComponent.Altimeter = Altimeter
MassComponent.FlightComputer = Flight computer MassComponent.FlightComputer = Flight computer
MassComponent.DeploymentCharge = Deployment charge MassComponent.DeploymentCharge = Deployment charge

2
core/src/net/sf/openrocket/rocketcomponent/MassComponent.java
View File

@ -102,7 +102,7 @@ public class MassComponent extends MassObject {
} }
checkState(); checkState();
this.massComponentType = compType; this.massComponentType = compType;
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE); fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE);
} }
@Override @Override

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

@ -69,11 +69,16 @@ public class ComponentTreeRenderer extends DefaultTreeCellRenderer {
sb.append("<b>").append(c.getName()).append("</b>"); sb.append("<b>").append(c.getName()).append("</b>");
if (c.isMassive() || c.isMassOverridden() ) { if (c.isMassive() || c.isMassOverridden() ) {
sb.append(" (").append(UnitGroup.UNITS_MASS.toStringUnit(c.getMass())).append(" of "); sb.append(" (").append(UnitGroup.UNITS_MASS.toStringUnit(c.getMass()));
sb.append(UnitGroup.UNITS_MASS.toStringUnit(c.getSectionMass())).append( " total)"); if(c.getChildCount()>0){
sb.append(" of ").append(UnitGroup.UNITS_MASS.toStringUnit(c.getSectionMass())).append( " total");
}
sb.append(")");
} else { } else {
if((c.getChildCount()>0) && (c.getSectionMass()>0)){
sb.append(" (").append(UnitGroup.UNITS_MASS.toStringUnit(c.getSectionMass())).append( " total)"); sb.append(" (").append(UnitGroup.UNITS_MASS.toStringUnit(c.getSectionMass())).append( " total)");
} }
}
if ( c.isMassOverridden() ) { if ( c.isMassOverridden() ) {
sb.append(" ").append(trans.get("ComponentTree.ttip.massoverride")); sb.append(" ").append(trans.get("ComponentTree.ttip.massoverride"));