Re-factoring de la méthode createParameters dans plotFunction

Menouard AZIB
1 parent bc850076
Showing 1 changed file with 7 additions and 29 deletions Show diff stats
src/ParamOutputImpl/Plot/InstantPlot/PlotFunction.cc
@@ -200,7 +200,8 @@ namespace plot
         {
             std::stringstream lError;
             lError << "PlotFunction::compute"
-                   << ": param with id '" << param_id << "' is not found in param_nb_points xml node.";
+                   << ": param with id " << param_id << " is not found in param_nb_points xml node.";
+            LOG4CXX_DEBUG(gLogger, lError.str());
             BOOST_THROW_EXCEPTION(PanelPlotOutputException() << AMDA::errno_code(AMDA_ERROR_PLOTFUNCTION_PARAM_NOT_FOUND) << AMDA::ex_msg(lError.str()));
         }
@@ -327,48 +328,25 @@ namespace plot
     void PlotFunction::createParameters(std::list<std::string> &usedParametersId_)
     {
-        // -- for each y serie on each parameter, calculate
-        // y serie sampling according to max resolution
+
         for (ParameterAxesList::iterator it = _parameterAxesList.begin();
              it != _parameterAxesList.end(); ++it)
         {
             AMDA::Parameters::ParameterSPtr originalParam =
                 _parameterManager.getParameter(it->_originalParamId);
-            LOG4CXX_DEBUG(gLogger, "before resampling : " << it->_originalParamId);
-
-            // original parameter sampling
-            double samplingValue = getSamplingInTreeParameter(originalParam);
-
             // For each series
             std::vector<SeriesProperties>::iterator ity;
             for (ity = it->getYSeriePropertiesList().begin(); ity != it->getYSeriePropertiesList().end();
                  ++ity)
             {
-                // get corrected sampling value in relation with max resolution
-                double correctedSamplingValue = getCorrectedSamplingValue(ity->getMaxResolution(), samplingValue);
-
-                AMDA::Parameters::ParameterSPtr usedParam;
-                // create resampling parameters for param
-                if (abs(samplingValue - correctedSamplingValue) > 1.)
-                {
-                    // more than one second between samplingValue and correctedSamplingValue
-                    //=> use resampling parameter
-                    usedParam = createSampledParameter(originalParam, correctedSamplingValue);
-                }
-                else
-                {
-                    // use original parameter
-                    usedParam = originalParam;
-                }
-
-                // Add used parameter to parameters list
+                // Add  parameter to parameters list
                 if (std::find(usedParametersId_.begin(), usedParametersId_.end(),
-                              usedParam->getId()) == usedParametersId_.end())
-                    usedParametersId_.push_back(usedParam->getId());
+                              originalParam->getId()) == usedParametersId_.end())
+                    usedParametersId_.push_back(originalParam->getId());
                 // link this paramter to the serie
-                ity->setParamId(usedParam->getId());
+                ity->setParamId(originalParam->getId());
             }
         }
     }