progress

Hacene SI HADJ MOHAND
1 parent 0be91da0
Showing 2 changed files with 42 additions and 32 deletions Show diff stats
src/ParamOutputImpl/Plot/Time/TimePlot.cc
src/ParamOutputImpl/Plot/Time/TimePlot.hh
@@ -17,6 +17,8 @@
 #include "ShadesTools.hh"
 #include "AxisLegendManager.hh"
 #include <fstream>
+#include <limits>
+#include <cstddef>
 #include "DefaultTimeAxisDecorator.hh"
 #include "TickMarkDecorator.hh"
@@ -961,24 +963,21 @@ void TimePlot::drawSpectro(double startDate, double stopDate, std::string pParam
 					continue;
 				}
 			}
-                                                            std::string normalistion = pSpectro pSpectro.getNormalisation;
-                                                            if (pSpectro != nullptr){
-                                                                double usedValues[] =  normalise(data.getValues(index, startIndex) ,normalistion);
-                                                            }else{
-                                                                double usedValues[] =  data.getValues(index, startIndex);
-                                                            }
-
+                                                         
 			for (int i = 0; i < nbValues - 1; ++i)
 			{
 				part.x[0] = data.getTimes()[startIndex+i];
 				part.x[1] = data.getTimes()[startIndex+i+1];
 				part.isColorIndex = false;
-				part.value = usedValues[i];
+				part.value = data.getValues(index, startIndex)[i];
 				matrixGrid.push_back(part);
 			}
 			//draw spectro
 			LOG4CXX_DEBUG(gLogger, "TimePlot::drawSpectro - Draw data grid - " << matrixGrid.size());
+                                                            std::string normalistion = pSpectro.getNormalisation();
+                                                            if (!normalistion.empty())
+                                                                 normalise(matrixGrid, normalistion);
 			drawMatrix(matrixGrid, pSpectro.getMin(), pSpectro.getMax(),
 				minValColor, maxValColor, lZAxis->_color._colorMapIndex, pSpectro.getUseLog0AsMin());
 			matrixGrid.clear();
@@ -1042,39 +1041,48 @@ void TimePlot::drawSpectro(double startDate, double stopDate, std::string pParam
 			}
 			//draw spectro
 			LOG4CXX_DEBUG(gLogger, "TimePlot::drawSpectro - Draw data grid - " << matrixGrid.size());
+                                                            std::string normalistion = pSpectro.getNormalisation();
+                                                             if (!normalistion.empty())
+                                                                 normalise(matrixGrid, normalistion);
+                                                                  
 			drawMatrix(matrixGrid, pSpectro.getMin(), pSpectro.getMax(),
 				minValColor, maxValColor, lZAxis->_color._colorMapIndex, pSpectro.getUseLog0AsMin());
 			matrixGrid.clear();
 		}
 	}
 }
-double * normalise(double values [], std::string normalisationType){
-        max = std::max_element(std::begin(rawValues), std::end(rawValues));
-        min  = std::min_element(std::begin(rawValues), std::end(rawValues));
-        int len = std::sizeof(values)/std::sizeof(values[0]);
-        double res [len] ;
+void TimePlot::normalise(MatrixGrid & matrixGrid, std::string normalisationType){
+        double min = DBL_MAX;
+        double max  = DBL_MIN;
+           int len = matrixGrid.size();
+        for(auto val :matrixGrid){
+            if(val.value <min)
+                min = val.value;
+            if(val.value  > max)
+                max = val.value;
+        }
+           if (min <= 0)
+               min = DBL_MIN;
         if(std::isnan(min) || std::isnan(max)){
-            return values;
+            return;
         }else if(min == max){
-            for (itn i =0; i < len; i++)
-                res[i] = values[i]/max;
-            return res;
+            for (int i =0; i < len; i++)
+                matrixGrid[i].value= matrixGrid[i].value/max;
         }else{
-    switch(normalisationType){
-        case 'log':
-              for (itn i =0; i < len; i++)
-                res[i] = (std::log10(values[i])-std::log10(min))/(std::log10(max)-std::log10(min));
-            return res;
-            break;
-        case 'linear':
-              for (itn i =0; i < len; i++)
-                res[i] = (values[i]-min)/(max-min);
-            return res;
-            break;
-        default:
-		BOOST_THROW_EXCEPTION(PanelPlotOutputException() << AMDA::ex_msg("Unknwon normalisation "<<normalisationType));
-            break;
-    }
+    if(normalisationType == "log"){
+              for (int i =0; i < len; i++)
+                matrixGrid[i].value = (std::log10(matrixGrid[i].value)-std::log10(min))/(std::log10(max)-std::log10(min));
+              return;
+    }else if (normalisationType == "linear"){
+              for (int i =0; i < len; i++)
+                matrixGrid[i].value = (matrixGrid[i].value-min)/(max-min);
+            return;
+    }else{
+            std::stringstream lError;
+            lError << "Unknwon normalisation " << normalisationType;
+		BOOST_THROW_EXCEPTION(PanelPlotOutputException() << AMDA::ex_msg(lError.str()));
+            }
+    
         }
 }
@@ -68,6 +68,8 @@ public:
 	std::shared_ptr<TimeAxisDecorator> getTimeAxisDecorator(){
 		return _xdecoratorPtr;
 	}
+        
+                      void  normalise(MatrixGrid & matrixGrid, std::string normalisationType);  
 	/**
 	 * @brief QSAS time configuration for time formatting