tza/openauto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change delimater for bug prevention

Browse Source
This commit is contained in:
hawkeyexp 2018-08-10 22:53:07 +02:00
parent bd36d87bdb
commit 46c2cb075c
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/autoapp/UI/SettingsWindow.cpp
View File

@ -110,95 +110,95 @@ void SettingsWindow::onSave()
// generate param string for autoapp_helper // generate param string for autoapp_helper
std::string params; std::string params;
params.append( std::to_string(ui_->horizontalSliderSystemVolume->value()) ); params.append( std::to_string(ui_->horizontalSliderSystemVolume->value()) );
params.append("#"); params.append(";");
params.append( std::to_string(ui_->horizontalSliderSystemCapture->value()) ); params.append( std::to_string(ui_->horizontalSliderSystemCapture->value()) );
params.append("#"); params.append(";");
params.append( std::to_string(ui_->spinBoxDisconnect->value()) ); params.append( std::to_string(ui_->spinBoxDisconnect->value()) );
params.append("#"); params.append(";");
params.append( std::to_string(ui_->spinBoxShutdown->value()) ); params.append( std::to_string(ui_->spinBoxShutdown->value()) );
params.append("#"); params.append(";");
params.append( std::to_string(ui_->spinBoxDay->value()) ); params.append( std::to_string(ui_->spinBoxDay->value()) );
params.append("#"); params.append(";");
params.append( std::to_string(ui_->spinBoxNight->value()) ); params.append( std::to_string(ui_->spinBoxNight->value()) );
params.append("#"); params.append(";");
if (ui_->checkBoxGPIO->isChecked()) { if (ui_->checkBoxGPIO->isChecked()) {
params.append("1"); params.append("1");
} else { } else {
params.append("0"); params.append("0");
} }
params.append("#"); params.append(";");
params.append( std::string(ui_->comboBoxDevMode->currentText().toStdString()) ); params.append( std::string(ui_->comboBoxDevMode->currentText().toStdString()) );
params.append("#"); params.append(";");
params.append( std::string(ui_->comboBoxInvert->currentText().toStdString()) ); params.append( std::string(ui_->comboBoxInvert->currentText().toStdString()) );
params.append("#"); params.append(";");
params.append( std::string(ui_->comboBoxX11->currentText().toStdString()) ); params.append( std::string(ui_->comboBoxX11->currentText().toStdString()) );
params.append("#"); params.append(";");
params.append( std::string(ui_->comboBoxRearcam->currentText().toStdString()) ); params.append( std::string(ui_->comboBoxRearcam->currentText().toStdString()) );
params.append("#"); params.append(";");
params.append( std::string(ui_->comboBoxAndroid->currentText().toStdString()) ); params.append( std::string(ui_->comboBoxAndroid->currentText().toStdString()) );
params.append("#"); params.append(";");
if (ui_->radioButtonX11->isChecked()) { if (ui_->radioButtonX11->isChecked()) {
params.append("1"); params.append("1");
} else { } else {
params.append("0"); params.append("0");
} }
params.append("#"); params.append(";");
if (ui_->radioButtonScreenRotated->isChecked()) { if (ui_->radioButtonScreenRotated->isChecked()) {
params.append("1"); params.append("1");
} else { } else {
params.append("0"); params.append("0");
} }
params.append("#"); params.append(";");
params.append( std::string("'") + std::string(ui_->comboBoxPulseOutput->currentText().toStdString()) + std::string("'") ); params.append( std::string("'") + std::string(ui_->comboBoxPulseOutput->currentText().toStdString()) + std::string("'") );
params.append("#"); params.append(";");
params.append( std::string("'") + std::string(ui_->comboBoxPulseInput->currentText().toStdString()) + std::string("'") ); params.append( std::string("'") + std::string(ui_->comboBoxPulseInput->currentText().toStdString()) + std::string("'") );
params.append("#"); params.append(";");
params.append( std::string(ui_->comboBoxHardwareRTC->currentText().toStdString()) ); params.append( std::string(ui_->comboBoxHardwareRTC->currentText().toStdString()) );
params.append("#"); params.append(";");
params.append( std::string(ui_->comboBoxTZ->currentText().toStdString()) ); params.append( std::string(ui_->comboBoxTZ->currentText().toStdString()) );
params.append("#"); params.append(";");
params.append( std::string(ui_->comboBoxHardwareDAC->currentText().toStdString()) ); params.append( std::string(ui_->comboBoxHardwareDAC->currentText().toStdString()) );
params.append("#"); params.append(";");
if (ui_->checkBoxDisableShutdown->isChecked()) { if (ui_->checkBoxDisableShutdown->isChecked()) {
params.append("1"); params.append("1");
} else { } else {
params.append("0"); params.append("0");
} }
params.append("#"); params.append(";");
if (ui_->checkBoxDisableScreenOff->isChecked()) { if (ui_->checkBoxDisableScreenOff->isChecked()) {
params.append("1"); params.append("1");
} else { } else {
params.append("0"); params.append("0");
} }
params.append("#"); params.append(";");
if (ui_->radioButtonDebugmodeEnabled->isChecked()) { if (ui_->radioButtonDebugmodeEnabled->isChecked()) {
params.append("1"); params.append("1");
} else { } else {
params.append("0"); params.append("0");
} }
params.append("#"); params.append(";");
params.append( std::string(ui_->comboBoxGPIOShutdown->currentText().toStdString()) ); params.append( std::string(ui_->comboBoxGPIOShutdown->currentText().toStdString()) );
params.append("#"); params.append(";");
params.append( std::to_string(ui_->spinBoxGPIOShutdownDelay->value()) ); params.append( std::to_string(ui_->spinBoxGPIOShutdownDelay->value()) );
params.append("#"); params.append(";");
params.append( std::string(ui_->lineEditWifiClientSSID->text().toStdString()) ); params.append( std::string(ui_->lineEditWifiClientSSID->text().toStdString()) );
params.append("#"); params.append(";");
params.append( std::string(ui_->lineEditWifiClientPassword->text().toStdString()) ); params.append( std::string(ui_->lineEditWifiClientPassword->text().toStdString()) );
params.append("#"); params.append(";");
if (ui_->checkBoxHotspot->isChecked()) { if (ui_->checkBoxHotspot->isChecked()) {
params.append("1"); params.append("1");
} else { } else {
params.append("0"); params.append("0");
} }
params.append("#"); params.append(";");
params.append( std::string(ui_->lineEditWifiHotspotPassword->text().toStdString()) ); params.append( std::string(ui_->lineEditWifiHotspotPassword->text().toStdString()) );
params.append("#"); params.append(";");
if (ui_->checkBoxHardwareSave->isChecked()) { if (ui_->checkBoxHardwareSave->isChecked()) {
params.append("1"); params.append("1");
} else { } else {
params.append("0"); params.append("0");
} }
params.append("#"); params.append(";");
system((std::string("/usr/local/bin/autoapp_helper setparams#") + std::string(params) + std::string(" &") ).c_str()); system((std::string("/usr/local/bin/autoapp_helper setparams#") + std::string(params) + std::string(" &") ).c_str());
this->close(); this->close();
} }
@ -353,7 +353,7 @@ void SettingsWindow::loadSystemValues()
QFile paramFile(QString("/tmp/return_value")); QFile paramFile(QString("/tmp/return_value"));
paramFile.open(QIODevice::ReadOnly); paramFile.open(QIODevice::ReadOnly);
QTextStream data_param(&paramFile); QTextStream data_param(&paramFile);
QStringList getparams = data_param.readAll().split("#"); QStringList getparams = data_param.readAll().split(";");
paramFile.close(); paramFile.close();
// version string // version string
ui_->valueSystemVersion->setText(getparams[0]); ui_->valueSystemVersion->setText(getparams[0]);