diff --git a/HPPA/HPPA.cpp b/HPPA/HPPA.cpp index 962c93d..0ba25cb 100644 --- a/HPPA/HPPA.cpp +++ b/HPPA/HPPA.cpp @@ -13,6 +13,10 @@ HPPA::HPPA(QWidget *parent) { ui.setupUi(this); + QCoreApplication::setOrganizationName("IRIS"); + QCoreApplication::setOrganizationDomain("iris.com"); + QCoreApplication::setApplicationName("HPPA"); + QString strPath = QCoreApplication::applicationDirPath() + "/UILayout.ini"; QFile file(strPath); if (file.open(QIODevice::ReadOnly)) { @@ -301,13 +305,36 @@ void HPPA::createActionGroups() mImagerGroup->addAction(ui.mActionCorning_410); mImagerGroup->addAction(ui.mActionPica_NIR); - ui.mActionPica_NIR->setChecked(true); - imagerSelected = ui.mActionPica_NIR->objectName(); + + // 读取上次选择的结果 + QSettings settings; + QString lastSelectedAction = settings.value("LastSelectedImagerAction").toString(); + + // 恢复上次选择的结果 + if (lastSelectedAction == "mActionPica_L") + { + ui.mActionPica_L->setChecked(true); + } + else if (lastSelectedAction == "mActionPica_NIR") + { + ui.mActionPica_NIR->setChecked(true); + } + else if (lastSelectedAction == "mActionPika_XC2") + { + ui.mActionPika_XC2->setChecked(true); + } + else if (lastSelectedAction == "mActionCorning_410") + { + ui.mActionCorning_410->setChecked(true); + } + } void HPPA::selectingImager(QAction* selectedAction) { - imagerSelected = selectedAction->objectName(); + QSettings settings; + settings.setValue("LastSelectedImagerAction", selectedAction->objectName()); + settings.sync(); } HPPA::~HPPA() @@ -1491,6 +1518,7 @@ void HPPA::newMotor() m_yMotor = new VinceControl(NETTCP, 6001);//原本:6001;韩工测试:6003 m_pathPlan->setMotor(m_xMotor, m_yMotor); + QString imagerSelected = mImagerGroup->checkedAction()->objectName(); if (imagerSelected == "mActionPica_NIR") { connect(m_xMotor, SIGNAL(newTCPConnection(VinceControl*)), this, SLOT(setMotorParamMicroscope(VinceControl*))); @@ -1626,6 +1654,7 @@ void HPPA::onconnect() m_RecordThread = new QThread(); //根据选择的相机类型创建对象mImagerGroup + QString imagerSelected = mImagerGroup->checkedAction()->objectName(); if (imagerSelected == "mActionPica_L") { m_Imager = new ResononPicaLImager();