tempo-plotter Changeset - ed44540644c7 · protofusion repositories

Changeset - ed44540644c7

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Hasan Yavuz ÖZDERYA - 11 years ago 2015-04-04 11:31:49
hy@ozderya.net

removed obscure debug code

1 file changed with 0 insertions and 1 deletions:

mainwindow.cpp

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -141,193 +141,192 @@ void MainWindow::loadPortList() @@
+    {
         ui->cbPortList->setCurrentIndex(currentSelectionIndex);
+    }
     else // our port doesn't exist anymore, close port if it's open
+    {
         if (serialPort.isOpen()) togglePort();
+    }
+}
 void MainWindow::loadBaudRateList()
+{
     ui->cbBaudRate->clear();
     for (auto baudRate : QSerialPortInfo::standardBaudRates())
+    {
         ui->cbBaudRate->addItem(QString::number(baudRate));
+    }
+}
 void MainWindow::togglePort()
+{
     if (serialPort.isOpen())
+    {
         serialPort.close();
         qDebug() << "Port closed, " << serialPort.portName();
         emit portToggled(false);
+    }
     else
+    {
         serialPort.setPortName(ui->cbPortList->currentText());
         // open port
         if (serialPort.open(QIODevice::ReadWrite))
+        {
             qDebug() << "Port opened, " << serialPort.portName();
             emit portToggled(true);
             // set baud rate
             if (!serialPort.setBaudRate(ui->cbBaudRate->currentText().toInt()))
+            {
                 qDebug() << "Set baud rate failed during port opening: "
                          << serialPort.error();
+            }
+        }
         else
+        {
             qDebug() << "Port open error: " << serialPort.error();
+        }
+    }
+}
 void MainWindow::selectPort(QString portName)
+{
     // has selection actually changed
     if (portName != serialPort.portName())
+    {
         // if another port is already open, close it by toggling
         if (serialPort.isOpen())
+        {
             togglePort();
             // open new selection by toggling
             togglePort();
+        }
+    }
+}
 void MainWindow::selectBaudRate(QString baudRate)
+{
     if (serialPort.isOpen())
+    {
         if (!serialPort.setBaudRate(baudRate.toInt()))
+        {
             qDebug() << "Set baud rate failed during select: "
                      << serialPort.error();
+        }
         else
+        {
             qDebug() << "Baud rate changed: " << serialPort.baudRate();
+        }
+    }
+}
 void MainWindow::selectParity(int parity)
+{
     if (serialPort.isOpen())
+    {
         if(!serialPort.setParity((QSerialPort::Parity) parity))
+        {
             qDebug() << "Set parity failed: " << serialPort.error();
+        }
+    }
+}
 void MainWindow::selectDataBits(int dataBits)
+{
     qDebug() << dataBits;
     if (serialPort.isOpen())
+    {
         if(!serialPort.setDataBits((QSerialPort::DataBits) dataBits))
+        {
             qDebug() << "Set data bits failed: " << serialPort.error();
+        }
+    }
+}
 void MainWindow::onPortToggled(bool open)
+{
     ui->pbOpenPort->setChecked(open);
+}
 void MainWindow::onDataReady()
+{
     if (!ui->actionPause->isChecked())
+    {
         int bytesAvailable = serialPort.bytesAvailable();
         if (bytesAvailable < sampleSize)
+        {
             return;
+        }
         else
+        {
             int numOfSamplesToRead =
                 (bytesAvailable - (bytesAvailable % sampleSize)) / sampleSize;
             QVector<double> samples(numOfSamplesToRead);
             int i = 0;
             while(i < numOfSamplesToRead)
+            {
                 samples.replace(i, (this->*readSample)());
                 i++;
+            }
             addData(samples);
+        }
+    }
     else
+    {
         serialPort.clear(QSerialPort::Input);
+    }
+}
 void MainWindow::onPortError(QSerialPort::SerialPortError error)
+{
     switch(error)
+    {
         case QSerialPort::NoError :
             break;
         case QSerialPort::ResourceError :
             qDebug() << "Port error: resource unavaliable; most likely device removed.";
             if (serialPort.isOpen())
+            {
                 qDebug() << "Closing port on resource error: " << serialPort.portName();
                 togglePort();
+            }
             loadPortList();
             break;
         default:
             qDebug() << "Unhandled port error: " << error;
             break;
+    }
+}
 void MainWindow::addData(QVector<double> data)
+{
     int offset = numOfSamples - data.size();
     if (offset < 0)
+    {
         for (int i = 0; i < numOfSamples; i++)
+        {
             dataArray[i] = data[i - offset];
+        }
+    }
     else if (offset == 0)
+    {
         dataArray = data;
+    }
     else
+    {
         // shift old samples
         int shift = data.size();
         for (int i = 0; i < offset; i++)
+        {
             dataArray[i] = dataArray[i + shift];
+        }
         // place new samples
         for (int i = 0; i < data.size(); i++)
+        {
             dataArray[offset + i] = data[i];
+        }
+    }
     // update plot

0 comments (0 inline, 0 general)