piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[Simulator] Fix startup when using a new file for radio data (file is now properly created, errors from Storage are ignored); Do not start simulator at all in case of data errors; Fix startup option dialog when finding radio type from profile for first time; Fix RadioOptions struct version control; Cleanup unused WinConsole code; Fix a warning and a missing const reference; Move ~SimulatedUIWidget() to public.

Browse Source
This commit is contained in:
Max Paperno
2017-01-28 19:15:46 -05:00
parent 32dc0dd2a0
commit fae095ea18
9 changed files with 54 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/simulation/simulatorstartupdialog.cpp
+9 -8
View File
@@ -56,13 +56,14 @@ SimulatorStartupDialog::SimulatorStartupDialog(SimulatorOptions * options, int *
ui->btnSelectDataFolder->setIcon(icon);
ui->btnSelectSdPath->setIcon(icon);
loadRadioProfile(*m_profileId);
QObject::connect(ui->radioProfile, SIGNAL(currentIndexChanged(int)), this, SLOT(onRadioProfileChanged(int)));
QObject::connect(ui->radioType, SIGNAL(currentIndexChanged(int)), this, SLOT(onRadioTypeChanged(int)));
QObject::connect(ui->btnSelectDataFile, &QToolButton::clicked, this, &SimulatorStartupDialog::onDataFileSelect);
QObject::connect(ui->btnSelectDataFolder, &QToolButton::clicked, this, &SimulatorStartupDialog::onDataFolderSelect);
QObject::connect(ui->btnSelectSdPath, &QToolButton::clicked, this, &SimulatorStartupDialog::onSdPathSelect);
loadRadioProfile(*m_profileId);
}
SimulatorStartupDialog::~SimulatorStartupDialog()
@@ -98,10 +99,9 @@ QString SimulatorStartupDialog::findRadioId(const QString & str)
QString radioId(str);
int pos = str.indexOf("-");
if (pos > 0) {
radioId = str.mid(pos+1);
pos = radioId.lastIndexOf("-");
pos = str.indexOf("-", pos + 1);
if (pos > 0) {
radioId = radioId.mid(0, pos);
radioId = str.mid(0, pos);
}
}
return radioId;
@@ -116,6 +116,9 @@ QString SimulatorStartupDialog::radioEepromFileName(const QString & firmwareId,
folder = g.eepromDir();
QString radioId = findRadioId(firmwareId);
int pos = radioId.indexOf("-");
if (pos > 0)
radioId = radioId.mid(pos+1);
if (usesCategorizedStorage(radioId))
ext = "otx";
@@ -155,10 +158,8 @@ void SimulatorStartupDialog::loadRadioProfile(int id)
return;
i = ui->radioProfile->findData(id);
if (i > -1 && ui->radioProfile->currentIndex() != i) {
if (i > -1 && ui->radioProfile->currentIndex() != i)
ui->radioProfile->setCurrentIndex(i);
return;
}
*m_options = g.profile[id].simulatorOptions();
@@ -167,7 +168,7 @@ void SimulatorStartupDialog::loadRadioProfile(int id)
tmpstr = g.profile[id].fwType();
else if (getSimulatorFactory(tmpstr))
tmpstr = getSimulatorFactory(tmpstr)->name();
i = ui->radioType->findText(findRadioId(tmpstr), Qt::MatchFixedString | Qt::MatchContains);
i = ui->radioType->findText(findRadioId(tmpstr), Qt::MatchContains);
if (i > -1)
ui->radioType->setCurrentIndex(i);