tempo-plotter Changeset - 1c69ffd0aa9d · protofusion repositories

Changeset - 1c69ffd0aa9d

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

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

refactor symbol setting saving

4 files changed with 57 insertions and 54 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

@@ @@ -36,13 +36,13 @@ Plot::Plot(QWidget* 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);
@@ @@ -249,17 +249,17 @@ void Plot::flashSnapshotOverlay(bool lig @@
+}
 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;
@@ @@ -268,13 +268,13 @@ void Plot::setSymbols(ShowSymbols shown) @@
     updateSymbols();
     replot();
+}
 void Plot::onXScaleChanged()
+{
-    if (showSymbols == Plot::Auto)
+    if (showSymbols == Plot::ShowSymbolsAuto)
+    {
         calcSymbolSize();
         updateSymbols();
+    }
+}

src/plot.h

➞

Show inline comments

@@ @@ -37,20 +37,18 @@ 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);

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -41,13 +41,13 @@ PlotManager::PlotManager(QWidget* plotAr @@
     _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();
@@ @@ -76,41 +76,41 @@ PlotManager::PlotManager(QWidget* plotAr @@
     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),
@@ @@ -523,14 +523,28 @@ void PlotManager::saveSettings(QSettings @@
     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);
@@ @@ -548,38 +562,29 @@ void PlotManager::loadSettings(QSettings @@
         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)
         setSymbols(Plot::ShowSymbolsShow);
         setSymbolsShowAct->setChecked(true);
+    }
     else if (showSymbolsStr == "hide")
+        {
             if (settValue == Plot::Auto)
+            {
                 setSymbolAutoAct->setChecked(true);
+            }
             else if (settValue == Plot::Show)
+            {
                 setSymbolAlwaysAct->setChecked(true);
         setSymbols(Plot::ShowSymbolsHide);
         setSymbolsHideAct->setChecked(true);
+            }
             else
+            {
                 setSymbolHideAct->setChecked(true);
+            }
             setSymbols(settValue);
+        }
         else
+        {
             qCritical() << "Invalid symbol setting:" << settStr;
+        }
         qCritical() << "Invalid symbol setting:" << showSymbolsStr;
+    }
     settings->endGroup();
+}

src/plotmanager.h

➞

Show inline comments

@@ @@ -99,15 +99,15 @@ private: @@
     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);

0 comments (0 inline, 0 general)