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

feat: Add progress in system correction page while empty scan data transfering.

Browse Source
This commit is contained in:
sunwen
2024-09-19 15:45:23 +08:00
parent 2d7c359a64
commit f679b81fb4
9 changed files with 259 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/device/DeviceManager.cpp
View File

@@ -428,6 +428,7 @@ void DeviceManager::prepareFinishScan(bool isNormalFinish, const QString& aReaso
if(mIsEmptyScan)
{
insertEmptyScanRecord();
TRIGGER_EVENT(EmptyScanFinished, nullptr, nullptr);
}
else
{
@@ -446,11 +447,8 @@ void DeviceManager::prepareFinishScan(bool isNormalFinish, const QString& aReaso
TRIGGER_EVENT(InvokeOperationEnd, nullptr, var);
}
if(mIsEmptyScan)
{
TRIGGER_EVENT(EmptyScanFinished, nullptr, nullptr);
}
else
if(!mIsEmptyScan)
{
ScanProcessSequence::getInstance()->popPosition();
startAutoLocate();
@@ -1065,7 +1063,7 @@ void DeviceManager::startTransfer()
}
else
{
emit transferStatusUpdated();
updateTransferState();
}
}
@@ -1100,7 +1098,7 @@ void DeviceManager::processTransferProgress(const QString& aProgress)
break;
}
emitInfoCallback(tr("Scan data transfer Succeeded!"), MessageLevel::Sucess);
emit transferStatusUpdated();
updateTransferState();
if(ReconManager::getInstance()->isConnected())
{
startCreateReconRecord();
@@ -1123,6 +1121,7 @@ void DeviceManager::processTransferProgress(const QString& aProgress)
}
QString message = tr("Scan data transfer failed.");
emitInfoCallback(message, MessageLevel::Error);
updateTransferState();
break;
}
}
@@ -1138,6 +1137,7 @@ void DeviceManager::processReconCreateEmptyScan(bool aResult, const QString& aSc
QString msg = "DB Error. Code:G504";
emitInfoCallback(msg, MessageLevel::Error);
}
EventCenter::Default()->triggerEvent(EmptyScanDataStateUpdated, nullptr, nullptr);
return;
}
@@ -1148,6 +1148,7 @@ void DeviceManager::processReconCreateEmptyScan(bool aResult, const QString& aSc
QString msg = "DB Error. Code:G505";
emitInfoCallback(msg, MessageLevel::Error);
}
EventCenter::Default()->triggerEvent(EmptyScanDataStateUpdated, nullptr, nullptr);
}
void DeviceManager::processReconCreateScan(bool aResult, const QString& aScanID, const QString& aMessage, bool aIsConnectSucceed)
@@ -1267,6 +1268,18 @@ bool DeviceManager::updateTransferProgress()
return false;
}
void DeviceManager::updateTransferState()
{
if(mIsTransferEmptyScan)
{
EventCenter::Default()->triggerEvent(EmptyScanDataStateUpdated, nullptr, nullptr);
}
else
{
emit transferStatusUpdated();
}
}
int DeviceManager::getTransferProgress()
{
return mTransferProgress;