From 52772674d28289b7e6ad4b45d14c3607b1b66fb9 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Sun, 7 Apr 2013 20:45:44 -0500 Subject: [PATCH] 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. --- .../sf/openrocket/gui/scalefigure/RocketPanel.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/core/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java b/core/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java index f262b4036..e5ff449b9 100644 --- a/core/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java +++ b/core/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java @@ -62,6 +62,7 @@ import net.sf.openrocket.masscalc.BasicMassCalculator; import net.sf.openrocket.masscalc.MassCalculator; import net.sf.openrocket.masscalc.MassCalculator.MassCalcType; import net.sf.openrocket.rocketcomponent.ComponentChangeEvent; +import net.sf.openrocket.rocketcomponent.ComponentChangeListener; import net.sf.openrocket.rocketcomponent.Configuration; import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.RocketComponent; @@ -214,6 +215,14 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change configuration.addChangeListener(new StateChangeListener() { @Override 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"); if (is3d) { if (e instanceof ComponentChangeEvent) { @@ -222,8 +231,6 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change } } } - updateExtras(); - updateFigures(); } });