From 07632e7de1ee1c82dfedf45077da091bfe4583d6 Mon Sep 17 00:00:00 2001 From: lidg Date: Wed, 28 Oct 2026 15:19:11 +0800 Subject: [PATCH] =?UTF-8?q?feat(camera):=20=E5=90=AF=E5=8A=A8=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B9=B6=E5=9C=A8=E6=B5=8B?= =?UTF-8?q?=E9=87=8F=E5=89=8D=E9=87=8D=E8=AF=95=E5=A4=B1=E8=B4=A5=E7=9A=84?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 程序启动后自动连接左右相机、应用参数并完成一次白平衡 - 测量请求到达时若相机未初始化成功,再初始化一次 - 重试成功继续同一测量请求,失败返回 INITIALIZATION 和 robot_valid=false - 初始化期间允许一个待处理测量请求,并支持取消 - IPC 状态增加 initialization_in_progress - 手动白平衡先失效初始化缓存并同步更新就绪状态 - 将带宽设置收口到 CameraManager,更新接入文档 验证:MSVC x64编译通过;启动重试8、IPC9、白平衡6、抓取7项测试通过 --- source/CameraManager.cpp | 14 +++++++++ source/CameraManager.h | 1 + source/CameraPanel.cpp | 10 ++----- source/CameraPanel.h | 2 ++ source/MainWindow.cpp | 60 +++++++++++++++++++++++++++++++------- source/MainWindow.h | 3 ++ source/SSP_INTEGRATION.md | 7 ++++- source/VisionIpcServer.cpp | 4 ++- 8 files changed, 81 insertions(+), 20 deletions(-) diff --git a/source/CameraManager.cpp b/source/CameraManager.cpp index 8cf17a3..391be31 100644 --- a/source/CameraManager.cpp +++ b/source/CameraManager.cpp @@ -316,6 +316,20 @@ bool CameraManager::setGain(CamIndex idx, double dB) } } +bool CameraManager::setBandwidthLimit(CamIndex idx, bool enabled) +{ + if (!m_connected[idx] || m_device[idx].IsNull()) return false; + try { + auto features = m_device[idx]->GetRemoteFeatureControl(); + features->GetIntFeature("DeviceLinkSelector")->SetValue(0); + features->GetEnumFeature("DeviceLinkThroughputLimitMode")->SetValue(enabled ? "On" : "Off"); + return true; + } catch (...) { + emit errorOccurred(idx, QStringLiteral("Set bandwidth limit failed")); + return false; + } +} + bool CameraManager::applyWhiteBalanceOnce(CamIndex idx) { if (!m_connected[idx] || m_device[idx].IsNull()) return false; diff --git a/source/CameraManager.h b/source/CameraManager.h index 71ce554..ae2a2fc 100644 --- a/source/CameraManager.h +++ b/source/CameraManager.h @@ -44,6 +44,7 @@ public: bool setExposureTime(CamIndex idx, double us); bool getExposureTime(CamIndex idx, double& us); bool setGain(CamIndex idx, double dB); + bool setBandwidthLimit(CamIndex idx, bool enabled); // Run the camera's one-shot automatic white-balance procedure. // The camera performs the adjustment and returns to its normal state. bool applyWhiteBalanceOnce(CamIndex idx); diff --git a/source/CameraPanel.cpp b/source/CameraPanel.cpp index fcc1917..f98df8b 100644 --- a/source/CameraPanel.cpp +++ b/source/CameraPanel.cpp @@ -251,13 +251,7 @@ bool CameraPanel::applyParameters(int cameraIndex) if(!m_mgr->isConnected(index))return false; const bool exposure=m_mgr->setExposureTime(index,ui.spinExposure->value()); const bool gain=m_mgr->setGain(index,ui.spinGain->value()); - bool bandwidth=false; - try { - auto features=m_mgr->getDevice(index)->GetRemoteFeatureControl(); - features->GetIntFeature("DeviceLinkSelector")->SetValue(0); - features->GetEnumFeature("DeviceLinkThroughputLimitMode")->SetValue(ui.chkBandwidthLimit->isChecked()?"On":"Off"); - bandwidth=true; - }catch(...){emit logMessage(QString::fromUtf8("[Camera] 带宽限制模式设置失败"));} + const bool bandwidth=m_mgr->setBandwidthLimit(index,ui.chkBandwidthLimit->isChecked()); return exposure&&gain&&bandwidth; } @@ -304,6 +298,8 @@ void CameraPanel::onApplyWhiteBalance() auto apply = [&](CameraManager::CamIndex ci, const QString& name) { if (!m_mgr->isConnected(ci)) return; + m_remoteInitialized[ci]=false; + emit remoteInitializationChanged(int(ci)); if (m_mgr->applyWhiteBalanceOnce(ci)) { applied = true; emit logMessage(QString::fromUtf8("%1自动白平衡已执行(Once)").arg(name)); diff --git a/source/CameraPanel.h b/source/CameraPanel.h index 94b9bab..265cebe 100644 --- a/source/CameraPanel.h +++ b/source/CameraPanel.h @@ -25,6 +25,7 @@ public: signals: void logMessage(const QString& msg); + void remoteInitializationChanged(int cameraIndex); private slots: void onLeftConnect(); void onLeftDisconnect(); @@ -40,6 +41,7 @@ private slots: void refreshComPorts(); private: + friend class CameraInitializationTest; void updateStates(); bool applyParameters(int cameraIndex); Ui::MainWindowClass& ui; diff --git a/source/MainWindow.cpp b/source/MainWindow.cpp index ec859c9..fd500b7 100644 --- a/source/MainWindow.cpp +++ b/source/MainWindow.cpp @@ -95,6 +95,12 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent) updateRemoteLock();updateIpcState(); }); connect(m_panelMeasurementOptions,&MeasurementOptionsPanel::remoteFinished,this,&MainWindow::ipcFinished); + connect(m_panelCam,&CameraPanel::remoteInitializationChanged,this,[this](int index){ + const QString key=index==0?"left":"right"; + auto state=m_initialization[key].toObject();state["white_balance_finished"]=false;state["reused"]=false; + m_initialization[key]=state;m_initialization["initialized"]=false; + updateIpcState(); + }); connect(m_panelMeas,&MeasurePanel::measureCompleted,this,[this](bool){QTimer::singleShot(0,this,[this]{updateRemoteLock();updateIpcState();});}); connect(m_panelVisionGuide,&VisionGuidePanel::busyChanged,this,[this](bool){updateRemoteLock();updateIpcState();}); connect(m_panelYolo,&YoloPanel::busyChanged,this,[this](bool){updateRemoteLock();updateIpcState();}); @@ -143,7 +149,18 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent) modalWatch->start(); // ★ 延迟加载: 窗口先显示, 模型后台加载, 启动秒开 - QTimer::singleShot(0, this, &MainWindow::autoLoadModels); + m_initializing=true; + QTimer::singleShot(0, this, [this]{ + autoLoadModels(); + QString error; + initializeCameras(&error); + if(!error.isEmpty())appendLog(QString::fromUtf8("启动相机初始化失败:")+error); + QTimer::singleShot(0,this,[this]{ + if(m_pendingMeasure.isEmpty())return; + const auto request=m_pendingMeasure;m_pendingMeasure={}; + onIpcCommand(request); + }); + }); appendLog(QString::fromUtf8("系统已启动")); } @@ -192,14 +209,39 @@ void MainWindow::updateIpcState() QString error; const bool ready=m_panelCam->remoteInitialized()&&m_panelMeasurementOptions->remoteReady(&error); emit ipcStateChanged(QJsonObject{{"ready",ready},{"resource_busy",resourceBusy()}, - {"initialization",m_initialization},{"message",error}}); + {"initialization",m_initialization},{"initialization_in_progress",m_initializing},{"message",error}}); +} + +bool MainWindow::initializeCameras(QString* error) +{ + m_initializing=true;updateRemoteLock();updateIpcState(); + try {m_initialization=m_panelCam->initializeRemote();} + catch(const std::exception& e){m_initialization={{"initialized",false},{"error",QString::fromUtf8(e.what())}};} + catch(...){m_initialization={{"initialized",false},{"error","Unhandled camera initialization failure"}};} + QString detail; + const bool ready=m_panelCam->remoteInitialized(); + if(!ready&&detail.isEmpty())detail=m_initialization["error"].toString("Camera initialization incomplete"); + if(error)*error=detail; + m_initializing=false; + updateRemoteLock();updateIpcState(); + return ready; } void MainWindow::onIpcCommand(const QJsonObject& request) { const auto type=request["type"].toString(); if(type=="show_window"){show();raise();activateWindow();return;} - if(type=="cancel"){m_panelMeasurementOptions->cancelRemote();return;} + if(type=="cancel"){ + if(!m_pendingMeasure.isEmpty()&&request["target_request_id"]==m_pendingMeasure["request_id"]){ + emit ipcFinished(QJsonObject{{"type","measure"},{"request_id",m_pendingMeasure["request_id"]},{"context",m_pendingMeasure["context"]},{"status","cancelled"},{"robot_valid",false}}); + m_pendingMeasure={}; + }else m_panelMeasurementOptions->cancelRemote(); + return; + } + if(type=="measure"&&m_initializing&&m_pendingMeasure.isEmpty()){ + m_pendingMeasure=request; + return; + } if(resourceBusy()){ emit ipcFinished(QJsonObject{{"type",type},{"request_id",request["request_id"]},{"context",request["context"]},{"status","error"},{"error_code","BUSY"},{"message","A local operation is already active"}});updateIpcState();return; } @@ -208,20 +250,16 @@ void MainWindow::onIpcCommand(const QJsonObject& request) QCoreApplication::quit();return; } if(type=="initialize"){ - m_initializing=true;updateRemoteLock();updateIpcState(); - try {m_initialization=m_panelCam->initializeRemote();} - catch(const std::exception& e){m_initialization={{"initialized",false},{"error",QString::fromUtf8(e.what())}};} - catch(...){m_initialization={{"initialized",false},{"error","Unhandled camera initialization failure"}};} - QString error;const bool ready=m_panelCam->remoteInitialized()&&m_panelMeasurementOptions->remoteReady(&error); - m_initializing=false; + QString error;const bool ready=initializeCameras(&error)&&m_panelMeasurementOptions->remoteReady(&error); // Keep the transport's request active until its terminal response has been delivered. emit ipcFinished(QJsonObject{{"type",type},{"request_id",request["request_id"]},{"status",ready?"ok":"error"},{"ready",ready}, {"initialization",m_initialization},{"error_code",ready?"":"INITIALIZATION"},{"message",error.isEmpty()&&!ready?QStringLiteral("Camera initialization incomplete"):error}}); updateRemoteLock();updateIpcState();return; } if(type=="measure"){ - if(!m_panelCam->remoteInitialized()){ - emit ipcFinished(QJsonObject{{"type",type},{"request_id",request["request_id"]},{"context",request["context"]},{"status","error"},{"error_code","NOT_INITIALIZED"},{"message","Initialize both cameras first"}}); + QString error; + if(!m_panelCam->remoteInitialized()&&!initializeCameras(&error)){ + emit ipcFinished(QJsonObject{{"type",type},{"request_id",request["request_id"]},{"context",request["context"]},{"status","error"},{"robot_valid",false},{"error_code","INITIALIZATION"},{"message",error}}); }else m_panelMeasurementOptions->startRemote(request); updateRemoteLock();updateIpcState(); } diff --git a/source/MainWindow.h b/source/MainWindow.h index 2fa3777..b0d7709 100644 --- a/source/MainWindow.h +++ b/source/MainWindow.h @@ -48,7 +48,9 @@ private slots: void onOpcResetRequested(); void onIpcCommand(const QJsonObject& request); private: + friend class VisionStartupTest; void autoLoadModels(); + bool initializeCameras(QString *error); void updateIpcState(); void updateRemoteLock(); bool resourceBusy() const; @@ -58,6 +60,7 @@ private: bool m_initializing = false; bool m_modalObserved = false; QJsonObject m_initialization; + QJsonObject m_pendingMeasure; Ui::MainWindowClass ui; // ── 后端对象(MainWindow 拥有生命周期) ── CameraManager* m_camMgr = nullptr; diff --git a/source/SSP_INTEGRATION.md b/source/SSP_INTEGRATION.md index 163c2d2..ed89609 100644 --- a/source/SSP_INTEGRATION.md +++ b/source/SSP_INTEGRATION.md @@ -2,17 +2,22 @@ 使用本目录 `VisionGuide.pro` 构建;不需要导出算法 DLL。ssp 保留原 MinGW 工程,此程序使用 Qt 5.14.1 MSVC x64 kit,运行目录必须保留部署脚本生成的 DLL、`visionguide.package.json`、`qt.conf` 和原项目资源目录。 -启动参数:`VisionGuide.exe --ipc-name ssp-visionguide --background`。不带 `--background` 时显示原窗口;不带 `--ipc-name` 时保持手动运行方式。IPC 接入不会自动连接相机,必须收到 initialize 命令才连接左右相机。 +启动参数:`VisionGuide.exe --ipc-name ssp_visionguide_v1 --background`。不带 `--background` 时显示原窗口;不带 `--ipc-name` 时不启动 IPC。程序启动后自动执行左右相机连接、参数应用及一次白平衡;失败保持程序运行。收到测量请求时相机尚未初始化成功则再初始化一次,成功继续同一请求,失败返回 INITIALIZATION 错误和 robot_valid=false。显式 initialize 仍用于维护。 + +初始化期间状态包含 initialization_in_progress=true;IPC 可接收一个待处理测量,其他请求仍受资源互斥约束。客户端允许未就绪状态发送测量,总超时需覆盖启动初始化、一次重试及测量。ssp 在视觉失败后写 M852=0 并继续普通 RackPick;视觉成功时确认 R60 写入后写 M852=1。VisionGuide 不操作 PLC。 协议对应 ssp 的 `docs/visionguide-ipc-protocol.md`:同用户 QLocalSocket,4字节大端长度和 UTF-8 JSON,协议版本1。通信在独立线程执行;相机/界面仍沿用原线程边界。控制端连接期间手动界面只供查看,OPC、标定和参数修改不能抢占;需断开控制端后进行手动配置。 初始化沿用 CameraPanel 当前曝光、增益和带宽值,两台相机分别连接、应用参数、提交一次白平衡、获取新帧并检查 BalanceWhiteAuto=Off。成功的同一连接代次不重复初始化。相机错误或断开使该路初始化失效。白平衡不完成时返回失败,不用命令提交成功冒充完成。 +2026-10-28 修复:手动再次执行白平衡时,先失效该路初始化状态并通知 IPC 更新就绪信息,再提交 Once。重复执行仍允许;命令失败也不能复用先前的完成状态。重新接回 ssp 后执行初始化,待确认完成后恢复生产就绪。`tests/vision_camera` 使用实际 CameraPanel 和相机管理器替身验证状态流转,不访问真实相机。 + 测量复用新测量页:读取指定料盘配置,冻结输入机器人位姿、标定、示教及高度策略,然后显式采用左相机、高精细化、5秒、0.70/0.80、中心选择、模型原点显示和4.40mm偏移。返回相机原点与左路抓取XYZABC两组数值;原点显示不会取消抓取偏移。取消或截止后算子仍在运行时保持 busy,迟到成功不会发布。旧分步位姿/调试和双目数据采集在整个操作期间保持资源占用,即使原进度界面处理嵌套事件,IPC初始化、测量和退出也会拒绝抢占。 测试工程: - `tests/vision_ipc/vision_ipc.pro`:不加载相机SDK的真实本机socket测试,验证分包/粘包、会话、去重、取消、断线、busy、单客户端及非法帧。 - `tests/vision_grasp/vision_grasp.pro`:复用实际抓取实现的无相机测试,验证已知几何、R40快照、偏移一次、部分成功和迟到结果拒绝。测试产物同样名为 VisionGuide.exe,位于独立测试构建目录,不用于生产。 +- `tests/vision_camera/vision_startup.pro`:实际 MainWindow/CameraPanel 配合相机管理器替身,验证启动初始化、失败重试一次、继续原请求、失败返回、初始化期间等待及取消。使用独立 build-ssp-startup-test,产物同样名为 VisionGuide.exe,仅供测试,禁止部署为生产程序。 2026-10-27 本机验证使用 Qt 5.14.1 msvc2017_64 库和已安装 VS2022 v143 14.44 编译器;本机未安装 v141,故尚未实测 MSVC2017 编译器。实际左右相机白平衡、同图识别一致性和机器人握手仍需现场验收。没有执行真实相机、PLC或机器人操作。 diff --git a/source/VisionIpcServer.cpp b/source/VisionIpcServer.cpp index 8bc3899..7980fe7 100644 --- a/source/VisionIpcServer.cpp +++ b/source/VisionIpcServer.cpp @@ -120,7 +120,9 @@ void VisionIpcServer::dispatch(const QJsonObject& request) if(type!="initialize"&&type!="measure"&&type!="shutdown"){ send(reply(request,"error","COMMAND","Unknown command"));return; } - if(m_state["resource_busy"].toBool()||!m_active.isEmpty()){ + // During startup initialization, one measure may wait in the GUI event queue. + const bool waitsForInitialization=type=="measure"&&m_state["initialization_in_progress"].toBool(); + if((m_state["resource_busy"].toBool()&&!waitsForInitialization)||!m_active.isEmpty()){ send(reply(request,"error","BUSY","Vision resource is busy"));return; } m_active=request;m_terminal=false;m_dispatchPending=true;