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

Merge pull request #12 from cthunter01/development

Browse Source 
bug fixes
This commit is contained in:
cthunter01 2023-04-26 06:54:27 -06:00 committed by GitHub
commit 1158bb4222
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 155 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
QtRocket.cpp
View File

@ -13,9 +13,6 @@
// qtrocket headers
#include "QtRocket.h"
#include "gui/MainWindow.h"
#include "sim/ConstantAtmosphere.h"
#include "sim/ConstantGravityModel.h"
// Initialize static member data
QtRocket* QtRocket::instance = nullptr;

17
gui/MainWindow.cpp
View File

@ -90,9 +90,8 @@ void MainWindow::on_testButton2_clicked()
double initialVelocityX = initialVelocity * std::cos(initialAngle / 57.2958);
double initialVelocityZ = initialVelocity * std::sin(initialAngle / 57.2958);
std::shared_ptr<Rocket> rocket = std::make_shared<Rocket>();
QtRocket::getInstance()->addRocket(rocket);
std::vector<double> initialState = {0.0, 0.0, 0.0, initialVelocityX, 0.0, initialVelocityZ, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
auto rocket = QtRocket::getInstance()->getRocket();
rocket->setInitialState(initialState);
rocket->setMass(mass);
rocket->setDragCoefficient(dragCoeff);
@ -111,14 +110,14 @@ void MainWindow::on_loadRSE_button_clicked()
"/home",
tr("Rocksim Engine Files (*.rse)"));
utils::RSEDatabaseLoader loader(rseFile.toStdString());
rseDatabase.reset(new utils::RSEDatabaseLoader(rseFile.toStdString()));
ui->rocketPartButtons->findChild<QLineEdit*>(QString("databaseFileLine"))->setText(rseFile);
QComboBox* engineSelector =
ui->rocketPartButtons->findChild<QComboBox*>(QString("engineSelectorComboBox"));
const std::vector<model::MotorModel>& motors = loader.getMotors();
const std::vector<model::MotorModel>& motors = rseDatabase->getMotors();
for(const auto& motor : motors)
{
std::cout << "Adding: " << motor.data.commonName << std::endl;
@ -146,3 +145,13 @@ void MainWindow::on_actionSimulation_Options_triggered()
}
void MainWindow::on_setMotor_clicked()
{
QString motorName = ui->engineSelectorComboBox->currentText();
model::MotorModel mm = rseDatabase->getMotorModelByName(motorName.toStdString());
QtRocket::getInstance()->getRocket()->setMotorModel(mm);
}

5
gui/MainWindow.h
View File

@ -4,6 +4,7 @@
/// \cond
// C headers
// C++ headers
#include <memory>
// 3rd Party headers
#include <QMainWindow>
/// \endcond
@ -12,6 +13,7 @@
#include "QtRocket.h"
#include "gui/SimOptionsWindow.h"
#include "utils/RSEDatabaseLoader.h"
QT_BEGIN_NAMESPACE
@ -47,10 +49,13 @@ private slots:
void on_actionSimulation_Options_triggered();
void on_setMotor_clicked();
private:
Ui::MainWindow* ui;
QtRocket* qtRocket;
SimOptionsWindow* simOptionsWindow{nullptr};
std::unique_ptr<utils::RSEDatabaseLoader> rseDatabase;
};
#endif // MAINWINDOW_H

7
gui/MainWindow.ui
View File

@ -211,6 +211,13 @@
<item row="1" column="0">
<widget class="QComboBox" name="engineSelectorComboBox"/>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="setMotor">
<property name="text">
<string>Set Motor</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QPushButton" name="getTCMotorData">

50
gui/SimOptionsWindow.cpp
View File

@ -1,14 +1,64 @@
/// \cond
// C headers
// C++ headers
#include <memory>
// 3rd party headers
/// \endcond
// qtrocket headers
#include "QtRocket.h"
#include "SimOptionsWindow.h"
#include "ui_SimOptionsWindow.h"
#include "sim/SimulationOptions.h"
SimOptionsWindow::SimOptionsWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::SimOptionsWindow)
{
ui->setupUi(this);
// populate the combo boxes
std::shared_ptr<sim::SimulationOptions> options(new sim::SimulationOptions);
std::vector<std::string> atmosphereModels = options->getAvailableAtmosphereModels();
std::vector<std::string> gravityModels = options->getAvailableGravityModels();
for(const auto& i : atmosphereModels)
{
ui->atmosphereModelCombo->addItem(QString::fromStdString(i));
}
for(const auto& i : gravityModels)
{
ui->gravityModelCombo->addItem(QString::fromStdString(i));
}
}
SimOptionsWindow::~SimOptionsWindow()
{
delete ui;
}
void SimOptionsWindow::on_buttonBox_rejected()
{
this->close();
}
void SimOptionsWindow::on_buttonBox_accepted()
{
QtRocket* qtrocket = QtRocket::getInstance();
std::shared_ptr<sim::SimulationOptions> options(new sim::SimulationOptions);
options->setTimeStep(ui->timeStep->text().toDouble());
options->setGravityModel(ui->gravityModelCombo->currentText().toStdString());
options->setAtmosphereModel(ui->atmosphereModelCombo->currentText().toStdString());
qtrocket->setSimulationOptions(options);
this->close();
}

5
gui/SimOptionsWindow.h
View File

@ -15,6 +15,11 @@ public:
explicit SimOptionsWindow(QWidget *parent = nullptr);
~SimOptionsWindow();
private slots:
void on_buttonBox_rejected();
void on_buttonBox_accepted();
private:
Ui::SimOptionsWindow *ui;
};

2
gui/SimOptionsWindow.ui
View File

@ -26,7 +26,7 @@
<x>60</x>
<y>20</y>
<width>261</width>
<height>131</height>
<height>156</height>
</rect>
</property>
<layout class="QFormLayout" name="formLayout">

17
model/MotorModel.cpp
View File

@ -9,6 +9,7 @@
#include "model/MotorModel.h"
#include "utils/math/Constants.h"
#include "utils/math/UtilityMathFunctions.h"
#include "utils/Logger.h"
namespace model
{
@ -69,6 +70,22 @@ double MotorModel::getMass(double simTime) const
}
}
double MotorModel::getThrust(double simTime)
{
if(simTime > thrust.getMaxTime() + ignitionTime)
{
if(!burnOutOccurred)
{
utils::Logger::getInstance()->info("motor burnout occurred: " + std::to_string(simTime));
burnOutOccurred = true;
}
return 0.0;
}
utils::Logger::getInstance()->info("simTime: " + std::to_string(simTime) + ": thrust: " + std::to_string(thrust.getThrust(simTime)));
return thrust.getThrust(simTime);
}
void MotorModel::setMetaData(const MetaData& md)
{
data = md;

2
model/MotorModel.h
View File

@ -396,11 +396,13 @@ public:
void startMotor(double startTime) { ignitionOccurred = true; ignitionTime = startTime; }
void addThrustCurve(const ThrustCurve& tc) { thrust = tc; }
// Thrust parameters
MetaData data;
private:
bool ignitionOccurred{false};
bool burnOutOccurred{false};
double emptyMass;
double isp;
double maxTime;

10
model/Rocket.cpp
View File

@ -9,6 +9,9 @@ Rocket::Rocket() : propagator(this)
void Rocket::launch()
{
propagator.setTimeStep(QtRocket::getInstance()->getTimeStep());
propagator.clearStates();
propagator.setCurrentTime(0.0);
mm.startMotor(0.0);
propagator.runUntilTerminate();
}
@ -28,10 +31,5 @@ bool Rocket::terminateCondition(const std::pair<double, std::vector<double>>& co
double Rocket::getThrust(double t)
{
return tc.getThrust(t);
}
void Rocket::setThrustCurve(const ThrustCurve& curve)
{
tc = curve;
return mm.getThrust(t);
}

1
model/Rocket.h
View File

@ -114,7 +114,6 @@ private:
double mass; /// @todo get rid of this, should be dynamically computed, but is the current rocket mass
model::MotorModel mm; /// Current Motor Model
ThrustCurve tc; /// @todo get rid of this, should be returned from the MotorModel
};

6
model/ThrustCurve.cpp
View File

@ -55,12 +55,6 @@ void ThrustCurve::setIgnitionTime(double t)
double ThrustCurve::getThrust(double t)
{
// calculate t relative to the start time of the motor
static bool burnout{false};
if(!burnout && t >= (maxTime + ignitionTime))
{
burnout = true;
utils::Logger::getInstance()->info("Motor burnout at time: " + std::to_string(t));
}
t -= ignitionTime;
if(t < 0.0 || t > maxTime)
{

7
sim/Propagator.cpp
View File

@ -2,6 +2,7 @@
/// \cond
// C headers
// C++ headers
#include <cmath>
#include <chrono>
#include <iostream>
#include <sstream>
@ -97,20 +98,20 @@ double Propagator::getMass()
double Propagator::getForceX()
{
QtRocket* qtrocket = QtRocket::getInstance();
return - qtrocket->getAtmosphereModel()->getDensity(currentState[3])/ 2.0 * 0.008107 * rocket->getDragCoefficient() * currentState[3]* currentState[3];
return (currentState[3] >= 0 ? -1.0 : 1.0) * qtrocket->getAtmosphereModel()->getDensity(currentState[2])/ 2.0 * 0.008107 * rocket->getDragCoefficient() * currentState[3]* currentState[3];
}
double Propagator::getForceY()
{
QtRocket* qtrocket = QtRocket::getInstance();
return -qtrocket->getAtmosphereModel()->getDensity(currentState[3]) / 2.0 * 0.008107 * rocket->getDragCoefficient() * currentState[4]* currentState[4];
return (currentState[4] >= 0 ? -1.0 : 1.0) * qtrocket->getAtmosphereModel()->getDensity(currentState[2]) / 2.0 * 0.008107 * rocket->getDragCoefficient() * currentState[4]* currentState[4];
}
double Propagator::getForceZ()
{
QtRocket* qtrocket = QtRocket::getInstance();
double gravity = (qtrocket->getGravityModel()->getAccel(currentState[0], currentState[1], currentState[2])).x3;
double airDrag = -qtrocket->getAtmosphereModel()->getDensity(currentState[3]) / 2.0 * 0.008107 * rocket->getDragCoefficient() * currentState[5]* currentState[5];
double airDrag = (currentState[5] >= 0 ? -1.0 : 1.0) * qtrocket->getAtmosphereModel()->getDensity(currentState[2]) / 2.0 * 0.008107 * rocket->getDragCoefficient() * currentState[5]* currentState[5];
double thrust = rocket->getThrust(currentTime);
return gravity + airDrag + thrust;
}

3
sim/Propagator.h
View File

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

27
sim/SimulationOptions.h
View File

@ -4,6 +4,7 @@
/// \cond
// C headers
// C++ headers
#include <algorithm>
#include <map>
#include <memory>
#include <string>
@ -42,6 +43,22 @@ public:
SimulationOptions& operator=(const SimulationOptions&) = delete;
SimulationOptions& operator=(SimulationOptions&&) = delete;
std::vector<std::string> getAvailableGravityModels()
{
std::vector<std::string> retVal(gravityModels.size());
std::transform(gravityModels.begin(), gravityModels.end(), std::back_inserter(retVal),
[](auto& i) { return i.first; });
return retVal;
}
std::vector<std::string> getAvailableAtmosphereModels()
{
std::vector<std::string> retVal(atmosphereModels.size());
std::transform(atmosphereModels.begin(), atmosphereModels.end(), std::back_inserter(retVal),
[](auto& i) { return i.first; });
return retVal;
}
void setTimeStep(double t) { timeStep = t; }
void setGravityModel(const std::string& model)
{
@ -62,16 +79,20 @@ public:
if(model == "Constant Atmosphere")
{
atmosphereModel = model;
atmosphereModels[gravityModel].reset(new sim::ConstantAtmosphere);
atmosphereModels[atmosphereModel].reset(new sim::ConstantAtmosphere);
}
else if(model == "US Standard 1976")
{
atmosphereModel = model;
atmosphereModels[gravityModel].reset(new sim::USStandardAtmosphere);
atmosphereModels[atmosphereModel].reset(new sim::USStandardAtmosphere);
}
}
std::shared_ptr<sim::AtmosphericModel> getAtmosphericModel() { return atmosphereModels[atmosphereModel]; }
std::shared_ptr<sim::AtmosphericModel> getAtmosphericModel()
{
auto retVal = atmosphereModels[atmosphereModel];
return retVal;
}
std::shared_ptr<sim::GravityModel> getGravityModel() { return gravityModels[gravityModel]; }
double getTimeStep() { return timeStep; }

17
utils/RSEDatabaseLoader.cpp
View File

@ -3,6 +3,7 @@
// C headers
// C++ headers
#include <iostream>
#include <algorithm>
#include <cmath>
// 3rd party headers
@ -12,6 +13,7 @@
// qtrocket headers
#include "utils/RSEDatabaseLoader.h"
#include "QtRocket.h"
#include "Logger.h"
namespace utils {
@ -33,6 +35,19 @@ RSEDatabaseLoader::RSEDatabaseLoader(const std::string& filename)
RSEDatabaseLoader::~RSEDatabaseLoader()
{}
model::MotorModel RSEDatabaseLoader::getMotorModelByName(const std::string &name)
{
auto mm = std::find_if(motors.begin(), motors.end(),
[&name](const auto& i) { return name == i.data.commonName; });
if(mm == motors.end())
{
Logger::getInstance()->error("Unable to locate " + name + " in RSE database");
return model::MotorModel();
}
return *mm;
}
void RSEDatabaseLoader::buildAndAppendMotorModel(boost::property_tree::ptree& v)
{
model::MotorModel::MetaData mm;
@ -70,7 +85,9 @@ void RSEDatabaseLoader::buildAndAppendMotorModel(boost::property_tree::ptree& v)
thrustData.push_back(std::make_pair(tdata, fdata));
}
ThrustCurve tc(thrustData);
model::MotorModel motorModel;
motorModel.addThrustCurve(tc);
motorModel.moveMetaData(std::move(mm));
motors.emplace_back(std::move(motorModel));
}

4
utils/RSEDatabaseLoader.h
View File

@ -23,7 +23,9 @@ public:
RSEDatabaseLoader(const std::string& filename);
~RSEDatabaseLoader();
const std::vector<model::MotorModel>& getMotors() const { return motors; }
std::vector<model::MotorModel>& getMotors() { return motors; }
model::MotorModel getMotorModelByName(const std::string& name);
private:
std::vector<model::MotorModel> motors;