1.修改了部分ATP系列光谱仪的控制函数以匹配数据类型的改变。

2.添加了网络上传模块，矫正算法部分可能需要调整。

source/FS/ATPControl_Serial_QT.cpp

@@ -2,11 +2,11 @@
 #include "ATPControl_Serial_QT.h"
 #include "ZZ_Math_HDRONLY.h"
 
-ZZ_ATPControl_Serial_Qt::ZZ_ATPControl_Serial_Qt()
+ZZ_ATPControl_Serial_Qt::ZZ_ATPControl_Serial_Qt(QObject* parent /*= nullptr*/)
 {
 	m_pSerialPort = new QSerialPort;
-	//connect(m_pSerialPort, &QSerialPort::readyRead, this, &ZZ_ATPControl_Serial_Qt::ReadMessage);
 	m_iBaudRate = 115200;
+	//emit SignalInit_Self();
 }
 
 ZZ_ATPControl_Serial_Qt::~ZZ_ATPControl_Serial_Qt()
@@ -18,6 +18,19 @@ ZZ_ATPControl_Serial_Qt::~ZZ_ATPControl_Serial_Qt()
 	
 }
 
+// int ZZ_ATPControl_Serial_Qt::ReInit()
+// {
+// 	m_pSerialPort->close();
+// 	delete m_pSerialPort;
+// 
+// 	m_pSerialPort = new QSerialPort;
+// 
+// 	m_pSerialPort->setPortName("COM7");
+// 	m_pSerialPort->setReadBufferSize(512);
+// 	bool bRes = m_pSerialPort->setBaudRate(m_iBaudRate);
+// 	bRes = m_pSerialPort->open(QIODevice::ReadWrite);
+// }
+
 // int ZZ_ATPControl_Serial_Qt::SetBaudRate(int iBaud)
 // {
 // 	m_iBaudRate = iBaud;
@@ -27,6 +40,9 @@ ZZ_ATPControl_Serial_Qt::~ZZ_ATPControl_Serial_Qt()
 
 int ZZ_ATPControl_Serial_Qt::Initialize(bool bIsUSBMode, std::string ucPortNumber, std::string strDeviceName)
 {
+	//connect(this, &ZZ_ATPControl_Serial_Qt::SignalInit_Self, this, &ZZ_ATPControl_Serial_Qt::Init_Self);
+	//emit SignalInit_Self();
+
 	QString qstrPortName = QString::fromStdString(ucPortNumber);
 
 	m_pSerialPort->setPortName(qstrPortName);
@@ -47,6 +63,18 @@ int ZZ_ATPControl_Serial_Qt::Initialize(bool bIsUSBMode, std::string ucPortNumbe
 		return 2;
 	}
 
+	GetDeviceInfo(m_diDeviceInfo);
+
+	std::string::size_type szPostion = m_diDeviceInfo.strSN.find(strDeviceName);
+	if (szPostion==std::string::npos)
+	{
+		qDebug() << "Err:FS serial number not match.Exit Code:3";
+		return 3;
+	}
+	else
+	{
+		return 0;
+	}
 	return 0;
 }
 
@@ -319,6 +347,12 @@ int ZZ_ATPControl_Serial_Qt::ParseData(QByteArray &qbData)
 	return 0;
 }
 
+int ZZ_ATPControl_Serial_Qt::Init_Self()
+{
+	m_pSerialPort = new QSerialPort;
+	return 0;
+}
+
 int ZZ_ATPControl_Serial_Qt::PerformAutoExposure(float fMinScaleFactor, float fMaxScaleFactor, float &fPredictedExposureTime)
 {
 	using namespace ZZ_MATH;
@@ -500,6 +534,7 @@ int ZZ_ATPControl_Serial_Qt::GetExposureTime(int &iExposureTimeInMS)
 
 int ZZ_ATPControl_Serial_Qt::SingleShot(DataFrame &dfData)
 {
+
 	QByteArray qbSend, qbRecv;
 	qbSend.clear();
 	qbRecv.clear();
@@ -511,6 +546,8 @@ int ZZ_ATPControl_Serial_Qt::SingleShot(DataFrame &dfData)
 	RecvData(qbRecv);
 	ParseData(qbRecv);
 
+	ZZ_U16 usData[4096] = {0};
+
 	if ((ZZ_U8)qbRecv[0] != 0)
 	{
 		qDebug() << "Err:SingleShot Failed.Exit Code:1";
@@ -518,9 +555,13 @@ int ZZ_ATPControl_Serial_Qt::SingleShot(DataFrame &dfData)
 	}
 	else
 	{
+		//int aaa = qbRecv.size();
 		int iDataSizeInPixel = (qbRecv.size() - 1) / 2;
-		memcpy(dfData.lData, qbRecv.data() + 1, iDataSizeInPixel * 2);
-
+		memcpy(usData, qbRecv.data() + 1, iDataSizeInPixel * 2);
+		for (int i=0;i< iDataSizeInPixel;i++)
+		{
+			dfData.lData[i] = usData[i];
+		}
 	}
 
 	return 0;

source/FS/ATPControl_Serial_QT.h

@@ -12,16 +12,19 @@ using namespace ZZ_MISCDEF::IRIS::FS;
 
 class ZZ_ATPControl_Serial_Qt:public CIrisFSBase
 {
-	//Q_OBJECT
+	Q_OBJECT
 public:
-	ZZ_ATPControl_Serial_Qt();
+	ZZ_ATPControl_Serial_Qt(QObject* parent = nullptr);
 	virtual ~ZZ_ATPControl_Serial_Qt();
 
 public:
+	//do not call
+	//int ReInit();
 	//<2F><><EFBFBD>ò<EFBFBD><C3B2><EFBFBD><EFBFBD><EFBFBD>
 	//int SetBaudRate(int iBaud);
 	//<2F><>ʼ<EFBFBD><CABC><EFBFBD>豸
 	int Initialize(bool bIsUSBMode, std::string ucPortNumber, std::string strDeviceName);
+
 	//<2F>ر<EFBFBD><D8B1>豸
 	void Close();
 
@@ -79,6 +82,10 @@ private:
 	int SendCommand(QByteArray qbCommand);
 	int RecvData(QByteArray &qbData);
 	int ParseData(QByteArray &qbData);
+public slots:
+	int Init_Self();
+signals:
+	void SignalInit_Self();
 //private slots :
 	//void ReadMessage();
 };

source/FS/DataFileProcessor.cpp

@@ -37,10 +37,10 @@ void DataFileProcessor::SetData(std::vector<std::vector<DataFrame>> vecData)
 
 bool DataFileProcessor::WriteDataFile()
 {
-	//GenerateFilePath();
-	//WriteEnvironmentInfo();
-	//WriteDeviceInfo();
-	//WriteData();
+	GenerateFilePath();
+	WriteEnvironmentInfo();
+	WriteDeviceInfo();
+	WriteData();
 	return 1;
 }
 
@@ -184,6 +184,7 @@ void DataFileProcessor::WriteDeviceInfo()
 		qfData.write("Depth,");
 		qstrTemp = QString::number(m_struDeviceContext.lDepth[i]);
 		qfData.write(qstrTemp.toLatin1());
+		qfData.write(",");
 
 		qfData.write("TEC Temperature,");
 		qstrTemp = QString::number(m_vecData[i][0].fTemperature);

source/FS/IrisFiberSpectrometerBase.h

@@ -1,10 +1,11 @@
 #include <string>
 #include "ZZ_Types.h"
+#include "pch.h"
 #pragma once
 using namespace ZZ_MISCDEF;
 using namespace ZZ_MISCDEF::IRIS::FS; 
 
-class CIrisFSBase
+class CIrisFSBase:public QObject
 {
 public:
 	//CIrisFSBase();