tempo-plotter Changeset - 7aac14a97552 · protofusion repositories

Changeset - 7aac14a97552

Parent rev.

Child rev.

[Not reviewed]

default

0 5 3

Hasan Yavuz ÖZDERYA - 10 years ago 2015-11-07 14:46:26
hy@ozderya.net

moved data parsing and reading related code to a new class

8 files changed with 731 insertions and 527 deletions:

CMakeLists.txt

dataformatpanel.cpp

327

dataformatpanel.h

117

dataformatpanel.ui

244

mainwindow.cpp

251

mainwindow.h

mainwindow.ui

230

serialplot.pro

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -50,24 +50,25 @@ endif (QWT_USE_STATIC) @@
 # includes
 include_directories(${QWT_INCLUDE_DIR})
 # wrap UI and resource files
 qt5_wrap_ui(UI_FILES
   mainwindow.ui
   portcontrol.ui
   about_dialog.ui
   snapshotview.ui
   commandpanel.ui
   commandwidget.ui
   dataformatpanel.ui
+  )
 if (WIN32)
   qt5_add_resources(RES_FILES misc/icons.qrc misc/winicons.qrc)
 else (WIN32)
   qt5_add_resources(RES_FILES misc/icons.qrc)
 endif (WIN32)
 add_executable(${PROGRAM_NAME} WIN32
   main.cpp
   mainwindow.cpp
   portcontrol.cpp
@@ @@ -76,24 +77,25 @@ add_executable(${PROGRAM_NAME} WIN32 @@
   hidabletabwidget.cpp
   framebuffer.cpp
   scalepicker.cpp
   scalezoomer.cpp
   portlist.cpp
   snapshot.cpp
   snapshotview.cpp
   snapshotmanager.cpp
   plotsnapshotoverlay.cpp
   commandpanel.cpp
   commandwidget.cpp
   commandedit.cpp
   dataformatpanel.cpp
   ${UI_FILES}
   ${RES_FILES}
   misc/windows_icon.rc
+  )
 # Use the Widgets module from Qt 5.
 target_link_libraries(${PROGRAM_NAME} ${QWT_LIBRARY})
 qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort Svg)
 # set compiler flags
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")

dataformatpanel.cpp

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright © 2015 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "dataformatpanel.h"
 #include "ui_dataformatpanel.h"
 #include <QtEndian>
 #include "utils.h"
 #include "floatswap.h"
 DataFormatPanel::DataFormatPanel(QSerialPort* port,
                                  QList<FrameBuffer*>* channelBuffers,
                                  QWidget *parent) :
     QWidget(parent),
     ui(new Ui::DataFormatPanel)
+{
     ui->setupUi(this);
     serialPort = port;
     _channelBuffers = channelBuffers;
     paused = false;
     // 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);
     numberFormatButtons.addButton(ui->rbFloat,  NumberFormat_float);
     numberFormatButtons.addButton(ui->rbASCII,  NumberFormat_ASCII);
     QObject::connect(
         &numberFormatButtons, SIGNAL(buttonToggled(int, bool)),
         this, SLOT(onNumberFormatButtonToggled(int, bool)));
     // init number format
     selectNumberFormat((NumberFormat) numberFormatButtons.checkedId());
     // setup number of channels spinbox
     QObject::connect(ui->spNumOfChannels,
                      SELECT<int>::OVERLOAD_OF(&QSpinBox::valueChanged),
                      this, &DataFormatPanel::onNumOfChannelsSP);
     _numOfChannels = ui->spNumOfChannels->value();
     // Init sps (sample per second) counter
     sampleCount = 0;
     QObject::connect(&spsTimer, &QTimer::timeout,
                      this, &DataFormatPanel::spsTimerTimeout);
     spsTimer.start(SPS_UPDATE_TIMEOUT * 1000);
     // Init demo mode
     demoCount = 0;
     demoTimer.setInterval(100);
     QObject::connect(&demoTimer, &QTimer::timeout,
                      this, &DataFormatPanel::demoTimerTimeout);
+}
 DataFormatPanel::~DataFormatPanel()
+{
     delete ui;
+}
 void DataFormatPanel::onNumberFormatButtonToggled(int numberFormatId,
                                                   bool checked)
+{
     if (checked) selectNumberFormat((NumberFormat) numberFormatId);
+}
 void DataFormatPanel::selectNumberFormat(NumberFormat numberFormatId)
+{
     numberFormat = numberFormatId;
     switch(numberFormat)
+    {
         case NumberFormat_uint8:
             sampleSize = 1;
             readSample = &DataFormatPanel::readSampleAs<quint8>;
             break;
         case NumberFormat_int8:
             sampleSize = 1;
             readSample = &DataFormatPanel::readSampleAs<qint8>;
             break;
         case NumberFormat_uint16:
             sampleSize = 2;
             readSample = &DataFormatPanel::readSampleAs<quint16>;
             break;
         case NumberFormat_int16:
             sampleSize = 2;
             readSample = &DataFormatPanel::readSampleAs<qint16>;
             break;
         case NumberFormat_uint32:
             sampleSize = 4;
             readSample = &DataFormatPanel::readSampleAs<quint32>;
             break;
         case NumberFormat_int32:
             sampleSize = 4;
             readSample = &DataFormatPanel::readSampleAs<qint32>;
             break;
         case NumberFormat_float:
             sampleSize = 4;
             readSample = &DataFormatPanel::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(serialPort, &QSerialPort::readyRead, 0, 0);
         QObject::connect(this->serialPort, &QSerialPort::readyRead,
                          this, &DataFormatPanel::onDataReadyASCII);
+    }
     else
+    {
         QObject::disconnect(serialPort, &QSerialPort::readyRead, 0, 0);
         QObject::connect(serialPort, &QSerialPort::readyRead,
                          this, &DataFormatPanel::onDataReady);
+    }
     emit skipByteEnabledChanged(skipByteEnabled());
+}
 bool DataFormatPanel::skipByteEnabled()
+{
     return numberFormat != NumberFormat_ASCII;
+}
 unsigned DataFormatPanel::numOfChannels()
+{
     return _numOfChannels;
+}
 void DataFormatPanel::onNumOfChannelsSP(int value)
+{
     _numOfChannels = value;
     emit numOfChannelsChanged(value);
+}
 void DataFormatPanel::requestSkipByte()
+{
     skipByteRequested = true;
+}
 void DataFormatPanel::pause(bool enabled)
+{
     paused = enabled;
+}
 void DataFormatPanel::enableDemo(bool enabled)
+{
     if (enabled)
+    {
         demoTimer.start();
+    }
     else
+    {
         demoTimer.stop();
+    }
+}
 void DataFormatPanel::spsTimerTimeout()
+{
     unsigned currentSps = _samplesPerSecond;
     _samplesPerSecond = sampleCount/SPS_UPDATE_TIMEOUT;
     if (currentSps != _samplesPerSecond)
+    {
         emit samplesPerSecondChanged(_samplesPerSecond);
+    }
     sampleCount = 0;
+}
 void DataFormatPanel::demoTimerTimeout()
+{
     const double period = 100;
     demoCount++;
     if (demoCount >= 100) demoCount = 0;
     if (!paused)
+    {
         for (unsigned 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);
+        }
         emit dataAdded();
+    }
+}
 void DataFormatPanel::onDataReady()
+{
     // TODO: discard data in the size of packageSize
     if (paused)
+    {
         serialPort->clear(QSerialPort::Input);
         return;
+    }
     // a package is a set of channel data like {CHAN0_SAMPLE, CHAN1_SAMPLE...}
     int packageSize = sampleSize * _numOfChannels;
     int bytesAvailable = serialPort->bytesAvailable();
     if (bytesAvailable > 0 && skipByteRequested)
+    {
         serialPort->read(1);
         skipByteRequested = false;
         bytesAvailable--;
+    }
     if (bytesAvailable < packageSize) return;
     int numOfPackagesToRead =
         (bytesAvailable - (bytesAvailable % packageSize)) / packageSize;
     double* channelSamples = new double[numOfPackagesToRead*_numOfChannels];
     // TODO: use `for`, it is for this
     int i = 0;
     while(i < numOfPackagesToRead)
+    {
         for (unsigned int ci = 0; ci < _numOfChannels; ci++)
+        {
             // channelSamples[ci].replace(i, (this->*readSample)());
             channelSamples[ci*numOfPackagesToRead+i] = (this->*readSample)();
+        }
         i++;
+    }
     for (unsigned int ci = 0; ci < _numOfChannels; ci++)
+    {
         addChannelData(ci,
                        channelSamples + ci*numOfPackagesToRead,
                        numOfPackagesToRead);
+    }
     emit dataAdded();
     delete channelSamples;
+}
 void DataFormatPanel::onDataReadyASCII()
+{
     while(serialPort->canReadLine())
+    {
         QByteArray line = serialPort->readLine();
         // discard data if paused
         if (paused)
+        {
             return;
+        }
         line = line.trimmed();
         auto separatedValues = line.split(',');
         int numReadChannels; // effective number of channels to read
         if (separatedValues.length() >= int(_numOfChannels))
+        {
             numReadChannels = _numOfChannels;
+        }
         else // there is missing channel data
+        {
             numReadChannels = separatedValues.length();
             qWarning() << "Incoming data is missing data for some channels!";
+        }
         // parse read line
         for (int ci = 0; ci < numReadChannels; ci++)
+        {
             bool ok;
             double channelSample = separatedValues[ci].toDouble(&ok);
             if (ok)
+            {
                 addChannelData(ci, &channelSample, 1);
+            }
             else
+            {
                 qWarning() << "Data parsing error for channel: " << ci;
+            }
+        }
         emit dataAdded();
+    }
+}
 template<typename T> double DataFormatPanel::readSampleAs()
+{
     T data;
     serialPort->read((char*) &data, sizeof(data));
     if (ui->rbLittleE->isChecked())
+    {
         data = qFromLittleEndian(data);
+    }
     else
+    {
         data = qFromBigEndian(data);
+    }
     return double(data);
+}
 void DataFormatPanel::addChannelData(unsigned int channel,
                                      double* data, unsigned size)
+{
     (*_channelBuffers)[channel]->addSamples(data, size);
     sampleCount += size;
+}

dataformatpanel.h

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright © 2015 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef DATAFORMATPANEL_H
 #define DATAFORMATPANEL_H
 #include <QWidget>
 #include <QButtonGroup>
 #include <QTimer>
 #include <QSerialPort>
 #include <QList>
 #include <QtGlobal>
 #include "framebuffer.h"
 namespace Ui {
 class DataFormatPanel;
+}
 class DataFormatPanel : public QWidget
+{
     Q_OBJECT
 public:
     explicit DataFormatPanel(QSerialPort* port,
                              QList<FrameBuffer*>* channelBuffers,
                              QWidget *parent = 0);
     ~DataFormatPanel();
     unsigned numOfChannels();
     unsigned samplesPerSecond();
     bool skipByteEnabled(void); // true for binary formats
 public slots:
     // during next read operation reader will skip 1 byte,
     // requests are not accumulated
     void requestSkipByte();
     void pause(bool);
     void enableDemo(bool); // demo shouldn't be enabled when port is open
 signals:
     void numOfChannelsChanged(unsigned);
     void samplesPerSecondChanged(unsigned);
     void skipByteEnabledChanged(bool);
     void dataAdded();
 private:
     enum NumberFormat
+    {
         NumberFormat_uint8,
         NumberFormat_uint16,
         NumberFormat_uint32,
         NumberFormat_int8,
         NumberFormat_int16,
         NumberFormat_int32,
         NumberFormat_float,
         NumberFormat_ASCII
     };
     Ui::DataFormatPanel *ui;
     QButtonGroup numberFormatButtons;
     QSerialPort* serialPort;
     QList<FrameBuffer*>* _channelBuffers;
     unsigned int _numOfChannels;
     NumberFormat numberFormat;
     unsigned int sampleSize; // number of bytes in the selected number format
     bool skipByteRequested;
     bool paused;
     const int SPS_UPDATE_TIMEOUT = 1;  // second
     unsigned _samplesPerSecond;
     unsigned int sampleCount;
     QTimer spsTimer;
     // demo
     QTimer demoTimer;
     int demoCount;
     void selectNumberFormat(NumberFormat numberFormatId);
     // points to the readSampleAs function for currently selected number format
     double (DataFormatPanel::*readSample)();
     // note that serialPort should already have enough bytes present
     template<typename T> double readSampleAs();
     // `data` contains i th channels data
     void addChannelData(unsigned int channel, double* data, unsigned size);
 private slots:
     void onDataReady();      // used with binary number formats
     void onDataReadyASCII(); // used with ASCII number format
     void onNumberFormatButtonToggled(int numberFormatId, bool checked);
     void onNumOfChannelsSP(int value);
     void spsTimerTimeout();
     void demoTimerTimeout();
 };
 #endif // DATAFORMATPANEL_H

dataformatpanel.ui

➞

Show inline comments

@@ new file 100644 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>DataFormatPanel</class>
  <widget class="QWidget" name="DataFormatPanel">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>607</width>
     <height>181</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Data Format</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
     <layout class="QFormLayout" name="formLayout_3">
      <item row="0" column="0">
       <widget class="QLabel" name="label_4">
        <property name="text">
         <string>Number Of Channels:</string>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="QSpinBox" name="spNumOfChannels">
        <property name="minimumSize">
         <size>
          <width>60</width>
          <height>0</height>
         </size>
        </property>
        <property name="keyboardTracking">
         <bool>false</bool>
        </property>
        <property name="minimum">
         <number>1</number>
        </property>
        <property name="maximum">
         <number>32</number>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="Line" name="line_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
     </widget>
    </item>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_5">
      <property name="leftMargin">
       <number>0</number>
      </property>
      <item>
       <widget class="QGroupBox" name="groupBox">
        <property name="title">
         <string>Number Format:</string>
        </property>
        <layout class="QGridLayout" name="gridLayout_2">
         <item row="2" column="0">
          <widget class="QRadioButton" name="rbUint32">
           <property name="toolTip">
            <string>unsigned 4 bytes integer</string>
           </property>
           <property name="text">
            <string>uint32</string>
           </property>
          </widget>
         </item>
         <item row="0" column="1">
          <widget class="QRadioButton" name="rbInt8">
           <property name="toolTip">
            <string>signed 1 byte integer</string>
           </property>
           <property name="text">
            <string>int8</string>
           </property>
          </widget>
         </item>
         <item row="0" column="0">
          <widget class="QRadioButton" name="rbUint8">
           <property name="toolTip">
            <string>unsigned 1 byte integer</string>
           </property>
           <property name="text">
            <string>uint8</string>
           </property>
           <property name="checked">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item row="3" column="1">
          <widget class="QRadioButton" name="rbASCII">
           <property name="toolTip">
            <string>Comma Separated Values</string>
           </property>
           <property name="text">
            <string>ASCII(CSV)</string>
           </property>
          </widget>
         </item>
         <item row="1" column="1">
          <widget class="QRadioButton" name="rbInt16">
           <property name="toolTip">
            <string>signed 2 bytes integer</string>
           </property>
           <property name="text">
            <string>int16</string>
           </property>
          </widget>
         </item>
         <item row="2" column="1">
          <widget class="QRadioButton" name="rbInt32">
           <property name="toolTip">
            <string>signed 4 bytes integer</string>
           </property>
           <property name="text">
            <string>int32</string>
           </property>
          </widget>
         </item>
         <item row="3" column="0">
          <widget class="QRadioButton" name="rbFloat">
           <property name="toolTip">
            <string>4 bytes floating point number</string>
           </property>
           <property name="text">
            <string>float</string>
           </property>
          </widget>
         </item>
         <item row="1" column="0">
          <widget class="QRadioButton" name="rbUint16">
           <property name="toolTip">
            <string>unsigned 2 bytes integer</string>
           </property>
           <property name="text">
            <string>uint16</string>
           </property>
          </widget>
         </item>
        </layout>
       </widget>
      </item>
      <item>
       <spacer name="verticalSpacer_2">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>1</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_4">
      <property name="leftMargin">
       <number>0</number>
      </property>
      <item>
       <widget class="QGroupBox" name="groupBox_2">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="title">
         <string>Byte Order:</string>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout">
         <item>
          <widget class="QRadioButton" name="rbLittleE">
           <property name="toolTip">
            <string>least significant byte first</string>
           </property>
           <property name="text">
            <string>Little Endian</string>
           </property>
           <property name="checked">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QRadioButton" name="rbBigE">
           <property name="toolTip">
            <string>most significant byte first</string>
           </property>
           <property name="text">
            <string>Big Endian</string>
           </property>
          </widget>
         </item>
        </layout>
       </widget>
      </item>
      <item>
       <spacer name="verticalSpacer">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>1</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
    <item>
     <spacer name="horizontalSpacer_3">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>37</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>

mainwindow.cpp

➞

Show inline comments

@@ @@ -16,59 +16,59 @@ @@
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include <QByteArray>
 #include <QApplication>
 #include <QFileDialog>
 #include <QFile>
 #include <QTextStream>
 #include <QtDebug>
 #include <QtEndian>
 #include <qwt_plot.h>
 #include <limits.h>
 #include <cmath>
 #include <iostream>
 #include <plot.h>
 #include "utils.h"
 #include "version.h"
 #include "floatswap.h"
 #if defined(Q_OS_WIN) && defined(QT_STATIC)
 #include <QtPlugin>
 Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
 #endif
 struct Range
+{
     double rmin;
     double rmax;
 };
 Q_DECLARE_METATYPE(Range);
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow),
     aboutDialog(this),
     portControl(&serialPort),
     commandPanel(&serialPort),
     dataFormatPanel(&serialPort, &channelBuffers),
     snapshotMan(this, &channelBuffers)
+{
     ui->setupUi(this);
     ui->tabWidget->insertTab(0, &portControl, "Port");
     ui->tabWidget->insertTab(1, &dataFormatPanel, "Data Format");
     ui->tabWidget->insertTab(3, &commandPanel, "Commands");
     ui->tabWidget->setCurrentIndex(0);
     addToolBar(portControl.toolBar());
     ui->mainToolBar->addAction(snapshotMan.takeSnapshotAction());
     ui->menuBar->insertMenu(ui->menuHelp->menuAction(), snapshotMan.menu());
     setupAboutDialog();
     // init view menu
     for (auto a : ui->plot->menuActions())
+    {
@@ @@ -85,77 +85,70 @@ MainWindow::MainWindow(QWidget *parent) @@
                      this, &MainWindow::onExportCsv);
     ui->actionQuit->setShortcutContext(Qt::ApplicationShortcut);
     QObject::connect(ui->actionQuit, &QAction::triggered,
                      this, &MainWindow::close);
     // port control signals
     QObject::connect(&portControl, &PortControl::portToggled,
                      this, &MainWindow::onPortToggled);
     QObject::connect(&portControl, &PortControl::skipByteRequested,
-                     this, &MainWindow::skipByte);
+                     &dataFormatPanel, &DataFormatPanel::requestSkipByte);
     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()));
     QObject::connect(snapshotMan.takeSnapshotAction(), &QAction::triggered,
                      ui->plot, &Plot::flashSnapshotOverlay);
     // setup number of channels spinbox
     QObject::connect(ui->spNumOfChannels,
                      SELECT<int>::OVERLOAD_OF(&QSpinBox::valueChanged),
                      this, &MainWindow::onNumOfChannelsChanged);
     // 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);
     numberFormatButtons.addButton(ui->rbFloat,  NumberFormat_float);
     numberFormatButtons.addButton(ui->rbASCII,  NumberFormat_ASCII);
     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)));
     // 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 data arrays and plot
     // init data format and reader
     QObject::connect(&dataFormatPanel, &DataFormatPanel::dataAdded,
                      ui->plot, &QwtPlot::replot);
     QObject::connect(ui->actionPause, &QAction::triggered,
                      &dataFormatPanel, &DataFormatPanel::pause);
     // init data arrays and plot
     numOfSamples = ui->spNumOfSamples->value();
     numOfChannels = ui->spNumOfChannels->value();
     unsigned numOfChannels = dataFormatPanel.numOfChannels();
     QObject::connect(&dataFormatPanel,
                      &DataFormatPanel::numOfChannelsChanged,
                      this,
                      &MainWindow::onNumOfChannelsChanged);
     // init channel data and curve list
     for (unsigned int i = 0; i < numOfChannels; i++)
+    {
         channelBuffers.append(new FrameBuffer(numOfSamples));
         curves.append(new QwtPlotCurve());
         curves[i]->setSamples(channelBuffers[i]);
         curves[i]->setPen(Plot::makeColor(i));
         curves[i]->attach(ui->plot);
+    }
     // init auto scale
@@ @@ -178,62 +171,46 @@ MainWindow::MainWindow(QWidget *parent) @@
         ui->cbRangePresets->addItem(
             QString().sprintf("Unsigned %d bits %d to +%d", nbits, 0, rmax),
             QVariant::fromValue(Range{0, double(rmax)}));
+    }
     ui->cbRangePresets->addItem("-1 to +1", QVariant::fromValue(Range{-1, +1}));
     ui->cbRangePresets->addItem("0 to +1", QVariant::fromValue(Range{0, +1}));
     ui->cbRangePresets->addItem("-100 to +100", QVariant::fromValue(Range{-100, +100}));
     ui->cbRangePresets->addItem("0 to +100", QVariant::fromValue(Range{0, +100}));
     QObject::connect(ui->cbRangePresets, SIGNAL(activated(int)),
                      this, SLOT(onRangeSelected()));
     // init number format
     if (numberFormatButtons.checkedId() >= 0)
+    {
         selectNumberFormat((NumberFormat) numberFormatButtons.checkedId());
+    }
     else
+    {
         selectNumberFormat(NumberFormat_uint8);
+    }
     // Init sps (sample per second) counter
     sampleCount = 0;
     spsLabel.setText("0sps");
     spsLabel.setToolTip("samples per second (total of all channels)");
     ui->statusBar->addPermanentWidget(&spsLabel);
     spsTimer.start(SPS_UPDATE_TIMEOUT * 1000);
     QObject::connect(&spsTimer, &QTimer::timeout,
                      this, &MainWindow::spsTimerTimeout);
     QObject::connect(&dataFormatPanel,
                      &DataFormatPanel::samplesPerSecondChanged,
                      this, &MainWindow::onSpsChanged);
     // Init demo mode
     demoCount = 0;
     demoTimer.setInterval(100);
     QObject::connect(&demoTimer, &QTimer::timeout,
                      this, &MainWindow::demoTimerTimeout);
     // init demo
     QObject::connect(ui->actionDemoMode, &QAction::toggled,
                      this, &MainWindow::enableDemo);
     {   // init demo indicator
         QwtText demoText(" DEMO RUNNING ");  // looks better with spaces
         demoText.setColor(QColor("white"));
         demoText.setBackgroundBrush(Qt::darkRed);
         demoText.setBorderRadius(4);
         demoText.setRenderFlags(Qt::AlignLeft | Qt::AlignTop);
         demoIndicator.setText(demoText);
         demoIndicator.hide();
         demoIndicator.attach(ui->plot);
+    }
+}
 MainWindow::~MainWindow()
+{
     for (auto curve : curves)
+    {
         // also deletes respective FrameBuffer
         delete curve;
+    }
     if (serialPort.isOpen())
+    {
@@ @@ -256,115 +233,24 @@ void MainWindow::setupAboutDialog() @@
     aboutText.replace("$VERSION_STRING$", VERSION_STRING);
     aboutText.replace("$VERSION_REVISION$", VERSION_REVISION);
     uiAboutDialog.lbAbout->setText(aboutText);
+}
 void MainWindow::onPortToggled(bool open)
+{
     // make sure demo mode is disabled
     if (open && isDemoRunning()) enableDemo(false);
     ui->actionDemoMode->setEnabled(!open);
+}
 void MainWindow::onDataReady()
+{
     if (ui->actionPause->isChecked())
+    {
         serialPort.clear(QSerialPort::Input);
         return;
+    }
     // a package is a set of channel data like {CHAN0_SAMPLE, CHAN1_SAMPLE...}
     int packageSize = sampleSize * numOfChannels;
     int bytesAvailable = serialPort.bytesAvailable();
     if (bytesAvailable > 0 && skipByteRequested)
+    {
         serialPort.read(1);
         skipByteRequested = false;
         bytesAvailable--;
+    }
     if (bytesAvailable < packageSize) return;
     int numOfPackagesToRead =
         (bytesAvailable - (bytesAvailable % packageSize)) / packageSize;
     double* channelSamples = new double[numOfPackagesToRead*numOfChannels];
     int i = 0;
     while(i < numOfPackagesToRead)
+    {
         for (unsigned int ci = 0; ci < numOfChannels; ci++)
+        {
             // channelSamples[ci].replace(i, (this->*readSample)());
             channelSamples[ci*numOfPackagesToRead+i] = (this->*readSample)();
+        }
         i++;
+    }
     for (unsigned int ci = 0; ci < numOfChannels; ci++)
+    {
         addChannelData(ci,
                        channelSamples + ci*numOfPackagesToRead,
                        numOfPackagesToRead);
+    }
     ui->plot->replot();
     delete channelSamples;
+}
 void MainWindow::onDataReadyASCII()
+{
     while(serialPort.canReadLine())
+    {
         QByteArray line = serialPort.readLine();
         // discard data if paused
         if (ui->actionPause->isChecked())
+        {
             return;
+        }
         line = line.trimmed();
         auto separatedValues = line.split(',');
         int numReadChannels; // effective number of channels to read
         if (separatedValues.length() >= int(numOfChannels))
+        {
             numReadChannels = numOfChannels;
+        }
         else // there is missing channel data
+        {
             numReadChannels = separatedValues.length();
             qWarning() << "Incoming data is missing data for some channels!";
+        }
         // parse read line
         for (int ci = 0; ci < numReadChannels; ci++)
+        {
             bool ok;
             double channelSample = separatedValues[ci].toDouble(&ok);
             if (ok)
+            {
                 addChannelData(ci, &channelSample, 1);
+            }
             else
+            {
                 qWarning() << "Data parsing error for channel: " << ci;
+            }
+        }
         ui->plot->replot();
+    }
+}
 void MainWindow::onPortError(QSerialPort::SerialPortError error)
+{
     switch(error)
+    {
         case QSerialPort::NoError :
             break;
         case QSerialPort::ResourceError :
             qWarning() << "Port error: resource unavaliable; most likely device removed.";
             if (serialPort.isOpen())
+            {
                 qWarning() << "Closing port on resource error: " << serialPort.portName();
                 portControl.togglePort();
@@ @@ -405,60 +291,49 @@ required privileges or device is already @@
         case QSerialPort::TimeoutError:
             qCritical() << "A timeout error occurred.";
             break;
         case QSerialPort::UnknownError:
             qCritical() << "Unknown error!";
             break;
         default:
             qCritical() << "Unhandled port error: " << error;
             break;
+    }
+}
 void MainWindow::skipByte()
+{
     skipByteRequested = true;
+}
 void MainWindow::addChannelData(unsigned int channel, double* data, unsigned size)
+{
     channelBuffers[channel]->addSamples(data, size);
     sampleCount += size;
+}
 void MainWindow::clearPlot()
+{
-    for (unsigned int ci = 0; ci < numOfChannels; ci++)
+    for (int ci = 0; ci < channelBuffers.size(); ci++)
+    {
         channelBuffers[ci]->clear();
+    }
     ui->plot->replot();
+}
 void MainWindow::onNumOfSamplesChanged(int value)
+{
     numOfSamples = value;
-    for (unsigned int ci = 0; ci < numOfChannels; ci++)
+    for (int ci = 0; ci < channelBuffers.size(); ci++)
+    {
         channelBuffers[ci]->resize(numOfSamples);
+    }
     ui->plot->replot();
+}
-void MainWindow::onNumOfChannelsChanged(int value)
+void MainWindow::onNumOfChannelsChanged(unsigned value)
+{
     unsigned int oldNum = this->numOfChannels;
     this->numOfChannels = value;
     unsigned int oldNum = channelBuffers.size();
     unsigned numOfChannels = value;
     if (numOfChannels > oldNum)
+    {
         // add new channels
         for (unsigned int i = 0; i < numOfChannels - oldNum; i++)
+        {
             channelBuffers.append(new FrameBuffer(numOfSamples));
             curves.append(new QwtPlotCurve());
             curves.last()->setSamples(channelBuffers.last());
             curves.last()->setPen(Plot::makeColor(curves.length()-1));
             curves.last()->attach(ui->plot);
+        }
@@ @@ -500,174 +375,78 @@ void MainWindow::onYScaleChanged() @@
+{
     ui->plot->setAxis(false,  ui->spYmin->value(), ui->spYmax->value());
+}
 void MainWindow::onRangeSelected()
+{
     Range r = ui->cbRangePresets->currentData().value<Range>();
     ui->spYmin->setValue(r.rmin);
     ui->spYmax->setValue(r.rmax);
     ui->cbAutoScale->setChecked(false);
+}
 void MainWindow::onNumberFormatButtonToggled(int numberFormatId, bool checked)
+{
     if (checked) selectNumberFormat((NumberFormat) numberFormatId);
+}
 void MainWindow::selectNumberFormat(NumberFormat numberFormatId)
 void MainWindow::onSpsChanged(unsigned sps)
+{
     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);
     spsLabel.setText(QString::number(sps) + "sps");
+}
 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 (!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();
+            dataFormatPanel.enableDemo(true);
             ui->actionDemoMode->setChecked(true);
             demoIndicator.show();
             ui->plot->replot();
+        }
         else
+        {
             ui->actionDemoMode->setChecked(false);
+        }
+    }
     else
+    {
-        demoTimer.stop();
+        dataFormatPanel.enableDemo(false);
         ui->actionDemoMode->setChecked(false);
         demoIndicator.hide();
         ui->plot->replot();
+    }
+}
 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);
             unsigned numOfChannels = channelBuffers.size();
             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++)
+            {
                 for (unsigned int ci = 0; ci < numOfChannels; ci++)
+                {
                     fileStream << channelBuffers[ci]->sample(i).y();

mainwindow.h

➞

Show inline comments

@@ @@ -27,115 +27,77 @@ @@
 #include <QVector>
 #include <QList>
 #include <QSerialPort>
 #include <QSignalMapper>
 #include <QTimer>
 #include <QColor>
 #include <QtGlobal>
 #include <qwt_plot_curve.h>
 #include <qwt_plot_textlabel.h>
 #include "portcontrol.h"
 #include "commandpanel.h"
 #include "dataformatpanel.h"
 #include "ui_about_dialog.h"
 #include "framebuffer.h"
 #include "snapshotmanager.h"
 namespace Ui {
 class MainWindow;
+}
 class MainWindow : public QMainWindow
+{
     Q_OBJECT
 public:
     explicit MainWindow(QWidget *parent = 0);
     ~MainWindow();
     void messageHandler(QtMsgType type, const QMessageLogContext &context,
                         const QString &msg);
 private:
     enum NumberFormat
+    {
         NumberFormat_uint8,
         NumberFormat_uint16,
         NumberFormat_uint32,
         NumberFormat_int8,
         NumberFormat_int16,
         NumberFormat_int32,
         NumberFormat_float,
         NumberFormat_ASCII
     };
     Ui::MainWindow *ui;
     QButtonGroup numberFormatButtons;
     QDialog aboutDialog;
     void setupAboutDialog();
     QSerialPort serialPort;
     PortControl portControl;
     unsigned int numOfSamples;
     unsigned int numOfChannels;
     QList<QwtPlotCurve*> curves;
     // Note: FrameBuffer s are owned by their respective QwtPlotCurve s.
     QList<FrameBuffer*> channelBuffers;
     // `data` contains i th channels data
     void addChannelData(unsigned int channel, double* data, unsigned size);
     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;
     CommandPanel commandPanel;
     DataFormatPanel dataFormatPanel;
     SnapshotManager snapshotMan;
     // demo
     QTimer demoTimer;
     int demoCount;
     QwtPlotTextLabel demoIndicator;
     bool isDemoRunning();
     QwtPlotTextLabel demoIndicator;
 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 onRangeSelected();
     void onNumOfChannelsChanged(int value);
     void onNumberFormatButtonToggled(int numberFormatId, bool checked);
     void selectNumberFormat(NumberFormat numberFormatId);
     void onNumOfChannelsChanged(unsigned value);
     void clearPlot();
-    void spsTimerTimeout();
+    void onSpsChanged(unsigned sps);
     void demoTimerTimeout();
     void enableDemo(bool enabled);
     void onExportCsv();
 };
 #endif // MAINWINDOW_H

mainwindow.ui

➞

Show inline comments

@@ @@ -42,254 +42,24 @@ @@
       <property name="maximumSize">
        <size>
         <width>16777215</width>
         <height>16777215</height>
        </size>
       </property>
       <property name="currentIndex">
        <number>0</number>
       </property>
       <property name="movable">
        <bool>false</bool>
       </property>
       <widget class="QWidget" name="tabDataFormat">
        <attribute name="title">
         <string>Data Format</string>
        </attribute>
        <layout class="QHBoxLayout" name="horizontalLayout_5">
         <item>
          <layout class="QFormLayout" name="formLayout_3">
           <item row="0" column="0">
            <widget class="QLabel" name="label_4">
             <property name="text">
              <string>Number Of Channels:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QSpinBox" name="spNumOfChannels">
             <property name="minimumSize">
              <size>
               <width>60</width>
               <height>0</height>
              </size>
             </property>
             <property name="keyboardTracking">
              <bool>false</bool>
             </property>
             <property name="minimum">
              <number>1</number>
             </property>
             <property name="maximum">
              <number>32</number>
             </property>
            </widget>
           </item>
          </layout>
         </item>
         <item>
          <widget class="Line" name="line_2">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
          </widget>
         </item>
         <item>
          <layout class="QVBoxLayout" name="verticalLayout_5">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <item>
            <widget class="QGroupBox" name="groupBox">
             <property name="title">
              <string>Number Format:</string>
             </property>
             <layout class="QGridLayout" name="gridLayout_2">
              <item row="2" column="0">
               <widget class="QRadioButton" name="rbUint32">
                <property name="toolTip">
                 <string>unsigned 4 bytes integer</string>
                </property>
                <property name="text">
                 <string>uint32</string>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
               <widget class="QRadioButton" name="rbInt8">
                <property name="toolTip">
                 <string>signed 1 byte integer</string>
                </property>
                <property name="text">
                 <string>int8</string>
                </property>
               </widget>
              </item>
              <item row="0" column="0">
               <widget class="QRadioButton" name="rbUint8">
                <property name="toolTip">
                 <string>unsigned 1 byte integer</string>
                </property>
                <property name="text">
                 <string>uint8</string>
                </property>
                <property name="checked">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
              <item row="3" column="1">
               <widget class="QRadioButton" name="rbASCII">
                <property name="toolTip">
                 <string>Comma Separated Values</string>
                </property>
                <property name="text">
                 <string>ASCII(CSV)</string>
                </property>
               </widget>
              </item>
              <item row="1" column="1">
               <widget class="QRadioButton" name="rbInt16">
                <property name="toolTip">
                 <string>signed 2 bytes integer</string>
                </property>
                <property name="text">
                 <string>int16</string>
                </property>
               </widget>
              </item>
              <item row="2" column="1">
               <widget class="QRadioButton" name="rbInt32">
                <property name="toolTip">
                 <string>signed 4 bytes integer</string>
                </property>
                <property name="text">
                 <string>int32</string>
                </property>
               </widget>
              </item>
              <item row="3" column="0">
               <widget class="QRadioButton" name="rbFloat">
                <property name="toolTip">
                 <string>4 bytes floating point number</string>
                </property>
                <property name="text">
                 <string>float</string>
                </property>
               </widget>
              </item>
              <item row="1" column="0">
               <widget class="QRadioButton" name="rbUint16">
                <property name="toolTip">
                 <string>unsigned 2 bytes integer</string>
                </property>
                <property name="text">
                 <string>uint16</string>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
           <item>
            <spacer name="verticalSpacer_2">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>1</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </item>
         <item>
          <layout class="QVBoxLayout" name="verticalLayout_4">
           <property name="leftMargin">
            <number>0</number>
           </property>
           <item>
            <widget class="QGroupBox" name="groupBox_2">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="title">
              <string>Byte Order:</string>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout">
              <item>
               <widget class="QRadioButton" name="rbLittleE">
                <property name="toolTip">
                 <string>least significant byte first</string>
                </property>
                <property name="text">
                 <string>Little Endian</string>
                </property>
                <property name="checked">
                 <bool>true</bool>
                </property>
               </widget>
              </item>
              <item>
               <widget class="QRadioButton" name="rbBigE">
                <property name="toolTip">
                 <string>most significant byte first</string>
                </property>
                <property name="text">
                 <string>Big Endian</string>
                </property>
               </widget>
              </item>
             </layout>
            </widget>
           </item>
           <item>
            <spacer name="verticalSpacer">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>1</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </item>
         <item>
          <spacer name="horizontalSpacer_3">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
           <property name="sizeType">
            <enum>QSizePolicy::MinimumExpanding</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>1</width>
             <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
        </layout>
       </widget>
       <widget class="QWidget" name="tabPlot">
        <attribute name="title">
         <string>Plot</string>
        </attribute>
        <layout class="QHBoxLayout" name="horizontalLayout_4">
         <item>
          <spacer name="horizontalSpacer_2">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>

serialplot.pro

➞

Show inline comments

@@ @@ -40,49 +40,52 @@ SOURCES += main.cpp\ @@
     zoomer.cpp \
     hidabletabwidget.cpp \
     framebuffer.cpp \
     scalepicker.cpp \
     scalezoomer.cpp \
     portlist.cpp \
     snapshotview.cpp \
     snapshotmanager.cpp \
     snapshot.cpp \
     plotsnapshotoverlay.cpp \
     commandpanel.cpp \
     commandwidget.cpp \
     commandedit.cpp
     commandedit.cpp \
     dataformatpanel.cpp
 HEADERS  += mainwindow.h \
     utils.h \
     portcontrol.h \
     floatswap.h \
     plot.h \
     zoomer.h \
     hidabletabwidget.h \
     framebuffer.h \
     scalepicker.h \
     scalezoomer.h \
     portlist.h \
     snapshotview.h \
     snapshotmanager.h \
     snapshot.h \
     plotsnapshotoverlay.h \
     commandpanel.h \
     commandwidget.h \
     commandedit.h
     commandedit.h \
     dataformatpanel.h
 FORMS    += mainwindow.ui \
     about_dialog.ui \
     portcontrol.ui \
     snapshotview.ui \
     commandpanel.ui \
     commandwidget.ui
     commandwidget.ui \
     dataformatpanel.ui
 INCLUDEPATH += qmake/
 CONFIG += c++11
 RESOURCES += misc/icons.qrc
 win32 {
     RESOURCES += misc/winicons.qrc
+}

0 comments (0 inline, 0 general)