tempo-plotter Changeset - 12603d48a708 · protofusion repositories

Changeset - 12603d48a708

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Hasan Yavuz ÖZDERYA - 7 years ago 2019-01-12 16:05:03
hy@ozderya.net

fix symbol show settings not loaded at startup

'toggled' is emitted for 'setChecked', 'triggered' is only emitted when user
actually clicks something

1 file changed with 6 insertions and 9 deletions:

src/plotmenu.cpp

0 comments (0 inline, 0 general)

src/plotmenu.cpp

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2019 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
@@ @@ -57,44 +57,44 @@ PlotMenu::PlotMenu(QWidget* parent) : @@
     showLegendAction.setChecked(true);
     showMultiAction.setChecked(false);
     // minor grid is only enabled when _major_ grid is enabled
     showMinorGridAction.setEnabled(false);
     connect(&showGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
             &showMinorGridAction, &QAction::setEnabled);
     // setup set symbols menu
     setSymbolsMenu.addAction(&setSymbolsAutoAct);
     setSymbolsAutoAct.setCheckable(true);
     setSymbolsAutoAct.setChecked(true);
-    connect(&setSymbolsAutoAct, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
+    connect(&setSymbolsAutoAct, SELECT<bool>::OVERLOAD_OF(&QAction::toggled),
             [this](bool checked)
+            {
                 if (checked) emit symbolShowChanged(Plot::ShowSymbolsAuto);
             });
     setSymbolsMenu.addAction(&setSymbolsShowAct);
     setSymbolsShowAct.setCheckable(true);
-    connect(&setSymbolsShowAct, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
+    connect(&setSymbolsShowAct, SELECT<bool>::OVERLOAD_OF(&QAction::toggled),
             [this](bool checked)
+            {
                 if (checked) symbolShowChanged(Plot::ShowSymbolsShow);
+                if (checked) emit symbolShowChanged(Plot::ShowSymbolsShow);
             });
     setSymbolsMenu.addAction(&setSymbolsHideAct);
     setSymbolsHideAct.setCheckable(true);
-    connect(&setSymbolsHideAct, SELECT<bool>::OVERLOAD_OF(&QAction::triggered),
+    connect(&setSymbolsHideAct, SELECT<bool>::OVERLOAD_OF(&QAction::toggled),
             [this](bool checked)
+            {
                 if (checked) symbolShowChanged(Plot::ShowSymbolsHide);
+                if (checked) emit symbolShowChanged(Plot::ShowSymbolsHide);
             });
     // add symbol actions to same group so that they appear as radio buttons
     auto group = new QActionGroup(this);
     group->addAction(&setSymbolsAutoAct);
     group->addAction(&setSymbolsShowAct);
     group->addAction(&setSymbolsHideAct);
     setSymbolsAction.setMenu(&setSymbolsMenu);
     // add all actions to create this menu
     addAction(&showGridAction);
@@ @@ -193,32 +193,29 @@ void PlotMenu::loadSettings(QSettings* s @@
         settings->value(SG_Plot_Grid, showGridAction.isChecked()).toBool());
     showMinorGridAction.setChecked(
         settings->value(SG_Plot_MinorGrid, showMinorGridAction.isChecked()).toBool());
     showMinorGridAction.setEnabled(showGridAction.isChecked());
     showLegendAction.setChecked(
         settings->value(SG_Plot_Legend, showLegendAction.isChecked()).toBool());
     showMultiAction.setChecked(
         settings->value(SG_Plot_MultiPlot, showMultiAction.isChecked()).toBool());
     QString showSymbolsStr = settings->value(SG_Plot_Symbols, QString()).toString();
     if (showSymbolsStr == "auto")
+    {
         // setSymbols(Plot::ShowSymbolsAuto);
         setSymbolsAutoAct.setChecked(true);
+    }
     else if (showSymbolsStr == "show")
+    {
         // setSymbols(Plot::ShowSymbolsShow);
         setSymbolsShowAct.setChecked(true);
+    }
     else if (showSymbolsStr == "hide")
+    {
         // setSymbols(Plot::ShowSymbolsHide);
         setSymbolsHideAct.setChecked(true);
+    }
     else
+    {
         qCritical() << "Invalid symbol setting:" << showSymbolsStr;
+    }
     settings->endGroup();
+}

0 comments (0 inline, 0 general)