diff --git a/src/components/CoordinateXYWidget.cpp b/src/components/CoordinateXYWidget.cpp index 1cb5921..ce82209 100644 --- a/src/components/CoordinateXYWidget.cpp +++ b/src/components/CoordinateXYWidget.cpp @@ -193,18 +193,18 @@ void CoordinateXYWidget::updateStopFlash() void CoordinateXYWidget::startFlash() { - show(); - connect(mTimer,&QTimer::timeout,this, &CoordinateXYWidget::updateFlash); - mStopGradientEnd = 1; - mTimer->start(20); +// show(); +// connect(mTimer,&QTimer::timeout,this, &CoordinateXYWidget::updateFlash); +// mStopGradientEnd = 1; +// mTimer->start(20); } void CoordinateXYWidget::stopFlash() { - disconnect(mTimer,&QTimer::timeout,this, &CoordinateXYWidget::updateFlash); - connect(mTimer,&QTimer::timeout,this, &CoordinateXYWidget::updateStopFlash); - mTimer->stop(); - mTimer->start(20); +// disconnect(mTimer,&QTimer::timeout,this, &CoordinateXYWidget::updateFlash); +// connect(mTimer,&QTimer::timeout,this, &CoordinateXYWidget::updateStopFlash); +// mTimer->stop(); +// mTimer->start(20); } void CoordinateXYWidget::quit() diff --git a/src/components/CoordinateZWidget.cpp b/src/components/CoordinateZWidget.cpp index bb0852e..f46ebac 100644 --- a/src/components/CoordinateZWidget.cpp +++ b/src/components/CoordinateZWidget.cpp @@ -115,18 +115,18 @@ void CoordinateZWidget::setBlinkPoint(int aZ) void CoordinateZWidget::startFlash() { - show(); - connect(mTimer,&QTimer::timeout,this, &CoordinateZWidget::updateFlash); - mStopGradientEnd = 1; - mTimer->start(20); +// show(); +// connect(mTimer,&QTimer::timeout,this, &CoordinateZWidget::updateFlash); +// mStopGradientEnd = 1; +// mTimer->start(20); } void CoordinateZWidget::stopFlash() { - disconnect(mTimer,&QTimer::timeout,this, &CoordinateZWidget::updateFlash); - connect(mTimer,&QTimer::timeout,this, &CoordinateZWidget::updateStopFlash); - mTimer->stop(); - mTimer->start(20); +// disconnect(mTimer,&QTimer::timeout,this, &CoordinateZWidget::updateFlash); +// connect(mTimer,&QTimer::timeout,this, &CoordinateZWidget::updateStopFlash); +// mTimer->stop(); +// mTimer->start(20); } void CoordinateZWidget::updateFlash() diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp index 0d570e0..97d6aa7 100644 --- a/src/device/DeviceManager.cpp +++ b/src/device/DeviceManager.cpp @@ -1365,7 +1365,7 @@ void DeviceManager::stopScanProcess() AppGlobalValues::setInProcessing(false); mIsScanning = false; LOG_SYS_OPERATION("Stop scan process.") - stopAutoLocate(); + //stopAutoLocate(); } bool DeviceManager::startAutoLocate() @@ -1375,25 +1375,28 @@ bool DeviceManager::startAutoLocate() TRIGGER_EVENT(StopScanProcess, nullptr, nullptr); return false; } - auto result = mStartAutoLocateAction->execute(); - if(result.mIsSucessful) - { - mIsAutoLocating = true; - QJsonObject jsonObj = toJsonObject(result.mData); - if(jsonObj["code"].toInt() == 0 ) - { - emit startAutoLocateResult(true); - mEffectivePositionCount = 0; - mGetAutoLocatePositionTimer = startTimer(1000); - return true; - } - } - emit startAutoLocateResult(false); - TRIGGER_EVENT(StopScanProcess, nullptr, nullptr); - 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; + emit startAutoLocateResult(true); + ScanProcessSequence::getInstance()->startFullScan(); + return true; +// auto result = mStartAutoLocateAction->execute(); +// if(result.mIsSucessful) +// { +// mIsAutoLocating = true; +// QJsonObject jsonObj = toJsonObject(result.mData); +// if(jsonObj["code"].toInt() == 0 ) +// { +// emit startAutoLocateResult(true); +// mEffectivePositionCount = 0; +// mGetAutoLocatePositionTimer = startTimer(1000); +// return true; +// } +// } +// emit startAutoLocateResult(false); +// TRIGGER_EVENT(StopScanProcess, nullptr, nullptr); +// 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()