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

feat: Remove autolocate in scan process.

Browse Source
This commit is contained in:
sunwen
2025-02-08 15:14:46 +08:00
parent e48f429206
commit b2158943ec
3 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/CoordinateXYWidget.cpp
View File

@@ -193,18 +193,18 @@ void CoordinateXYWidget::updateStopFlash()
void CoordinateXYWidget::startFlash() void CoordinateXYWidget::startFlash()
{ {
show(); // show();
connect(mTimer,&QTimer::timeout,this, &CoordinateXYWidget::updateFlash); // connect(mTimer,&QTimer::timeout,this, &CoordinateXYWidget::updateFlash);
mStopGradientEnd = 1; // mStopGradientEnd = 1;
mTimer->start(20); // mTimer->start(20);
} }
void CoordinateXYWidget::stopFlash() void CoordinateXYWidget::stopFlash()
{ {
disconnect(mTimer,&QTimer::timeout,this, &CoordinateXYWidget::updateFlash); // disconnect(mTimer,&QTimer::timeout,this, &CoordinateXYWidget::updateFlash);
connect(mTimer,&QTimer::timeout,this, &CoordinateXYWidget::updateStopFlash); // connect(mTimer,&QTimer::timeout,this, &CoordinateXYWidget::updateStopFlash);
mTimer->stop(); // mTimer->stop();
mTimer->start(20); // mTimer->start(20);
} }
void CoordinateXYWidget::quit() void CoordinateXYWidget::quit()

16
src/components/CoordinateZWidget.cpp
View File

@@ -115,18 +115,18 @@ void CoordinateZWidget::setBlinkPoint(int aZ)
void CoordinateZWidget::startFlash() void CoordinateZWidget::startFlash()
{ {
show(); // show();
connect(mTimer,&QTimer::timeout,this, &CoordinateZWidget::updateFlash); // connect(mTimer,&QTimer::timeout,this, &CoordinateZWidget::updateFlash);
mStopGradientEnd = 1; // mStopGradientEnd = 1;
mTimer->start(20); // mTimer->start(20);
} }
void CoordinateZWidget::stopFlash() void CoordinateZWidget::stopFlash()
{ {
disconnect(mTimer,&QTimer::timeout,this, &CoordinateZWidget::updateFlash); // disconnect(mTimer,&QTimer::timeout,this, &CoordinateZWidget::updateFlash);
connect(mTimer,&QTimer::timeout,this, &CoordinateZWidget::updateStopFlash); // connect(mTimer,&QTimer::timeout,this, &CoordinateZWidget::updateStopFlash);
mTimer->stop(); // mTimer->stop();
mTimer->start(20); // mTimer->start(20);
} }
void CoordinateZWidget::updateFlash() void CoordinateZWidget::updateFlash()

43
src/device/DeviceManager.cpp
View File

@@ -1365,7 +1365,7 @@ void DeviceManager::stopScanProcess()
AppGlobalValues::setInProcessing(false); AppGlobalValues::setInProcessing(false);
mIsScanning = false; mIsScanning = false;
LOG_SYS_OPERATION("Stop scan process.") LOG_SYS_OPERATION("Stop scan process.")
stopAutoLocate(); //stopAutoLocate();
} }
bool DeviceManager::startAutoLocate() bool DeviceManager::startAutoLocate()
@@ -1375,25 +1375,28 @@ bool DeviceManager::startAutoLocate()
TRIGGER_EVENT(StopScanProcess, nullptr, nullptr); TRIGGER_EVENT(StopScanProcess, nullptr, nullptr);
return false; return false;
} }
auto result = mStartAutoLocateAction->execute(); emit startAutoLocateResult(true);
if(result.mIsSucessful) ScanProcessSequence::getInstance()->startFullScan();
{ return true;
mIsAutoLocating = true; // auto result = mStartAutoLocateAction->execute();
QJsonObject jsonObj = toJsonObject(result.mData); // if(result.mIsSucessful)
if(jsonObj["code"].toInt() == 0 ) // {
{ // mIsAutoLocating = true;
emit startAutoLocateResult(true); // QJsonObject jsonObj = toJsonObject(result.mData);
mEffectivePositionCount = 0; // if(jsonObj["code"].toInt() == 0 )
mGetAutoLocatePositionTimer = startTimer(1000); // {
return true; // emit startAutoLocateResult(true);
} // mEffectivePositionCount = 0;
} // mGetAutoLocatePositionTimer = startTimer(1000);
emit startAutoLocateResult(false); // return true;
TRIGGER_EVENT(StopScanProcess, nullptr, nullptr); // }
QString errorMessage = tr("Start auto locate failed") + AlarmHelper::getAlarmString(toJsonObject(result.mData)["info"].toInt()); // }
THROW_ERROR(errorMessage) // emit startAutoLocateResult(false);
LOG_SYS_OPERATION("Start auto locate failed.") // TRIGGER_EVENT(StopScanProcess, nullptr, nullptr);
return false; // QString errorMessage = tr("Start auto locate failed") + AlarmHelper::getAlarmString(toJsonObject(result.mData)["info"].toInt());
// THROW_ERROR(errorMessage)
// LOG_SYS_OPERATION("Start auto locate failed.")
// return false;
} }
void DeviceManager::stopAutoLocate() void DeviceManager::stopAutoLocate()