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

完善了保存信息文件的定义，添加了读写JSON配置文件的代码。身体原因这两天效率不高。

Browse Source
This commit is contained in:
zhangzhuo
2021-11-18 17:42:14 +08:00
parent b9bece4de9
commit fdffb86c96
10 changed files with 312 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/Thread/ATPAbstractController.h
View File

@ -1,3 +1,6 @@
//////////////////////////////////////////////////////////////////////////
//ATP<54>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD>
//////////////////////////////////////////////////////////////////////////
#pragma once
#include "pch.h"
#include "ATPControl_Serial_QT.h"
@ -12,15 +15,15 @@ public:
public:
std::atomic<bool> m_bFlagIsCollecting;
QMutex *m_pMutex;
QWaitCondition *m_pwcFinish;
//QMutex *m_pMutex;
//QWaitCondition *m_pwcFinish;
public:
ZZ_ATPAbsCtrlThread(QObject* parent = nullptr);
virtual ~ZZ_ATPAbsCtrlThread();
private:
ZZ_ATPControl_Serial_Qt m_iSIFctrl;
public slots:
virtual void SetWaitCondition(QWaitCondition *pFinish, QMutex *pMutex);
//virtual void SetWaitCondition(QWaitCondition *pFinish, QMutex *pMutex);
virtual int StartTestAcquisition();
int StopTestAcquisition();
signals: