mirror of
http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git
synced 2025-10-19 11:49:42 +08:00
完善了保存信息文件的定义,添加了读写JSON配置文件的代码。身体原因这两天效率不高。
This commit is contained in:
@ -9,12 +9,12 @@ ZZ_ATPAbsCtrlThread::~ZZ_ATPAbsCtrlThread()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void ZZ_ATPAbsCtrlThread::SetWaitCondition(QWaitCondition *pFinish, QMutex *pMutex)
|
||||
{
|
||||
m_pwcFinish = pFinish;
|
||||
m_pMutex = pMutex;
|
||||
}
|
||||
//
|
||||
// void ZZ_ATPAbsCtrlThread::SetWaitCondition(QWaitCondition *pFinish, QMutex *pMutex)
|
||||
// {
|
||||
// m_pwcFinish = pFinish;
|
||||
// m_pMutex = pMutex;
|
||||
// }
|
||||
|
||||
int ZZ_ATPAbsCtrlThread::StartTestAcquisition()
|
||||
{
|
||||
@ -27,7 +27,7 @@ int ZZ_ATPAbsCtrlThread::StartTestAcquisition()
|
||||
}
|
||||
qDebug() << "ThreadATPAbsController quit";
|
||||
|
||||
m_pwcFinish->wakeAll();
|
||||
//m_pwcFinish->wakeAll();
|
||||
emit SignalAcqFinished(0,1);
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user