tempo-plotter Changeset - 87442438e0fd · protofusion repositories

Changeset - 87442438e0fd

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Hasan Yavuz ÖZDERYA - 7 years ago 2019-01-22 10:10:52
hy@ozderya.net

symbol setting may not exist in loaded settings file

such as at first run, don't display error in this case

1 file changed with 1 insertions and 1 deletions:

src/plotmenu.cpp

0 comments (0 inline, 0 general)

src/plotmenu.cpp

➞

Show inline comments

@@ @@ -119,103 +119,103 @@ PlotMenu::PlotMenu(PlotViewSettings s, Q @@
         case Plot::ShowSymbolsAuto:
              setSymbolsAutoAct.setChecked(true);
             break;
         case Plot::ShowSymbolsShow:
             setSymbolsShowAct.setChecked(true);
             break;
         case Plot::ShowSymbolsHide:
             setSymbolsHideAct.setChecked(true);
             break;
+    }
+}
 PlotViewSettings PlotMenu::viewSettings() const
+{
     return PlotViewSettings(
+        {
             showGridAction.isChecked(),
             showMinorGridAction.isChecked(),
             darkBackgroundAction.isChecked(),
             showLegendAction.isChecked(),
             showMultiAction.isChecked(),
             showSymbols()
         });
+}
 Plot::ShowSymbols PlotMenu::showSymbols() const
+{
     if (setSymbolsAutoAct.isChecked())
+    {
         return Plot::ShowSymbolsAuto;
+    }
     else if (setSymbolsShowAct.isChecked())
+    {
         return Plot::ShowSymbolsShow;
+    }
     else // setSymbolsHideAct.isChecked()
+    {
         return Plot::ShowSymbolsHide;
+    }
+}
 void PlotMenu::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());
     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 PlotMenu::loadSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_Plot);
     darkBackgroundAction.setChecked(
         settings->value(SG_Plot_DarkBackground, darkBackgroundAction.isChecked()).toBool());
     showGridAction.setChecked(
         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")
+    {
         setSymbolsAutoAct.setChecked(true);
+    }
     else if (showSymbolsStr == "show")
+    {
         setSymbolsShowAct.setChecked(true);
+    }
     else if (showSymbolsStr == "hide")
+    {
         setSymbolsHideAct.setChecked(true);
+    }
     else
+    else if (!showSymbolsStr.isEmpty())
+    {
         qCritical() << "Invalid symbol setting:" << showSymbolsStr;
+    }
     settings->endGroup();
+}

0 comments (0 inline, 0 general)