Fixed issue with 3d view now updating when an edited texture is saved.
The Configuration object did not propagate the underlying Texture Changed ComponentChangeEvent object. Modified RocketPanel to listen to the Rocket object for Texture changes, and to the Configuration object for other changes which update the "extras" (cg, stability, etc) and the Figure.
This commit is contained in:
parent
faac6d2537
commit
52772674d2
@ -62,6 +62,7 @@ import net.sf.openrocket.masscalc.BasicMassCalculator;
|
|||||||
import net.sf.openrocket.masscalc.MassCalculator;
|
import net.sf.openrocket.masscalc.MassCalculator;
|
||||||
import net.sf.openrocket.masscalc.MassCalculator.MassCalcType;
|
import net.sf.openrocket.masscalc.MassCalculator.MassCalcType;
|
||||||
import net.sf.openrocket.rocketcomponent.ComponentChangeEvent;
|
import net.sf.openrocket.rocketcomponent.ComponentChangeEvent;
|
||||||
|
import net.sf.openrocket.rocketcomponent.ComponentChangeListener;
|
||||||
import net.sf.openrocket.rocketcomponent.Configuration;
|
import net.sf.openrocket.rocketcomponent.Configuration;
|
||||||
import net.sf.openrocket.rocketcomponent.Rocket;
|
import net.sf.openrocket.rocketcomponent.Rocket;
|
||||||
import net.sf.openrocket.rocketcomponent.RocketComponent;
|
import net.sf.openrocket.rocketcomponent.RocketComponent;
|
||||||
@ -214,6 +215,14 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
|
|||||||
configuration.addChangeListener(new StateChangeListener() {
|
configuration.addChangeListener(new StateChangeListener() {
|
||||||
@Override
|
@Override
|
||||||
public void stateChanged(EventObject e) {
|
public void stateChanged(EventObject e) {
|
||||||
|
updateExtras();
|
||||||
|
updateFigures();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
document.getRocket().addComponentChangeListener(new ComponentChangeListener() {
|
||||||
|
@Override
|
||||||
|
public void componentChanged(ComponentChangeEvent e) {
|
||||||
// System.out.println("Configuration changed, calling updateFigure");
|
// System.out.println("Configuration changed, calling updateFigure");
|
||||||
if (is3d) {
|
if (is3d) {
|
||||||
if (e instanceof ComponentChangeEvent) {
|
if (e instanceof ComponentChangeEvent) {
|
||||||
@ -222,8 +231,6 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
updateExtras();
|
|
||||||
updateFigures();
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user