feat(camera): 启动自动初始化并在测量前重试失败的初始化
- 程序启动后自动连接左右相机、应用参数并完成一次白平衡 - 测量请求到达时若相机未初始化成功,再初始化一次 - 重试成功继续同一测量请求,失败返回 INITIALIZATION 和 robot_valid=false - 初始化期间允许一个待处理测量请求,并支持取消 - IPC 状态增加 initialization_in_progress - 手动白平衡先失效初始化缓存并同步更新就绪状态 - 将带宽设置收口到 CameraManager,更新接入文档 验证:MSVC x64编译通过;启动重试8、IPC9、白平衡6、抓取7项测试通过
This commit is contained in:
+49
-11
@@ -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();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user