fix:
自动调焦完成后弹窗提示,上海农科院整个流程全自动化,不需要弹窗提示
This commit is contained in:
@ -237,6 +237,7 @@ void TwoMotorControl::run4_ObtainTargetDepthInfo(DepthCameraWindow* window, doub
|
||||
void TwoMotorControl::run5_AutoFocus(double autoFocusX, double autoFocusY)
|
||||
{
|
||||
m_focusWindow = new focusWindow(this, m_Imager);
|
||||
m_focusWindow->setIsDisplaysAutofocusResultViaPopup(false);
|
||||
m_focusWindow->onConnectMotor();
|
||||
m_focusWindow->show();
|
||||
|
||||
|
||||
@ -657,12 +657,20 @@ void focusWindow::moveAfterAutoFocus(int motorID, double location)
|
||||
if (!m_isAutoFocusSuccess)
|
||||
{
|
||||
qDebug() << "纹理较弱,自动调焦效果不佳!请使用调焦纸进行自动调焦!";
|
||||
//showMessageBox(QString::fromLocal8Bit("纹理较弱,自动调焦效果不佳!请使用调焦纸进行自动调焦!"));
|
||||
|
||||
if (m_isDisplaysAutofocusResultViaPopup)
|
||||
{
|
||||
showMessageBox(QString::fromLocal8Bit("纹理较弱,自动调焦效果不佳!请使用调焦纸进行自动调焦!"));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
qDebug() << "自动调焦成功!";
|
||||
//showMessageBox(QString::fromLocal8Bit("自动调焦成功!"));
|
||||
|
||||
if (m_isDisplaysAutofocusResultViaPopup)
|
||||
{
|
||||
showMessageBox(QString::fromLocal8Bit("自动调焦成功!"));
|
||||
}
|
||||
}
|
||||
emit AutoFocusFinishedSignal(0);
|
||||
}
|
||||
@ -673,6 +681,13 @@ void focusWindow::moveAfterAutoFocus(int motorID, double location)
|
||||
//移动马达到最佳位置
|
||||
emit move2LocSignal(0, (double)m_goodPos, m_dSpeed, 1000);
|
||||
}
|
||||
|
||||
m_isDisplaysAutofocusResultViaPopup = true;
|
||||
}
|
||||
|
||||
void focusWindow::setIsDisplaysAutofocusResultViaPopup(bool isDisplaysAutofocusResultViaPopup)
|
||||
{
|
||||
m_isDisplaysAutofocusResultViaPopup = isDisplaysAutofocusResultViaPopup;
|
||||
}
|
||||
|
||||
double focusWindow::getErrorRate(double targetLoc, double actualLoc)
|
||||
|
||||
@ -111,6 +111,8 @@ public:
|
||||
|
||||
ImagerOperationBase* m_Imager;
|
||||
|
||||
void setIsDisplaysAutofocusResultViaPopup(bool isDisplaysAutofocusResultViaPopup);
|
||||
|
||||
protected:
|
||||
bool eventFilter(QObject *obj, QEvent *event) override;
|
||||
|
||||
@ -152,6 +154,8 @@ private:
|
||||
|
||||
double getErrorRate(double targetLoc, double actualLoc);
|
||||
|
||||
bool m_isDisplaysAutofocusResultViaPopup = true;
|
||||
|
||||
public Q_SLOTS:
|
||||
void onConnectMotor();
|
||||
void onMove2MotorLogicZero();
|
||||
|
||||
Reference in New Issue
Block a user