From c2b3f131eee6d9575a0cb85d35bc1f0d15d944b1 Mon Sep 17 00:00:00 2001 From: tangchao0503 <735056338@qq.com> Date: Wed, 7 May 2025 10:05:16 +0800 Subject: [PATCH] =?UTF-8?q?fix=201=E3=80=81=E9=87=8D=E5=90=AF=E8=BD=AF?= =?UTF-8?q?=E4=BB=B6=E5=90=8E=EF=BC=8C=E6=81=A2=E5=A4=8D=E4=B8=8A=E6=AC=A1?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=9A=84=E5=B8=83=E5=B1=80=EF=BC=9B=202?= =?UTF-8?q?=E3=80=81=E8=8F=9C=E5=8D=95=E6=A0=8F=E6=B7=BB=E5=8A=A0/?= =?UTF-8?q?=EF=BC=9A=E5=85=89=E8=B0=B1=E6=9B=B2=E7=BA=BF=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=81=9C=E9=9D=A0=E7=AA=97=EF=BC=9B=20add=20=E5=8F=8C=E8=BD=B4?= =?UTF-8?q?=E7=BA=BF=E6=80=A7=E5=B9=B3=E5=8F=B0=EF=BC=9A=E9=87=87=E9=9B=86?= =?UTF-8?q?=E6=9A=97=E7=94=B5=E6=B5=81=E4=B9=9F=E7=A7=BB=E5=8A=A8x?= =?UTF-8?q?=E9=A9=AC=E8=BE=BE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HPPA/HPPA.cpp | 88 +++++++++++++++++++++++++++++++++--------------- HPPA/HPPA.ui | 20 +++++------ HPPA/PathPlan.ui | 16 +++------ 3 files changed, 75 insertions(+), 49 deletions(-) diff --git a/HPPA/HPPA.cpp b/HPPA/HPPA.cpp index 22e00d4..801211d 100644 --- a/HPPA/HPPA.cpp +++ b/HPPA/HPPA.cpp @@ -17,15 +17,7 @@ HPPA::HPPA(QWidget *parent) QCoreApplication::setOrganizationDomain("iris.com"); QCoreApplication::setApplicationName("HPPA"); - QString strPath = QCoreApplication::applicationDirPath() + "/UILayout.ini"; - QFile file(strPath); - if (file.open(QIODevice::ReadOnly)) { - QByteArray ba; - QDataStream in(&file); - in >> ba; - file.close(); - this->restoreState(ba); - } + //配置文件：如果没有，就创建配置文件 string HPPACfgFile = getPathofEXE() + "\\HPPA.cfg"; @@ -98,23 +90,8 @@ HPPA::HPPA(QWidget *parent) ptoolbar->addAction(pAction);*/ - //用于显示光谱 - QWidget* widget = new QWidget(); - QGridLayout* grid = new QGridLayout(widget); - m_chartView = new QChartView(ui.mDockWidgetSpectralViewer); - m_chartView->setRenderHint(QPainter::Antialiasing); - - grid->addWidget(m_chartView); - //grid->setMargin(0); - grid->setContentsMargins(0, 0, 0, 0); - //grid->SetMaximumSize(0); - ui.mDockWidgetSpectralViewer->setWidget(widget); - - //QLineSeries *series = new QLineSeries(); - //QChart *chart = new QChart(); - //光谱仪操作 m_Imager = nullptr; @@ -264,6 +241,23 @@ HPPA::HPPA(QWidget *parent) initPanelToolbar(); + //光谱显示 + QWidget* widget = new QWidget(); + QGridLayout* grid = new QGridLayout(widget); + + m_chartView = new QChartView(ui.mDockWidgetSpectralViewer); + m_chartView->setRenderHint(QPainter::Antialiasing); + + grid->addWidget(m_chartView); + //grid->setMargin(0); + grid->setContentsMargins(0, 0, 0, 0); + //grid->SetMaximumSize(0); + ui.mDockWidgetSpectralViewer->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea | Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea); + ui.mDockWidgetSpectralViewer->setWidget(widget); + //QLineSeries *series = new QLineSeries(); + //QChart *chart = new QChart(); + mPanelMenu->addAction(ui.mDockWidgetSpectralViewer->toggleViewAction()); + //轨迹规划 m_pathPlan = new PathPlan(m_xMotor, m_yMotor, ui.xmotor_location_slider, ui.ymotor_location_slider); QDockWidget* dock_pathPlan = new QDockWidget(QString::fromLocal8Bit("轨迹规划"), this); @@ -310,11 +304,22 @@ HPPA::HPPA(QWidget *parent) createMoveplatformActionGroup(); connect(moveplatformActionGroup, &QActionGroup::triggered, this, &HPPA::selectingMoveplatform); + + QString strPath = QCoreApplication::applicationDirPath() + "/UILayout.ini"; + QFile file(strPath); + if (file.open(QIODevice::ReadOnly)) + { + QByteArray ba; + QDataStream in(&file); + in >> ba; + file.close(); + this->restoreState(ba); + } } void HPPA::recordFromRobotArm(int fileCounter) { - qDebug() << "recordFromRobotArm" << fileCounter; + //qDebug() << "recordFromRobotArm" << fileCounter; if (fileCounter == -1) { @@ -322,7 +327,7 @@ void HPPA::recordFromRobotArm(int fileCounter) ui.action_start_recording->setText(QString::fromLocal8Bit("采集")); ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}"); - qDebug() << "recordFromRobotArm: 1111111111111111111111"; + //qDebug() << "recordFromRobotArm: 1111111111111111111111"; return; } @@ -338,7 +343,7 @@ void HPPA::recordFromRobotArm(int fileCounter) ui.action_start_recording->setText(QString::fromLocal8Bit("采集中")); ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(255,0,0);}"); - qDebug() << "recordFromRobotArm: 2222222222222222222222"; + //qDebug() << "recordFromRobotArm: 2222222222222222222222"; } void HPPA::createActionGroups() @@ -1950,15 +1955,42 @@ void HPPA::onAbout() void HPPA::onDark() { QMessageBox msgBox; - msgBox.setText(QString::fromLocal8Bit("请确保镜头盖盖上！")); + msgBox.setText(QString::fromLocal8Bit("采集暗电流，请确保镜头盖盖上！")); msgBox.exec(); + bool isMotorEnable = this->ui.mAction_2AxisMotor->isChecked(); + if (isMotorEnable) + { + //移动x马达 + if (!isMotorConnected(m_xMotor)) + { + m_xMotor->EnableMotro(); + m_lXmotorLocationOfStartRecord = m_xMotor->GetLocationNow(); + m_xMotor->SettingSpeed(ui.xmotor_speed_slider->OriginalValue()); + //m_xMotor->SettingSpeed(m_lManualSpeedOfXMotor); + + m_xMotor->MoveMotar(true); + } + } + emit RecordDarlSignal(); } void HPPA::recordDarkFinish() { ui.mainToolBar->widgetForAction(ui.action_dark)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}"); + + bool isMotorEnable = this->ui.mAction_2AxisMotor->isChecked(); + if (isMotorEnable) + { + //移动x马达 + if (!isMotorConnected(m_xMotor)) + { + //x马达返回采集前的位置 + m_xMotor->SettingSpeed(m_lManualSpeedOfXMotor); + m_xMotor->MoveToLocation(m_lXmotorLocationOfStartRecord); + } + } } void HPPA::onReference() diff --git a/HPPA/HPPA.ui b/HPPA/HPPA.ui index f08f8b2..9e1c128 100644 --- a/HPPA/HPPA.ui +++ b/HPPA/HPPA.ui @@ -442,19 +442,19 @@ QDockWidget::title { - 0 + 9 - 0 + 9 - 0 + 9 - 0 + 9 - 0 + 6 @@ -706,19 +706,19 @@ QDockWidget::title { - 0 + 9 - 0 + 9 - 0 + 9 - 0 + 9 - 0 + 6 diff --git a/HPPA/PathPlan.ui b/HPPA/PathPlan.ui index 07883bd..5277f63 100644 --- a/HPPA/PathPlan.ui +++ b/HPPA/PathPlan.ui @@ -15,19 +15,19 @@ - 0 + 9 - 0 + 9 - 0 + 9 - 0 + 9 - 0 + 6 @@ -349,12 +349,6 @@ - layoutWidget - layoutWidget_2 - recordLine_tableWidget - layoutWidget_3 - layoutWidget_4 - label_7