tempo-plotter Changeset - 44b87d87610b · protofusion repositories

Changeset - 44b87d87610b

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Hasan Yavuz ÖZDERYA - 11 years ago 2015-03-16 16:41:13
hy@ozderya.net

implemented "Clear" plot button

2 files changed with 14 insertions and 0 deletions:

mainwindow.cpp

mainwindow.h

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -21,48 +21,51 @@ MainWindow::MainWindow(QWidget *parent) @@
     QObject::connect(this, &MainWindow::portToggled,
                      this, &MainWindow::onPortToggled);
     QObject::connect(ui->cbPortList,
                      SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
                      this, &MainWindow::selectPort);
     QObject::connect(ui->cbBaudRate,
                      SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
                      this, &MainWindow::selectBaudRate);
     QObject::connect(ui->spNumOfSamples, SELECT<int>::OVERLOAD_OF(&QSpinBox::valueChanged),
                      this, &MainWindow::onNumOfSamplesChanged);
     QObject::connect(ui->cbAutoScale, &QCheckBox::toggled,
                      this, &MainWindow::onAutoScaleChecked);
     QObject::connect(ui->spYmin, SIGNAL(valueChanged(double)),
                      this, SLOT(onYScaleChanged()));
     QObject::connect(ui->spYmax, SIGNAL(valueChanged(double)),
                      this, SLOT(onYScaleChanged()));
     QObject::connect(ui->actionClear, SIGNAL(triggered(bool)),
                      this, SLOT(clearPlot()));
     // setup number format buttons
     numberFormatButtons.addButton(ui->rbUint8,  NumberFormat_uint8);
     numberFormatButtons.addButton(ui->rbUint16, NumberFormat_uint16);
     numberFormatButtons.addButton(ui->rbUint32, NumberFormat_uint32);
     numberFormatButtons.addButton(ui->rbInt8,   NumberFormat_int8);
     numberFormatButtons.addButton(ui->rbInt16,  NumberFormat_int16);
     numberFormatButtons.addButton(ui->rbInt32,  NumberFormat_int32);
     QObject::connect(&numberFormatButtons, SIGNAL(buttonToggled(int, bool)),
                      this, SLOT(onNumberFormatButtonToggled(int, bool)));
     // 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);
     loadPortList();
     loadBaudRateList();
     ui->cbBaudRate->setCurrentIndex(ui->cbBaudRate->findText("9600"));
     // set limits for axis limit boxes
     ui->spYmin->setRange(std::numeric_limits<double>::min(),
@@ @@ -244,48 +247,57 @@ void MainWindow::onPortError(QSerialPort @@
+            }
             loadPortList();
             break;
         default:
             qDebug() << "Unhandled port error: " << error;
             break;
+    }
+}
 void MainWindow::addData(double data)
+{
     // shift data array and place new data at the end
     for (int i = 0; i < dataArray.size()-1; i++)
+    {
         dataArray[i] = dataArray[i+1];
+    }
     dataArray.last() = data;
     // update plot
     curve.setSamples(dataX, dataArray);
     ui->plot->replot();
+}
 void MainWindow::clearPlot()
+{
     dataArray.fill(0.0);
     // update plot
     curve.setSamples(dataX, dataArray);
     ui->plot->replot();
+}
 void MainWindow::onNumOfSamplesChanged(int value)
+{
     unsigned int oldNum = this->numOfSamples;
     numOfSamples = value;
     // resize data arrays
     if (numOfSamples < oldNum)
+    {
         dataX.resize(numOfSamples);
         dataArray.remove(0, oldNum - numOfSamples);
+    }
     else if(numOfSamples > oldNum)
+    {
         dataX.resize(numOfSamples);
         for (unsigned int i = oldNum; i < numOfSamples; i++)
+        {
             dataX[i] = i;
             dataArray.prepend(0);
+        }
+    }
+}
 void MainWindow::onAutoScaleChecked(bool checked)
+{

mainwindow.h

➞

Show inline comments

@@ @@ -46,29 +46,31 @@ private: @@
     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();
 private slots:
     void loadPortList();
     void loadBaudRateList();
     void togglePort();
     void selectPort(QString portName);
     void onPortToggled(bool open);
     void selectBaudRate(QString baudRate);
     void onDataReady();
     void onPortError(QSerialPort::SerialPortError error);
     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);
 };
 #endif // MAINWINDOW_H

0 comments (0 inline, 0 general)