简单了解了QJson和QNetworkAccessManager相关的使用方法。

尝试了使用QWaitCondition,QMutex同步线程。未能实现,准备改用状态机
This commit is contained in:
2021-11-09 17:45:04 +08:00
parent 9c93e66a05
commit b9bece4de9
10 changed files with 114 additions and 34 deletions

View File

@ -23,11 +23,12 @@ int main(int argc, char *argv[])
m_test.moveToThread(m_pqDataGrabberThreadHolder); m_test.moveToThread(m_pqDataGrabberThreadHolder);
m_pqDataGrabberThreadHolder->start(); m_pqDataGrabberThreadHolder->start();
m_test.TestGrab(); m_test.TestGrab();
QThread::msleep(5000); //QThread::msleep(5000);
m_test.StopTestGrab(); //m_test.StopTestGrab();
// ZZ_ATPControl_Serial_Qt m_ctrlATP; // ZZ_ATPControl_Serial_Qt m_ctrlATP;
// QByteArray qbTest; // QByteArray qbTest;
// m_ctrlATP.ATPInitialize(7); // m_ctrlATP.ATPInitialize(7);

View File

@ -447,9 +447,12 @@ int ZZ_ATPControl_Serial_Qt::PerformAutoExposure(float fMinScaleFactor, float fM
return 0; return 0;
} }
int ZZ_ATPControl_Serial_Qt::SetExtShutter(int iShutterA, int iShutterB)
int ZZ_ATPControl_Serial_Qt::SetExtShutter(int iShutterUP0, int iShutterDOWN1, int iShutterDOWN2, int iShutterDOWN3)
{ {
return 0; qDebug() << "stub code not implemented";
return -1;
} }
int ZZ_ATPControl_Serial_Qt::SetExposureTime(int iExposureTimeInMS) int ZZ_ATPControl_Serial_Qt::SetExposureTime(int iExposureTimeInMS)
@ -527,6 +530,13 @@ int ZZ_ATPControl_Serial_Qt::SingleShot(int &iPixels)
return 0; return 0;
} }
int ZZ_ATPControl_Serial_Qt::SingleShotDark(ATPDataFrame &dfData)
{
SetExtShutter(0,0,0,0);
SingleShot(dfData);
return 0;
}
//void ZZ_ATPControl_Serial_Qt::ReadMessage() //void ZZ_ATPControl_Serial_Qt::ReadMessage()
//{ //{
// QByteArray qbTemp, qbTemp1; // QByteArray qbTemp, qbTemp1;

View File

@ -49,7 +49,7 @@ private:
ATPDeviceAttribute m_adaDeviceAttr; ATPDeviceAttribute m_adaDeviceAttr;
//////////////////////////////////////////////////////////////////////////shutter control stub code s //////////////////////////////////////////////////////////////////////////shutter control stub code s
int SetExtShutter(int iShutterA, int iShutterB); //0:close 1:open int SetExtShutter(int iShutterUP0, int iShutterDOWN1,int iShutterDOWN2,int iShutterDOWN3); //0:close 1:open
//////////////////////////////////////////////////////////////////////////shutter control stub code e //////////////////////////////////////////////////////////////////////////shutter control stub code e
int SendCommand(QByteArray qbCommand); int SendCommand(QByteArray qbCommand);
int RecvData(QByteArray &qbData); int RecvData(QByteArray &qbData);

View File

@ -10,16 +10,25 @@ ZZ_ATPAbsCtrlThread::~ZZ_ATPAbsCtrlThread()
} }
void ZZ_ATPAbsCtrlThread::SetWaitCondition(QWaitCondition *pFinish, QMutex *pMutex)
{
m_pwcFinish = pFinish;
m_pMutex = pMutex;
}
int ZZ_ATPAbsCtrlThread::StartTestAcquisition() int ZZ_ATPAbsCtrlThread::StartTestAcquisition()
{ {
m_bFlagIsCollecting = true; m_bFlagIsCollecting = true;
while (m_bFlagIsCollecting) while (m_bFlagIsCollecting)
{ {
QMutexLocker locker(&m_Mutex); //QMutexLocker locker(&m_Mutex);
QThread::msleep(1000); QThread::msleep(1000);
qDebug() << "ThreadATPAbsController busy"; qDebug() << "ThreadATPAbsController busy";
} }
qDebug() << "ThreadATPAbsController quit"; qDebug() << "ThreadATPAbsController quit";
m_pwcFinish->wakeAll();
emit SignalAcqFinished(0,1);
return 0; return 0;
} }

View File

@ -12,18 +12,18 @@ public:
public: public:
std::atomic<bool> m_bFlagIsCollecting; std::atomic<bool> m_bFlagIsCollecting;
QMutex m_Mutex; QMutex *m_pMutex;
QWaitCondition *m_pwcFinish;
public: public:
ZZ_ATPAbsCtrlThread(QObject* parent = nullptr); ZZ_ATPAbsCtrlThread(QObject* parent = nullptr);
virtual ~ZZ_ATPAbsCtrlThread(); virtual ~ZZ_ATPAbsCtrlThread();
private: private:
ZZ_ATPControl_Serial_Qt m_iSIFctrl; ZZ_ATPControl_Serial_Qt m_iSIFctrl;
public slots: public slots:
virtual void SetWaitCondition(QWaitCondition *pFinish, QMutex *pMutex);
virtual int StartTestAcquisition(); virtual int StartTestAcquisition();
int StopTestAcquisition(); int StopTestAcquisition();
signals: signals:
void AcqStarted(); void SignalAcqStarted();
void AcqFinished(); void SignalAcqFinished(int iThreadID,int iFlagStatus);
}; };

View File

@ -2,6 +2,7 @@
ZZ_DataGrabberThread::ZZ_DataGrabberThread(QObject* parent /*= nullptr*/) ZZ_DataGrabberThread::ZZ_DataGrabberThread(QObject* parent /*= nullptr*/)
{ {
m_bFlagIsCollecting = false;
SetupSignals(); SetupSignals();
StartGrabberThread(); StartGrabberThread();
} }
@ -16,9 +17,11 @@ int ZZ_DataGrabberThread::SetupSignals()
connect(this, &ZZ_DataGrabberThread::SignalStartGrabOnce, &m_tcISIFCtrlThread, &ZZ_iSIFControlThread::StartTestAcquisition); connect(this, &ZZ_DataGrabberThread::SignalStartGrabOnce, &m_tcISIFCtrlThread, &ZZ_iSIFControlThread::StartTestAcquisition);
connect(this, &ZZ_DataGrabberThread::SignalStartGrabOnce, &m_tcIS1CtrlThread, &ZZ_IS1ControlThread::StartTestAcquisition); connect(this, &ZZ_DataGrabberThread::SignalStartGrabOnce, &m_tcIS1CtrlThread, &ZZ_IS1ControlThread::StartTestAcquisition);
bool bres = connect(this, &ZZ_DataGrabberThread::SignalStopGrab, &m_tcISIFCtrlThread, &ZZ_iSIFControlThread::StopTestAcquisition, Qt::DirectConnection); connect(this, &ZZ_DataGrabberThread::SignalStopGrab, &m_tcISIFCtrlThread, &ZZ_iSIFControlThread::StopTestAcquisition, Qt::DirectConnection);
bres = connect(this, &ZZ_DataGrabberThread::SignalStopGrab, &m_tcIS1CtrlThread, &ZZ_IS1ControlThread::StopTestAcquisition, Qt::DirectConnection); connect(this, &ZZ_DataGrabberThread::SignalStopGrab, &m_tcIS1CtrlThread, &ZZ_IS1ControlThread::StopTestAcquisition, Qt::DirectConnection);
//m_tcISIFCtrlThread.SetWaitCondition(&m_wcWaitISIF,&m_mTestMutex);
//m_tcIS1CtrlThread.SetWaitCondition(&m_wcWaitIS1, &m_mTestMutex);
return 0; return 0;
} }
@ -37,14 +40,43 @@ int ZZ_DataGrabberThread::StartGrabberThread()
int ZZ_DataGrabberThread::TestGrab() int ZZ_DataGrabberThread::TestGrab()
{ {
m_bFlagIsCollecting = true;
while (m_bFlagIsCollecting)
{
emit SignalStartGrabOnce(); emit SignalStartGrabOnce();
//m_mTestMutex.lock();
//m_wcWaitISIF.wait(&m_mTestMutex);
//m_mTestMutex.lock();
//m_wcWaitIS1.wait(&m_mTestMutex);
//m_mTestMutex.unlock();
}
return 0; return 0;
} }
int ZZ_DataGrabberThread::StopTestGrab() int ZZ_DataGrabberThread::TestStopGrab()
{ {
emit SignalStopGrab(); //emit SignalStopGrab();
//m_tcISIFCtrlThread.StopTestAcquisition(); m_tcISIFCtrlThread.StopTestAcquisition();
//m_tcIS1CtrlThread.StopTestAcquisition(); m_tcIS1CtrlThread.StopTestAcquisition();
return 0; return 0;
} }
int ZZ_DataGrabberThread::handleThreadEvent(int x, int value)
{
ProcessingThreadAactive[x] = value;
// Check if threads are finished
for (int i = 0; i < numThreads; i++)
{
bool finished = true;
if (ProcessingThreadAactive[i] == true)
{
finished = false;
// Do end actions here
break;
}
}
}

View File

@ -11,12 +11,16 @@ public:
~ZZ_DataGrabberThread(); ~ZZ_DataGrabberThread();
public: public:
QWaitCondition m_wcWaitISIF,m_wcWaitIS1;
QMutex m_mTestMutex;
private: private:
ZZ_iSIFControlThread m_tcISIFCtrlThread; ZZ_iSIFControlThread m_tcISIFCtrlThread;
ZZ_IS1ControlThread m_tcIS1CtrlThread; ZZ_IS1ControlThread m_tcIS1CtrlThread;
QThread* m_pqISIFThreadHolder; QThread* m_pqISIFThreadHolder;
QThread* m_pqIS1ThreadHolder; QThread* m_pqIS1ThreadHolder;
std::atomic<bool> m_bFlagIsCollecting;
public: public:
int SetupSignals(); int SetupSignals();
int StartGrabberThread(); int StartGrabberThread();
@ -24,8 +28,10 @@ private:
public slots: public slots:
int TestGrab(); int TestGrab();
int StopTestGrab(); int TestStopGrab();
int handleThreadEvent(int x, int value);
signals: signals:
void SignalStartGrabOnce(); void SignalStartGrabOnce();
void SignalStopGrab(); void SignalStopGrab();
}; };

View File

@ -11,13 +11,21 @@ ZZ_IS1ControlThread::~ZZ_IS1ControlThread()
int ZZ_IS1ControlThread::StartTestAcquisition() int ZZ_IS1ControlThread::StartTestAcquisition()
{ {
m_bFlagIsCollecting = true; // m_bFlagIsCollecting = true;
while (m_bFlagIsCollecting) // while (m_bFlagIsCollecting)
{ // {
//QMutexLocker locker(&m_Mutex); // //QMutexLocker locker(&m_Mutex);
QThread::msleep(1000); // QThread::msleep(1000);
// qDebug() << "ThreadIS1Controller busy";
// }
// qDebug() << "ThreadIS1Controller quit";
qDebug() << "ThreadIS1Controller busy"; qDebug() << "ThreadIS1Controller busy";
} QThread::msleep(1000);
qDebug() << "ThreadIS1Controller quit"; qDebug() << "ThreadIS1Controller quit";
//m_pwcFinish->wakeAll();
emit SignalAcqFinished(1,1);
return 0; return 0;
} }

View File

@ -12,14 +12,21 @@ ZZ_iSIFControlThread::~ZZ_iSIFControlThread()
int ZZ_iSIFControlThread::StartTestAcquisition() int ZZ_iSIFControlThread::StartTestAcquisition()
{ {
m_bFlagIsCollecting = true; // m_bFlagIsCollecting = true;
while (m_bFlagIsCollecting) // while (m_bFlagIsCollecting)
{ // {
//QMutexLocker locker(&m_Mutex); // //QMutexLocker locker(&m_Mutex);
QThread::msleep(1000); // QThread::msleep(1000);
// qDebug() << "ThreadiSIFController busy";
// }
// qDebug() << "ThreadiSIFController quit";
qDebug() << "ThreadiSIFController busy"; qDebug() << "ThreadiSIFController busy";
} QThread::msleep(2000);
qDebug() << "ThreadiSIFController quit"; qDebug() << "ThreadiSIFController quit";
//m_pwcFinish->wakeAll();
emit SignalAcqFinished(0,1);
return 0; return 0;
} }

View File

@ -10,3 +10,10 @@
#include <QObject> #include <QObject>
#include <QThread> #include <QThread>
#include <QMutex> #include <QMutex>
#include <QWaitCondition>
////////////////////////////json
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonValue>
#include <QJsonParseError>