tempo-plotter Changeset - 86a3be168e93 · protofusion repositories

Changeset - 86a3be168e93

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-08-15 13:46:45
hy@ozderya.net

call replot after all channels data is ready

1 file changed with 3 insertions and 1 deletions:

mainwindow.cpp

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -265,24 +265,25 @@ void MainWindow::onDataReady() @@
             // channelSamples[ci].replace(i, (this->*readSample)());
             channelSamples[ci*numOfPackagesToRead+i] = (this->*readSample)();
+        }
         i++;
+    }
     for (unsigned int ci = 0; ci < numOfChannels; ci++)
+    {
         addChannelData(ci,
                        channelSamples + ci*numOfPackagesToRead,
                        numOfPackagesToRead);
+    }
     ui->plot->replot();
     delete channelSamples;
+}
 void MainWindow::onDataReadyASCII()
+{
     while(serialPort.canReadLine())
+    {
         QByteArray line = serialPort.readLine();
         // discard data if paused
         if (ui->actionPause->isChecked())
@@ @@ -309,24 +310,25 @@ void MainWindow::onDataReadyASCII() @@
+        {
             bool ok;
             double channelSample = separatedValues[ci].toDouble(&ok);
             if (ok)
+            {
                 addChannelData(ci, &channelSample, 1);
+            }
             else
+            {
                 qWarning() << "Data parsing error for channel: " << ci;
+            }
+        }
         ui->plot->replot();
+    }
+}
 void MainWindow::onPortError(QSerialPort::SerialPortError error)
+{
     switch(error)
+    {
         case QSerialPort::NoError :
             break;
         case QSerialPort::ResourceError :
             qWarning() << "Port error: resource unavaliable; most likely device removed.";
             if (serialPort.isOpen())
@@ @@ -378,25 +380,24 @@ required privileges or device is already @@
             break;
+    }
+}
 void MainWindow::skipByte()
+{
     skipByteRequested = true;
+}
 void MainWindow::addChannelData(unsigned int channel, double* data, unsigned size)
+{
     channelBuffers[channel]->addSamples(data, size);
     ui->plot->replot(); // TODO: replot after all channel data updated
     sampleCount += size;
+}
 void MainWindow::clearPlot()
+{
     for (unsigned int ci = 0; ci < numOfChannels; ci++)
+    {
         channelBuffers[ci]->clear();
+    }
     ui->plot->replot();
+}
@@ @@ -561,24 +562,25 @@ void MainWindow::demoTimerTimeout() @@
     const double period = 100;
     demoCount++;
     if (demoCount > 100) demoCount = 0;
     if (!ui->actionPause->isChecked())
+    {
         for (unsigned int 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);
+        }
         ui->plot->replot();
+    }
+}
 void MainWindow::enableDemo(bool enabled)
+{
     if (enabled)
+    {
         if (!serialPort.isOpen())
+        {
             demoTimer.start();
             ui->actionDemoMode->setChecked(true);
             demoIndicator.show();

0 comments (0 inline, 0 general)