travis/qtrocket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix simTime restart to 0.0

Browse Source
This commit is contained in:
Travis Hunter 2023-04-26 06:43:46 -06:00
parent 5d2becd2b4
commit fc57b00ec4
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gui/SimOptionsWindow.cpp
View File

@ -20,7 +20,6 @@ SimOptionsWindow::SimOptionsWindow(QWidget *parent) :
ui->setupUi(this); ui->setupUi(this);
// populate the combo boxes // populate the combo boxes
QtRocket* qtrocket = QtRocket::getInstance();
std::shared_ptr<sim::SimulationOptions> options(new sim::SimulationOptions); std::shared_ptr<sim::SimulationOptions> options(new sim::SimulationOptions);
std::vector<std::string> atmosphereModels = options->getAvailableAtmosphereModels(); std::vector<std::string> atmosphereModels = options->getAvailableAtmosphereModels();

1
model/Rocket.cpp
View File

@ -10,6 +10,7 @@ void Rocket::launch()
{ {
propagator.setTimeStep(QtRocket::getInstance()->getTimeStep()); propagator.setTimeStep(QtRocket::getInstance()->getTimeStep());
propagator.clearStates(); propagator.clearStates();
propagator.setCurrentTime(0.0);
mm.startMotor(0.0); mm.startMotor(0.0);
propagator.runUntilTerminate(); propagator.runUntilTerminate();
} }

1
sim/Propagator.h
View File

@ -52,6 +52,7 @@ public:
const std::vector<std::pair<double, std::vector<double>>>& getStates() const { return states; } const std::vector<std::pair<double, std::vector<double>>>& getStates() const { return states; }
void clearStates() { states.clear(); } void clearStates() { states.clear(); }
void setCurrentTime(double t) { currentTime = t; }
void setTimeStep(double ts) { timeStep = ts; } void setTimeStep(double ts) { timeStep = ts; }