This commit is contained in:
2022-01-10 17:46:44 +08:00
parent 5f9208b9e1
commit a3d2319f56
49 changed files with 174 additions and 391 deletions

View File

@ -4,6 +4,7 @@ CMainDataUploader::CMainDataUploader(QObject* parent /*= nullptr*/)
{
m_pRadConverter = new RadConverter;
m_pTransfer = new ZZ_HttpTransfer;
//connect(this, &CMainDataUploader::SignalInit_Self, m_pTransfer, &ZZ_HttpTransfer::SlotInit_Self);
}
CMainDataUploader::~CMainDataUploader()
@ -18,6 +19,12 @@ CMainDataUploader::~CMainDataUploader()
}
}
void CMainDataUploader::SetErr(ErrInfo struErrInfo)
{
m_pTransfer->SetErrInfo(struErrInfo);
//m_struErrInfo = struErrInfo;
}
void CMainDataUploader::SetData(vector<vector<DataFrame>> vecData)
{
QDateTime qdtTime = QDateTime::currentDateTime();
@ -77,6 +84,7 @@ int CMainDataUploader::UploadInfo()
int CMainDataUploader::UploadErr()
{
m_pTransfer->SendErr();
return 0;
}
@ -92,9 +100,16 @@ int CMainDataUploader::Initialize()
m_pRadConverter->LoadCalibrationFrames(m_struGrabberRTParams,m_vecCalData);
m_pTransfer->SetContext(m_struEC, m_struMEC);
m_pTransfer->SetDeviceInfo(m_struGrabberRTParams);
//m_pTransfer->Init_Self();
return 0;
}
// int CMainDataUploader::Init_Self()
// {
// emit SignalInit_Self();
// return 0;
// }
// int CMainDataUploader::SlotPushOneDataFrame(vector<vector<DataFrame>> vecData)
// {
// return 0;
@ -107,3 +122,13 @@ int CMainDataUploader::SlotPushOneDataFrame()
m_vecData.clear();
return 0;
}
int CMainDataUploader::SlotUpdateErrorInfo()
{
return 0;
}
// int CMainDataUploader::SlotInit_Self()
// {
//
// }