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

@@ @@ -29,25 +29,24 @@ @@
 DataFormatPanel::DataFormatPanel(QSerialPort* port, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::DataFormatPanel),
     bsReader(port, this),
     asciiReader(port, this),
     framedReader(port, this),
     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);
     ui->horizontalLayout->addWidget(bsReader.settingsWidget(), 1);
     // initalize reader selection buttons
     connect(ui->rbBinary, &QRadioButton::toggled, [this](bool checked)
+            {
                 if (checked) selectReader(&bsReader);
@@ @@ -77,77 +76,81 @@ unsigned DataFormatPanel::numChannels() @@
 Source* DataFormatPanel::activeSource()
+{
     return currentReader;
+}
 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
     disconnect(currentReader, 0, this, 0);
     // switch the settings widget
     ui->horizontalLayout->removeWidget(currentReader->settingsWidget());
     currentReader->settingsWidget()->hide();
     ui->horizontalLayout->addWidget(reader->settingsWidget(), 1);
     reader->settingsWidget()->show();
     reader->pause(paused);
     currentReader = reader;
     emit sourceChanged(currentReader);
+}
 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";
+    }
     settings->setValue(SG_DataFormat_Format, format);
     settings->endGroup();
     // save reader settings

src/dataformatpanel.h

➞

Show inline comments

@@ @@ -69,18 +69,19 @@ private: @@
     QSerialPort* serialPort;
     BinaryStreamReader bsReader;
     AsciiReader asciiReader;
     FramedReader framedReader;
     /// Currently selected reader
     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)