tempo-plotter Changeset - 6abb4bd782b3 · protofusion repositories

Changeset - 6abb4bd782b3

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-09-21 12:46:06
hy@ozderya.net

fix zero passing of demo data calculation

1 file changed with 1 insertions and 1 deletions:

mainwindow.cpp

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -510,193 +510,193 @@ void MainWindow::onRangeSelected() @@
     ui->cbAutoScale->setChecked(false);
+}
 void MainWindow::onNumberFormatButtonToggled(int numberFormatId, bool checked)
+{
     if (checked) selectNumberFormat((NumberFormat) numberFormatId);
+}
 void MainWindow::selectNumberFormat(NumberFormat numberFormatId)
+{
     numberFormat = numberFormatId;
     switch(numberFormat)
+    {
         case NumberFormat_uint8:
             sampleSize = 1;
             readSample = &MainWindow::readSampleAs<quint8>;
             break;
         case NumberFormat_int8:
             sampleSize = 1;
             readSample = &MainWindow::readSampleAs<qint8>;
             break;
         case NumberFormat_uint16:
             sampleSize = 2;
             readSample = &MainWindow::readSampleAs<quint16>;
             break;
         case NumberFormat_int16:
             sampleSize = 2;
             readSample = &MainWindow::readSampleAs<qint16>;
             break;
         case NumberFormat_uint32:
             sampleSize = 4;
             readSample = &MainWindow::readSampleAs<quint32>;
             break;
         case NumberFormat_int32:
             sampleSize = 4;
             readSample = &MainWindow::readSampleAs<qint32>;
             break;
         case NumberFormat_float:
             sampleSize = 4;
             readSample = &MainWindow::readSampleAs<float>;
             break;
         case NumberFormat_ASCII:
             sampleSize = 0;    // these two members should not be used
             readSample = NULL; // in this mode
             break;
+    }
     if (numberFormat == NumberFormat_ASCII)
+    {
         QObject::disconnect(&(this->serialPort), &QSerialPort::readyRead, 0, 0);
         QObject::connect(&(this->serialPort), &QSerialPort::readyRead,
                          this, &MainWindow::onDataReadyASCII);
         portControl.enableSkipByte();
+    }
     else
+    {
         QObject::disconnect(&(this->serialPort), &QSerialPort::readyRead, 0, 0);
         QObject::connect(&(this->serialPort), &QSerialPort::readyRead,
                          this, &MainWindow::onDataReady);
         portControl.enableSkipByte(false);
+    }
+}
 template<typename T> double MainWindow::readSampleAs()
+{
     T data;
     this->serialPort.read((char*) &data, sizeof(data));
     if (ui->rbLittleE->isChecked())
+    {
         data = qFromLittleEndian(data);
+    }
     else
+    {
         data = qFromBigEndian(data);
+    }
     return double(data);
+}
 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 (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();
         ui->plot->replot();
+    }
+}
 /*
   Below crude drawing demostrates how color selection occurs for
   given channel index
 °                     <--Hue Value-->                           360°
   |* . o . + . o . * . o . + . o . * . o . + . o . * . o . + . o . |
   * -> 0-3
   + -> 4-7
   o -> 8-15
   . -> 16-31
  */
 QColor MainWindow::makeColor(unsigned int channelIndex)
+{
     auto i = channelIndex;
     if (i < 4)
+    {
         return QColor::fromHsv(360*i/4, 255, 230);
+    }
     else
+    {
         double p = floor(log2(i));
         double n = pow(2, p);
         i = i - n;
         return QColor::fromHsv(360*i/n + 360/pow(2,p+1), 255, 230);
+    }
+}
 void MainWindow::onExportCsv()
+{
     bool wasPaused = ui->actionPause->isChecked();
     ui->actionPause->setChecked(true); // pause plotting
     QString fileName = QFileDialog::getSaveFileName(this, tr("Export CSV File"));
     if (fileName.isNull())  // user canceled export
+    {
         ui->actionPause->setChecked(wasPaused);
+    }
     else
+    {
         QFile file(fileName);
         if (file.open(QIODevice::WriteOnly | QIODevice::Text))
+        {
             QTextStream fileStream(&file);
             for (unsigned int ci = 0; ci < numOfChannels; ci++)
+            {
                 fileStream << "Channel " << ci;
                 if (ci != numOfChannels-1) fileStream << ",";
+            }
             fileStream << '\n';
             for (unsigned int i = 0; i < numOfSamples; i++)
+            {

0 comments (0 inline, 0 general)