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

主采集逻辑修改中，添加了部分写文件实现

Browse Source
This commit is contained in:
zhangzhuo
2021-12-02 18:07:29 +08:00
parent 95da780693
commit efbcde38d7
403 changed files with 26857 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/Settings/SystemConfigger.cpp
View File

@ -92,6 +92,18 @@
return 0;
}
int ZZ_SysConfigger::GetECParams(EContext &struEC)
{
struEC = m_struEC;
return 0;
}
int ZZ_SysConfigger::GetMECParams(MEContext &struMEC)
{
struMEC = m_struMEC;
return 0;
}
int ZZ_SysConfigger::LoadSettingsFromFile_IS1()
{
m_struIS1Info.qstrCalFile_U0 = m_qjoJObj.value("IS1UpCalFile").toString();

4
source/Settings/SystemConfigger.h
View File

@ -14,6 +14,8 @@ public:
public:
int Initialize();
int GetGrabberRunParams(RunTimeGrabberParams &struGrabberRTParams);
int GetECParams(EContext &struEC);
int GetMECParams(MEContext &struMEC);
int LoadSettingsFromFile_IS1();
int LoadSettingsFromFile_iSIF();
@ -33,7 +35,7 @@ public:
Q_ENUM(ConfiggerDeviceModel);
//////////////////////////////////////////////////////////////////////////run-time settings
AcqTimeSettings m_struAcqTime;
FSContext m_struDeviceContext;
FSContext m_struDeviceContext;
AcqPosSettings m_struAcqPosition;
//////////////////////////////////////////////////////////////////////////
EContext m_struEC;