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

Don't display warning dialog when simulation ends.

Browse Source
This commit is contained in:
kruland2607 2013-05-24 14:57:32 -05:00
parent ff39e0ea63
commit 9a43a01663
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/net/sf/openrocket/gui/simulation/SimulationRunDialog.java
View File

@ -23,9 +23,6 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JProgressBar; import javax.swing.JProgressBar;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.Simulation;
@ -50,6 +47,9 @@ import net.sf.openrocket.unit.Unit;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.MathUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SimulationRunDialog extends JDialog { public class SimulationRunDialog extends JDialog {
private static final Logger log = LoggerFactory.getLogger(SimulationRunDialog.class); private static final Logger log = LoggerFactory.getLogger(SimulationRunDialog.class);
@ -395,7 +395,6 @@ public class SimulationRunDialog extends JDialog {
log.debug("Simulation done"); log.debug("Simulation done");
setSimulationProgress(1.0); setSimulationProgress(1.0);
updateProgress(); updateProgress();
SimulationWarningDialog.showWarningDialog(SimulationRunDialog.this, simulation);
} }

5
core/src/net/sf/openrocket/gui/simulation/SimulationWorker.java
View File

@ -53,7 +53,6 @@ public abstract class SimulationWorker extends SwingWorker<FlightData, Simulatio
try { try {
simulation.simulate(listeners); simulation.simulate(listeners);
// FIXME - test for simulation warnings.
} catch (Throwable e) { } catch (Throwable e) {
throwable = e; throwable = e;
return null; return null;
@ -87,7 +86,7 @@ public abstract class SimulationWorker extends SwingWorker<FlightData, Simulatio
protected abstract void simulationInterrupted(Throwable t); protected abstract void simulationInterrupted(Throwable t);
/** /**
* Marks this simulation as done and calls the progress update. * Marks this simulation as done and calls the progress update.
*/ */
@ -100,7 +99,7 @@ public abstract class SimulationWorker extends SwingWorker<FlightData, Simulatio
} }
/** /**
* A simulation listener that throws a {@link SimulationCancelledException} if * A simulation listener that throws a {@link SimulationCancelledException} if
* this SwingWorker has been cancelled. The conditions is checked every time a step * this SwingWorker has been cancelled. The conditions is checked every time a step