主采集逻辑修改中，添加了部分写文件实现

source/OSIF/include/vendors/OceanOptics/features/irradcal/IrradCalFeature.h

@@ -0,0 +1,71 @@
+/***************************************************//**
+ * @file    IrradCalFeature.h
+ * @date    March 2010
+ * @author  Ocean Optics, Inc.
+ *
+ * This feature provides an interface to the
+ * irradiance calibration storage available on some
+ * devices (such as the USB2000+).
+ *
+ * LICENSE:
+ *
+ * SeaBreeze Copyright (C) 2014, Ocean Optics Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject
+ * to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *******************************************************/
+
+#ifndef IRRADCALFEATURE_H
+#define IRRADCALFEATURE_H
+
+#include "common/buses/Bus.h"
+#include "common/protocols/Protocol.h"
+#include "common/features/FeatureImpl.h"
+#include "common/exceptions/FeatureException.h"
+#include "common/FloatVector.h"
+#include "vendors/OceanOptics/features/irradcal/IrradCalFeatureInterface.h"
+
+namespace seabreeze {
+
+    class IrradCalFeature : public FeatureImpl, public IrradCalFeatureInterface {
+    public:
+        IrradCalFeature(std::vector<ProtocolHelper *> helpers, int numPixels);
+        virtual ~IrradCalFeature();
+        virtual std::vector<float> *readIrradCalibration(const Protocol &protocol,
+            const Bus &bus) throw (FeatureException);
+        virtual int writeIrradCalibration(const Protocol &protocol,
+            const Bus &bus, const std::vector<float> &values) throw (FeatureException);
+        int getNumberOfPixels();
+        virtual int hasCollectionArea(const Protocol &protocol,
+            const Bus &bus);
+        virtual double readCollectionArea(const Protocol &protocol,
+            const Bus &bus) throw (FeatureException);
+        virtual void writeCollectionArea(const Protocol &protocol,
+            const Bus &bus, double area) throw (FeatureException);
+
+        /* Overriding from Feature */
+        virtual FeatureFamily getFeatureFamily();
+
+    private:
+        int numberOfPixels;
+    };
+
+}
+
+#endif /* IRRADCALFEATURE_H */

source/OSIF/include/vendors/OceanOptics/features/irradcal/IrradCalFeatureInterface.h

@@ -0,0 +1,62 @@
+/***************************************************//**
+ * @file    IrradCalFeatureInterface.h
+ * @date    February 2011
+ * @author  Ocean Optics, Inc.
+ *
+ * This feature provides an interface to the
+ * irradiance calibration storage available on some
+ * devices (such as the USB2000+).
+ *
+ * LICENSE:
+ *
+ * SeaBreeze Copyright (C) 2014, Ocean Optics Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject
+ * to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *******************************************************/
+
+#ifndef IRRADCALFEATUREINTERFACE_H
+#define IRRADCALFEATUREINTERFACE_H
+
+#include "common/buses/Bus.h"
+#include "common/protocols/Protocol.h"
+#include "common/exceptions/FeatureException.h"
+
+namespace seabreeze {
+
+    class IrradCalFeatureInterface {
+    public:
+        virtual ~IrradCalFeatureInterface() = 0;
+        virtual std::vector<float> *readIrradCalibration(const Protocol &protocol,
+            const Bus &bus) throw (FeatureException) = 0;
+        virtual int writeIrradCalibration(const Protocol &protocol,
+            const Bus &bus, const std::vector<float> &values) throw (FeatureException) = 0;
+        virtual int hasCollectionArea(const Protocol &protocol,
+            const Bus &bus) = 0;
+        virtual double readCollectionArea(const Protocol &protocol,
+            const Bus &bus) throw (FeatureException) = 0;
+        virtual void writeCollectionArea(const Protocol &protocol,
+            const Bus &bus, double area) throw (FeatureException) = 0;
+    };
+
+    /* Default implementation for (otherwise) pure virtual destructor */
+    inline IrradCalFeatureInterface::~IrradCalFeatureInterface() {}
+}
+
+#endif /* IRRADCALFEATUREINTERFACE_H */