tempo-plotter Changeset - bcd6b30d01d1 · protofusion repositories

Changeset - bcd6b30d01d1

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Hasan Yavuz ÖZDERYA - 11 years ago 2015-04-07 05:00:45
hy@ozderya.net

implemented skip byte function

2 files changed with 22 insertions and 0 deletions:

mainwindow.cpp

mainwindow.h

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -112,24 +112,29 @@ MainWindow::MainWindow(QWidget *parent) @@
     QObject::connect(&flowControlButtons,
                      SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),
                      this, &MainWindow::selectFlowControl);
     // init port signals
     QObject::connect(&(this->serialPort), SIGNAL(error(QSerialPort::SerialPortError)),
                      this, SLOT(onPortError(QSerialPort::SerialPortError)));
     QObject::connect(&(this->serialPort), &QSerialPort::readyRead,
                      this, &MainWindow::onDataReady);
     // init skip byte button
     skipByteRequested = false;
     QObject::connect(ui->pbSkipByte, &QPushButton::clicked,
                      this, &MainWindow::skipByte);
     loadPortList();
     loadBaudRateList();
     ui->cbBaudRate->setCurrentIndex(ui->cbBaudRate->findText("9600"));
     // set limits for axis limit boxes
     ui->spYmin->setRange((-1) * std::numeric_limits<double>::max(),
                          std::numeric_limits<double>::max());
     ui->spYmax->setRange((-1) * std::numeric_limits<double>::max(),
                          std::numeric_limits<double>::max());
     // init plot
@@ @@ -305,24 +310,32 @@ void MainWindow::selectFlowControl(int f @@
+}
 void MainWindow::onPortToggled(bool open)
+{
     ui->pbOpenPort->setChecked(open);
+}
 void MainWindow::onDataReady()
+{
     if (!ui->actionPause->isChecked())
+    {
         int bytesAvailable = serialPort.bytesAvailable();
         if (bytesAvailable > 0 && skipByteRequested)
+        {
             serialPort.read(1);
             skipByteRequested = false;
             bytesAvailable--;
+        }
         if (bytesAvailable < sampleSize)
+        {
             return;
+        }
         else
+        {
             int numOfSamplesToRead =
                 (bytesAvailable - (bytesAvailable % sampleSize)) / sampleSize;
             QVector<double> samples(numOfSamplesToRead);
             int i = 0;
             while(i < numOfSamplesToRead)
+            {
@@ @@ -351,24 +364,29 @@ void MainWindow::onPortError(QSerialPort @@
                 qDebug() << "Closing port on resource error: " << serialPort.portName();
                 togglePort();
+            }
             loadPortList();
             break;
         default:
             qDebug() << "Unhandled port error: " << error;
             break;
+    }
+}
 void MainWindow::skipByte()
+{
     skipByteRequested = true;
+}
 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)

mainwindow.h

➞

Show inline comments

@@ @@ -64,39 +64,43 @@ private: @@
     QwtPlotCurve curve;
     QVector<double> dataArray;
     QVector<double> dataX;
     void addData(QVector<double> data);
     NumberFormat numberFormat;
     unsigned int sampleSize; // number of bytes in the selected number format
     double (MainWindow::*readSample)();
     // note that serialPort should already have enough bytes present
     template<typename T> double readSampleAs();
     bool skipByteRequested;
 private slots:
     void loadPortList();
     void loadBaudRateList();
     void togglePort();
     void selectPort(QString portName);
     void onPortToggled(bool open);
     void selectBaudRate(QString baudRate);
     void selectParity(int parity); // parity must be one of QSerialPort::Parity
     void selectDataBits(int dataBits); // bits must be one of QSerialPort::DataBits
     void selectStopBits(int stopBits); // stopBits must be one of QSerialPort::StopBits
     void selectFlowControl(int flowControl); // flowControl must be one of QSerialPort::FlowControl
     void onDataReady();
     void onPortError(QSerialPort::SerialPortError error);
     void skipByte();
     void onNumOfSamplesChanged(int value);
     void onAutoScaleChecked(bool checked);
     void onYScaleChanged();
     void onNumberFormatButtonToggled(int numberFormatId, bool checked);
     void selectNumberFormat(NumberFormat numberFormatId);
     void clearPlot();
 signals:
     void portToggled(bool open);
 };

0 comments (0 inline, 0 general)