diff --git a/gui/SimOptionsWindow.cpp b/gui/SimOptionsWindow.cpp index 49fa931..a357db2 100644 --- a/gui/SimOptionsWindow.cpp +++ b/gui/SimOptionsWindow.cpp @@ -20,7 +20,6 @@ SimOptionsWindow::SimOptionsWindow(QWidget *parent) : ui->setupUi(this); // populate the combo boxes - QtRocket* qtrocket = QtRocket::getInstance(); std::shared_ptr options(new sim::SimulationOptions); std::vector atmosphereModels = options->getAvailableAtmosphereModels(); diff --git a/model/Rocket.cpp b/model/Rocket.cpp index 4946a7c..a1c860a 100644 --- a/model/Rocket.cpp +++ b/model/Rocket.cpp @@ -10,6 +10,7 @@ void Rocket::launch() { propagator.setTimeStep(QtRocket::getInstance()->getTimeStep()); propagator.clearStates(); + propagator.setCurrentTime(0.0); mm.startMotor(0.0); propagator.runUntilTerminate(); } diff --git a/sim/Propagator.h b/sim/Propagator.h index f483a35..9e1151b 100644 --- a/sim/Propagator.h +++ b/sim/Propagator.h @@ -52,6 +52,7 @@ public: const std::vector>>& getStates() const { return states; } void clearStates() { states.clear(); } + void setCurrentTime(double t) { currentTime = t; } void setTimeStep(double ts) { timeStep = ts; }