diff --git a/experiment_data/sample_data/new_20251230_081008.xlsx b/experiment_data/sample_data/new_20251230_081008.xlsx new file mode 100644 index 0000000..8542cc4 Binary files /dev/null and b/experiment_data/sample_data/new_20251230_081008.xlsx differ diff --git a/experiment_data/sample_data/new_20251230_081232.xlsx b/experiment_data/sample_data/new_20251230_081232.xlsx new file mode 100644 index 0000000..25740d0 Binary files /dev/null and b/experiment_data/sample_data/new_20251230_081232.xlsx differ diff --git a/experiment_data/sample_data/new_20251230_081312.xlsx b/experiment_data/sample_data/new_20251230_081312.xlsx new file mode 100644 index 0000000..e020165 Binary files /dev/null and b/experiment_data/sample_data/new_20251230_081312.xlsx differ diff --git a/experiment_data/sample_data/new_20251230_083301.xlsx b/experiment_data/sample_data/new_20251230_083301.xlsx new file mode 100644 index 0000000..f17de9c Binary files /dev/null and b/experiment_data/sample_data/new_20251230_083301.xlsx differ diff --git a/experiment_data/sample_data/new_20251230_084257.xlsx b/experiment_data/sample_data/new_20251230_084257.xlsx new file mode 100644 index 0000000..067580e Binary files /dev/null and b/experiment_data/sample_data/new_20251230_084257.xlsx differ diff --git a/experiment_data/sample_data/new_20251230_084633.xlsx b/experiment_data/sample_data/new_20251230_084633.xlsx new file mode 100644 index 0000000..5aa58e6 Binary files /dev/null and b/experiment_data/sample_data/new_20251230_084633.xlsx differ diff --git a/experiment_data/sample_data/new_20251230_085828.xlsx b/experiment_data/sample_data/new_20251230_085828.xlsx new file mode 100644 index 0000000..a4b6cd6 Binary files /dev/null and b/experiment_data/sample_data/new_20251230_085828.xlsx differ diff --git a/experiment_data/sample_data/new_20251230_085852.xlsx b/experiment_data/sample_data/new_20251230_085852.xlsx new file mode 100644 index 0000000..a6dc3ff Binary files /dev/null and b/experiment_data/sample_data/new_20251230_085852.xlsx differ diff --git a/experiment_data/sample_data/new_20251230_104446.xlsx b/experiment_data/sample_data/new_20251230_104446.xlsx new file mode 100644 index 0000000..9f2faa0 Binary files /dev/null and b/experiment_data/sample_data/new_20251230_104446.xlsx differ diff --git a/src/.vscode/launch.json b/src/.vscode/launch.json index d0997cb..a3f8fa1 100644 --- a/src/.vscode/launch.json +++ b/src/.vscode/launch.json @@ -18,7 +18,7 @@ ], "externalConsole": false, "miDebuggerPath": "D:/qt/Qt5.14.2/5.14.2/mingw73_64/bin/gdb.exe", - "visualizerFile": "c:\\Users\\sunqu\\AppData\\Roaming\\Code\\User\\workspaceStorage\\7f93734217a2e383fe34beaf49d497fe\\tonka3000.qtvsctools\\qt.natvis.xml" + "visualizerFile": "c:\\Users\\sunqu\\AppData\\Roaming\\Trae CN\\User\\workspaceStorage\\7f93734217a2e383fe34beaf49d497fe\\tonka3000.qtvsctools\\qt.natvis.xml" } ] } \ No newline at end of file diff --git a/src/global.h b/src/global.h index 6891466..a6289d3 100644 --- a/src/global.h +++ b/src/global.h @@ -183,7 +183,6 @@ extern QString _smoothnessFileName; void updateFileList(); bool isFileExist(const QString &fileName); - }; // namespace Global #endif // GLOBAL_H diff --git a/src/ui/experimentsettingform.cpp b/src/ui/experimentsettingform.cpp index a84aa8d..f1e6185 100644 --- a/src/ui/experimentsettingform.cpp +++ b/src/ui/experimentsettingform.cpp @@ -919,6 +919,7 @@ void ExperimentSettingForm::slotRecvPhaseInfo(const QByteArray &ba) atmoshpereComboBox->setEnabled(true); } } + // // radioButton_OIT_not // radioButton_OIT @@ -929,36 +930,28 @@ void ExperimentSettingForm::slotRecvPhaseInfo(const QByteArray &ba) logde << "oit value:" << (int)*oitValue; - if (*oitValue) + Global::_experimentInfo.testType = (Global::TestType)*oitValue; + + if (*oitValue == Global::TestType::NoneOIT) { ui->radioButton_OIT->setChecked(false); ui->radioButton_OIT_not->setChecked(true); -#if 0 - QString oitRadioButtonName("radioButton_OIT"); - QRadioButton *oitRadioButton = - qobject_cast(this->findChild(oitRadioButtonName)); - if(oitRadioButton){ - oitRadioButton->setChecked(true); - } -#endif + + Global::_experimentOITFlag = false; + + logde << "Global::_experimentOITFlag = false;"; } else { ui->radioButton_OIT->setChecked(true); ui->radioButton_OIT_not->setChecked(false); + Global::_experimentOITFlag = true; logde << "Global::_experimentOITFlag = true;"; -#if 0 - QString oitNotRadioButtonName("radioButton_OIT_not"); - QRadioButton *oitNotRadioButton = - qobject_cast(this->findChild(oitNotRadioButtonName)); - if(oitNotRadioButton){ - oitNotRadioButton->setChecked(true); - } -#endif } +#if 0 // 设置默认其他类型。 u8 *initAtmosphereValue = (data + 73); logde << "initAtmosphereValue:" << (int)(*initAtmosphereValue); @@ -972,6 +965,7 @@ void ExperimentSettingForm::slotRecvPhaseInfo(const QByteArray &ba) initialAtmosphereComboBox->setCurrentIndex(*initAtmosphereValue); } #endif +#endif } void ExperimentSettingForm::showEvent(QShowEvent *event) @@ -981,6 +975,7 @@ void ExperimentSettingForm::showEvent(QShowEvent *event) ui->dateTimeLineEdit->setText(internationalFormat); +#if 0 // 测试类型OIT设置 if (Global::_experimentInfo.testType == Global::TestType::OIT) { @@ -996,6 +991,9 @@ void ExperimentSettingForm::showEvent(QShowEvent *event) ui->radioButton_OIT->setChecked(false); ui->radioButton_OIT_not->setChecked(true); } +#endif + // 初始气氛 - ui->comboBox_initial_atmosphere->setCurrentIndex((int)Global::_experimentInfo.initialAtmosPhere); + ui->comboBox_initial_atmosphere->setCurrentIndex( + (int)Global::_experimentInfo.initialAtmosPhere); }