tempo-plotter Changeset - 5d1e33f3fcdc · protofusion repositories

Changeset - 5d1e33f3fcdc

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Hasan Yavuz ÖZDERYA - 8 years ago 2017-08-20 14:09:32
hy@ozderya.net

don't commot all 0 data samples if parsing of all channels have failed

1 file changed with 5 insertions and 2 deletions:

src/asciireader.cpp

0 comments (0 inline, 0 general)

src/asciireader.cpp

➞

Show inline comments

@@ @@ -120,64 +120,67 @@ void AsciiReader::onDataReady() @@
         // empty lines in the input when the port is just opened.
         if (line.isEmpty())
+        {
             continue;
+        }
         auto separatedValues = line.split(delimiter, QString::SkipEmptyParts);
         unsigned numReadChannels; // effective number of channels to read
         unsigned numComingChannels = separatedValues.length();
         if (autoNumOfChannels)
+        {
             // did number of channels changed?
             if (numComingChannels != _numOfChannels)
+            {
                 _numOfChannels = numComingChannels;
                 emit numOfChannelsChanged(numComingChannels);
+            }
             numReadChannels = numComingChannels;
+        }
         else if (numComingChannels >= _numOfChannels)
+        {
             numReadChannels = _numOfChannels;
+        }
         else // there is missing channel data
+        {
             numReadChannels = separatedValues.length();
             qWarning() << "Incoming data is missing data for some channels!";
             qWarning() << "Read line: " << line;
+        }
         // parse read line
         unsigned numDataBroken = 0;
         double* channelSamples = new double[_numOfChannels]();
         for (unsigned ci = 0; ci < numReadChannels; ci++)
+        {
             bool ok;
             channelSamples[ci] = separatedValues[ci].toDouble(&ok);
             if (!ok)
+            {
                 qWarning() << "Data parsing error for channel: " << ci;
                 qWarning() << "Read line: " << line;
                 channelSamples[ci] = 0;
                 numDataBroken++;
+            }
+        }
         // commit data
         addData(channelSamples, _numOfChannels);
         if (numReadChannels > numDataBroken)
+        {
             // commit data
             addData(channelSamples, _numOfChannels);
+        }
         delete[] channelSamples;
+    }
+}
 void AsciiReader::saveSettings(QSettings* settings)
+{
     _settingsWidget.saveSettings(settings);
+}
 void AsciiReader::loadSettings(QSettings* settings)
+{
     _settingsWidget.loadSettings(settings);
+}

0 comments (0 inline, 0 general)