sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add check recon connection and restart create recon record.

Browse Source
This commit is contained in:
sunwen
2023-09-06 18:01:48 +08:00
parent f9a99925a6
commit 663b8d8f35
9 changed files with 80 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/device/DeviceManager.cpp
View File

@@ -147,7 +147,10 @@ void DeviceManager::initDevice()
connect(ReconManager::getInstance(), &ReconManager::createEmptyScanResponsed, this, &DeviceManager::processReconCreateEmptyScan);
connect(this, &DeviceManager::queryScanStatusToRecon, ReconManager::getInstance(), &ReconManager::queryReconStatus);
connect(ReconManager::getInstance(), &ReconManager::queryReconStateResponsed, this, &DeviceManager::processReconQueryScanState);
connect(ReconManager::getInstance(), &ReconManager::restartCreatReconRecord, this, &DeviceManager::startCreateReconRecord);
connect(ReconManager::getInstance(), &ReconManager::checkReconConnectionResponsed, this, &DeviceManager::updateReconConnectionState);
mReconHttpThread->start();
QMetaObject::invokeMethod(ReconManager::getInstance(), "checkReconConnection", Qt::QueuedConnection);
//init dms status--------------------make a function future
if(JsonObject::Instance()->isDmsSimulator())
@@ -855,7 +858,10 @@ void DeviceManager::processTransferProgress(const QString& aProgress)
}
emitInfoCallback("Scan data transfer Succeeded!", MessageLevel::Sucess);
emit transferStatusUpdated();
startCreateReconRecord();
if(ReconManager::getInstance()->isConnected())
{
startCreateReconRecord();
}
startTransfer();
break;
}
@@ -973,6 +979,11 @@ void DeviceManager::initEmptyScanMeasurementID()
void DeviceManager::updateReconState()
{
if(!ReconManager::getInstance()->isConnected())
{
emitInfoCallback(tr("Recon disconnected."), MessageLevel::Error);
return;
}
QString sql = "SELECT ScanID FROM Scan WHERE State < 999 And State >= 300";
auto result = SQLHelper::queryValues(sql);
QStringList scanIDs;
@@ -1046,3 +1057,8 @@ void DeviceManager::controlDrainage(const QString& aCode)
QString msg = tr("Open pump failed.");
THROW_ERROR(msg);
}
void DeviceManager::updateReconConnectionState(bool aIsConnected)
{
EventCenter::Default()->triggerEvent(ReconConnectionUpdated, nullptr, (QObject*)&aIsConnected);
}

3
src/device/DeviceManager.h
View File

@@ -92,7 +92,6 @@ private:
void startScan(const QString& json, bool empty = false);
void startPreview();
void shutdown();
void startCreateReconRecord();
//-----------------new
DeviceStatus getDeviceStatus();
@@ -129,6 +128,8 @@ private slots:
void processReconCreateEmptyScan(bool aResult, const QString& aScanID, const QString& aMessage);
void processReconCreateScan(bool aResult, const QString& aScanID, const QString& aMessage);
void processReconQueryScanState(bool aResult, const QVariant& aState);
void startCreateReconRecord();
void updateReconConnectionState(bool aIsConnected);
//GUI
void scanTimeout();