Remplacer les strings par un enum

Menouard AZIB
1 parent fe6b6521
Showing 3 changed files with 29 additions and 9 deletions Show diff stats
src/ParamOutputImpl/Plot/SpectroNode.hh
src/ParamOutputImpl/Plot/SpectroProperties.hh
src/ParamOutputImpl/Plot/Time/TimePlot.cc
@@ -100,7 +100,17 @@ namespace plot
 			value = xmlGetProp(pNode_, (const xmlChar *)BACKGROUND_SUB_TYPE);
 			if (value)
 			{
-				spectroPropsPtr->setBackgroundSubType((const char *)value);
+				const char *valueString = (const char *)value;
+
+				if (strcmp(valueString, BACKGROUND_SUB_TYPE_BY_CHANNEL) == 0)
+				{
+					spectroPropsPtr->setBackgroundSubType(SpectroProperties::BackgroundSubType::BYCHANNEL);
+				}
+				else if (strcmp(valueString, BACKGROUND_SUB_TYPE_BY_FIXED_VALUE) == 0)
+				{
+					spectroPropsPtr->setBackgroundSubType(SpectroProperties::BackgroundSubType::FIXEDVALUE);
+				}
+
 				xmlFree(value);
 			}
  
@@ -29,6 +29,15 @@ namespace plot
 	class SpectroProperties : public DrawingProperties
 	{
 	public:
+	/**
+	 * @brief An enum to represent different possible values of the background subtraction type
+	 * 
+	 */
+		enum BackgroundSubType
+		{
+			BYCHANNEL,
+			FIXEDVALUE
+		};
 		friend std::ostream &operator<<(std::ostream &out_,
 										const SpectroProperties &lprop_);
  
@@ -89,7 +98,7 @@ namespace plot
 		 * @brief the type of the background subtraction : By channel, Fixed value
 		 * 
 		 */
-		std::string backgroundSubType;
+		BackgroundSubType backgroundSubType;
 		/**
 		 * @brief the value of the background subtraction
 		 * 
@@ -206,12 +215,12 @@ namespace plot
 			_normalization = normalization;
 		}
  
-		void setBackgroundSubType(std::string backgroundSubType1)
+		void setBackgroundSubType(BackgroundSubType backgroundSubType1)
 		{
 			backgroundSubType = backgroundSubType1;
 		}
  
-		std::string getBackgroundSubType()
+		BackgroundSubType getBackgroundSubType()
 		{
 			return backgroundSubType;
 		}
@@ -1140,12 +1140,13 @@ namespace plot
 		//We get the background subtraction value given by the user
 		const double backgroundSubValue = pSpectro.getBackgroundSubValue();
  
-		 //If negative value then quit and do nothing
-		if (backgroundSubValue < 0) return;
+		//If negative value then quit and do nothing
+		if (backgroundSubValue < 0)
+			return;
  
 		const int len = matrixGrid.size();
 		//Channel subtraction
-		if (pSpectro.getBackgroundSubType().compare(BACKGROUND_SUB_TYPE_BY_CHANNEL) == 0)
+		if (pSpectro.getBackgroundSubType() == SpectroProperties::BackgroundSubType::BYCHANNEL)
 		{
 			int indexChannelDim1 = -1;
 			int indexChannelDim2 = -1;
@@ -1163,7 +1164,7 @@ namespace plot
 				matrixGrid[i].value -= values[i];
 		}
 		//Fixed value substraction
-		else if (pSpectro.getBackgroundSubType().compare(BACKGROUND_SUB_TYPE_BY_FIXED_VALUE) == 0)
+		else if (pSpectro.getBackgroundSubType() == SpectroProperties::BackgroundSubType::FIXEDVALUE)
 		{
 			for (int i = 0; i < len; i++)
 				matrixGrid[i].value -= backgroundSubValue;
@@ -1172,7 +1173,7 @@ namespace plot
 		{
 			std::stringstream lError;
 			lError << "Unknown background substracion type "
-				<< pSpectro.getBackgroundSubType();
+				   << pSpectro.getBackgroundSubType();
 			BOOST_THROW_EXCEPTION(PanelPlotOutputException() << AMDA::ex_msg(lError.str()));
 		}