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

[Bugfix] Display now updates with editing changes.

Browse Source
This commit is contained in:
Daniel_M_Williams 2015-10-19 11:26:11 -04:00
parent dac67b0f71
commit 35b46ca44f
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
View File

@ -351,6 +351,15 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
} }
} }
@Override
public String toString() {
if( this.overrideName){
return this.fcid.key;
}else{
return this.getName() + "["+this.fcid.getShortKey()+"]";
}
}
// DEBUG / DEVEL // DEBUG / DEVEL
public String toDebug() { public String toDebug() {
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();

10
swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
View File

@ -210,14 +210,12 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
document.getRocket().addComponentChangeListener(new ComponentChangeListener() { document.getRocket().addComponentChangeListener(new ComponentChangeListener() {
@Override @Override
public void componentChanged(ComponentChangeEvent e) { public void componentChanged(ComponentChangeEvent e) {
// System.out.println("Configuration changed, calling updateFigure");
if (is3d) { if (is3d) {
if (e instanceof ComponentChangeEvent) { if (e.isTextureChange()) {
if (((ComponentChangeEvent) e).isTextureChange()) {
figure3d.flushTextureCaches(); figure3d.flushTextureCaches();
} }
} }
} updateFigures();
} }
}); });
@ -495,7 +493,6 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
} }
private void handleComponentClick(RocketComponent[] clicked, MouseEvent event) { private void handleComponentClick(RocketComponent[] clicked, MouseEvent event) {
// If no component is clicked, do nothing // If no component is clicked, do nothing
if (clicked.length == 0) { if (clicked.length == 0) {
selectionModel.setSelectionPath(null); selectionModel.setSelectionPath(null);
@ -801,8 +798,6 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
figure3d.setSelection(components); figure3d.setSelection(components);
} }
//
//
// /** // /**
// * An <code>Action</code> that shows whether the figure type is the // * An <code>Action</code> that shows whether the figure type is the
// type // type
@ -838,5 +833,4 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
// putValue(Action.SELECTED_KEY, figure.getType() == type && !is3d); // putValue(Action.SELECTED_KEY, figure.getType() == type && !is3d);
// } // }
// } // }
//
} }