tempo-plotter Changeset - 16cb36cb4df0 · protofusion repositories

Changeset - 16cb36cb4df0

Parent rev.

Child rev.

[Not reviewed]

longmem

6 12 2

Ethan Zonca - 5 years ago 2020-04-08 19:37:29
ez@ethanzonca.com

Hack and slash: update for ThermoPlot thermocouple logger.

20 files changed with 289 insertions and 1570 deletions:

.hgignore

serialplot.pro

194

src/about_dialog.ui

src/bpslabel.cpp

src/dataformatpanel.cpp

src/dataformatpanel.ui

src/main.cpp

src/mainwindow.cpp

src/mainwindow.h

src/mainwindow.ui

src/plotcontrolpanel.cpp

src/portcontrol.cpp

268

src/portcontrol.h

src/portcontrol.ui

471

src/updatecheckdialog.cpp

105

src/updatecheckdialog.h

src/updatecheckdialog.ui

src/updatechecker.cpp

222

src/updatechecker.h

tempo-plotter.pro

189

0 comments (0 inline, 0 general)

.hgignore

➞

Show inline comments

		new file 100644
		mode=blob

		build/*

serialplot.pro

➞

Show inline comments

deleted file

src/about_dialog.ui

➞

Show inline comments

 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>AboutDialog</class>
  <widget class="QDialog" name="AboutDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>487</width>
     <height>325</height>
     <width>516</width>
     <height>360</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>About</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QLabel" name="lbAbout">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;SerialPlot&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;$VERSION_STRING$&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Developed by Hasan Yavuz Özderya&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Using Qt (&lt;a href=&quot;https://www.qt.io/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://www.qt.io/&lt;/span&gt;&lt;/a&gt;) and Qwt (&lt;a href=&quot;http://qwt.sf.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://qwt.sf.net&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;br/&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;This software is GPL licensed. You can obtain source code from &lt;a href=&quot;https://bitbucket.org/hyOzd/serialplot&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://bitbucket.org/hyOzd/serialplot&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;br/&gt;&lt;/p&gt;&lt;p align=&quot;right&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;RevID: $VERSION_REVISION$&lt;br/&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;Tempo Thermocouple Plotter&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;$VERSION_STRING$&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Based on SerialPlot&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Developed by Hasan Yavuz Özderya&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Adapted by Ethan Zonca&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Using Qt (&lt;a href=&quot;https://www.qt.io/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://www.qt.io/&lt;/span&gt;&lt;/a&gt;) and Qwt (&lt;a href=&quot;http://qwt.sf.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://qwt.sf.net&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;br/&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;This software is GPL licensed. Original source code is avialable here: &lt;a href=&quot;https://bitbucket.org/hyOzd/serialplot&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://bitbucket.org/hyOzd/serialplot&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;br/&gt;&lt;/p&gt;&lt;p align=&quot;right&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;RevID: $VERSION_REVISION$&lt;br/&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>
      <property name="openExternalLinks">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>

src/bpslabel.cpp

➞

Show inline comments

@@ @@ -39,25 +39,25 @@ BPSLabel::BPSLabel(PortControl* portCont @@
     connect(portControl, &PortControl::portToggled,
             this, &BPSLabel::onPortToggled);
+}
 void BPSLabel::onBpsTimeout()
+{
     uint64_t curBytesRead = _dataFormatPanel->bytesRead();
     uint64_t bytesRead = curBytesRead - prevBytesRead;
     prevBytesRead = curBytesRead;
     unsigned bits = bytesRead * 8;
-    unsigned maxBps = _portControl->maxBitRate();
+    unsigned maxBps = 1000000; // EMZ FIXME
     QString str;
     if (bits >= maxBps)
+    {
         // TODO: an icon for bps warning
         str = QString(tr("!%1/%2bps")).arg(bits).arg(maxBps);
         setToolTip(tr(BPS_TOOLTIP_ERR));
+    }
     else
+    {
         str = QString(tr("%1bps")).arg(bits);
         setToolTip(tr(BPS_TOOLTIP));
+    }

src/dataformatpanel.cpp

➞

Show inline comments

@@ @@ -38,39 +38,40 @@ DataFormatPanel::DataFormatPanel(QSerial @@
     serialPort = port;
     paused = false;
     readerBeforeDemo = nullptr;
     _bytesRead = 0;
     // initalize default reader
     currentReader = &bsReader;
     bsReader.enable();
     ui->rbBinary->setChecked(true);
     ui->horizontalLayout->addWidget(bsReader.settingsWidget(), 1);
     // initalize reader selection buttons
     connect(ui->rbBinary, &QRadioButton::toggled, [this](bool checked)
+            {
                 if (checked) selectReader(&bsReader);
             });
     selectReader(&asciiReader);
 //    // initalize reader selection buttons
 //    connect(ui->rbBinary, &QRadioButton::toggled, [this](bool checked)
 //            {
 //                if (checked) selectReader(&bsReader);
 //            });
     connect(ui->rbAscii, &QRadioButton::toggled, [this](bool checked)
+            {
                 if (checked) selectReader(&asciiReader);
             });
 //    connect(ui->rbAscii, &QRadioButton::toggled, [this](bool checked)
 //            {
 //                if (checked) selectReader(&asciiReader);
 //            });
     connect(ui->rbFramed, &QRadioButton::toggled, [this](bool checked)
+            {
                 if (checked) selectReader(&framedReader);
             });
 //    connect(ui->rbFramed, &QRadioButton::toggled, [this](bool checked)
 //            {
 //                if (checked) selectReader(&framedReader);
 //            });
+}
 DataFormatPanel::~DataFormatPanel()
+{
     delete ui;
+}
 unsigned DataFormatPanel::numChannels() const
+{
     return currentReader->numChannels();
+}

src/dataformatpanel.ui

➞

Show inline comments

@@ @@ -16,36 +16,42 @@ @@
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
     <layout class="QVBoxLayout" name="vlRadioButtons">
      <item>
       <widget class="QRadioButton" name="rbBinary">
        <property name="toolTip">
         <string>Data is sent as consecutive samples in binary form. Syncing can be a problem.</string>
        </property>
        <property name="text">
         <string>Simple Binary</string>
        </property>
        <property name="checked">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QRadioButton" name="rbAscii">
        <property name="enabled">
         <bool>true</bool>
        </property>
        <property name="toolTip">
         <string>Data is sent in the form of ASCII text as comma seperated values. Easy to implement.</string>
        </property>
        <property name="text">
         <string>ASCII</string>
        </property>
        <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QRadioButton" name="rbFramed">
        <property name="toolTip">
         <string>Define a custom binary frame. Powerful.</string>
        </property>
        <property name="text">
         <string>Custom Frame</string>
        </property>
       </widget>
      </item>

src/main.cpp

➞

Show inline comments

@@ @@ -72,19 +72,19 @@ int main(int argc, char *argv[]) @@
     QApplication a(argc, argv);
     QApplication::setApplicationName(PROGRAM_NAME);
     QApplication::setApplicationVersion(VERSION_STRING);
     qInstallMessageHandler(messageHandler);
     MainWindow w;
     pMainWindow = &w;
     ToolTipFilter ttf;
     a.installEventFilter(&ttf);
     // log application information
-    qDebug() << "SerialPlot" << VERSION_STRING;
+    qDebug() << "Tempo Plotter" << VERSION_STRING;
     qDebug() << "Revision" << VERSION_REVISION;
     w.show();
     return a.exec();
+}

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -44,57 +44,56 @@ @@
 #include "utils.h"
 #include "defines.h"
 #include "version.h"
 #include "setting_defines.h"
 #if defined(Q_OS_WIN) && defined(QT_STATIC)
 #include <QtPlugin>
 Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
 #endif
 // TODO: depends on tab insertion order, a better solution would be to use object names
 const QMap<int, QString> panelSettingMap({
         {0, "Port"},
         {1, "DataFormat"},
         {2, "Plot"},
         {3, "Commands"},
         {4, "Record"},
         {5, "TextView"},
         {6, "Log"}
        // {0, "Port"},
        // {0, "DataFormat"},
         {0, "Plot"},
         {1, "Commands"},
         {2, "Record"},
         //{3, "TextView"},
         {3, "Log"}
     });
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow),
     aboutDialog(this),
     portControl(&serialPort),
     secondaryPlot(NULL),
     snapshotMan(this, &stream),
     commandPanel(&serialPort),
     dataFormatPanel(&serialPort),
     recordPanel(&stream),
     textView(&stream),
     updateCheckDialog(this),
     bpsLabel(&portControl, &dataFormatPanel, this)
+{
     ui->setupUi(this);
     plotMan = new PlotManager(ui->plotArea, &plotMenu, &stream);
     ui->tabWidget->insertTab(0, &portControl, "Port");
     ui->tabWidget->insertTab(1, &dataFormatPanel, "Data Format");
     ui->tabWidget->insertTab(2, &plotControlPanel, "Plot");
     ui->tabWidget->insertTab(3, &commandPanel, "Commands");
     ui->tabWidget->insertTab(4, &recordPanel, "Record");
     ui->tabWidget->insertTab(5, &textView, "Text View");
 //    ui->tabWidget->insertTab(0, &portControl, "Port");
 //    ui->tabWidget->insertTab(0, &dataFormatPanel, "Data Format");
     ui->tabWidget->insertTab(0, &plotControlPanel, "Plot");
     ui->tabWidget->insertTab(1, &commandPanel, "Commands");
     ui->tabWidget->insertTab(2, &recordPanel, "Record");
 //    ui->tabWidget->insertTab(3, &textView, "Text View");
     ui->tabWidget->setCurrentIndex(0);
     auto tbPortControl = portControl.toolBar();
     addToolBar(tbPortControl);
     addToolBar(recordPanel.toolbar());
     ui->plotToolBar->addAction(snapshotMan.takeSnapshotAction());
     menuBar()->insertMenu(ui->menuHelp->menuAction(), snapshotMan.menu());
     menuBar()->insertMenu(ui->menuHelp->menuAction(), commandPanel.menu());
     connect(&commandPanel, &CommandPanel::focusRequested, [this]()
+            {
                 this->ui->tabWidget->setCurrentWidget(&commandPanel);
@@ @@ -104,54 +103,54 @@ MainWindow::MainWindow(QWidget *parent) @@
     tbPortControl->setObjectName("tbPortControl");
     ui->plotToolBar->setObjectName("tbPlot");
     setupAboutDialog();
     // init view menu
     ui->menuBar->insertMenu(ui->menuSecondary->menuAction(), &plotMenu);
     plotMenu.addSeparator();
     QMenu* tbMenu = plotMenu.addMenu("Toolbars");
     tbMenu->addAction(ui->plotToolBar->toggleViewAction());
     tbMenu->addAction(portControl.toolBar()->toggleViewAction());
     // init secondary plot menu
     auto group = new QActionGroup(this);
     group->addAction(ui->actionVertical);
     group->addAction(ui->actionHorizontal);
     // init UI signals
     // Secondary plot menu signals
     connect(ui->actionBarPlot, &QAction::triggered,
             this, &MainWindow::showBarPlot);
     connect(ui->actionVertical, &QAction::triggered,
             [this](bool checked)
+            {
                 if (checked) ui->splitter->setOrientation(Qt::Vertical);
             });
     connect(ui->actionHorizontal, &QAction::triggered,
             [this](bool checked)
+            {
                 if (checked) ui->splitter->setOrientation(Qt::Horizontal);
             });
     // Help menu signals
     QObject::connect(ui->actionHelpAbout, &QAction::triggered,
               &aboutDialog, &QWidget::show);
     QObject::connect(ui->actionCheckUpdate, &QAction::triggered,
               &updateCheckDialog, &QWidget::show);
     QObject::connect(ui->actionReportBug, &QAction::triggered,
                      [](){QDesktopServices::openUrl(QUrl(BUG_REPORT_URL));});
     // File menu signals
     QObject::connect(ui->actionExportCsv, &QAction::triggered,
                      this, &MainWindow::onExportCsv);
     QObject::connect(ui->actionSaveSettings, &QAction::triggered,
                      this, &MainWindow::onSaveSettings);
     QObject::connect(ui->actionLoadSettings, &QAction::triggered,
                      this, &MainWindow::onLoadSettings);
@@ @@ -215,24 +214,27 @@ MainWindow::MainWindow(QWidget *parent) @@
                              dataFormatPanel.pause(false);
+                         }
                      });
     connect(&serialPort, &QIODevice::aboutToClose,
             &recordPanel, &RecordPanel::onPortClose);
     // init plot
     numOfSamples = plotControlPanel.numOfSamples();
     stream.setNumSamples(numOfSamples);
     plotControlPanel.setChannelInfoModel(stream.infoModel());
     // Show bar plot EMZ
     this->showBarPlot(true);
     // init scales
     stream.setXAxis(plotControlPanel.xAxisAsIndex(),
                     plotControlPanel.xMin(), plotControlPanel.xMax());
     plotMan->setYAxis(plotControlPanel.autoScale(),
                       plotControlPanel.yMin(), plotControlPanel.yMax());
     plotMan->setXAxis(plotControlPanel.xAxisAsIndex(),
                       plotControlPanel.xMin(), plotControlPanel.xMax());
     plotMan->setNumOfSamples(numOfSamples);
     plotMan->setPlotWidth(plotControlPanel.plotWidth());
     // init bps (bits per second) counter
@@ @@ -294,53 +296,53 @@ MainWindow::~MainWindow() @@
     delete plotMan;
     delete ui;
     ui = NULL; // we check if ui is deleted in messageHandler
+}
 void MainWindow::closeEvent(QCloseEvent * event)
+{
     // save snapshots
     if (!snapshotMan.isAllSaved())
+    {
         auto clickedButton = QMessageBox::warning(
-            this, "Closing SerialPlot",
+            this, "Closing Tempo Plotter",
             "There are un-saved snapshots. If you close you will loose the data.",
             QMessageBox::Discard, QMessageBox::Cancel);
         if (clickedButton == QMessageBox::Cancel)
+        {
             event->ignore();
             return;
+        }
+    }
     // save settings
     QSettings settings(PROGRAM_NAME, PROGRAM_NAME);
     saveAllSettings(&settings);
     settings.sync();
     if (settings.status() != QSettings::NoError)
+    {
         QString errorText;
         if (settings.status() == QSettings::AccessError)
+        {
             QString file = settings.fileName();
-            errorText = QString("Serialplot cannot save settings due to access error. \
+            errorText = QString("Tempo Plotter cannot save settings due to access error. \
 This happens if you have run serialplot as root (with sudo for ex.) previously. \
 Try fixing the permissions of file: %1, or just delete it.").arg(file);
+        }
         else
+        {
-            errorText = QString("Serialplot cannot save settings due to unknown error: %1").\
+            errorText = QString("Tempo Plotter cannot save settings due to unknown error: %1").\
                 arg(settings.status());
+        }
         auto button = QMessageBox::critical(
             NULL,
             "Failed to save settings!", errorText,
             QMessageBox::Cancel | QMessageBox::Ok);
         if (button == QMessageBox::Cancel)
+        {
             event->ignore();
             return;
@@ @@ -499,47 +501,45 @@ void MainWindow::messageHandler(QtMsgTyp @@
     if (ui != NULL)
         ui->ptLog->appendPlainText(logString);
     if (type != QtDebugMsg && ui != NULL)
+    {
         ui->statusBar->showMessage(msg, 5000);
+    }
+}
 void MainWindow::saveAllSettings(QSettings* settings)
+{
     saveMWSettings(settings);
     portControl.saveSettings(settings);
     dataFormatPanel.saveSettings(settings);
     stream.saveSettings(settings);
     plotControlPanel.saveSettings(settings);
     plotMenu.saveSettings(settings);
     commandPanel.saveSettings(settings);
     recordPanel.saveSettings(settings);
     textView.saveSettings(settings);
     updateCheckDialog.saveSettings(settings);
 //    portControl.saveSettings(settings);
 //    dataFormatPanel.saveSettings(settings);
 //    stream.saveSettings(settings);
 //    plotControlPanel.saveSettings(settings);
 //    plotMenu.saveSettings(settings);
 //    commandPanel.saveSettings(settings);
 //    recordPanel.saveSettings(settings);
 //    textView.saveSettings(settings);
+}
 void MainWindow::loadAllSettings(QSettings* settings)
+{
     loadMWSettings(settings);
     portControl.loadSettings(settings);
     dataFormatPanel.loadSettings(settings);
     stream.loadSettings(settings);
     plotControlPanel.loadSettings(settings);
     plotMenu.loadSettings(settings);
     commandPanel.loadSettings(settings);
     recordPanel.loadSettings(settings);
     textView.loadSettings(settings);
     updateCheckDialog.loadSettings(settings);
 //    portControl.loadSettings(settings);
 //    dataFormatPanel.loadSettings(settings);
 //    stream.loadSettings(settings);
 //    plotControlPanel.loadSettings(settings);
 //    plotMenu.loadSettings(settings);
 //    commandPanel.loadSettings(settings);
 //    recordPanel.loadSettings(settings);
 //    textView.loadSettings(settings);
+}
 void MainWindow::saveMWSettings(QSettings* settings)
+{
     // save window geometry
     settings->beginGroup(SettingGroup_MainWindow);
     settings->setValue(SG_MainWindow_Size, size());
     settings->setValue(SG_MainWindow_Pos, pos());
     // save active panel
     settings->setValue(SG_MainWindow_ActivePanel,
                        panelSettingMap.value(ui->tabWidget->currentIndex()));
     // save panel minimization
@@ @@ -641,22 +641,18 @@ void MainWindow::handleCommandLineOption @@
         else
+        {
             qCritical() << "Configuration file not exist. Closing application.";
             std::exit(1);
+        }
+    }
     if (parser.isSet(portOpt))
+    {
         portControl.selectPort(parser.value(portOpt));
+    }
     if (parser.isSet(baudrateOpt))
+    {
         portControl.selectBaudrate(parser.value(baudrateOpt));
+    }
     if (parser.isSet(openPortOpt))
+    {
         portControl.openPort();
+    }
+}

src/mainwindow.h

➞

Show inline comments

@@ @@ -35,25 +35,24 @@ @@
 #include <qwt_plot_curve.h>
 #include "portcontrol.h"
 #include "commandpanel.h"
 #include "dataformatpanel.h"
 #include "plotcontrolpanel.h"
 #include "recordpanel.h"
 #include "ui_about_dialog.h"
 #include "stream.h"
 #include "snapshotmanager.h"
 #include "plotmanager.h"
 #include "plotmenu.h"
 #include "updatecheckdialog.h"
 #include "samplecounter.h"
 #include "datatextview.h"
 #include "bpslabel.h"
 namespace Ui {
 class MainWindow;
+}
 class MainWindow : public QMainWindow
+{
     Q_OBJECT
@@ @@ -82,25 +81,24 @@ private: @@
     PlotManager* plotMan;
     QWidget* secondaryPlot;
     SnapshotManager snapshotMan;
     SampleCounter sampleCounter;
     QLabel spsLabel;
     CommandPanel commandPanel;
     DataFormatPanel dataFormatPanel;
     RecordPanel recordPanel;
     PlotControlPanel plotControlPanel;
     PlotMenu plotMenu;
     DataTextView textView;
     UpdateCheckDialog updateCheckDialog;
     BPSLabel bpsLabel;
     void handleCommandLineOptions(const QCoreApplication &app);
     /// Returns true if demo is running
     bool isDemoRunning();
     /// Display a secondary plot in the splitter, removing and
     /// deleting previous one if it exists
     void showSecondary(QWidget* wid);
     /// Hide secondary plot
     void hideSecondary();
     /// Stores settings for all modules

src/mainwindow.ui

➞

Show inline comments

@@ @@ -2,25 +2,25 @@ @@
 <ui version="4.0">
  <class>MainWindow</class>
  <widget class="QMainWindow" name="MainWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>653</width>
     <height>650</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>SerialPlot</string>
+   <string>Tempo Thermocouple Plotter</string>
   </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
      <widget class="QSplitter" name="splitter">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
       <property name="orientation">
@@ @@ -92,34 +92,31 @@ @@
        </layout>
       </widget>
      </widget>
     </item>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>653</width>
-     <height>24</height>
+     <height>30</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
      <string>&amp;Help</string>
     </property>
     <addaction name="actionDemoMode"/>
     <addaction name="actionReportBug"/>
     <addaction name="actionCheckUpdate"/>
     <addaction name="actionHelpAbout"/>
    </widget>
    <widget class="QMenu" name="menuFile">
     <property name="title">
      <string>&amp;File</string>
     </property>
     <addaction name="actionSaveSettings"/>
     <addaction name="actionLoadSettings"/>
     <addaction name="actionExportCsv"/>
     <addaction name="separator"/>
     <addaction name="actionQuit"/>
    </widget>
@@ @@ -211,25 +208,25 @@ @@
    <property name="text">
     <string>&amp;Quit</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+Q</string>
    </property>
   </action>
   <action name="actionReportBug">
    <property name="text">
     <string>&amp;Report a Bug</string>
    </property>
    <property name="toolTip">
-    <string>Report a Bug on SerialPlot Website</string>
+    <string>Report a Bug on Tempo Plotter Website</string>
    </property>
   </action>
   <action name="actionSaveSettings">
    <property name="text">
     <string>&amp;Save Settings</string>
    </property>
    <property name="toolTip">
     <string>Save Settings to a File</string>
    </property>
   </action>
   <action name="actionLoadSettings">
    <property name="text">
@@ @@ -239,24 +236,27 @@ @@
     <string>Load Settings from a File</string>
    </property>
   </action>
   <action name="actionCheckUpdate">
    <property name="text">
     <string>&amp;Check Update</string>
    </property>
   </action>
   <action name="actionBarPlot">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="checked">
     <bool>true</bool>
    </property>
    <property name="text">
     <string>Bar Plot</string>
    </property>
   </action>
   <action name="actionVertical">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="text">
     <string>Vertical</string>
    </property>
   </action>

src/plotcontrolpanel.cpp

➞

Show inline comments

@@ @@ -127,43 +127,26 @@ PlotControlPanel::PlotControlPanel(QWidg @@
     connect(ui->spXmin, static_cast<void(QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
             [this](double v)
+            {
                 // set limit just a little above
                 double step = pow(10, -1 * ui->spXmax->decimals());
                 ui->spXmax->setMinimum(v + step);
             });
     connect(ui->spPlotWidth, SIGNAL(valueChanged(int)),
             this, SLOT(onPlotWidthChanged()));
     // init scale range preset list
     for (int nbits = 8; nbits <= 24; nbits++) // signed binary formats
+    {
         int rmax = pow(2, nbits-1)-1;
         int rmin = -rmax-1;
         Range r = {double(rmin),  double(rmax)};
         ui->cbRangePresets->addItem(
             QString().sprintf("Signed %d bits %d to +%d", nbits, rmin, rmax),
             QVariant::fromValue(r));
+    }
     for (int nbits = 8; nbits <= 24; nbits++) // unsigned binary formats
+    {
         int rmax = pow(2, nbits)-1;
         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()));
     // color selector starts disabled until a channel is selected
     ui->pbColorSel->setDisabled(true);
     setSelectorColor(QColor(0,0,0,0));
     connect(ui->pbColorSel, &QPushButton::clicked, this, &PlotControlPanel::onColorSelect);
     // reset buttons

src/portcontrol.cpp

➞

Show inline comments

@@ @@ -22,30 +22,24 @@ @@
 #include <QSerialPortInfo>
 #include <QKeySequence>
 #include <QLabel>
 #include <QMap>
 #include <QtDebug>
 #include "setting_defines.h"
 #include "utils.h"
 #define TBPORTLIST_MINWIDTH (200)
 // setting mappings
 const QMap<QSerialPort::Parity, QString> paritySettingMap({
         {QSerialPort::NoParity, "none"},
         {QSerialPort::OddParity, "odd"},
         {QSerialPort::EvenParity, "even"},
     });
 PortControl::PortControl(QSerialPort* port, QWidget* parent) :
     QWidget(parent),
     ui(new Ui::PortControl),
     portToolBar("Port Toolbar"),
     openAction("Open", this),
     loadPortListAction("↺", this)
+{
     ui->setupUi(this);
     serialPort = port;
     connect(serialPort, SIGNAL(error(QSerialPort::SerialPortError)),
@@ @@ -79,194 +73,61 @@ PortControl::PortControl(QSerialPort* po @@
                      this, &PortControl::onTbPortListActivated);
     QObject::connect(ui->cbPortList,
                      SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::selectListedPort);
     QObject::connect(&tbPortList,
                      SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::selectListedPort);
     // setup buttons
     ui->pbOpenPort->setDefaultAction(&openAction);
     ui->pbReloadPorts->setDefaultAction(&loadPortListAction);
     // setup baud rate selection widget
     QObject::connect(ui->cbBaudRate,
                      SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::_selectBaudRate);
     // setup parity selection buttons
     parityButtons.addButton(ui->rbNoParity, (int) QSerialPort::NoParity);
     parityButtons.addButton(ui->rbEvenParity, (int) QSerialPort::EvenParity);
     parityButtons.addButton(ui->rbOddParity, (int) QSerialPort::OddParity);
     QObject::connect(&parityButtons,
                      SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),
                      this, &PortControl::selectParity);
     // setup data bits selection buttons
     dataBitsButtons.addButton(ui->rb8Bits, (int) QSerialPort::Data8);
     dataBitsButtons.addButton(ui->rb7Bits, (int) QSerialPort::Data7);
     dataBitsButtons.addButton(ui->rb6Bits, (int) QSerialPort::Data6);
     dataBitsButtons.addButton(ui->rb5Bits, (int) QSerialPort::Data5);
     QObject::connect(&dataBitsButtons,
                      SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),
                      this, &PortControl::selectDataBits);
     // setup stop bits selection buttons
     stopBitsButtons.addButton(ui->rb1StopBit, (int) QSerialPort::OneStop);
     stopBitsButtons.addButton(ui->rb2StopBit, (int) QSerialPort::TwoStop);
     QObject::connect(&stopBitsButtons,
                      SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),
                      this, &PortControl::selectStopBits);
     // setup flow control selection buttons
     flowControlButtons.addButton(ui->rbNoFlowControl,
                                  (int) QSerialPort::NoFlowControl);
     flowControlButtons.addButton(ui->rbHardwareControl,
                                  (int) QSerialPort::HardwareControl);
     flowControlButtons.addButton(ui->rbSoftwareControl,
                                  (int) QSerialPort::SoftwareControl);
     QObject::connect(&flowControlButtons,
                      SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),
                      this, &PortControl::selectFlowControl);
     // initialize signal leds
     ui->ledDTR->setOn(true);
     ui->ledRTS->setOn(true);
     // connect output signals
     connect(ui->pbDTR, &QPushButton::clicked, [this]()
+            {
                 // toggle DTR
                 ui->ledDTR->toggle();
                 if (serialPort->isOpen())
+                {
                     serialPort->setDataTerminalReady(ui->ledDTR->isOn());
+                }
             });
     connect(ui->pbRTS, &QPushButton::clicked, [this]()
+            {
                 // toggle RTS
                 ui->ledRTS->toggle();
                 if (serialPort->isOpen())
+                {
                     serialPort->setRequestToSend(ui->ledRTS->isOn());
+                }
             });
     // setup pin update leds
     ui->ledDCD->setColor(Qt::yellow);
     ui->ledDSR->setColor(Qt::yellow);
     ui->ledRI->setColor(Qt::yellow);
     ui->ledCTS->setColor(Qt::yellow);
     pinUpdateTimer.setInterval(1000); // ms
     connect(&pinUpdateTimer, &QTimer::timeout, this, &PortControl::updatePinLeds);
     loadPortList();
     loadBaudRateList();
     ui->cbBaudRate->setCurrentIndex(ui->cbBaudRate->findText("9600"));
+}
 PortControl::~PortControl()
+{
     delete ui;
+}
 void PortControl::loadPortList()
+{
     QString currentSelection = ui->cbPortList->currentData(PortNameRole).toString();
     portList.loadPortList();
     int index = portList.indexOf(currentSelection);
     if (index >= 0)
+    {
         ui->cbPortList->setCurrentIndex(index);
         tbPortList.setCurrentIndex(index);
+    }
+}
 void PortControl::loadBaudRateList()
+{
     ui->cbBaudRate->clear();
     for (auto baudRate : QSerialPortInfo::standardBaudRates())
+    {
         ui->cbBaudRate->addItem(QString::number(baudRate));
+    }
+}
 void PortControl::_selectBaudRate(QString baudRate)
+{
     if (serialPort->isOpen())
+    {
         if (!serialPort->setBaudRate(baudRate.toInt()))
+        {
             qCritical() << "Can't set baud rate!";
+        }
+    }
+}
 void PortControl::selectParity(int parity)
+{
     if (serialPort->isOpen())
+    {
         if(!serialPort->setParity((QSerialPort::Parity) parity))
+        {
             qCritical() << "Can't set parity option!";
+        }
+    }
+}
 void PortControl::selectDataBits(int dataBits)
+{
     if (serialPort->isOpen())
+    {
         if(!serialPort->setDataBits((QSerialPort::DataBits) dataBits))
+        {
             qCritical() << "Can't set numer of data bits!";
+        }
+    }
+}
 void PortControl::selectStopBits(int stopBits)
+{
     if (serialPort->isOpen())
+    {
         if(!serialPort->setStopBits((QSerialPort::StopBits) stopBits))
+        {
             qCritical() << "Can't set number of stop bits!";
+        }
+    }
+}
 void PortControl::selectFlowControl(int flowControl)
+{
     if (serialPort->isOpen())
+    {
         if(!serialPort->setFlowControl((QSerialPort::FlowControl) flowControl))
+        {
             qCritical() << "Can't set flow control option!";
+        }
+    }
+}
 void PortControl::togglePort()
+{
     if (serialPort->isOpen())
+    {
         pinUpdateTimer.stop();
         serialPort->close();
         qDebug() << "Closed port:" << serialPort->portName();
         emit portToggled(false);
+    }
     else
+    {
         // we get the port name from the edit text, which may not be
         // in the portList if user hasn't pressed Enter
         // Also note that, portText may not be the `portName`
         QString portText = ui->cbPortList->currentText();
         QString portName;
         int portIndex = portList.indexOf(portText);
@@ @@ -280,37 +141,25 @@ void PortControl::togglePort() @@
         else
+        {
             // get the port name from the data field
             portName = static_cast<PortListItem*>(portList.item(portIndex))->portName();
+        }
         serialPort->setPortName(ui->cbPortList->currentData(PortNameRole).toString());
         // open port
         if (serialPort->open(QIODevice::ReadWrite))
+        {
             // set port settings
             _selectBaudRate(ui->cbBaudRate->currentText());
             selectParity((QSerialPort::Parity) parityButtons.checkedId());
             selectDataBits((QSerialPort::DataBits) dataBitsButtons.checkedId());
             selectStopBits((QSerialPort::StopBits) stopBitsButtons.checkedId());
             selectFlowControl((QSerialPort::FlowControl) flowControlButtons.checkedId());
             // set output signals
             serialPort->setDataTerminalReady(ui->ledDTR->isOn());
             serialPort->setRequestToSend(ui->ledRTS->isOn());
             // update pin signals
             updatePinLeds();
             pinUpdateTimer.start();
             _selectBaudRate("115200");
             qDebug() << "Opened port:" << serialPort->portName();
             emit portToggled(true);
+        }
+    }
     openAction.setChecked(serialPort->isOpen());
+}
 void PortControl::selectListedPort(QString portName)
+{
     // portName may be coming from combobox
     portName = portName.split(" ")[0];
@@ @@ -437,177 +286,61 @@ required privileges or device is already @@
             // Qt 5.2 gives "Invalid argument" with 'UnknownError'
             if (isPtsInvalidArgErr())
                 break;
 #endif
             qCritical() << "Unknown error! Error: " << serialPort->errorString();
             break;
         default:
             qCritical() << "Unhandled port error: " << error;
             break;
+    }
+}
 void PortControl::updatePinLeds(void)
+{
     auto pins = serialPort->pinoutSignals();
     ui->ledDCD->setOn(pins & QSerialPort::DataCarrierDetectSignal);
     ui->ledDSR->setOn(pins & QSerialPort::DataSetReadySignal);
     ui->ledRI->setOn(pins & QSerialPort::RingIndicatorSignal);
     ui->ledCTS->setOn(pins & QSerialPort::ClearToSendSignal);
+}
 QString PortControl::currentParityText()
+{
     return paritySettingMap.value(
         (QSerialPort::Parity) parityButtons.checkedId());
+}
 QString PortControl::currentFlowControlText()
+{
     if (flowControlButtons.checkedId() == QSerialPort::HardwareControl)
+    {
         return "hardware";
+    }
     else if (flowControlButtons.checkedId() == QSerialPort::SoftwareControl)
+    {
         return "software";
+    }
     else // no parity
+    {
         return "none";
+    }
+}
 void PortControl::selectPort(QString portName)
+{
     int portIndex = portList.indexOfName(portName);
     if (portIndex < 0) // not in list, add to model and update the selections
+    {
         portList.appendRow(new PortListItem(portName));
         portIndex = portList.rowCount()-1;
+    }
     ui->cbPortList->setCurrentIndex(portIndex);
     tbPortList.setCurrentIndex(portIndex);
     selectListedPort(portName);
+}
 void PortControl::selectBaudrate(QString baudRate)
+{
     int baudRateIndex = ui->cbBaudRate->findText(baudRate);
     if (baudRateIndex < 0)
+    {
         ui->cbBaudRate->setCurrentText(baudRate);
+    }
     else
+    {
         ui->cbBaudRate->setCurrentIndex(baudRateIndex);
+    }
     _selectBaudRate(baudRate);
+}
 void PortControl::openPort()
+{
     if (!serialPort->isOpen())
+    {
         openAction.trigger();
+    }
+}
 unsigned PortControl::maxBitRate() const
+{
     float baud = serialPort->baudRate();
     float dataBits = serialPort->dataBits();
     float parityBits = serialPort->parity() == QSerialPort::NoParity ? 0 : 1;
     float stopBits;
     if (serialPort->stopBits() == QSerialPort::OneAndHalfStop)
+    {
         stopBits = 1.5;
+    }
     else
+    {
         stopBits = serialPort->stopBits();
+    }
     float frame_size = 1 /* start bit */ + dataBits + parityBits + stopBits;
     return float(baud) / frame_size;
+}
 void PortControl::saveSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_Port);
     settings->setValue(SG_Port_SelectedPort, selectedPortName());
     settings->setValue(SG_Port_BaudRate, ui->cbBaudRate->currentText());
     settings->setValue(SG_Port_Parity, currentParityText());
     settings->setValue(SG_Port_DataBits, dataBitsButtons.checkedId());
     settings->setValue(SG_Port_StopBits, stopBitsButtons.checkedId());
     settings->setValue(SG_Port_FlowControl, currentFlowControlText());
     settings->endGroup();
+}
 void PortControl::loadSettings(QSettings* settings)
+{
     // make sure the port is closed
     if (serialPort->isOpen()) togglePort();
     settings->beginGroup(SettingGroup_Port);
     // set port name if it exists in the current list otherwise ignore
     QString portName = settings->value(SG_Port_SelectedPort, QString()).toString();
     if (!portName.isEmpty())
+    {
         int index = portList.indexOfName(portName);
         if (index > -1) ui->cbPortList->setCurrentIndex(index);
+    }
     // load baud rate setting if it exists in baud rate list
     QString baudSetting = settings->value(
         SG_Port_BaudRate, ui->cbBaudRate->currentText()).toString();
     int baudIndex = ui->cbBaudRate->findText(baudSetting);
     if (baudIndex > -1) ui->cbBaudRate->setCurrentIndex(baudIndex);
     // load parity setting
     QString parityText =
         settings->value(SG_Port_Parity, currentParityText()).toString();
     QSerialPort::Parity paritySetting = paritySettingMap.key(
         parityText, (QSerialPort::Parity) parityButtons.checkedId());
     parityButtons.button(paritySetting)->setChecked(true);
     // load number of bits
     int dataBits = settings->value(SG_Port_DataBits, dataBitsButtons.checkedId()).toInt();
     if (dataBits >=5 && dataBits <= 8)
+    {
         dataBitsButtons.button((QSerialPort::DataBits) dataBits)->setChecked(true);
+    }
     // load stop bits
     int stopBits = settings->value(SG_Port_StopBits, stopBitsButtons.checkedId()).toInt();
     if (stopBits == QSerialPort::OneStop)
+    {
         ui->rb1StopBit->setChecked(true);
+    }
     else if (stopBits == QSerialPort::TwoStop)
+    {
         ui->rb2StopBit->setChecked(true);
+    }
     // load flow control
     QString flowControlSetting =
         settings->value(SG_Port_FlowControl, currentFlowControlText()).toString();
     if (flowControlSetting == "hardware")
+    {
         ui->rbHardwareControl->setChecked(true);
+    }
     else if (flowControlSetting == "software")
+    {
         ui->rbSoftwareControl->setChecked(true);
+    }
     else
+    {
         ui->rbNoFlowControl->setChecked(true);
+    }
     settings->endGroup();
+}

src/portcontrol.h

➞

Show inline comments

@@ @@ -52,56 +52,36 @@ public: @@
     void openPort();
     /// Returns maximum bit rate for current baud rate
     unsigned maxBitRate() const;
     /// Stores port settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads port settings from a `QSettings`. If open serial port is closed.
     void loadSettings(QSettings* settings);
 private:
     Ui::PortControl *ui;
     QButtonGroup parityButtons;
     QButtonGroup dataBitsButtons;
     QButtonGroup stopBitsButtons;
     QButtonGroup flowControlButtons;
     QToolBar portToolBar;
     QAction openAction;
     QAction loadPortListAction;
     QComboBox tbPortList;
     PortList portList;
     /// Used to refresh pinout signal leds periodically
     QTimer pinUpdateTimer;
     /// Returns the currently selected (entered) "portName" in the UI
     QString selectedPortName();
     /// Returns currently selected parity as text to be saved in settings
     QString currentParityText();
     /// Returns currently selected flow control as text to be saved in settings
     QString currentFlowControlText();
 private slots:
     void loadPortList();
     void loadBaudRateList();
     void togglePort();
     void selectListedPort(QString portName);
     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 openActionTriggered(bool checked);
     void onCbPortListActivated(int index);
     void onTbPortListActivated(int index);
     void onPortError(QSerialPort::SerialPortError error);
     void updatePinLeds(void);
 signals:
     void portToggled(bool open);
 };
 #endif // PORTCONTROL_H

src/portcontrol.ui

➞

Show inline comments

 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>PortControl</class>
  <widget class="QWidget" name="PortControl">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>631</width>
-    <height>232</height>
+    <height>64</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_3">
      <item>
       <layout class="QGridLayout" name="gridLayout">
        <item row="0" column="0">
         <widget class="QLabel" name="label">
          <property name="text">
           <string>Port:</string>
          </property>
         </widget>
        </item>
        <item row="0" column="1">
         <widget class="QComboBox" name="cbPortList">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="toolTip">
           <string>You can enter a port name even if it's not listed, such as pseudo terminals.</string>
          </property>
          <property name="editable">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <widget class="QComboBox" name="cbBaudRate">
          <property name="toolTip">
           <string>You can enter a custom baud rate if it's supported by your OS/adapter.</string>
          <property name="sizeAdjustPolicy">
           <enum>QComboBox::AdjustToContents</enum>
          </property>
          <property name="inputMethodHints">
           <set>Qt::ImhPreferNumbers</set>
          </property>
          <property name="editable">
           <bool>true</bool>
          <property name="minimumContentsLength">
           <number>22</number>
          </property>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QLabel" name="label_2">
        <item row="0" column="0">
         <widget class="QLabel" name="label">
          <property name="text">
-          <string>Baud Rate:</string>
+          <string>Port:</string>
          </property>
         </widget>
        </item>
        <item row="0" column="2">
         <widget class="QToolButton" name="pbReloadPorts">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="maximumSize">
@@ @@ -74,499 +60,66 @@ @@
            <width>30</width>
            <height>16777215</height>
           </size>
          </property>
          <property name="toolTip">
           <string>Reload the list of ports</string>
          </property>
          <property name="text">
           <string>↺</string>
          </property>
         </widget>
        </item>
       </layout>
      </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_2">
        <item>
         <widget class="QFrame" name="frame">
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_5">
           <item>
            <widget class="QRadioButton" name="rbNoParity">
             <property name="text">
              <string>No Parity</string>
             </property>
             <property name="checked">
              <bool>true</bool>
        <item row="0" column="3">
         <widget class="QToolButton" name="pbOpenPort">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QRadioButton" name="rbOddParity">
             <property name="text">
              <string>Odd Parity</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QRadioButton" name="rbEvenParity">
             <property name="text">
              <string>Even Parity</string>
             </property>
            </widget>
           </item>
           <item>
            <spacer name="verticalSpacer_2">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
          <property name="minimumSize">
              <size>
               <width>20</width>
               <height>2</height>
            <width>85</width>
            <height>25</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QFrame" name="frame_3">
          <layout class="QVBoxLayout" name="verticalLayout_7">
           <item>
            <widget class="QRadioButton" name="rb8Bits">
          <property name="toolTip">
           <string>Toggle port status</string>
          </property>
             <property name="text">
-             <string>8 bits</string>
+          <string>Open</string>
             </property>
-            <property name="checked">
+         <property name="checkable">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QRadioButton" name="rb7Bits">
             <property name="text">
              <string>7 bits</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QRadioButton" name="rb6Bits">
             <property name="text">
              <string>6 bits</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QRadioButton" name="rb5Bits">
             <property name="text">
              <string>5 bits</string>
             </property>
            </widget>
           </item>
           <item>
            <spacer name="verticalSpacer_3">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>2</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QFrame" name="frame_4">
          <layout class="QVBoxLayout" name="verticalLayout">
           <item>
            <widget class="QRadioButton" name="rb1StopBit">
             <property name="text">
              <string>1 Stop Bit</string>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QRadioButton" name="rb2StopBit">
             <property name="text">
              <string>2 Stop Bit</string>
             </property>
            </widget>
           </item>
           <item>
            <spacer name="verticalSpacer_4">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>2</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <widget class="QFrame" name="frame_2">
          <layout class="QVBoxLayout" name="verticalLayout_6">
           <item>
            <widget class="QRadioButton" name="rbNoFlowControl">
             <property name="text">
              <string>No Flow Control</string>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QRadioButton" name="rbHardwareControl">
             <property name="text">
              <string>Hardware Control</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QRadioButton" name="rbSoftwareControl">
             <property name="text">
              <string>Software Control</string>
             </property>
            </widget>
           </item>
           <item>
            <spacer name="verticalSpacer_5">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
               <height>2</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
      </item>
     </layout>
    </item>
    <item>
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>10000</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_4">
      <item>
       <widget class="QToolButton" name="pbOpenPort">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="minimumSize">
         <size>
          <width>85</width>
          <height>50</height>
         </size>
        </property>
        <property name="toolTip">
         <string>Toggle port status</string>
        </property>
        <property name="text">
         <string>Open</string>
        </property>
        <property name="checkable">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
       <layout class="QGridLayout" name="gridLayout_2">
        <property name="spacing">
         <number>2</number>
        </property>
        <item row="1" column="2">
         <widget class="LedWidget" name="ledRTS" native="true">
          <property name="minimumSize">
           <size>
            <width>15</width>
            <height>15</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
            <width>15</width>
            <height>15</height>
           </size>
          </property>
          <property name="toolTip">
           <string>Request To Send</string>
          </property>
         </widget>
        </item>
        <item row="0" column="0">
         <spacer name="horizontalSpacer_2">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>40</width>
            <height>20</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="0" column="1">
         <widget class="QPushButton" name="pbDTR">
          <property name="maximumSize">
           <size>
            <width>40</width>
            <height>20</height>
           </size>
          </property>
          <property name="toolTip">
           <string>Data Terminal Ready</string>
          </property>
          <property name="text">
           <string>DTR</string>
          </property>
         </widget>
        </item>
        <item row="0" column="2">
         <widget class="LedWidget" name="ledDTR" native="true">
          <property name="minimumSize">
           <size>
            <width>15</width>
            <height>15</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
            <width>15</width>
            <height>15</height>
           </size>
          </property>
          <property name="toolTip">
           <string>Data Terminal Ready</string>
          </property>
         </widget>
        </item>
        <item row="3" column="2">
         <widget class="LedWidget" name="ledDSR" native="true">
          <property name="minimumSize">
           <size>
            <width>15</width>
            <height>15</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
            <width>15</width>
            <height>15</height>
           </size>
          </property>
          <property name="toolTip">
           <string>Data Set Ready</string>
          </property>
         </widget>
        </item>
        <item row="3" column="1">
         <widget class="QLabel" name="labDSR">
          <property name="toolTip">
           <string>Data Set Ready</string>
          </property>
          <property name="text">
           <string>DSR</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <widget class="QPushButton" name="pbRTS">
          <property name="maximumSize">
           <size>
            <width>40</width>
            <height>20</height>
           </size>
          </property>
          <property name="toolTip">
           <string>Request To Send</string>
          </property>
          <property name="text">
           <string>RTS</string>
          </property>
         </widget>
        </item>
        <item row="2" column="1">
         <widget class="QLabel" name="labDCD">
          <property name="toolTip">
           <string>Data Carrier Detect</string>
          </property>
          <property name="text">
           <string>DCD</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
          </property>
         </widget>
        </item>
        <item row="2" column="2">
         <widget class="LedWidget" name="ledDCD" native="true">
          <property name="minimumSize">
           <size>
            <width>15</width>
            <height>15</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
            <width>15</width>
            <height>15</height>
           </size>
          </property>
          <property name="toolTip">
           <string>Data Carrier Detect</string>
          </property>
         </widget>
        </item>
        <item row="4" column="1">
         <widget class="QLabel" name="labRI">
          <property name="toolTip">
           <string>Ring Indicator</string>
          </property>
          <property name="text">
           <string>RI</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
          </property>
         </widget>
        </item>
        <item row="4" column="2">
         <widget class="LedWidget" name="ledRI" native="true">
          <property name="minimumSize">
           <size>
            <width>15</width>
            <height>15</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
            <width>15</width>
            <height>15</height>
           </size>
          </property>
          <property name="toolTip">
           <string>Ring Indicator</string>
          </property>
         </widget>
        </item>
        <item row="5" column="2">
         <widget class="LedWidget" name="ledCTS" native="true">
          <property name="minimumSize">
           <size>
            <width>15</width>
            <height>15</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
            <width>15</width>
            <height>15</height>
           </size>
          </property>
          <property name="toolTip">
           <string>Clear To Send</string>
          </property>
         </widget>
        </item>
        <item row="5" column="1">
         <widget class="QLabel" name="labCTS">
          <property name="toolTip">
           <string>Clear To Send</string>
          </property>
          <property name="text">
           <string>CTS</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
          </property>
         </widget>
        </item>
       </layout>
      </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>
     <layout class="QVBoxLayout" name="verticalLayout_4"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>LedWidget</class>
    <extends>QWidget</extends>
    <header>ledwidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>cbPortList</tabstop>
   <tabstop>pbReloadPorts</tabstop>
   <tabstop>pbOpenPort</tabstop>
   <tabstop>cbBaudRate</tabstop>
   <tabstop>rbNoParity</tabstop>
   <tabstop>rbOddParity</tabstop>
   <tabstop>rbEvenParity</tabstop>
   <tabstop>rb8Bits</tabstop>
   <tabstop>rb7Bits</tabstop>
   <tabstop>rb6Bits</tabstop>
   <tabstop>rb5Bits</tabstop>
   <tabstop>rb1StopBit</tabstop>
   <tabstop>rb2StopBit</tabstop>
   <tabstop>rbNoFlowControl</tabstop>
   <tabstop>rbHardwareControl</tabstop>
   <tabstop>rbSoftwareControl</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>

src/updatecheckdialog.cpp

➞

Show inline comments

deleted file

src/updatecheckdialog.h

➞

Show inline comments

deleted file

src/updatecheckdialog.ui

➞

Show inline comments

deleted file

src/updatechecker.cpp

➞

Show inline comments

deleted file

src/updatechecker.h

➞

Show inline comments

deleted file

tempo-plotter.pro

➞

Show inline comments

@@ new file 100644 @@
+#
 # Copyright © 2019 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/>.
+#
 #-------------------------------------------------
+#
 # Project created by QtCreator 2015-03-04T08:20:06
+#
 #-------------------------------------------------
 QT       += core gui serialport network svg
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = tempo-plotter
 TEMPLATE = app
 CONFIG += qwt
 # LIBS += -lqwt # enable this line if qwt pri files aren't installed
 DEFINES += PROGRAM_NAME="\\\"tempo-plotter\\\""
 DEFINES += VERSION_MAJOR=10 VERSION_MINOR=0 VERSION_PATCH=0 VERSION_STRING=\\\"10.0.0\\\"
 SOURCES += \
     src/main.cpp \
     src/mainwindow.cpp \
     src/portcontrol.cpp \
     src/plot.cpp \
     src/zoomer.cpp \
     src/scrollzoomer.cpp \
     src/scrollbar.cpp \
     src/hidabletabwidget.cpp \
     src/scalepicker.cpp \
     src/scalezoomer.cpp \
     src/portlist.cpp \
     src/snapshot.cpp \
     src/snapshotview.cpp \
     src/snapshotmanager.cpp \
     src/plotsnapshotoverlay.cpp \
     src/commandpanel.cpp \
     src/commandwidget.cpp \
     src/commandedit.cpp \
     src/dataformatpanel.cpp \
     src/plotcontrolpanel.cpp \
     src/recordpanel.cpp \
     src/datarecorder.cpp \
     src/tooltipfilter.cpp \
     src/sneakylineedit.cpp \
     src/stream.cpp \
     src/streamchannel.cpp \
     src/channelinfomodel.cpp \
     src/ringbuffer.cpp \
     src/indexbuffer.cpp \
     src/linindexbuffer.cpp \
     src/readonlybuffer.cpp \
     src/framebufferseries.cpp \
     src/numberformatbox.cpp \
     src/endiannessbox.cpp \
     src/abstractreader.cpp \
     src/binarystreamreader.cpp \
     src/binarystreamreadersettings.cpp \
     src/asciireader.cpp \
     src/asciireadersettings.cpp \
     src/demoreader.cpp \
     src/demoreadersettings.cpp \
     src/framedreader.cpp \
     src/framedreadersettings.cpp \
     src/plotmanager.cpp \
     src/plotmenu.cpp \
     src/barplot.cpp \
     src/barchart.cpp \
     src/barscaledraw.cpp \
     src/numberformat.cpp \
     src/versionnumber.cpp \
     src/samplepack.cpp \
     src/source.cpp \
     src/sink.cpp \
     src/samplecounter.cpp \
     src/ledwidget.cpp \
     src/datatextview.cpp \
     src/bpslabel.cpp
 HEADERS += \
     src/mainwindow.h \
     src/utils.h \
     src/portcontrol.h \
     src/floatswap.h \
     src/plot.h \
     src/hidabletabwidget.h \
     src/framebuffer.h \
     src/scalepicker.h \
     src/scalezoomer.h \
     src/portlist.h \
     src/snapshotview.h \
     src/snapshotmanager.h \
     src/snapshot.h \
     src/plotsnapshotoverlay.h \
     src/commandpanel.h \
     src/commandwidget.h \
     src/commandedit.h \
     src/dataformatpanel.h \
     src/tooltipfilter.h \
     src/sneakylineedit.h \
     src/framebufferseries.h \
     src/plotcontrolpanel.h \
     src/numberformatbox.h \
     src/endiannessbox.h \
     src/framedreadersettings.h \
     src/abstractreader.h \
     src/binarystreamreader.h \
     src/binarystreamreadersettings.h \
     src/asciireadersettings.h \
     src/asciireader.h \
     src/demoreader.h \
     src/framedreader.h \
     src/plotmanager.h \
     src/setting_defines.h \
     src/numberformat.h \
     src/recordpanel.h \
     src/demoreadersettings.h \
     src/datatextview.h \
     src/bpslabel.h \
     src/barchart.h \
     src/barplot.h \
     src/barscaledraw.h \
     src/channelinfomodel.h \
     src/datarecorder.h \
     src/defines.h \
     src/indexbuffer.h \
     src/ledwidget.h \
     src/linindexbuffer.h \
     src/plotmenu.h \
     src/readonlybuffer.h \
     src/ringbuffer.h \
     src/samplecounter.h \
     src/samplepack.h \
     src/scrollbar.h \
     src/scrollzoomer.h \
     src/sink.h \
     src/source.h \
     src/streamchannel.h \
     src/stream.h \
     src/version.h \
     src/versionnumber.h \
     src/zoomer.h
 FORMS += \
     src/mainwindow.ui \
     src/about_dialog.ui \
     src/portcontrol.ui \
     src/snapshotview.ui \
     src/commandpanel.ui \
     src/commandwidget.ui \
     src/dataformatpanel.ui \
     src/plotcontrolpanel.ui \
     src/numberformatbox.ui \
     src/endiannessbox.ui \
     src/framedreadersettings.ui \
     src/binarystreamreadersettings.ui \
     src/asciireadersettings.ui \
     src/recordpanel.ui \
     src/demoreadersettings.ui \
     src/datatextview.ui
 INCLUDEPATH += qmake/ src/
 CONFIG += c++11
 RESOURCES += misc/icons.qrc
 win32 {
     RESOURCES += misc/winicons.qrc
+}

0 comments (0 inline, 0 general)