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

source/OSIF/include/vendors/OceanOptics/features/light_source/LightSourceFeatureBase.h

@@ -0,0 +1,76 @@
+/***************************************************//**
+ * @file    LightSourceFeatureBase.h
+ * @date    April 2013
+ * @author  Ocean Optics, Inc.
+ *
+ * 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 LIGHTSOURCEFEATUREBASE_H
+#define LIGHTSOURCEFEATUREBASE_H
+
+#include "common/features/FeatureImpl.h"
+#include "common/protocols/Protocol.h"
+#include "common/buses/Bus.h"
+#include "common/exceptions/FeatureException.h"
+#include "vendors/OceanOptics/features/light_source/LightSourceFeatureInterface.h"
+
+namespace seabreeze {
+
+    class LightSourceFeatureBase : public FeatureImpl,
+            public LightSourceFeatureInterface {
+    public:
+        LightSourceFeatureBase(std::vector<ProtocolHelper *> helpers, int lampModuleIndex);
+        virtual ~LightSourceFeatureBase();
+
+        /* Enable controls */
+        virtual bool hasLightSourceEnable(const Protocol &protocol,
+            const Bus &bus, int lightSourceIndex) throw (FeatureException);
+
+        virtual bool isLightSourceEnabled(const Protocol &protocol,
+            const Bus &bus, int lightSourceIndex) throw (FeatureException);
+
+        virtual void setLightSourceEnable(const Protocol &protocol,
+            const Bus &bus, int lightSourceIndex, bool enable) throw (FeatureException);
+
+        /* Intensity controls */
+        virtual bool hasVariableIntensity(const Protocol &protocol,
+            const Bus &bus, int lightSourceIndex) throw (FeatureException);
+
+        virtual double getLightSourceIntensity(const Protocol &protocol,
+            const Bus &bus, int lightSourceIndex) throw (FeatureException);
+
+        virtual void setLightSourceIntensity(const Protocol &protocol,
+            const Bus &bus, int lightSourceIndex, double intensity) throw (FeatureException);
+
+        /* Overriding from Feature */
+        virtual FeatureFamily getFeatureFamily();
+
+    protected:
+        int moduleIndex;
+    };
+
+}
+
+#endif /* LIGHTSOURCEFEATUREBASE_H */

source/OSIF/include/vendors/OceanOptics/features/light_source/LightSourceFeatureImpl.h

@@ -0,0 +1,57 @@
+/***************************************************//**
+ * @file    LightSourceFeatureImpl.h
+ * @date    April 2013
+ * @author  Ocean Optics, Inc.
+ *
+ * This is a trivial implementation of LightSourceFeatureInterface
+ * that can manage a single module with one or more light sources
+ * (e.g. light bulbs, lasers, LEDs).
+ *
+ * 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 LIGHTSOURCEFEATUREIMPL_H
+#define LIGHTSOURCEFEATUREIMPL_H
+
+#include "vendors/OceanOptics/features/light_source/LightSourceFeatureBase.h"
+
+namespace seabreeze {
+
+    class LightSourceFeatureImpl : public LightSourceFeatureBase {
+    public:
+        LightSourceFeatureImpl(std::vector<ProtocolHelper *> helpers,
+            int lampModuleIndex, int lightSources);
+        virtual ~LightSourceFeatureImpl();
+
+        /* Override from LightSourceFeatureBase */
+        virtual int getLightSourceCount(const Protocol &protocol,
+            const Bus &bus) throw (FeatureException);
+
+    protected:
+        int lightSourceCount;
+    };
+
+}
+
+#endif /* LIGHTSOURCEFEATUREIMPL_H */

source/OSIF/include/vendors/OceanOptics/features/light_source/LightSourceFeatureInterface.h

@@ -0,0 +1,72 @@
+/***************************************************//**
+ * @file    LightSourceFeatureInterface.h
+ * @date    April 2013
+ * @author  Ocean Optics, Inc.
+ *
+ * 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 LIGHTSOURCEFEATUREINTERFACE_H
+#define LIGHTSOURCEFEATUREINTERFACE_H
+
+#include "common/features/Feature.h"
+#include "common/protocols/Protocol.h"
+#include "common/buses/Bus.h"
+#include "common/exceptions/FeatureException.h"
+
+namespace seabreeze {
+
+    class LightSourceFeatureInterface {
+    public:
+        virtual ~LightSourceFeatureInterface() = 0;
+
+        virtual int getLightSourceCount(const Protocol &protocol,
+            const Bus &bus) throw (FeatureException) = 0;
+
+        virtual bool hasLightSourceEnable(const Protocol &protocol,
+            const Bus &bus, int lightSourceIndex) throw (FeatureException) = 0;
+
+        virtual bool isLightSourceEnabled(const Protocol &protocol,
+            const Bus &bus, int lightSourceIndex) throw (FeatureException) = 0;
+
+        virtual void setLightSourceEnable(const Protocol &protocol,
+            const Bus &bus, int lightSourceIndex, bool enable) throw (FeatureException) = 0;
+
+        virtual bool hasVariableIntensity(const Protocol &protocol,
+            const Bus &bus, int lightSourceIndex) throw (FeatureException) = 0;
+
+        virtual double getLightSourceIntensity(const Protocol &protocol,
+            const Bus &bus, int lightSourceIndex) throw (FeatureException) = 0;
+
+        virtual void setLightSourceIntensity(const Protocol &protocol,
+            const Bus &bus, int lightSourceIndex, double intensity) throw (FeatureException) = 0;
+
+    };
+
+    /* Default implementation for (otherwise) pure virtual destructor */
+    inline LightSourceFeatureInterface::~LightSourceFeatureInterface() {}
+
+}
+
+#endif /* LIGHTSOURCEFEATUREINTERFACE_H */

source/OSIF/include/vendors/OceanOptics/features/light_source/StrobeLampFeature.h

@@ -0,0 +1,55 @@
+/***************************************************//**
+ * @file    StrobeLampFeature.h
+ * @date    February 2009
+ * @author  Ocean Optics, Inc.
+ *
+ * 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 STROBELAMPFEATURE_H
+#define STROBELAMPFEATURE_H
+
+#include "common/features/FeatureImpl.h"
+#include "common/protocols/Protocol.h"
+#include "common/buses/Bus.h"
+#include "common/exceptions/FeatureException.h"
+#include "vendors/OceanOptics/features/light_source/StrobeLampFeatureInterface.h"
+
+namespace seabreeze {
+
+    class StrobeLampFeature : public FeatureImpl, public StrobeLampFeatureInterface {
+    public:
+        StrobeLampFeature(std::vector<ProtocolHelper *> helpers);
+        virtual ~StrobeLampFeature();
+        virtual void setStrobeLampEnable(const Protocol &protocol,
+                const Bus &bus, bool enable) throw (FeatureException);
+
+        /* Overriding from Feature */
+        virtual FeatureFamily getFeatureFamily();
+
+    };
+
+}
+
+#endif /* STROBELAMPFEATURE_H */

source/OSIF/include/vendors/OceanOptics/features/light_source/StrobeLampFeatureInterface.h

@@ -0,0 +1,51 @@
+/***************************************************//**
+ * @file    StrobeLampFeatureInterface.h
+ * @date    February 2011
+ * @author  Ocean Optics, Inc.
+ *
+ * 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 STROBELAMPFEATUREINTERFACE_H
+#define STROBELAMPFEATUREINTERFACE_H
+
+#include "common/features/Feature.h"
+#include "common/protocols/Protocol.h"
+#include "common/buses/Bus.h"
+#include "common/exceptions/FeatureException.h"
+
+namespace seabreeze {
+
+    class StrobeLampFeatureInterface {
+    public:
+        virtual ~StrobeLampFeatureInterface() = 0;
+        virtual void setStrobeLampEnable(const Protocol &protocol,
+                const Bus &bus, bool enable) throw (FeatureException) = 0;
+    };
+
+    /* Default implementation for (otherwise) pure virtual destructor */
+    inline StrobeLampFeatureInterface::~StrobeLampFeatureInterface() {}
+}
+
+#endif /* STROBELAMPFEATUREINTERFACE_H */

source/OSIF/include/vendors/OceanOptics/features/light_source/VentanaLightSourceFeature.h

@@ -0,0 +1,49 @@
+/***************************************************//**
+ * @file    VentanaLightSourceFeature.h
+ * @date    April 2013
+ * @author  Ocean Optics, Inc.
+ *
+ * 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 VENTANALIGHTSOURCEFEATURE_H
+#define VENTANALIGHTSOURCEFEATURE_H
+
+#include "vendors/OceanOptics/features/light_source/LightSourceFeatureImpl.h"
+
+namespace seabreeze {
+
+    class VentanaLightSourceFeature : public LightSourceFeatureImpl {
+    public:
+        VentanaLightSourceFeature(std::vector<ProtocolHelper *> helpers);
+        virtual ~VentanaLightSourceFeature();
+
+        /* Overriding from Feature */
+        virtual bool initialize(const Protocol &protocol, const Bus &bus)
+            throw (FeatureException);
+    };
+
+}
+
+#endif /* VENTANALIGHTSOURCEFEATURE_H */