HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1471:d48510a1cc4a

More fixes on spectrograms...

jeandet -

r1471:d48510a1cc4a

parent child

Context file:

r1471:d48510a1cc4a

core +1 -1

	@@ -1,1 +1,1
	1	Subproject commit 1e3f92d40b0ec24443e067aaa9e7bca385ec27b2		1	Subproject commit 70d6748a06620f865b683c86c89cc27e1cb0d4b9

gui/src/Visualization/VisualizationGraphHelper.cpp +6 -18

                 const ColomapProperties& colormap_properties)
             {
                 std::vector<std::pair<int, int>> access_pattern;
-                for (int index = 0, cel_index = 0; index < colormap_properties.v_size_px; index++)
+                for (int index = 0, cel_index = axis.size() - 1; index < colormap_properties.v_size_px; index++)
                 {
                     double current_y = pow(10., (axisProperties.max_resolution * index) + axisProperties.min);
                     if (current_y > axis[cel_index])
-                        cel_index++;
+                        cel_index--;
-                    access_pattern.push_back({ index, axis.size() - 1 - cel_index });
+                    access_pattern.push_back({ index, cel_index });
                 }
                 return access_pattern;
             }
                                 QCPRange { xAxisProperties.min, xAxisProperties.max }, { minValue, maxValue });
                             auto y_access_pattern
-                                = build_access_pattern(yAxis, yAxisProperties, colormap_properties);
+                                = build_access_pattern(serie->axis(1), yAxisProperties, colormap_properties);
                             auto line = serie->begin();
                             auto next_line = line + 1;
                                 = std::fmin(2. * serie->max_sampling, xAxisProperties.max_resolution * 100.);
                             std::vector<double> line_values(serie->size(1));
                             double avg_coef = 0.;
-                            bool has_nan = false;
                             while (x_index < colormap_properties.h_size_px)
                             {
                                 if (next_line != std::end(*serie) and current_time >= next_line->t())
                                     std::fill(std::begin(line_values), std::end(line_values), 0.);
                                     x_index++;
                                     avg_coef = 0.;
-                                    has_nan = false;
                                 }
                                 if (line->t() + x_min_resolution > current_time)
                                 {
-                                    if (has_nan)
-                                        std::transform(std::begin(*line), std::end(*line),
-                                            std::begin(line_values),
-                                            [](const auto& input) { return input.v(); });
-                                        has_nan = false;
-                                    else
                                     {
                                         std::transform(std::begin(*line), std::end(*line),
                                             std::cbegin(line_values), std::begin(line_values),
                                     {
                                         if (avg_coef > 0.)
                                         {
-                                            has_nan = true;
+                                            std::fill(std::begin(line_values), std::end(line_values), 0);
-                                            std::fill(
-                                                std::begin(line_values), std::end(line_values), std::nan(""));
                                         }
                                     }
                                 }
-                                current_time += xAxisProperties.max_resolution;
+                                current_time += xAxisProperties.max_resolution * 0.9;
                             }
                         }
                         colormap->rescaleDataRange(true);

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages