tempo-plotter Changeset - 1c804a335df5 · protofusion repositories

Changeset - 1c804a335df5

Parent rev.

Child rev.

[Not reviewed]

add-textview

0 2 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-07-05 21:43:23
hy@ozderya.net

move binary sample printing to its own function

2 files changed with 20 insertions and 12 deletions:

mainwindow.cpp

mainwindow.h

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -556,81 +556,86 @@ void MainWindow::selectNumberFormat(Numb @@
             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));
     printBinarySample((char*) &data, sizeof(data));
     if (ui->rbLittleE->isChecked())
+    {
         data = qFromLittleEndian(data);
+    }
     else
+    {
         data = qFromBigEndian(data);
+    }
     return double(data);
+}
 void MainWindow::printBinarySample(char* data, int size)
+{
     // print data in hex format
     if (ui->cbEnableTextView->isChecked())
+    {
         QTextCursor cursor(ui->ptTextView->document());
         cursor.movePosition(QTextCursor::End);
-        QByteArray ba((char*) &data, sizeof(data));
+        QByteArray ba(data, size);
         QScrollBar* vbar = ui->ptTextView->verticalScrollBar();
         bool isEnd = (vbar->value() == vbar->maximum());
         cursor.insertText(ba.toHex() + " ");
         // `53` is selected for minimum width of the main window
         if (cursor.positionInBlock() >= 53)
+        {
             cursor.insertText("\n");
+        }
         // scroll if we were at the end of the display
         if (isEnd)
+        {
             vbar->setValue(vbar->maximum());
+        }
+    }
     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()
+{
     demoCount++;
     if (demoCount > 100) demoCount = 0;
     if (!ui->actionPause->isChecked())
+    {
         for (unsigned int ci = 0; ci < numOfChannels; ci++)
+        {
             DataArray data(1);
             data.replace(0, (ci + 1)*demoCount);

mainwindow.h

➞

Show inline comments

@@ @@ -78,48 +78,51 @@ private: @@
     unsigned int numOfChannels;
     QList<QwtPlotCurve*> curves;
     typedef QVector<double> DataArray;
     DataArray dataX;   // array that simply contains numbers 0..numberOfSamples
     QList<DataArray> channelsData;
     // `data` contains i th channels data
     void addChannelData(unsigned int channel, DataArray 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;
     const int SPS_UPDATE_TIMEOUT = 1;  // second
     QLabel spsLabel;
     unsigned int sampleCount;
     QTimer spsTimer;
     // prints to text view if its is enabled
     void printBinarySample(char* data, int size);
     // demo
     QTimer demoTimer;
     int demoCount;
     bool isDemoRunning();
     QwtPlotTextLabel demoIndicator;
     QColor makeColor(unsigned int channelIndex);
 private slots:
     void onPortToggled(bool open);
     void onDataReady();      // used with binary number formats
     void onDataReadyASCII(); // used with ASCII number format
     void onPortError(QSerialPort::SerialPortError error);
     void skipByte();
     void onNumOfSamplesChanged(int value);
     void onAutoScaleChecked(bool checked);
     void onYScaleChanged();
     void onNumOfChannelsChanged(int value);
     void onNumberFormatButtonToggled(int numberFormatId, bool checked);
     void selectNumberFormat(NumberFormat numberFormatId);

0 comments (0 inline, 0 general)