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

@@ @@ -253,92 +253,94 @@ void MainWindow::onDataReady() @@
     if (bytesAvailable < packageSize) return;
     int numOfPackagesToRead =
         (bytesAvailable - (bytesAvailable % packageSize)) / packageSize;
     double* channelSamples = new double[numOfPackagesToRead*numOfChannels];
     int i = 0;
     while(i < numOfPackagesToRead)
+    {
         for (unsigned int ci = 0; ci < numOfChannels; ci++)
+        {
             // 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())
+        {
             return;
+        }
         line = line.trimmed();
         auto separatedValues = line.split(',');
         int numReadChannels; // effective number of channels to read
         if (separatedValues.length() >= int(numOfChannels))
+        {
             numReadChannels = numOfChannels;
+        }
         else // there is missing channel data
+        {
             numReadChannels = separatedValues.length();
             qWarning() << "Incoming data is missing data for some channels!";
+        }
         // parse read line
         for (int ci = 0; ci < numReadChannels; ci++)
+        {
             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())
+            {
                 qWarning() << "Closing port on resource error: " << serialPort.portName();
                 portControl.togglePort();
+            }
             portControl.loadPortList();
             break;
         case QSerialPort::DeviceNotFoundError:
             qCritical() << "Device doesn't exists: " << serialPort.portName();
             break;
         case QSerialPort::PermissionError:
             qCritical() << "Permission denied. Either you don't have \
 required privileges or device is already opened by another process.";
@@ @@ -366,49 +368,48 @@ required privileges or device is already @@
             break;
         case QSerialPort::UnsupportedOperationError:
             qCritical() << "Operation is not supported.";
             break;
         case QSerialPort::TimeoutError:
             qCritical() << "A timeout error occurred.";
             break;
         case QSerialPort::UnknownError:
             qCritical() << "Unknown error!";
             break;
         default:
             qCritical() << "Unhandled port error: " << error;
             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();
+}
 void MainWindow::onNumOfSamplesChanged(int value)
+{
     numOfSamples = value;
     for (unsigned int ci = 0; ci < numOfChannels; ci++)
+    {
         channelBuffers[ci]->resize(numOfSamples);
+    }
     ui->plot->replot();
+}
@@ @@ -549,48 +550,49 @@ bool MainWindow::isDemoRunning() @@
+{
     return ui->actionDemoMode->isChecked();
+}
 void MainWindow::spsTimerTimeout()
+{
     spsLabel.setText(QString::number(sampleCount/SPS_UPDATE_TIMEOUT) + "sps");
     sampleCount = 0;
+}
 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();
             ui->plot->replot();
+        }
         else
+        {
             ui->actionDemoMode->setChecked(false);
+        }
+    }
     else
+    {
         demoTimer.stop();
         ui->actionDemoMode->setChecked(false);
         demoIndicator.hide();

0 comments (0 inline, 0 general)