tempo-plotter Changeset - 326761aef909 · protofusion repositories

Changeset - 326761aef909

Parent rev.

Child rev.

[Not reviewed]

stream

0 2 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-06-23 10:53:35
hy@ozderya.net

fix when sp previously is closed during demo custom reader is selected always

2 files changed with 13 insertions and 9 deletions:

src/dataformatpanel.cpp

src/dataformatpanel.h

0 comments (0 inline, 0 general)

src/dataformatpanel.cpp

➞

Show inline comments

@@ @@ -38,7 +38,6 @@ DataFormatPanel::DataFormatPanel(QSerial @@
     serialPort = port;
     paused = false;
     demoEnabled = false;
     readerBeforeDemo = nullptr;
     // initalize default reader
@@ @@ -86,9 +85,9 @@ void DataFormatPanel::pause(bool enabled @@
     demoReader.pause(enabled);
+}
-void DataFormatPanel::enableDemo(bool enabled)
+void DataFormatPanel::enableDemo(bool demoEnabled)
+{
-    if (enabled)
+    if (demoEnabled)
+    {
         readerBeforeDemo = currentReader;
         demoReader.setNumChannels(readerBeforeDemo->numChannels());
@@ @@ -100,14 +99,17 @@ void DataFormatPanel::enableDemo(bool en @@
         selectReader(readerBeforeDemo);
+    }
     demoEnabled = enabled;
     // disable/enable reader selection buttons during/after demo
     ui->rbAscii->setDisabled(demoEnabled);
     ui->rbBinary->setDisabled(demoEnabled);
     ui->rbFramed->setDisabled(demoEnabled);
+}
 bool DataFormatPanel::isDemoEnabled() const
+{
     return currentReader == &demoReader;
+}
 void DataFormatPanel::selectReader(AbstractReader* reader)
+{
     currentReader->enable(false);
@@ @@ -132,13 +134,14 @@ void DataFormatPanel::saveSettings(QSett @@
+{
     settings->beginGroup(SettingGroup_DataFormat);
     // save selected format
+    // save selected data format (current reader)
     QString format;
     if (currentReader == &bsReader)
     AbstractReader* selectedReader = isDemoEnabled() ? readerBeforeDemo : currentReader;
     if (selectedReader == &bsReader)
+    {
         format = "binary";
+    }
-    else if (currentReader == &asciiReader)
+    else if (selectedReader == &asciiReader)
+    {
         format = "ascii";
+    }

src/dataformatpanel.h

➞

Show inline comments

@@ @@ -78,9 +78,10 @@ private: @@
     bool paused;
     bool demoEnabled;
     DemoReader demoReader;
     AbstractReader* readerBeforeDemo;
     bool isDemoEnabled() const;
 };
 #endif // DATAFORMATPANEL_H

0 comments (0 inline, 0 general)