mirror of
http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git
synced 2025-10-22 20:49:43 +08:00
1.修改了部分ATP系列光谱仪的控制函数以匹配数据类型的改变。
2.添加了网络上传模块,矫正算法部分可能需要调整。
This commit is contained in:
@ -54,7 +54,7 @@ int CAbstractFSController::InitializeFSControl()
|
||||
break;
|
||||
case DeviceModel::ISIF:
|
||||
m_pFSCtrl = new ZZ_ATPControl_Serial_Qt;
|
||||
m_pFSCtrl->Initialize(false, m_fsInfo.strInterface, NULL);
|
||||
//m_pFSCtrl->Initialize(false, m_fsInfo.strInterface, NULL);
|
||||
if (m_pFSCtrl->Initialize(false, m_fsInfo.strInterface, m_fsInfo.strSN) != 0)
|
||||
{
|
||||
qDebug() << "ISIF Not Opened";
|
||||
@ -63,7 +63,7 @@ int CAbstractFSController::InitializeFSControl()
|
||||
break;
|
||||
case DeviceModel::IS1:
|
||||
m_pFSCtrl = new ZZ_ATPControl_Serial_Qt;
|
||||
m_pFSCtrl->Initialize(false, m_fsInfo.strInterface, NULL);
|
||||
//m_pFSCtrl->Initialize(false, m_fsInfo.strInterface, NULL);
|
||||
if (m_pFSCtrl->Initialize(false, m_fsInfo.strInterface, m_fsInfo.strSN) != 0)
|
||||
{
|
||||
qDebug() << "IS1 Not Opened";
|
||||
@ -72,7 +72,7 @@ int CAbstractFSController::InitializeFSControl()
|
||||
break;
|
||||
case DeviceModel::IS2:
|
||||
m_pFSCtrl = new ZZ_ATPControl_Serial_Qt;
|
||||
m_pFSCtrl->Initialize(false, m_fsInfo.strInterface, NULL);
|
||||
//m_pFSCtrl->Initialize(false, m_fsInfo.strInterface, NULL);
|
||||
if (m_pFSCtrl->Initialize(false, m_fsInfo.strInterface, m_fsInfo.strSN) != 0)
|
||||
{
|
||||
qDebug() << "IS2 Not Opened";
|
||||
|
Reference in New Issue
Block a user