最新更改
This commit is contained in:
@ -31,7 +31,8 @@ int CAbsFSController::Initialize()
|
||||
m_pFSCtrl = new OceanOptics_lib;
|
||||
if (m_pFSCtrl->Initialize(false, m_struFSParam.strInterface, m_struFSParam.strSN) != 0)
|
||||
{
|
||||
qDebug() << "Flame Not Opened";
|
||||
//qDebug() << "Flame Not Opened";
|
||||
printf("Flame Not Opened");
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
@ -65,7 +66,8 @@ int CAbsFSController::Initialize()
|
||||
//m_pFSCtrl->Initialize(false, m_struFSParam.strInterface, NULL);
|
||||
if (m_pFSCtrl->Initialize(false, m_struFSParam.strInterface, m_struFSParam.strSN) != 0)
|
||||
{
|
||||
qDebug() << "IS1 Not Opened";
|
||||
//qDebug() << "IS1 Not Opened";
|
||||
printf("IS1 Not Opened");
|
||||
return 3;
|
||||
}
|
||||
break;
|
||||
@ -86,8 +88,16 @@ int CAbsFSController::Initialize()
|
||||
if (iRes != 0)
|
||||
{
|
||||
qDebug() << "GetDeviceAttribute Failed" << iRes;
|
||||
printf("GetDeviceAttribute Failed");
|
||||
return 4;
|
||||
}
|
||||
else//mark by zz
|
||||
{
|
||||
if (m_struFSParam.ucDeviceModel== DeviceModel::IS2)
|
||||
{
|
||||
m_struDeviceAttr.iMinIntegrationTimeInMS = 10;
|
||||
}
|
||||
}
|
||||
|
||||
iRes = m_pFSCtrl->SetDeviceTemperature(0);
|
||||
if (iRes != 0)
|
||||
@ -124,7 +134,8 @@ int CAbsFSController::SingleShot(DataFrame& struSingleFrame)
|
||||
int iRes = m_pFSCtrl->SingleShot(m_struSingleFrame);
|
||||
if (iRes != 0)
|
||||
{
|
||||
qDebug() << "Err. SingleShot";
|
||||
//qDebug() << "Err. SingleShot";
|
||||
printf("Err. SingleShot");
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -133,7 +144,8 @@ int CAbsFSController::SingleShot(DataFrame& struSingleFrame)
|
||||
int iRes = m_pFSCtrl->SingleShot(m_struSingleFrame);
|
||||
if (iRes != 0)
|
||||
{
|
||||
qDebug() << "Err. SingleShot";
|
||||
//qDebug() << "Err. SingleShot";
|
||||
printf("Err. SingleShot");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
@ -209,7 +221,8 @@ int CAbsFSController::PerformAutoExposure()
|
||||
int iRes = m_pFSCtrl->SingleShot(dfTemp);
|
||||
if (iRes != 0)
|
||||
{
|
||||
qDebug() << "Err:PerformAutoExposure Failed.Exit Code:2";
|
||||
//qDebug() << "Err:PerformAutoExposure Failed.Exit Code:2";
|
||||
printf("Err:PerformAutoExposure Failed,SingleShot Failed.Exit Code:2");
|
||||
return 2;
|
||||
}
|
||||
|
||||
@ -284,7 +297,8 @@ int CAbsFSController::PerformAutoExposure()
|
||||
iRes = m_pFSCtrl->SetExposureTime(m_struDeviceAttr.iMinIntegrationTimeInMS);
|
||||
if (iRes != 0)
|
||||
{
|
||||
qDebug() << "Err:PerformAutoExposure Failed.Exit Code:3" ;
|
||||
//qDebug() << "Err:PerformAutoExposure Failed.Exit Code:3" ;
|
||||
printf("Err:PerformAutoExposure Failed,SetExposureTime Failed.Exit Code:2");
|
||||
return 3;
|
||||
}
|
||||
else
|
||||
@ -304,7 +318,8 @@ int CAbsFSController::PerformAutoExposure()
|
||||
iRes = m_pFSCtrl->SetExposureTime(m_struDeviceAttr.iMaxIntegrationTimeInMS - 1);
|
||||
if (iRes != 0)
|
||||
{
|
||||
qDebug() << "Err:PerformAutoExposure Failed.Exit Code:3";
|
||||
//qDebug() << "Err:PerformAutoExposure Failed.Exit Code:3";
|
||||
printf("Err:PerformAutoExposure Failed,SetExposureTime Failed.Exit Code:3");
|
||||
return 3;
|
||||
}
|
||||
else
|
||||
@ -318,7 +333,8 @@ int CAbsFSController::PerformAutoExposure()
|
||||
iRes = m_pFSCtrl->SetExposureTime((int)iExposureTime);
|
||||
if (iRes != 0)
|
||||
{
|
||||
qDebug() << "Err:PerformAutoExposure Failed.Exit Code:4" ;
|
||||
//qDebug() << "Err:PerformAutoExposure Failed.Exit Code:4" ;
|
||||
printf("Err:PerformAutoExposure Failed,SetExposureTime Failed.Exit Code:4");
|
||||
return 3;
|
||||
}
|
||||
else
|
||||
@ -342,7 +358,8 @@ int CAbsFSController::CheckAndAdjust_Fast()
|
||||
int iRes = m_pFSCtrl->GetExposureTime(iExposureTime);
|
||||
if (iRes != 0)
|
||||
{
|
||||
qDebug() << "Err. SingleShot";
|
||||
//qDebug() << "Err. SingleShot";
|
||||
printf("CheckAndAdjust_Fast,Err. SingleShot");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user