tempo-plotter Changeset - 9c7f8589ff84 · protofusion repositories

Changeset - 9c7f8589ff84

Parent rev.

Child rev.

[Not reviewed]

new-reader

0 2 0

Hasan Yavuz ÖZDERYA - 10 years ago 2016-05-24 03:17:48
hy@ozderya.net

pause when switching readers

2 files changed with 5 insertions and 1 deletions:

src/dataformatpanel.cpp

src/dataformatpanel.h

0 comments (0 inline, 0 general)

src/dataformatpanel.cpp

➞

Show inline comments

@@ @@ -60,48 +60,49 @@ DataFormatPanel::DataFormatPanel(QSerial @@
             });
     connect(ui->rbAscii, &QRadioButton::toggled, [this](bool checked)
+            {
                 if (checked) selectReader(&asciiReader);
             });
     // re-purpose numofchannels settings from actual reader settings to demo reader
     connect(this, &DataFormatPanel::numOfChannelsChanged,
             &demoReader, &DemoReader::setNumOfChannels);
+}
 DataFormatPanel::~DataFormatPanel()
+{
     delete ui;
+}
 unsigned DataFormatPanel::numOfChannels()
+{
     return currentReader->numOfChannels();
+}
 void DataFormatPanel::pause(bool enabled)
+{
     paused = enabled;
     currentReader->pause(enabled);
     demoReader.pause(enabled);
+}
 void DataFormatPanel::enableDemo(bool enabled)
+{
     if (enabled)
+    {
         demoReader.enable();
         connect(&demoReader, &DemoReader::dataAdded,
                 this, &DataFormatPanel::dataAdded);
         connect(&demoReader, &DemoReader::samplesPerSecondChanged,
                 this, &DataFormatPanel::samplesPerSecondChanged);
+    }
     else
+    {
         demoReader.enable(false);
         disconnect(&demoReader, 0, this, 0);
+    }
+}
 void DataFormatPanel::addChannelData(unsigned int channel,
                                      double* data, unsigned size)
+{
@@ @@ -112,26 +113,29 @@ void DataFormatPanel::selectReader(Abstr @@
+{
     currentReader->enable(false);
     reader->enable();
     // re-connect signals
     disconnect(currentReader, 0, this, 0);
     connect(reader, SIGNAL(dataAdded()), this, SIGNAL(dataAdded()));
     connect(reader, SIGNAL(numOfChannelsChanged(unsigned)),
             this, SIGNAL(numOfChannelsChanged(unsigned)));
     connect(reader, SIGNAL(samplesPerSecondChanged(unsigned)),
             this, SIGNAL(samplesPerSecondChanged(unsigned)));
     // switch the settings widget
     ui->horizontalLayout->removeWidget(currentReader->settingsWidget());
     currentReader->settingsWidget()->hide();
     ui->horizontalLayout->addWidget(reader->settingsWidget(), 1);
     reader->settingsWidget()->show();
     // notify if number of channels is different
     if (currentReader->numOfChannels() != reader->numOfChannels())
+    {
         emit numOfChannelsChanged(reader->numOfChannels());
+    }
     // pause
     reader->pause(paused);
     currentReader = reader;
+}

src/dataformatpanel.h

➞

Show inline comments

@@ @@ -50,33 +50,33 @@ public: @@
     unsigned numOfChannels();
 public slots:
     void pause(bool);
     void enableDemo(bool); // demo shouldn't be enabled when port is open
 signals:
     void numOfChannelsChanged(unsigned);
     void samplesPerSecondChanged(unsigned);
     void dataAdded();
 private:
     Ui::DataFormatPanel *ui;
     QSerialPort* serialPort;
     ChannelManager* _channelMan;
     BinaryStreamReader bsReader;
     AsciiReader asciiReader;
     /// Currently selected reader
     AbstractReader* currentReader;
     /// Disable current reader and enable a another one
     void selectReader(AbstractReader* reader);
-    bool paused; // remove
     bool paused;
     DemoReader demoReader;
     // `data` contains i th channels data
     void addChannelData(unsigned int channel, double* data, unsigned size);
 };
 #endif // DATAFORMATPANEL_H

0 comments (0 inline, 0 general)