tempo-plotter Changeset - 1c69ffd0aa9d · protofusion repositories

Changeset - 1c69ffd0aa9d

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Hasan Yavuz ÖZDERYA - 9 years ago 2017-04-30 12:04:27
hy@ozderya.net

refactor symbol setting saving

4 files changed with 61 insertions and 58 deletions:

src/plot.cpp

src/plot.h

src/plotmanager.cpp

src/plotmanager.h

0 comments (0 inline, 0 general)

src/plot.cpp

➞

Show inline comments

@@ @@ -18,49 +18,49 @@ @@
 */
 #include <QRectF>
 #include <QKeySequence>
 #include <QColor>
 #include <qwt_symbol.h>
 #include <qwt_plot_curve.h>
 #include <math.h>
 #include <algorithm>
 #include "plot.h"
 #include "utils.h"
 static const int SYMBOL_SHOW_AT_WIDTH = 5;
 static const int SYMBOL_SIZE_MAX = 7;
 Plot::Plot(QWidget* parent) :
     QwtPlot(parent),
     zoomer(this->canvas(), false),
     sZoomer(this, &zoomer)
+{
     isAutoScaled = true;
     symbolSize = 0;
     numOfSamples = 1;
-    showSymbols = Plot::Auto;
+    showSymbols = Plot::ShowSymbolsAuto;
     QObject::connect(&zoomer, &Zoomer::unzoomed, this, &Plot::unzoomed);
     zoomer.setZoomBase();
     grid.attach(this);
     legend.attach(this);
     showGrid(false);
     darkBackground(false);
     snapshotOverlay = NULL;
     connect(&zoomer, &QwtPlotZoomer::zoomed,
             [this](const QRectF &rect)
+            {
                 onXScaleChanged();
             });
     connect(this, &QwtPlot::itemAttached,
             [this](QwtPlotItem *plotItem, bool on)
+            {
                 if (symbolSize) updateSymbols();
             });
@@ @@ -231,68 +231,68 @@ void Plot::flashSnapshotOverlay(bool lig @@
     QColor color;
     if(light)
+    {
         color = QColor(Qt::white);
+    }
     else
+    {
         color = QColor(Qt::black);
+    }
     snapshotOverlay = new PlotSnapshotOverlay(this->canvas(), color);
     connect(snapshotOverlay, &PlotSnapshotOverlay::done,
             [this]()
+            {
                 delete snapshotOverlay;
                 snapshotOverlay = NULL;
             });
+}
 void Plot::setSymbols(ShowSymbols shown)
+{
     showSymbols = shown;
-    if (showSymbols == Plot::Auto)
+    if (showSymbols == Plot::ShowSymbolsAuto)
+    {
         calcSymbolSize();
+    }
-    else if (showSymbols == Plot::Show)
+    else if (showSymbols == Plot::ShowSymbolsShow)
+    {
         symbolSize = SYMBOL_SIZE_MAX;
+    }
     else
+    {
         symbolSize = 0;
+    }
     updateSymbols();
     replot();
+}
 void Plot::onXScaleChanged()
+{
-    if (showSymbols == Plot::Auto)
+    if (showSymbols == Plot::ShowSymbolsAuto)
+    {
         calcSymbolSize();
         updateSymbols();
+    }
+}
 void Plot::calcSymbolSize()
+{
     auto sw = axisWidget(QwtPlot::xBottom);
     auto paintDist = sw->scaleDraw()->scaleMap().pDist();
     auto scaleDist = sw->scaleDraw()->scaleMap().sDist();
     auto fullScaleDist = zoomer.zoomBase().width();
     auto zoomRate = fullScaleDist / scaleDist;
     float samplesInView = numOfSamples / zoomRate;
     int symDisPx = round(paintDist / samplesInView);
     if (symDisPx < SYMBOL_SHOW_AT_WIDTH)
+    {
         symbolSize = 0;
+    }
     else
+    {
         symbolSize = std::min(SYMBOL_SIZE_MAX, symDisPx-SYMBOL_SHOW_AT_WIDTH+1);
+    }

src/plot.h

➞

Show inline comments

@@ @@ -19,56 +19,54 @@ @@
 #ifndef PLOT_H
 #define PLOT_H
 #include <QColor>
 #include <QList>
 #include <QAction>
 #include <qwt_plot.h>
 #include <qwt_plot_grid.h>
 #include <qwt_plot_shapeitem.h>
 #include <qwt_plot_legenditem.h>
 #include <qwt_plot_textlabel.h>
 #include "zoomer.h"
 #include "scalezoomer.h"
 #include "plotsnapshotoverlay.h"
 class Plot : public QwtPlot
+{
     Q_OBJECT
     friend class PlotManager;
 public:
     // Note: this naming is also used as setting values
     enum ShowSymbols
+    {
         Auto,
         Show,
         Hide
         ShowSymbolsAuto,
         ShowSymbolsShow,
         ShowSymbolsHide
     };
     Q_ENUM(ShowSymbols);
     Plot(QWidget* parent = 0);
     ~Plot();
     static QColor makeColor(unsigned int channelIndex);
 public slots:
     void showGrid(bool show = true);
     void showMinorGrid(bool show = true);
     void showLegend(bool show = true);
     void showDemoIndicator(bool show = true);
     void unzoom();
     void darkBackground(bool enabled = true);
     void setYAxis(bool autoScaled, double yMin = 0, double yMax = 1);
     void setXAxis(double xMin, double xMax);
     void setSymbols(ShowSymbols shown);
     /**
      * Displays an animation for snapshot.
+     *
      * @param light show a light colored (white) animation or the opposite
      */
     void flashSnapshotOverlay(bool light);

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -23,112 +23,112 @@ @@
 #include "qwt_symbol.h"
 #include "plot.h"
 #include "plotmanager.h"
 #include "utils.h"
 #include "setting_defines.h"
 PlotManager::PlotManager(QWidget* plotArea, ChannelInfoModel* infoModel, QObject *parent) :
     QObject(parent),
     _plotArea(plotArea),
     showGridAction("&Grid", this),
     showMinorGridAction("&Minor Grid", this),
     unzoomAction("&Unzoom", this),
     darkBackgroundAction("&Dark Background", this),
     showLegendAction("&Legend", this),
     showMultiAction("Multi &Plot", this),
     setSymbolsAction("Symbols", this)
+{
     _autoScaled = true;
     _yMin = 0;
     _yMax = 1;
     isDemoShown = false;
     _infoModel = infoModel;
     _numOfSamples = 1;
-    showSymbols = Plot::Auto;
+    showSymbols = Plot::ShowSymbolsAuto;
     // initalize layout and single widget
     isMulti = false;
     scrollArea = NULL;
     setupLayout(isMulti);
     addPlotWidget();
     // initialize menu actions
     showGridAction.setToolTip("Show Grid");
     showMinorGridAction.setToolTip("Show Minor Grid");
     unzoomAction.setToolTip("Unzoom the Plot");
     darkBackgroundAction.setToolTip("Enable Dark Plot Background");
     showLegendAction.setToolTip("Display the Legend on Plot");
     showMultiAction.setToolTip("Display All Channels Separately");
     setSymbolsAction.setToolTip("Show/Hide symbols");
     showGridAction.setShortcut(QKeySequence("G"));
     showMinorGridAction.setShortcut(QKeySequence("M"));
     showGridAction.setCheckable(true);
     showMinorGridAction.setCheckable(true);
     darkBackgroundAction.setCheckable(true);
     showLegendAction.setCheckable(true);
     showMultiAction.setCheckable(true);
     showGridAction.setChecked(false);
     showMinorGridAction.setChecked(false);
     darkBackgroundAction.setChecked(false);
     showLegendAction.setChecked(true);
     showMultiAction.setChecked(false);
     showMinorGridAction.setEnabled(false);
     // setup symbols menu
     setSymbolAutoAct = setSymbolsMenu.addAction("Show When Zoomed");
     setSymbolAutoAct->setCheckable(true);
     setSymbolAutoAct->setChecked(true);
     connect(setSymbolAutoAct, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
     setSymbolsAutoAct = setSymbolsMenu.addAction("Show When Zoomed");
     setSymbolsAutoAct->setCheckable(true);
     setSymbolsAutoAct->setChecked(true);
     connect(setSymbolsAutoAct, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             [this](bool checked)
+            {
-                if (checked) setSymbols(Plot::Auto);
+                if (checked) setSymbols(Plot::ShowSymbolsAuto);
             });
     setSymbolAlwaysAct = setSymbolsMenu.addAction("Always Show");
     setSymbolAlwaysAct->setCheckable(true);
     connect(setSymbolAlwaysAct, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
     setSymbolsShowAct = setSymbolsMenu.addAction("Always Show");
     setSymbolsShowAct->setCheckable(true);
     connect(setSymbolsShowAct, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             [this](bool checked)
+            {
-                if (checked) setSymbols(Plot::Show);
+                if (checked) setSymbols(Plot::ShowSymbolsShow);
             });
     setSymbolHideAct = setSymbolsMenu.addAction("Always Hide");
     setSymbolHideAct->setCheckable(true);
     connect(setSymbolHideAct, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
     setSymbolsHideAct = setSymbolsMenu.addAction("Always Hide");
     setSymbolsHideAct->setCheckable(true);
     connect(setSymbolsHideAct, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             [this](bool checked)
+            {
-                if (checked) setSymbols(Plot::Hide);
+                if (checked) setSymbols(Plot::ShowSymbolsHide);
             });
     setSymbolsAction.setMenu(&setSymbolsMenu);
     // add symbol actions to same group so that they appear as radio buttons
     auto group = new QActionGroup(this);
     group->addAction(setSymbolAutoAct);
     group->addAction(setSymbolAlwaysAct);
     group->addAction(setSymbolHideAct);
     group->addAction(setSymbolsAutoAct);
     group->addAction(setSymbolsShowAct);
     group->addAction(setSymbolsHideAct);
     connect(&showGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::showGrid);
     connect(&showGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             &showMinorGridAction, &QAction::setEnabled);
     connect(&showMinorGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::showMinorGrid);
     connect(&unzoomAction, &QAction::triggered, this, &PlotManager::unzoom);
     connect(&darkBackgroundAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::darkBackground);
     connect(&showLegendAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::showLegend);
     connect(&showLegendAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::showLegend);
     connect(&showMultiAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             this, &PlotManager::setMulti);
     // connect to channel info model
     if (_infoModel != NULL)     // TODO: remove when snapshots have infomodel
+    {
         connect(_infoModel, &QAbstractItemModel::dataChanged,
                 this, &PlotManager::onChannelInfoChanged);
         connect(_infoModel, &QAbstractItemModel::modelReset,
@@ @@ -505,81 +505,86 @@ void PlotManager::flashSnapshotOverlay() @@
     for (auto plot : plotWidgets)
+    {
         plot->flashSnapshotOverlay(darkBackgroundAction.isChecked());
+    }
+}
 void PlotManager::onNumOfSamplesChanged(unsigned value)
+{
     _numOfSamples = value;
     for (auto plot : plotWidgets)
+    {
         plot->setNumOfSamples(value);
         if (_xAxisAsIndex) plot->setXAxis(0, value);
+    }
+}
 void PlotManager::saveSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_Plot);
     settings->setValue(SG_Plot_DarkBackground, darkBackgroundAction.isChecked());
     settings->setValue(SG_Plot_Grid, showGridAction.isChecked());
     settings->setValue(SG_Plot_MinorGrid, showMinorGridAction.isChecked());
     settings->setValue(SG_Plot_Legend, showLegendAction.isChecked());
     settings->setValue(SG_Plot_MultiPlot, showMultiAction.isChecked());
     settings->setValue(SG_Plot_Symbols,
                        QMetaEnum::fromType<Plot::ShowSymbols>().valueToKey(showSymbols));
     QString showSymbolsStr;
     if (showSymbols == Plot::ShowSymbolsAuto)
+    {
         showSymbolsStr = "auto";
+    }
     else if (showSymbols == Plot::ShowSymbolsShow)
+    {
         showSymbolsStr = "show";
+    }
     else
+    {
         showSymbolsStr = "hide";
+    }
     settings->setValue(SG_Plot_Symbols, showSymbolsStr);
     settings->endGroup();
+}
 void PlotManager::loadSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_Plot);
     darkBackgroundAction.setChecked(
         settings->value(SG_Plot_DarkBackground, darkBackgroundAction.isChecked()).toBool());
     darkBackground(darkBackgroundAction.isChecked());
     showGridAction.setChecked(
         settings->value(SG_Plot_Grid, showGridAction.isChecked()).toBool());
     showGrid(showGridAction.isChecked());
     showMinorGridAction.setChecked(
         settings->value(SG_Plot_MinorGrid, showMinorGridAction.isChecked()).toBool());
     showMinorGridAction.setEnabled(showGridAction.isChecked());
     showMinorGrid(showMinorGridAction.isChecked());
     showLegendAction.setChecked(
         settings->value(SG_Plot_Legend, showLegendAction.isChecked()).toBool());
     showLegend(showLegendAction.isChecked());
     showMultiAction.setChecked(
         settings->value(SG_Plot_MultiPlot, showMultiAction.isChecked()).toBool());
     setMulti(showMultiAction.isChecked());
     // symbol setting
     QString showSymbolsStr = settings->value(SG_Plot_Symbols, QString()).toString();
     if (showSymbolsStr == "auto")
+    {
         setSymbols(Plot::ShowSymbolsAuto);
         setSymbolsAutoAct->setChecked(true);
+    }
     else if (showSymbolsStr == "show")
+    {
         bool ok = false;
         QString curStr = QMetaEnum::fromType<Plot::ShowSymbols>().valueToKey(showSymbols);
         QString settStr = settings->value(SG_Plot_Symbols, curStr).toString();
         Plot::ShowSymbols settValue =
             (Plot::ShowSymbols) QMetaEnum::fromType<Plot::ShowSymbols>().\
             keyToValue(settStr.toLatin1().constData(), &ok);
         if (ok)
+        {
             if (settValue == Plot::Auto)
+            {
                 setSymbolAutoAct->setChecked(true);
+            }
             else if (settValue == Plot::Show)
+            {
                 setSymbolAlwaysAct->setChecked(true);
+            }
             else
+            {
                 setSymbolHideAct->setChecked(true);
+            }
             setSymbols(settValue);
+        }
         else
+        {
             qCritical() << "Invalid symbol setting:" << settStr;
+        }
         setSymbols(Plot::ShowSymbolsShow);
         setSymbolsShowAct->setChecked(true);
+    }
     else if (showSymbolsStr == "hide")
+    {
         setSymbols(Plot::ShowSymbolsHide);
         setSymbolsHideAct->setChecked(true);
+    }
     else
+    {
         qCritical() << "Invalid symbol setting:" << showSymbolsStr;
+    }
     settings->endGroup();
+}

src/plotmanager.h

➞

Show inline comments

@@ @@ -81,50 +81,50 @@ private: @@
     QVBoxLayout* layout; ///< layout of the `plotArea`
     QScrollArea* scrollArea;
     QList<QwtPlotCurve*> curves;
     QList<Plot*> plotWidgets;
     ChannelInfoModel* _infoModel;
     bool isDemoShown;
     bool _autoScaled;
     double _yMin;
     double _yMax;
     bool _xAxisAsIndex;
     double _xMin;
     double _xMax;
     unsigned _numOfSamples;
     Plot::ShowSymbols showSymbols;
     // menu actions
     QAction showGridAction;
     QAction showMinorGridAction;
     QAction unzoomAction;
     QAction darkBackgroundAction;
     QAction showLegendAction;
     QAction showMultiAction;
     QAction setSymbolsAction;
     QMenu setSymbolsMenu;
     QAction* setSymbolAutoAct;
     QAction* setSymbolAlwaysAct;
     QAction* setSymbolHideAct;
     QAction* setSymbolsAutoAct;
     QAction* setSymbolsShowAct;
     QAction* setSymbolsHideAct;
     void setupLayout(bool multiPlot);
     /// Inserts a new plot widget to the current layout.
     Plot* addPlotWidget();
     /// Returns the plot widget that given curve is attached to
     Plot* plotWidget(unsigned curveIndex);
     /// Common part of overloaded `addCurve` functions
     void _addCurve(QwtPlotCurve* curve);
     void setSymbols(Plot::ShowSymbols shown);
 private slots:
     void showGrid(bool show = true);
     void showMinorGrid(bool show = true);
     void showLegend(bool show = true);
     void unzoom();
     void darkBackground(bool enabled = true);
     void onChannelInfoChanged(const QModelIndex & topLeft,
                               const QModelIndex & bottomRight,
                               const QVector<int> & roles = QVector<int> ());
 };
 #endif // PLOTMANAGER_H

0 comments (0 inline, 0 general)