2025-12-30T11:14:28

This commit is contained in:
yuntang 2025-12-30 11:14:28 +08:00
parent 7ddd2212ab
commit 033ffde4eb
12 changed files with 17 additions and 20 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -18,7 +18,7 @@
], ],
"externalConsole": false, "externalConsole": false,
"miDebuggerPath": "D:/qt/Qt5.14.2/5.14.2/mingw73_64/bin/gdb.exe", "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"
} }
] ]
} }

View File

@ -183,7 +183,6 @@ extern QString _smoothnessFileName;
void updateFileList(); void updateFileList();
bool isFileExist(const QString &fileName); bool isFileExist(const QString &fileName);
}; // namespace Global }; // namespace Global
#endif // GLOBAL_H #endif // GLOBAL_H

View File

@ -919,6 +919,7 @@ void ExperimentSettingForm::slotRecvPhaseInfo(const QByteArray &ba)
atmoshpereComboBox->setEnabled(true); atmoshpereComboBox->setEnabled(true);
} }
} }
// //
// radioButton_OIT_not // radioButton_OIT_not
// radioButton_OIT // radioButton_OIT
@ -929,36 +930,28 @@ void ExperimentSettingForm::slotRecvPhaseInfo(const QByteArray &ba)
logde << "oit value:" << (int)*oitValue; 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->setChecked(false);
ui->radioButton_OIT_not->setChecked(true); ui->radioButton_OIT_not->setChecked(true);
#if 0
QString oitRadioButtonName("radioButton_OIT"); Global::_experimentOITFlag = false;
QRadioButton *oitRadioButton =
qobject_cast<QRadioButton*>(this->findChild<QObject*>(oitRadioButtonName)); logde << "Global::_experimentOITFlag = false;";
if(oitRadioButton){
oitRadioButton->setChecked(true);
}
#endif
} }
else else
{ {
ui->radioButton_OIT->setChecked(true); ui->radioButton_OIT->setChecked(true);
ui->radioButton_OIT_not->setChecked(false); ui->radioButton_OIT_not->setChecked(false);
Global::_experimentOITFlag = true; Global::_experimentOITFlag = true;
logde << "Global::_experimentOITFlag = true;"; logde << "Global::_experimentOITFlag = true;";
#if 0
QString oitNotRadioButtonName("radioButton_OIT_not");
QRadioButton *oitNotRadioButton =
qobject_cast<QRadioButton*>(this->findChild<QObject*>(oitNotRadioButtonName));
if(oitNotRadioButton){
oitNotRadioButton->setChecked(true);
}
#endif
} }
#if 0
// 设置默认其他类型。 // 设置默认其他类型。
u8 *initAtmosphereValue = (data + 73); u8 *initAtmosphereValue = (data + 73);
logde << "initAtmosphereValue:" << (int)(*initAtmosphereValue); logde << "initAtmosphereValue:" << (int)(*initAtmosphereValue);
@ -972,6 +965,7 @@ void ExperimentSettingForm::slotRecvPhaseInfo(const QByteArray &ba)
initialAtmosphereComboBox->setCurrentIndex(*initAtmosphereValue); initialAtmosphereComboBox->setCurrentIndex(*initAtmosphereValue);
} }
#endif #endif
#endif
} }
void ExperimentSettingForm::showEvent(QShowEvent *event) void ExperimentSettingForm::showEvent(QShowEvent *event)
@ -981,6 +975,7 @@ void ExperimentSettingForm::showEvent(QShowEvent *event)
ui->dateTimeLineEdit->setText(internationalFormat); ui->dateTimeLineEdit->setText(internationalFormat);
#if 0
// 测试类型OIT设置 // 测试类型OIT设置
if (Global::_experimentInfo.testType == Global::TestType::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->setChecked(false);
ui->radioButton_OIT_not->setChecked(true); 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);
} }