Compile error fixed

include/N_PhotoConducteur.h

@@ -54,6 +54,7 @@ public:
 	*/
 	void set_ElectroMeterRange(std::string range_str);
 	std::string get_ElectroMeterRange();
+	std::vector<std::string> ranges_list(void);
 
 	/**
 	*  \brief getters and setters.

include/N_PhotoVoltaique.h

@@ -54,6 +54,7 @@ public:
 	*/
 	void set_ElectroMeterRange(std::string range_str);
 	std::string get_ElectroMeterRange();
+	std::vector<std::string> ranges_list(void);
 
 	/**
 	*  \brief getters and setters.

include/Novelec_MCCE2.h

@@ -46,13 +46,13 @@ public:
   bool init_protocol(void);
 
 	std::string get_ElectroMeterPolarity(void);
-	void set_ElectroMeterPolarity	(std::string);
-
-	short get_electrometer_type() {
-    return this->_MCCE2electroTypeNumber;
+	void set_ElectroMeterPolarity	(std::string);
+
+	short get_electrometer_type() {
+    return this->_MCCE2electroTypeNumber;
   }
-	std::string get_electrometer_typeStr() {
-    return this->_MCCE2electroTypeStr;
+	std::string get_electrometer_typeStr() {
+    return this->_MCCE2electroTypeStr;
   }
 
 	/**
@@ -67,7 +67,7 @@ public:
 	/**
 	*	\brief Sets the new range value
 	*/
-	//virtual void set_ElectroMeterRange(std::string range_str) = 0;
+	//virtual void set_ElectroMeterRange(std::string range_str) = 0;
   virtual void range_up	     (void) {};
   virtual void range_down    (void) {};
 
@@ -86,15 +86,18 @@ public:
 	*/
 	std::string electrometer_status		(void);
 
+  virtual std::vector<std::string> ranges_list(void) {};
+
+
 protected :
 	unsigned short _rangeLimit;				      //- define the range limit for each novelec type
   unsigned short _address;                //- a DAIP manages 2 "channels" (or address)
-	unsigned short _MCCE2electroTypeNumber;	//- the mcce2 electrometer type number (to check range value)
+	unsigned short _MCCE2electroTypeNumber;	//- the mcce2 electrometer type number (to check range value)
     std::string _MCCE2electroTypeStr;       //-  "      "   "   "   "   "   as string
 	/**
 	*	\brief Checks the new range value
 	*/
-	short check_range_value(const std::string& rgToCheck, const std::string* electroRangeList);
+	short check_range_value(const std::string& rgToCheck, const std::vector<std::string>	 electroRangeList);
 
 };
 

pom.xml

@@ -8,7 +8,7 @@
    </parent>
    <groupId>fr.soleil.lib</groupId>
    <artifactId>Electrometers-${aol}-${library}-${mode}</artifactId>
-   <version>2.6.0</version>
+   <version>2.7.0</version>
    <packaging>nar</packaging>
    <name>Electrometers library</name>
    <description>Electrometers library</description>

src/N_PhotoConducteur.cpp

@@ -24,8 +24,8 @@
 /*
 * Valid Range values for a N_PhotoConducteur
 */
-static const std::string NType4_rangeValue[] = {"100","30","10","3"};		//- MOhms
-static const std::string NType5_rangeValue[] = {"1000","300","100","30"};	//- KOhms
+static const std::vector<std::string> NType4_rangeValue {"100","30","10","3"};			//- MOhms
+static const std::vector<std::string> NType5_rangeValue {"1000","300","100","30"};	//- KOhms
 
 
 // ============================================================================
@@ -195,3 +195,21 @@ std::string rangeStr("");
 
 	return rangeStr;
 }
+
+// ============================================================================
+// N_PhotoConducteur::ranges_list
+// ============================================================================
+std::vector<std::string> N_PhotoConducteur::ranges_list(void)
+{
+  std::vector<std::string> vrangeslist;
+
+	//- switch the novelec type :
+	switch(_MCCE2electroTypeNumber)
+	{
+	case 4 : vrangeslist = NType4_rangeValue;
+		break;
+	case 5 : vrangeslist = NType5_rangeValue;
+		break;
+	}
+	return vrangeslist;
+}

src/N_PhotoVoltaique.cpp

@@ -24,9 +24,9 @@
 /*
 * Valid Range values for a N_PhotoVoltaique
 */
-static const std::string NType1_rangeValue[] = {"1E-11AcC","3E-11AcC","1E-10AcC","3E-10AcC"};
-static const std::string NType2_rangeValue[] = {"1E-10AcC","3E-10AcC","1E-09AcC","3E-09AcC","1E-08AcC","3E-08AcC","1E-07AcC","3E-07AcC"};
-static const std::string NType3_rangeValue[] = {"1E-08AcC","3E-08AcC","1E-07AcC","3E-07AcC","1E-06AcC","3E-06AcC","1E-05AcC","3E-05AcC"};
+static const std::vector<std::string> NType1_rangeValue {"1E-11AcC","3E-11AcC","1E-10AcC","3E-10AcC"};
+static const std::vector<std::string> NType2_rangeValue {"1E-10AcC","3E-10AcC","1E-09AcC","3E-09AcC","1E-08AcC","3E-08AcC","1E-07AcC","3E-07AcC"};
+static const std::vector<std::string> NType3_rangeValue {"1E-08AcC","3E-08AcC","1E-07AcC","3E-07AcC","1E-06AcC","3E-06AcC","1E-05AcC","3E-05AcC"};
 
 
 // ============================================================================
@@ -226,3 +226,23 @@ std::string rangeStr("");
 
 	return rangeStr;
 }
+
+// ============================================================================
+// N_PhotoVoltaique::ranges_list
+// ============================================================================
+std::vector<std::string> N_PhotoVoltaique::ranges_list(void)
+{
+  std::vector<std::string> vrangeslist;
+
+	//- switch the novelec type :
+	switch(_MCCE2electroTypeNumber)
+	{
+	case 1 : vrangeslist = NType1_rangeValue;
+		break;
+	case 2 : vrangeslist = NType2_rangeValue;
+		break;
+	case 3 : vrangeslist = NType3_rangeValue;
+		break;
+	}
+	return vrangeslist;
+}

src/Novelec_MCCE2.cpp

@@ -393,7 +393,7 @@ std::string Novelec_MCCE2::electrometer_status (void)
 // ============================================================================
 // Novelec_MCCE2::check_range_value
 // ============================================================================
-short Novelec_MCCE2::check_range_value (const std::string& rgToCheck, const std::string* electroRangeList)
+short Novelec_MCCE2::check_range_value (const std::string& rgToCheck, const std::vector<std::string> electroRangeList)
 {
 	std::string electroRg("");
 	for (unsigned int idx = 0; idx <= _rangeLimit; idx++)