tempo-plotter Changeset - 538d40c57b2b · protofusion repositories

Changeset - 538d40c57b2b

Parent rev.

Child rev.

[Not reviewed]

recording

0 6 0

Hasan Yavuz ÖZDERYA - 9 years ago 2017-02-14 05:58:51
hy@ozderya.net

moved buffer access to abstract reader class

6 files changed with 17 insertions and 18 deletions:

src/abstractreader.cpp

src/abstractreader.h

src/asciireader.cpp

src/binarystreamreader.cpp

src/demoreader.cpp

src/framedreader.cpp

0 comments (0 inline, 0 general)

src/abstractreader.cpp

➞

Show inline comments

 /*
-  Copyright © 2016 Hasan Yavuz Özderya
+  Copyright © 2017 Hasan Yavuz Özderya
   This file is part of serialplot.
@@ @@ -44,3 +44,10 @@ void AbstractReader::spsTimerTimeout() @@
+    }
     sampleCount = 0;
+}
 void AbstractReader::addData(double* samples, unsigned length)
+{
     _channelMan->addData(samples, length);
     sampleCount += length;
     emit dataAdded();
+}

src/abstractreader.h

➞

Show inline comments

 /*
-  Copyright © 2016 Hasan Yavuz Özderya
+  Copyright © 2017 Hasan Yavuz Özderya
   This file is part of serialplot.
@@ @@ -72,13 +72,14 @@ public slots: @@
 protected:
     QIODevice* _device;
     ChannelManager* _channelMan;
     /// Implementing class should simply increase this count as samples are read
     unsigned sampleCount;
     /// Should be called with read data
     void addData(double* samples, unsigned length);
 private:
     const int SPS_UPDATE_TIMEOUT = 1;  // second
     ChannelManager* _channelMan;
     unsigned sampleCount;
     unsigned samplesPerSecond;
     QTimer spsTimer;

src/asciireader.cpp

➞

Show inline comments

@@ @@ -29,7 +29,6 @@ AsciiReader::AsciiReader(QIODevice* devi @@
+{
     paused = false;
     discardFirstLine = true;
     sampleCount = 0;
     _numOfChannels = _settingsWidget.numOfChannels();
     autoNumOfChannels = (_numOfChannels == NUMOFCHANNELS_AUTO);
@@ @@ -155,9 +154,7 @@ void AsciiReader::onDataReady() @@
+        }
         // commit data
         _channelMan->addData(channelSamples, _numOfChannels);
         sampleCount += numReadChannels;
         emit dataAdded();
         addData(channelSamples, _numOfChannels);
         delete[] channelSamples;
+    }

src/binarystreamreader.cpp

➞

Show inline comments

@@ @@ -29,7 +29,6 @@ BinaryStreamReader::BinaryStreamReader(Q @@
     paused = false;
     skipByteRequested = false;
     skipSampleRequested = false;
     sampleCount = 0;
     _numOfChannels = _settingsWidget.numOfChannels();
     connect(&_settingsWidget, &BinaryStreamReaderSettings::numOfChannelsChanged,
@@ @@ -171,9 +170,7 @@ void BinaryStreamReader::onDataReady() @@
+        }
+    }
     _channelMan->addData(channelSamples, numOfPackagesToRead*_numOfChannels);
     sampleCount += numOfPackagesToRead*_numOfChannels;
     emit dataAdded();
     addData(channelSamples, numOfPackagesToRead*_numOfChannels);
     delete[] channelSamples;
+}

src/demoreader.cpp

➞

Show inline comments

@@ @@ -81,10 +81,8 @@ void DemoReader::demoTimerTimeout() @@
+        {
             // we are calculating the fourier components of square wave
             samples[ci] = 4*sin(2*M_PI*double((ci+1)*count)/period)/((2*(ci+1))*M_PI);
             sampleCount++;
+        }
-        _channelMan->addData(samples, _numOfChannels);
         addData(samples, _numOfChannels);
         delete[] samples;
         emit dataAdded();
+    }
+}

src/framedreader.cpp

➞

Show inline comments

@@ @@ -310,8 +310,7 @@ void FramedReader::readFrameDataAndCheck @@
     if (!checksumEnabled || checksumPassed)
+    {
         // commit data
         _channelMan->addData(channelSamples, numOfPackagesToRead * _numOfChannels);
         emit dataAdded();
         addData(channelSamples, numOfPackagesToRead*_numOfChannels);
+    }
     else
+    {

0 comments (0 inline, 0 general)