xin/TowerOptoSifAndSpectral
1
0
Fork 0
mirror of http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git synced 2025-10-19 03:49:42 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/zhangzhuo'

Browse Source
This commit is contained in:
任立新
2022-02-17 18:05:32 +08:00
parent 70fde7f131 28281519a2
commit 92fe58d0c3
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/CaptureThread/MainDataGrabber.cpp
View File

@ -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)

2
source/FS/ATPControl_Serial_QT.cpp
View File

@ -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)