tempo-plotter Changeset - 87f05e438f7f · protofusion repositories

Changeset - 87f05e438f7f

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-11-07 14:56:52
hy@ozderya.net

when paused preserve 'package' synchronization

1 file changed with 9 insertions and 9 deletions:

dataformatpanel.cpp

0 comments (0 inline, 0 general)

dataformatpanel.cpp

➞

Show inline comments

@@ @@ -190,70 +190,70 @@ void DataFormatPanel::spsTimerTimeout() @@
     sampleCount = 0;
+}
 void DataFormatPanel::demoTimerTimeout()
+{
     const double period = 100;
     demoCount++;
     if (demoCount >= 100) demoCount = 0;
     if (!paused)
+    {
         for (unsigned ci = 0; ci < _numOfChannels; ci++)
+        {
             // we are calculating the fourier components of square wave
             double value = 4*sin(2*M_PI*double((ci+1)*demoCount)/period)/((2*(ci+1))*M_PI);
             addChannelData(ci, &value, 1);
+        }
         emit dataAdded();
+    }
+}
 void DataFormatPanel::onDataReady()
+{
     // TODO: discard data in the size of packageSize
     if (paused)
+    {
         serialPort->clear(QSerialPort::Input);
         return;
+    }
     // a package is a set of channel data like {CHAN0_SAMPLE, CHAN1_SAMPLE...}
     int packageSize = sampleSize * _numOfChannels;
     int bytesAvailable = serialPort->bytesAvailable();
     int numOfPackagesToRead =
         (bytesAvailable - (bytesAvailable % packageSize)) / packageSize;
     if (paused)
+    {
         // read and discard data
         serialPort->read(numOfPackagesToRead*packageSize);
         return;
+    }
     if (bytesAvailable > 0 && skipByteRequested)
+    {
         serialPort->read(1);
         skipByteRequested = false;
         bytesAvailable--;
+    }
     if (bytesAvailable < packageSize) return;
     int numOfPackagesToRead =
         (bytesAvailable - (bytesAvailable % packageSize)) / packageSize;
     double* channelSamples = new double[numOfPackagesToRead*_numOfChannels];
     for (int i = 0; i < numOfPackagesToRead; i++)
+    {
         for (unsigned int ci = 0; ci < _numOfChannels; ci++)
+        {
             // channelSamples[ci].replace(i, (this->*readSample)());
             channelSamples[ci*numOfPackagesToRead+i] = (this->*readSample)();
+        }
+    }
     for (unsigned int ci = 0; ci < _numOfChannels; ci++)
+    {
         addChannelData(ci,
                        channelSamples + ci*numOfPackagesToRead,
                        numOfPackagesToRead);
+    }
     emit dataAdded();
     delete channelSamples;
+}
 void DataFormatPanel::onDataReadyASCII()
+{

0 comments (0 inline, 0 general)