Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 09:45:21 +03:00
Code Issues Wiki Activity

[Companion] Make simulator startup from ModelEdit panel act the same as simulating a model from the models list widget (that is, including the other radio data as well); Simplify some code, remove automatic signal connections and use new syntax. (#4721)

Browse source
This commit is contained in:
Max Paperno 2017-03-31 01:55:25 -04:00 • committed by Bertrand Songis
parent 965849ee41
commit 4c0dbfcb6c
2 changed files with 23 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

60
companion/src/modeledit/modeledit.cpp
View file

@ -38,8 +38,7 @@ ModelEdit::ModelEdit(QWidget * parent, RadioData & radioData, int modelId, Firmw
QDialog(parent), QDialog(parent),
ui(new Ui::ModelEdit), ui(new Ui::ModelEdit),
modelId(modelId), modelId(modelId),
model(radioData.models[modelId]), radioData(radioData),
generalSettings(radioData.generalSettings),
firmware(firmware) firmware(firmware)
{ {
Stopwatch s1("ModelEdit"); Stopwatch s1("ModelEdit");
@ -49,27 +48,30 @@ ModelEdit::ModelEdit(QWidget * parent, RadioData & radioData, int modelId, Firmw
setWindowIcon(CompanionIcon("edit.png")); setWindowIcon(CompanionIcon("edit.png"));
restoreGeometry(g.modelEditGeo()); restoreGeometry(g.modelEditGeo());
ui->pushButton->setIcon(CompanionIcon("simulate.png")); ui->pushButton->setIcon(CompanionIcon("simulate.png"));
SetupPanel * setupPanel = new SetupPanel(this, model, generalSettings, firmware); SetupPanel * setupPanel = new SetupPanel(this, radioData.models[modelId], radioData.generalSettings, firmware);
addTab(setupPanel, tr("Setup")); addTab(setupPanel, tr("Setup"));
if (firmware->getCapability(Heli)) if (firmware->getCapability(Heli))
addTab(new HeliPanel(this, model, generalSettings, firmware), tr("Heli")); addTab(new HeliPanel(this, radioData.models[modelId], radioData.generalSettings, firmware), tr("Heli"));
addTab(new FlightModesPanel(this, model, generalSettings, firmware), tr("Flight Modes")); addTab(new FlightModesPanel(this, radioData.models[modelId], radioData.generalSettings, firmware), tr("Flight Modes"));
addTab(new InputsPanel(this, model, generalSettings, firmware), tr("Inputs")); addTab(new InputsPanel(this, radioData.models[modelId], radioData.generalSettings, firmware), tr("Inputs"));
s1.report("inputs"); s1.report("inputs");
addTab(new MixesPanel(this, model, generalSettings, firmware), tr("Mixes")); addTab(new MixesPanel(this, radioData.models[modelId], radioData.generalSettings, firmware), tr("Mixes"));
s1.report("Mixes"); s1.report("Mixes");
Channels * chnPanel = new Channels(this, model, generalSettings, firmware); Channels * chnPanel = new Channels(this, radioData.models[modelId], radioData.generalSettings, firmware);
addTab(chnPanel, tr("Outputs")); addTab(chnPanel, tr("Outputs"));
s1.report("Outputs"); s1.report("Outputs");
addTab(new Curves(this, model, generalSettings, firmware), tr("Curves")); addTab(new Curves(this, radioData.models[modelId], radioData.generalSettings, firmware), tr("Curves"));
addTab(new LogicalSwitchesPanel(this, model, generalSettings, firmware), tr("Logical Switches")); addTab(new LogicalSwitchesPanel(this, radioData.models[modelId], radioData.generalSettings, firmware), tr("Logical Switches"));
s1.report("LS"); s1.report("LS");
addTab(new CustomFunctionsPanel(this, &model, generalSettings, firmware), tr("Special Functions")); addTab(new CustomFunctionsPanel(this, &radioData.models[modelId], radioData.generalSettings, firmware), tr("Special Functions"));
s1.report("CF"); s1.report("CF");
if (firmware->getCapability(Telemetry) & TM_HASTELEMETRY) if (firmware->getCapability(Telemetry) & TM_HASTELEMETRY)
addTab(new TelemetryPanel(this, model, generalSettings, firmware), tr("Telemetry")); addTab(new TelemetryPanel(this, radioData.models[modelId], radioData.generalSettings, firmware), tr("Telemetry"));
connect(setupPanel, &SetupPanel::extendedLimitsToggled, chnPanel, &Channels::refreshExtendedLimits);
connect(ui->tabWidget, &QTabWidget::currentChanged, this, &ModelEdit::onTabIndexChanged);
connect(ui->pushButton, &QPushButton::clicked, this, &ModelEdit::launchSimulation);
connect(setupPanel, SIGNAL(extendedLimitsToggled()), chnPanel, SLOT(refreshExtendedLimits()));
s1.report("end"); s1.report("end");
gStopwatch.report("ModelEdit end constructor"); gStopwatch.report("ModelEdit end constructor");
} }
@ -92,38 +94,16 @@ void ModelEdit::addTab(GenericPanel *panel, QString text)
VerticalScrollArea * area = new VerticalScrollArea(widget, panel); VerticalScrollArea * area = new VerticalScrollArea(widget, panel);
baseLayout->addWidget(area); baseLayout->addWidget(area);
ui->tabWidget->addTab(widget, text); ui->tabWidget->addTab(widget, text);
connect(panel, SIGNAL(modified()), this, SLOT(onTabModified())); connect(panel, &GenericPanel::modified, this, &ModelEdit::modified);
} }
void ModelEdit::onTabModified() void ModelEdit::onTabIndexChanged(int index)
{ {
emit modified(); if (index < panels.size())
} panels.at(index)->update();
void ModelEdit::on_tabWidget_currentChanged(int index)
{
panels[index]->update();
}
void ModelEdit::on_pushButton_clicked()
{
launchSimulation();
} }
void ModelEdit::launchSimulation() void ModelEdit::launchSimulation()
{ {
RadioData * simuData = new RadioData(); startSimulation(this, radioData, modelId);
simuData->generalSettings = generalSettings;
/*: Translators do NOT use accent for this, this is the default category name on Horus. */
CategoryData category(qPrintable(tr("Models")));
simuData->categories.push_back(category);
if (simuData->models.size() == 0) {
simuData->models.push_back(model);
}
else {
simuData->models[0] = model;
}
simuData->models[0].category = 0;
startSimulation(this, *simuData, 0);
delete simuData;
} }

9
companion/src/modeledit/modeledit.h
View file

@ -46,7 +46,7 @@ class ModelEdit : public QDialog
public: public:
ModelEdit(QWidget * parent, RadioData & radioData, int modelId, Firmware * firmware); ModelEdit(QWidget * parent, RadioData & radioData, int modelId, Firmware * firmware);
~ModelEdit(); ~ModelEdit();
protected: protected:
void closeEvent(QCloseEvent *event); void closeEvent(QCloseEvent *event);
@ -54,15 +54,12 @@ class ModelEdit : public QDialog
void modified(); void modified();
private slots: private slots:
void onTabModified(); void onTabIndexChanged(int index);
void on_pushButton_clicked();
void on_tabWidget_currentChanged(int index);
private: private:
Ui::ModelEdit *ui; Ui::ModelEdit *ui;
int modelId; int modelId;
ModelData & model; RadioData & radioData;
GeneralSettings & generalSettings;
Firmware * firmware; Firmware * firmware;
QVector<GenericPanel *> panels; QVector<GenericPanel *> panels;