GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1060:1474b0522998

Updates sqp color scale thresholds (1)...

Alexandre Leroux -

r1060:1474b0522998

parent child

Context file:

r1060:1474b0522998

Collapse all files

gui/include/Visualization/SqpColorScale.h +2 0

             #ifndef SCIQLOP_SQPCOLORSCALE_H
             #define SCIQLOP_SQPCOLORSCALE_H
             #include <Visualization/qcustomplot.h>
             #include <QLoggingCategory>
             Q_DECLARE_LOGGING_CATEGORY(LOG_SqpColorScale)
             /**
              * @brief The SqpColorScale struct represents the color scale for some graphs (such as
              * spectrograms).
              *
              * Its implementation is based on the QCustomPlot color scale (@sa QCPColorScale) to which are added
              * other useful properties for viewing in SciQlop
              */
             struct SqpColorScale {
                 static std::pair<double, double> computeThresholds(const SqpColorScale &scale);
                 explicit SqpColorScale(QCustomPlot &plot);
+                void updateDataRange() noexcept;
                 /// QCustomPlot object representing the color scale.
                 /// @remarks The SqpColorScale instance has not the property on this pointer. The pointer must
                 /// remain valid throughout the existence of the SqpColorScale instance
                 QCPColorScale *m_Scale{nullptr};
                 bool m_AutomaticThreshold{false};
                 QCPColorGradient::GradientPreset m_GradientPreset{QCPColorGradient::gpJet};
             };
             #endif // SCIQLOP_SQPCOLORSCALE_H

gui/src/Visualization/SqpColorScale.cpp +20 -1

             #include "Visualization/SqpColorScale.h"
             #include <Data/DataSeriesUtils.h>
             #include <Visualization/QCPColorMapIterator.h>
             Q_LOGGING_CATEGORY(LOG_SqpColorScale, "SqpColorScale")
             namespace {
             const auto DEFAULT_GRADIENT_PRESET = QCPColorGradient::gpJet;
             const auto DEFAULT_RANGE = QCPRange{1.0e3, 1.7e7};
             } // namespace
             std::pair<double, double> SqpColorScale::computeThresholds(const SqpColorScale &scale)
             {
                 auto qcpScale = scale.m_Scale;
                 auto colorMaps = qcpScale->colorMaps();
                 if (colorMaps.size() != 1) {
                     return {std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN()};
                 }
                 // Computes thresholds
                 auto isLogarithmicScale = qcpScale->dataScaleType() == QCPAxis::stLogarithmic;
                 auto colorMapData = colorMaps.first()->data();
                 QCPColorMapIterator begin{colorMapData, true};
                 QCPColorMapIterator end{colorMapData, false};
                 return DataSeriesUtils::thresholds(begin, end, isLogarithmicScale);
             }
             SqpColorScale::SqpColorScale(QCustomPlot &plot)
                     : m_Scale{new QCPColorScale{&plot}},
-                      m_AutomaticThreshold{false},
+                      m_AutomaticThreshold{true},
                       m_GradientPreset{DEFAULT_GRADIENT_PRESET}
             {
                 m_Scale->setGradient(m_GradientPreset);
                 m_Scale->setDataRange(DEFAULT_RANGE);
             }
+            void SqpColorScale::updateDataRange() noexcept
+            {
+                // Updates data range only if mode is automatic
+                if (!m_AutomaticThreshold) {
+                    return;
+                }
+                double minThreshold, maxThreshold;
+                std::tie(minThreshold, maxThreshold) = computeThresholds(*this);
+                if (std::isnan(minThreshold) || std::isnan(maxThreshold)) {
+                    qCCritical(LOG_SqpColorScale())
+                        << "Can't update data range of color scale: thresholds computed are invalid";
+                    return;
+                }
+                // Updates thresholds
+                m_Scale->setDataRange({minThreshold, maxThreshold});
+            }

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