添加管控软件和相机的通讯
This commit is contained in:
+42
-8
@@ -6,6 +6,8 @@
|
||||
#include "../services/workpieceservice.h"
|
||||
#include "../repositories/productionrepository.h"
|
||||
#include "uihelpers.h"
|
||||
#include "../services/visionservice.h"
|
||||
#include <QJsonDocument>
|
||||
|
||||
#include <QAbstractItemView>
|
||||
#include <QDateTime>
|
||||
@@ -306,6 +308,35 @@ DashboardPage::~DashboardPage()
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void DashboardPage::attachVisionService(VisionService *service)
|
||||
{
|
||||
qRegisterMetaType<QJsonObject>("QJsonObject");
|
||||
connect(productionWorker, &ProductionWorker::visionMeasureRequested,
|
||||
service, &VisionService::measure, Qt::QueuedConnection);
|
||||
connect(productionWorker, &ProductionWorker::visionCancelRequested,
|
||||
service, &VisionService::cancel, Qt::QueuedConnection);
|
||||
connect(productionWorker, &ProductionWorker::visionProductionActiveChanged,
|
||||
service, &VisionService::setProductionActive, Qt::QueuedConnection);
|
||||
connect(productionWorker, &ProductionWorker::visionProductionActiveChanged,
|
||||
this, &DashboardPage::visionProductionActiveChanged, Qt::QueuedConnection);
|
||||
connect(service, &VisionService::measurementFinished,
|
||||
productionWorker, &ProductionWorker::receiveVisionResult, Qt::QueuedConnection);
|
||||
connect(service, &VisionService::availabilityChanged,
|
||||
productionWorker, &ProductionWorker::updateVisionAvailability, Qt::QueuedConnection);
|
||||
connect(productionWorker, &ProductionWorker::visionCycleChanged, this,
|
||||
[this](const QJsonObject &cycle) {
|
||||
visionRecoveryRequired = cycle.value("recovery_required").toBool();
|
||||
updateRecoveryButtons();
|
||||
emit visionCycleChanged(cycle);
|
||||
emit logRequested("生产日志", "视觉引导", "自动取料",
|
||||
QString::fromUtf8(QJsonDocument(cycle).toJson(QJsonDocument::Compact)),
|
||||
visionRecoveryRequired ? "待恢复" : "记录");
|
||||
}, Qt::QueuedConnection);
|
||||
QMetaObject::invokeMethod(productionWorker, "updateVisionAvailability", Qt::QueuedConnection,
|
||||
Q_ARG(bool, service->isReady()), Q_ARG(bool, service->isBusy()), Q_ARG(QString, service->sessionId()));
|
||||
QMetaObject::invokeMethod(productionWorker, "requestVisionSnapshot", Qt::QueuedConnection);
|
||||
}
|
||||
|
||||
void DashboardPage::addLog(const QString &type, const QString &module, const QString &content,
|
||||
const QString &status)
|
||||
{
|
||||
@@ -377,6 +408,7 @@ void DashboardPage::startProduction()
|
||||
|
||||
void DashboardPage::pauseProduction()
|
||||
{
|
||||
productionWorker->requestPauseImmediate();
|
||||
QMetaObject::invokeMethod(productionWorker, "requestPause",
|
||||
Qt::QueuedConnection);
|
||||
}
|
||||
@@ -494,11 +526,13 @@ void DashboardPage::onRecoveryCompleted(const QString &mode)
|
||||
|
||||
void DashboardPage::recoverProduction()
|
||||
{
|
||||
if (productionState == ProductionService::ManualConfirm
|
||||
if ((productionState == ProductionService::ManualConfirm || visionRecoveryRequired)
|
||||
&& QMessageBox::question(
|
||||
this, "继续生产",
|
||||
"请确认设备和 PLC 当前步骤安全后再继续生产。",
|
||||
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)
|
||||
visionRecoveryRequired
|
||||
? "请先核对机器人当前位置及本次 R60 目标是否已被消费或撤销,并确认 PLC 已复位 850、851。确认后 ssp 会清除自己的视觉输出并重新核对信号,不会重发旧坐标。是否已完成现场核对?"
|
||||
: "请确认设备和 PLC 当前步骤安全后再继续生产。",
|
||||
QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
|
||||
!= QMessageBox::Yes) {
|
||||
return;
|
||||
}
|
||||
@@ -531,22 +565,22 @@ void DashboardPage::updateRecoveryButtons()
|
||||
{
|
||||
const ProductionService::State state = productionState;
|
||||
const bool recoveryRequired = state == ProductionService::TimeoutPaused
|
||||
|| state == ProductionService::ManualConfirm;
|
||||
|| state == ProductionService::ManualConfirm || visionRecoveryRequired;
|
||||
const bool running = state != ProductionService::Idle
|
||||
&& state != ProductionService::Completed;
|
||||
const bool terminating = state == ProductionService::Terminating;
|
||||
const bool canStart = (state == ProductionService::Idle
|
||||
|| state == ProductionService::Completed)
|
||||
&& currentOrderStartable;
|
||||
&& currentOrderStartable && !visionRecoveryRequired;
|
||||
ui->startButton->setEnabled(canStart);
|
||||
recoverButton->setVisible(recoveryRequired);
|
||||
retryButton->setVisible(recoveryRequired);
|
||||
retryButton->setVisible(recoveryRequired && !visionRecoveryRequired);
|
||||
markNgButton->setVisible(recoveryRequired
|
||||
&& productionWorkpiece.id > 0);
|
||||
&& productionWorkpiece.id > 0 && !visionRecoveryRequired);
|
||||
stopButton->setVisible(running);
|
||||
stopButton->setEnabled(!terminating);
|
||||
stopButton->setText(terminating ? "终止中..." : "终止");
|
||||
recoverButton->setText(state == ProductionService::ManualConfirm
|
||||
recoverButton->setText(visionRecoveryRequired ? "核对视觉恢复" : state == ProductionService::ManualConfirm
|
||||
? "继续" : "恢复");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user