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

@@ @@ -35,13 +35,12 @@ DataFormatPanel::DataFormatPanel(QSerial @@
     demoReader(port, this)
+{
     ui->setupUi(this);
     serialPort = port;
     paused = false;
     demoEnabled = false;
     readerBeforeDemo = nullptr;
     // initalize default reader
     currentReader = &bsReader;
     bsReader.enable();
     ui->rbBinary->setChecked(true);
@@ @@ -83,34 +82,37 @@ void DataFormatPanel::pause(bool enabled @@
+{
     paused = enabled;
     currentReader->pause(enabled);
     demoReader.pause(enabled);
+}
-void DataFormatPanel::enableDemo(bool enabled)
+void DataFormatPanel::enableDemo(bool demoEnabled)
+{
-    if (enabled)
+    if (demoEnabled)
+    {
         readerBeforeDemo = currentReader;
         demoReader.setNumChannels(readerBeforeDemo->numChannels());
         selectReader(&demoReader);
+    }
     else
+    {
         Q_ASSERT(readerBeforeDemo != nullptr);
         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);
     reader->enable();
     // re-connect signals
@@ @@ -129,19 +131,20 @@ void DataFormatPanel::selectReader(Abstr @@
+}
 void DataFormatPanel::saveSettings(QSettings* settings)
+{
     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";
+    }
     else // framed reader
+    {
         format = "custom";

src/dataformatpanel.h

➞

Show inline comments

@@ @@ -75,12 +75,13 @@ private: @@
     AbstractReader* currentReader;
     /// Disable current reader and enable a another one
     void selectReader(AbstractReader* reader);
     bool paused;
     bool demoEnabled;
     DemoReader demoReader;
     AbstractReader* readerBeforeDemo;
     bool isDemoEnabled() const;
 };
 #endif // DATAFORMATPANEL_H

0 comments (0 inline, 0 general)