From 28281519a28d08f270df02ce13ca4a30322cc29c Mon Sep 17 00:00:00 2001
From: zhangzhuo <zhangzhuo@iris-rs.cn>
Date: Thu, 17 Feb 2022 14:19:31 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BA=86GetDeviceAttribute?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E4=B8=AD=E7=9A=84=E4=B8=80=E4=B8=AA=E7=91=95?=
 =?UTF-8?q?=E7=96=B5=EF=BC=8C=E5=8D=B3=E4=B8=BA=E6=89=A7=E8=A1=8CGetDevice?=
 =?UTF-8?q?Attribute=E5=87=BD=E6=95=B0=E5=90=8E=E4=BC=9A=E5=BD=B1=E5=93=8D?=
 =?UTF-8?q?=E8=B0=B1=E4=BB=AA=E7=9A=84=E6=9B=9D=E5=85=89=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=EF=BC=8C=E4=BA=A7=E7=94=9F=E8=BF=99=E4=B8=AA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E7=9A=84=E5=8E=9F=E5=9B=A0=E6=98=AF=EF=BC=8C=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=9B=B4=E6=8E=A5=E8=8E=B7=E5=8F=96=E5=83=8F?=
 =?UTF-8?q?=E7=B4=A0=E4=B8=AA=E6=95=B0=EF=BC=8C=E9=9C=80=E8=A6=81=E6=8B=8D?=
 =?UTF-8?q?=E6=91=84=E4=B8=80=E5=B8=A7=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B0=8F=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E3=80=82=E6=8B=8D=E6=91=84=E6=97=B6=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=BE=E5=AE=9A=E4=B8=BA=E6=9C=80=E7=9F=AD=E6=9B=9D=E5=85=89?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=82=202.IS2=E8=AE=BE=E5=A4=87=E7=9A=84S?=
 =?UTF-8?q?etExposureTime=E5=87=BD=E6=95=B0=E8=BF=94=E5=9B=9E=E5=92=8CIS1?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8AISif=E8=AE=BE=E5=A4=87=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=EF=BC=8C=E5=AE=9E=E9=99=85=E4=B8=8D=E5=BD=B1=E5=93=8D?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=EF=BC=8C=E4=BD=86=E4=BC=9A=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=BF=94=E5=9B=9E=E5=87=BD=E6=95=B0=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E5=A4=B1=E8=B4=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/CaptureThread/MainDataGrabber.cpp | 14 +++++++++++---
 source/FS/ATPControl_Serial_QT.cpp       |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/source/CaptureThread/MainDataGrabber.cpp b/source/CaptureThread/MainDataGrabber.cpp
index 77745ec..12e0e4b 100644
--- a/source/CaptureThread/MainDataGrabber.cpp
+++ b/source/CaptureThread/MainDataGrabber.cpp
@@ -447,10 +447,18 @@ int CMainDataGrabber::GrabOnceFinished()
 		 ResetThreadStatus();
 		 ////move to
 		 qDebug()<<"Start ILMES_MoveToPos:"<<i+1;
-		 m_ctrlLS.MoveTo(m_struAcqPosSetting.iPosition[1]);
+		 if (i==0)
+		 {
+			 m_ctrlLS.ILMES_MoveToPos(i + 1);
+		 }
+		 else
+		 {
+			 m_ctrlLS.MoveTo(m_struAcqPosSetting.iPosition[1]);
+		 }
 		 m_ctrlLS.ILMES_MoveToPos(i+1);
+		 ////
 		 qDebug() << "Stop ILMES_MoveToPos:" << i + 1;
-		 m_struAcqPosSetting.iPosition[i + 1];
+		// m_struAcqPosSetting.iPosition[i + 1];
 		 m_iFlagIsCapturing_Signal = 1;
 		 emit SignalStartGrabOnce_Signal();
 		 while (m_iFlagIsCapturing_Signal)
@@ -463,7 +471,7 @@ int CMainDataGrabber::GrabOnceFinished()
 		 qDebug() << "Start ILMES_MoveToPos:" << 0;
 		 m_ctrlLS.ILMES_MoveToPos(0);
 		 qDebug() << "Stop ILMES_MoveToPos:" << 0;
-		 m_struAcqPosSetting.iPosition[0];
+		 //m_struAcqPosSetting.iPosition[0];
 		 m_iFlagIsCapturing_Dark = 1;
 		 emit SignalStartGrabOnce_Dark();
 		 while (m_iFlagIsCapturing_Dark)
diff --git a/source/FS/ATPControl_Serial_QT.cpp b/source/FS/ATPControl_Serial_QT.cpp
index 0ac9f3a..c8a714d 100644
--- a/source/FS/ATPControl_Serial_QT.cpp
+++ b/source/FS/ATPControl_Serial_QT.cpp
@@ -201,7 +201,7 @@ int ZZ_ATPControl_Serial_Qt::GetDeviceAttribute(DeviceAttribute &Attr)
 	if (iRes != 0)
 	{
 		qDebug() << "Err:GetDeviceAttribute Failed,Call SetExposureTime error.Exit Code:2";
-		return 2;
+		//return 2;
 	}
 	iRes = SingleShot(m_daDeviceAttr.iPixels);
 	if (iRes != 0)