GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1050:761051f0c06c

Uses SciQlop color scale in graphs

Alexandre Leroux -

r1050:761051f0c06c

parent child

Context file:

r1050:761051f0c06c

Collapse all files

gui/include/Visualization/AxisRenderingUtils.h +2 -2

              class IDataSeries;
              class QCPAxis;
-             class QCPColorScale;
              class QCustomPlot;
+             class SqpColorScale;
              /// Formats a data value according to the axis on which it is present
              QString formatValue(double value, const QCPAxis &axis);
                  /// parameters
                  /// @param plot the plot for which to set axe properties
                  /// @param colorScale the color scale for which to set properties
-                 virtual void setProperties(QCustomPlot &plot, QCPColorScale &colorScale) = 0;
+                 virtual void setProperties(QCustomPlot &plot, SqpColorScale &colorScale) = 0;
              };
              struct IAxisHelperFactory {

gui/src/Visualization/AxisRenderingUtils.cpp +10 -11

              #include <Data/SpectrogramSeries.h>
              #include <Data/VectorSeries.h>
+             #include <Visualization/SqpColorScale.h>
              #include <Visualization/qcustomplot.h>
              Q_LOGGING_CATEGORY(LOG_AxisRenderingUtils, "AxisRenderingUtils")
               */
              template <typename T, typename Enabled = void>
              struct AxisSetter {
-                 static void setProperties(T &, QCustomPlot &, QCPColorScale &)
+                 static void setProperties(T &, QCustomPlot &, SqpColorScale &)
                  {
                      // Default implementation does nothing
                      qCCritical(LOG_AxisRenderingUtils()) << "Can't set axis properties: unmanaged type of data";
              template <typename T>
              struct AxisSetter<T, typename std::enable_if_t<std::is_base_of<ScalarSeries, T>::value
                                                             or std::is_base_of<VectorSeries, T>::value> > {
-                 static void setProperties(T &dataSeries, QCustomPlot &plot, QCPColorScale &)
+                 static void setProperties(T &dataSeries, QCustomPlot &plot, SqpColorScale &)
                  {
                      dataSeries.lockRead();
                      auto xAxisUnit = dataSeries.xAxisUnit();
               */
              template <typename T>
              struct AxisSetter<T, typename std::enable_if_t<std::is_base_of<SpectrogramSeries, T>::value> > {
-                 static void setProperties(T &dataSeries, QCustomPlot &plot, QCPColorScale &colorScale)
+                 static void setProperties(T &dataSeries, QCustomPlot &plot, SqpColorScale &colorScale)
                  {
                      dataSeries.lockRead();
                      auto xAxisUnit = dataSeries.xAxisUnit();
                      // Displays color scale in plot
                      plot.plotLayout()->insertRow(0);
-                     plot.plotLayout()->addElement(0, 0, &colorScale);
-                     colorScale.setType(QCPAxis::atTop);
-                     colorScale.setMinimumMargins(QMargins{0, 0, 0, 0});
+                     plot.plotLayout()->addElement(0, 0, colorScale.m_Scale);
+                     colorScale.m_Scale->setType(QCPAxis::atTop);
+                     colorScale.m_Scale->setMinimumMargins(QMargins{0, 0, 0, 0});
                      // Aligns color scale with axes
                      auto marginGroups = plot.axisRect()->marginGroups();
                      for (auto it = marginGroups.begin(), end = marginGroups.end(); it != end; ++it) {
-                         colorScale.setMarginGroup(it.key(), it.value());
+                         colorScale.m_Scale->setMarginGroup(it.key(), it.value());
                      }
                      // Set color scale properties
-                     setAxisProperties(*colorScale.axis(), valuesUnit, QCPAxis::stLogarithmic);
-                     /// @todo ALX: temp data range, remove it when widget to set data range is implemented
-                     colorScale.setDataRange(QCPRange{8.32e2, 1.77e7});
+                     setAxisProperties(*colorScale.m_Scale->axis(), valuesUnit, QCPAxis::stLogarithmic);
                  }
              };
              struct AxisHelper : public IAxisHelper {
                  explicit AxisHelper(T &dataSeries) : m_DataSeries{dataSeries} {}
-                 void setProperties(QCustomPlot &plot, QCPColorScale &colorScale) override
+                 void setProperties(QCustomPlot &plot, SqpColorScale &colorScale) override
                  {
                      AxisSetter<T>::setProperties(m_DataSeries, plot, colorScale);
                  }

gui/src/Visualization/PlottablesRenderingUtils.cpp 0 -5

              namespace {
-             /// Default gradient used for colormap
-             const auto DEFAULT_COLORMAP_GRADIENT = QCPColorGradient::gpJet;
              /**
               * Delegate used to set plottables properties
               */
                              }
                          }
-                         // Sets gradient used for color scale
-                         colormap->setGradient(DEFAULT_COLORMAP_GRADIENT);
                          colormap->rescaleDataRange();
                      }
                      else {

gui/src/Visualization/VisualizationGraphRenderingDelegate.cpp +4 -3

              #include "Visualization/AxisRenderingUtils.h"
              #include "Visualization/ColorScaleEditor.h"
              #include "Visualization/PlottablesRenderingUtils.h"
+             #include "Visualization/SqpColorScale.h"
              #include "Visualization/VisualizationGraphWidget.h"
              #include "Visualization/qcustomplot.h"
                            m_XAxisPixmap{new QCPItemPixmap{&m_Plot}},
                            m_ShowXAxis{true},
                            m_XAxisLabel{},
-                           m_ColorScale{new QCPColorScale{&m_Plot}}
+                           m_ColorScale{SqpColorScale{m_Plot}}
                  {
                      initPointTracerStyle(*m_PointTracer);
                  QCPItemPixmap *m_XAxisPixmap;
                  bool m_ShowXAxis; /// X-axis properties are shown or hidden
                  QString m_XAxisLabel;
-                 QCPColorScale *m_ColorScale; /// Color scale used for some types of graphs (as spectrograms)
+                 SqpColorScale m_ColorScale; /// Color scale used for some types of graphs (as spectrograms)
              };
              VisualizationGraphRenderingDelegate::VisualizationGraphRenderingDelegate(
                  impl->m_XAxisLabel = dataSeries->xAxisUnit().m_Name;
                  auto axisHelper = IAxisHelperFactory::create(dataSeries);
-                 axisHelper->setProperties(impl->m_Plot, *impl->m_ColorScale);
+                 axisHelper->setProperties(impl->m_Plot, impl->m_ColorScale);
                  // Updates x-axis state
                  impl->updateXAxisState();

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