Ignore zero point for frequency and period

Menouard AZIB
1 parent 9d60b18e
Showing 3 changed files with 28 additions and 16 deletions Show diff stats
src/ParamOutputImpl/Plot/InstantPlot/PlotFunction.cc
src/ParamOutputImpl/Plot/InstantPlot/PlotFunction.hh
src/Parameters/fonctions/fourier/DiscreteFourierTransform.cc
@@ -165,6 +165,7 @@ namespace plot
         {
             minValue = pow10(minValue);
             maxValue = pow10(maxValue);
+            lAxisRange._extend = false;
         }
  
         lAxisRange.setMin(minValue);
@@ -179,6 +180,7 @@ namespace plot
         {
             minValue = pow10(minValue);
             maxValue = pow10(maxValue);
+            lAxisRange._extend = false;
         }
         lAxisRange.setMin(minValue);
         lAxisRange.setMax(maxValue);
@@ -419,12 +421,16 @@ namespace plot
             AMDA::Parameters::ParameterSPtr originalParam = _parameterManager.getParameter(paramOriginID);
             const double timeSampling = originalParam->getDataWriterTemplate()->getMinSampling();
  
+            LOG4CXX_DEBUG(gLogger, "Fourier:: Signal Size = " << yValues.size());
+
             DiscreteFourierTransform<double, double> DFT(yValues, timeSampling);
             const bool computeFFT = (function == PlotFunction::Function::FFT);
             DFT.compute(computeFFT);
  
             std::vector<std::complex<double>> phasors = DFT.getPhasors();
             yValues = DFT.computeDSP(phasors);
+            if (computeFFT)
+                LOG4CXX_DEBUG(gLogger, "FFT Next Power of 2 = " << yValues.size() << " " << DFT.highestPowerof2(8211));
  
             if (abscisse.getType() == Abscisse::Abscisse_Type::FREQUENCY)
                 xValues = DFT.getFreq(phasors, 1.0 / timeSampling); // DFT.getFrequences();
@@ -432,10 +438,7 @@ namespace plot
                 xValues = DFT.getPeriods(phasors, 1.0 / timeSampling); // DFT.getFrequences();
         }
  
-        if (ordonneeScale == Axis::Scale::LOGARITHMIC)
-            PlotFunction::applyScale(yValues);
-        if (abscisseScale == Axis::Scale::LOGARITHMIC)
-            PlotFunction::applyScale(xValues);
+        PlotFunction::applyScale(xValues, yValues);
  
         std::string id = "";
         if (pSerie != nullptr)
@@ -451,20 +454,31 @@ namespace plot
         PlotFunction::yValuesMap[id] = yValues;
     }
  
-    void PlotFunction::applyScale(std::vector<double> &vect)
+    void PlotFunction::applyScale(std::vector<double> &vectX, std::vector<double> &vectY)
     {
-        for (std::size_t i = 0; i < vect.size(); i++)
+        std::vector<double> xtemp;
+        std::vector<double> ytemp;
+        for (std::size_t i = 0; i < vectX.size(); i++)
         {
-            if (vect[i] <= 0)
+            if ((vectX[i] <= 0 && abscisseScale == Axis::Scale::LOGARITHMIC) ||
+                (vectY[i] <= 0 && ordonneeScale == Axis::Scale::LOGARITHMIC))
             {
-                vect[i] = log10(10e-20);
                 LOG4CXX_WARN(gLogger, "Negative value found, no log calculated");
             }
             else
             {
-                vect[i] = log10(vect[i]);
+                if (abscisseScale == Axis::Scale::LOGARITHMIC)
+                    xtemp.push_back(log10(vectX[i]));
+                else
+                    xtemp.push_back(vectX[i]);
+                if (ordonneeScale == Axis::Scale::LOGARITHMIC)
+                    ytemp.push_back(log10(vectY[i]));
+                else
+                    ytemp.push_back(vectY[i]);
             }
         }
+        vectX = xtemp;
+        vectY = ytemp;
     }
  
     void PlotFunction::drawStartDate(std::string _timeFormat, double startTime, double stopTime)
@@ -190,7 +190,7 @@ namespace plot
          *
          * @param vect vector of data
          */
-        void applyScale(std::vector<double> &vect);
+        void applyScale(std::vector<double> &vectX, std::vector<double> &vectY);
         /**
          * @brief Get the Min Max de xValuesMap et yValuesMap
          *
@@ -116,7 +116,7 @@ std::vector&lt;E&gt; DiscreteFourierTransform&lt;T, E&gt;::computeDSP(std::vector&lt;std::compl
 {
     const int N = x.size();
     std::vector<E> out;
-    for (int k = 0; k < N / 2; k++)
+    for (int k = 1; k < N / 2; k++)
     {
         const E magnitude = (E)pow(abs(x[k]), 2);
         const E dsp = (E)(1.0 / N) * magnitude;
@@ -131,7 +131,7 @@ std::vector&lt;E&gt; DiscreteFourierTransform&lt;T, E&gt;::getFreq(std::vector&lt;std::complex&lt;
 {
     const int N = x.size();
     std::vector<E> out;
-    for (int k = 0; k < N / 2; k++)
+    for (int k = 1; k < N / 2; k++)
     {
         const E freq = (E)k * frequency_ / N;
         out.push_back(freq);
@@ -145,11 +145,9 @@ std::vector&lt;E&gt; DiscreteFourierTransform&lt;T, E&gt;::getPeriods(std::vector&lt;std::compl
 {
     const int N = x.size();
     std::vector<E> out;
-    for (int k = 0; k < N / 2; k++)
+    for (int k = 1; k < N / 2; k++)
     {
-        E period = (E)INT_MAX;
-        if (k != 0)
-            period = N / ((E)k * frequency_);
+        const E period = N / ((E)k * frequency_);
         out.push_back(period);
     }