（1）将atp光谱仪的控制类更新到卓哥最新版，解决连接atp的问题；

（2）将读取OceanOptics的非线性校正文件  集成到定标程序中；

othersoft/calibration_console/Header_Files/ATPControl_Serial_QT.h

@@ -3,6 +3,7 @@
 //////////////////////////////////////////////////////////////////////////
 #pragma once
 //#include "pch.h"
+
 #include "ZZ_Types.h"
 #include "ZZ_Math.h"
 #include <QSerialPort>
@@ -14,7 +15,7 @@ using namespace ZZ_MISCDEF;
 using namespace ZZ_MISCDEF::ATP;
 using namespace ZZ_MISCDEF::IRIS::FS;
 
-class ZZ_ATPControl_Serial_Qt :public CIrisFSBase
+class ZZ_ATPControl_Serial_Qt:public CIrisFSBase
 {
 Q_OBJECT
 public:
@@ -33,10 +34,10 @@ public:
     void Close();
 
     //<2F><><EFBFBD>β<EFBFBD><CEB2>Բɼ<D4B2> <20><><EFBFBD><EFBFBD>ȷ<EFBFBD><C8B7><EFBFBD>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-    int SingleShot(int& iPixels);
+    int SingleShot(int &iPixels);
 
     //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݲɼ<DDB2>
-    int SingleShot(DataFrame& dfData);
+    int SingleShot(DataFrame &dfData);
 
     //<2F><><EFBFBD>ΰ<EFBFBD><CEB0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɼ<EFBFBD>
     //int SingleShotDark(ATPDataFrame &dfData);
@@ -46,15 +47,15 @@ public:
     int SetExposureTime(int iExposureTimeInMS);
 
     //<2F><>ȡ<EFBFBD>ع<EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-    int GetExposureTime(int& iExposureTimeInMS);
+    int GetExposureTime(int &iExposureTimeInMS);
 
     //int GetWaveLength(float *pfWaveLength);
 
     //<2F><>ȡ<EFBFBD>豸<EFBFBD><E8B1B8>Ϣ
-    int GetDeviceInfo(DeviceInfo& Info);
+    int GetDeviceInfo(DeviceInfo &Info);
 
     //<2F><>ȡ<EFBFBD>豸<EFBFBD><E8B1B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-    int GetDeviceAttribute(DeviceAttribute& Attr);
+    int GetDeviceAttribute(DeviceAttribute &Attr);
 
     //int GetDeviceListInfo(); //use type name to enum
 
@@ -62,10 +63,12 @@ public:
     int SetDeviceTemperature(float fTemperature);
 
     //<2F><>ȡ<EFBFBD>¶<EFBFBD>
-    int GetDeviceTemperature(float& fTemperature);
+    int GetDeviceTemperature(float &fTemperature);
 
     //<2F>Զ<EFBFBD><D4B6>ع<EFBFBD>
-    int PerformAutoExposure(float fMinScaleFactor, float fMaxScaleFactor, float& fPredictedExposureTime);
+    int PerformAutoExposure(float fMinScaleFactor, float fMaxScaleFactor, float &fPredictedExposureTime);
+private:
+    int SetAvgTimes(int iTimes = 1);
 
 #ifdef _DEBUG
     public:
@@ -74,7 +77,7 @@ private:
 #endif
     //port
     int m_iBaudRate;
-    QSerialPort* m_pSerialPort;
+    QSerialPort *m_pSerialPort;
 
     //ATP
     DeviceInfo m_diDeviceInfo;
@@ -94,6 +97,6 @@ public slots:
     int Init_Self();
 signals:
     void SignalInit_Self();
-    //private slots :
+//private slots :
     //void ReadMessage();
 };

othersoft/calibration_console/Header_Files/FiberSpectrometerOperationBase.h

@@ -30,6 +30,14 @@ public:
 
     virtual void singleShot(DataFrame &dfData) = 0;
 
+//    typedef struct coeffs
+//    {
+//        ZZ_U32    coeffsCounter;
+//        double    coeffs[100];
+//    }coeffsFrame;
+    virtual void getNonlinearityCoeffs(coeffsFrame &coeffs) = 0;
+
+
 //    ZZ_S32 GetMaxValue(ZZ_S32 * dark, int number) = 0;
 
     DataFrame m_IntegratingSphereData;

othersoft/calibration_console/Header_Files/ZZ_Types.h

@@ -30,6 +30,12 @@ namespace ZZ_MISCDEF
                 double    dTimes = 0;
             }DataFrame;
 
+            typedef struct coeffs//tc<74><63><EFBFBD><EFBFBD>-----------------------
+            {
+                ZZ_U32    coeffsCounter;
+                double    coeffs[100];
+            }coeffsFrame;
+
             typedef struct tagDeviceInfo
             {
                 std::string strPN;

othersoft/calibration_console/Header_Files/atpFiberImager.h

@@ -31,6 +31,8 @@ public:
 
     void singleShot(DataFrame &dfData);
 
+    void getNonlinearityCoeffs(coeffsFrame &coeffs);
+
     ZZ_S32 GetMaxValue(ZZ_S32 * dark, int number);
 
 //	DataFrame m_IntegratingSphereData;

othersoft/calibration_console/Header_Files/library.h

@@ -11,6 +11,7 @@
 
 #include "IrisFiberSpectrometerBase.h"
 #include "api/seabreezeapi/SeaBreezeAPI.h"
+#include "api/seabreezeapi/NonlinearityCoeffsFeatureAdapter.h"
 
 
 using namespace std;
@@ -53,6 +54,7 @@ public:
 
 	//tc
 	static const char* get_error_string(int error);
+    void test_nonlinearity_coeffs_feature();
 private:
 	int m_iSpectralmeterHandle;
 	DeviceInfo m_deviceInfo;

othersoft/calibration_console/Header_Files/oceanOpticsFiberImager.h

@@ -31,6 +31,8 @@ public:
 	
 	void singleShot(DataFrame &dfData);
 
+    void getNonlinearityCoeffs(coeffsFrame &coeffs);
+
     ZZ_S32 GetMaxValue(ZZ_S32 * dark, int number);
 
 //	DataFrame m_IntegratingSphereData;