Changeset - f5f0a29e6433
Parent rev.
Child rev.
[Not reviewed]
reader-stat
0 3 0
Hasan Yavuz ÖZDERYA - 7 years ago 2019-03-07 15:07:14
hy@ozderya.net
display baud rate warning tooltip and max bit rate in case its hit
3 files changed with 45 insertions and 4 deletions:
src/mainwindow.cpp
19
2
src/portcontrol.cpp
22
1
src/portcontrol.h
4
1
0 comments (0 inline, 0 general)
src/mainwindow.cpp
➞
Show inline comments
 
@@ -38,48 +38,51 @@
 
#include <barplot.h>
 

			




	
	
	
		
 
#include "framebufferseries.h"

			




	
	
	
		
 
#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"}

			




	
	
	
		
 
    });

			




	
	
	
		
 

			




	
	
	
		
 
const char* BPS_TOOLTIP = "bits per second";

			




	
	
	
		
 
const char* BPS_TOOLTIP_ERR = "Maximum baud rate may be reached!";

			




	
	
	
		
 

			




	
	
	
		
 
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)

			




	
	
	
		
 
{

			




	
	
	
		
 
    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->setCurrentIndex(0);

			




	
	
		
 
@@ -212,49 +215,49 @@ MainWindow::MainWindow(QWidget *parent) 

			




	
	
	
		
 
                         }

			




	
	
	
		
 
                     });

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&serialPort, &QIODevice::aboutToClose,

			




	
	
	
		
 
            &recordPanel, &RecordPanel::onPortClose);

			




	
	
	
		
 

			




	
	
	
		
 
    // init plot

			




	
	
	
		
 
    numOfSamples = plotControlPanel.numOfSamples();

			




	
	
	
		
 
    stream.setNumSamples(numOfSamples);

			




	
	
	
		
 
    plotControlPanel.setChannelInfoModel(stream.infoModel());

			




	
	
	
		
 

			




	
	
	
		
 
    // 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

			




	
	
	
		
 
    bpsLabel.setText("0bps");

			




	
	
	
		
 
    bpsLabel.setToolTip(tr("bits per second"));

			




	
	
	
		
 
    bpsLabel.setToolTip(tr(BPS_TOOLTIP));

			




	
	
	
		
 
    ui->statusBar->addPermanentWidget(&bpsLabel);

			




	
	
	
		
 
    connect(&bpsTimer, &QTimer::timeout,

			




	
	
	
		
 
            this, &MainWindow::onBpsTimeout);

			




	
	
	
		
 

			




	
	
	
		
 
    // Init sps (sample per second) counter

			




	
	
	
		
 
    spsLabel.setText("0sps");

			




	
	
	
		
 
    spsLabel.setToolTip(tr("samples per second (per channel)"));

			




	
	
	
		
 
    ui->statusBar->addPermanentWidget(&spsLabel);

			




	
	
	
		
 
    connect(&sampleCounter, &SampleCounter::spsChanged,

			




	
	
	
		
 
            this, &MainWindow::onSpsChanged);

			




	
	
	
		
 

			




	
	
	
		
 
    // init demo

			




	
	
	
		
 
    QObject::connect(ui->actionDemoMode, &QAction::toggled,

			




	
	
	
		
 
                     this, &MainWindow::enableDemo);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->actionDemoMode, &QAction::toggled,

			




	
	
	
		
 
                     plotMan, &PlotManager::showDemoIndicator);

			




	
	
	
		
 

			




	
	
	
		
 
    // init stream connections

			




	
	
	
		
 
    connect(&dataFormatPanel, &DataFormatPanel::sourceChanged,

			




	
	
	
		
 
            this, &MainWindow::onSourceChanged);

			




	
	
	
		
 
    onSourceChanged(dataFormatPanel.activeSource());

			




	
	
	
		
 

			




	
	
	
		
 
    // load default settings

			




	
	
		
 
@@ -351,81 +354,95 @@ void MainWindow::setupAboutDialog()

			




	
	
	
		
 
    QObject::connect(uiAboutDialog.pbAboutQt, &QPushButton::clicked,

			




	
	
	
		
 
                     [](){ QApplication::aboutQt();});

			




	
	
	
		
 

			




	
	
	
		
 
    QString aboutText = uiAboutDialog.lbAbout->text();

			




	
	
	
		
 
    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);

			




	
	
	
		
 

			




	
	
	
		
 
    if (open)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        bpsTimer.start(1000);

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
	
		
 
        bpsTimer.stop();

			




	
	
	
		
 
        // if not cleared last displayed value is stuck

			




	
	
	
		
 
        bpsLabel.setText("0bps");

			




	
	
	
		
 
        bpsLabel.setToolTip(tr(BPS_TOOLTIP));

			




	
	
	
		
 
        spsLabel.setText("0sps");

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::onSourceChanged(Source* source)

			




	
	
	
		
 
{

			




	
	
	
		
 
    source->connectSink(&stream);

			




	
	
	
		
 
    source->connectSink(&sampleCounter);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::clearPlot()

			




	
	
	
		
 
{

			




	
	
	
		
 
    stream.clear();

			




	
	
	
		
 
    plotMan->replot();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::onNumOfSamplesChanged(int value)

			




	
	
	
		
 
{

			




	
	
	
		
 
    numOfSamples = value;

			




	
	
	
		
 
    stream.setNumSamples(value);

			




	
	
	
		
 
    plotMan->replot();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::onSpsChanged(float sps)

			




	
	
	
		
 
{

			




	
	
	
		
 
    int precision = sps < 1. ? 3 : 0;

			




	
	
	
		
 
    spsLabel.setText(QString::number(sps, 'f', precision) + "sps");

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::onBpsTimeout()

			




	
	
	
		
 
{

			




	
	
	
		
 
    unsigned bits = dataFormatPanel.getBytesRead() * 8;

			




	
	
	
		
 
    bpsLabel.setText(QString("%1bps").arg(bits));

			




	
	
	
		
 
    unsigned maxBps = portControl.maxBitRate();

			




	
	
	
		
 
    QString str;

			




	
	
	
		
 
    if (bits >= maxBps)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        // TODO: an icon for bps warning

			




	
	
	
		
 
        str = QString(tr("!%1/%2bps")).arg(bits).arg(maxBps);

			




	
	
	
		
 
        bpsLabel.setToolTip(tr(BPS_TOOLTIP_ERR));

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
	
		
 
        str = QString(tr("%1bps")).arg(bits);

			




	
	
	
		
 
        bpsLabel.setToolTip(tr(BPS_TOOLTIP));

			




	
	
	
		
 
    }

			




	
	
	
		
 
    bpsLabel.setText(str);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool MainWindow::isDemoRunning()

			




	
	
	
		
 
{

			




	
	
	
		
 
    return ui->actionDemoMode->isChecked();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void MainWindow::enableDemo(bool enabled)

			




	
	
	
		
 
{

			




	
	
	
		
 
    if (enabled)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        if (!serialPort.isOpen())

			




	
	
	
		
 
        {

			




	
	
	
		
 
            dataFormatPanel.enableDemo(true);

			




	
	
	
		
 
        }

			




	
	
	
		
 
        else

			




	
	
	
		
 
        {

			




	
	
	
		
 
            ui->actionDemoMode->setChecked(false);

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
	
		
 
        dataFormatPanel.enableDemo(false);

			




	
	
	
		
 
        ui->actionDemoMode->setChecked(false);

			




        

    


    
    

    

        

                

                    src/portcontrol.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
/*

			




	
	
	
		
 
  Copyright © 2017 Hasan Yavuz Özderya

			




	
	
	
		
 
  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/>.

			




	
	
	
		
 
*/

			




	
	
	
		
 

			




	
	
	
		
 
#include "portcontrol.h"

			




	
	
	
		
 
#include "ui_portcontrol.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include <QSerialPortInfo>

			




	
	
	
		
 
#include <QKeySequence>

			




	
	
	
		
 
#include <QLabel>

			




	
	
	
		
 
#include <QMap>

			




	
	
		
 
@@ -432,48 +432,69 @@ void PortControl::updatePinLeds(void)

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
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";

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
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);

			




        

    


    
    

    

        

                

                    src/portcontrol.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
/*

			




	
	
	
		
 
  Copyright © 2017 Hasan Yavuz Özderya

			




	
	
	
		
 
  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/>.

			




	
	
	
		
 
*/

			




	
	
	
		
 

			




	
	
	
		
 
#ifndef PORTCONTROL_H

			




	
	
	
		
 
#define PORTCONTROL_H

			




	
	
	
		
 

			




	
	
	
		
 
#include <QWidget>

			




	
	
	
		
 
#include <QButtonGroup>

			




	
	
	
		
 
#include <QSerialPort>

			




	
	
	
		
 
#include <QStringList>

			




	
	
	
		
 
#include <QToolBar>

			




	
	
	
		
 
#include <QAction>

			




	
	
	
		
 
#include <QComboBox>

			




	
	
	
		
 
#include <QSettings>

			




	
	
	
		
 
#include <QTimer>

			




	
	
	
		
 

			




	
	
	
		
 
#include "portlist.h"

			




	
	
	
		
 

			




	
	
	
		
 
namespace Ui {

			




	
	
	
		
 
class PortControl;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
class PortControl : public QWidget

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
	
		
 
    explicit PortControl(QSerialPort* port, QWidget* parent = 0);

			




	
	
	
		
 
    ~PortControl();

			




	
	
	
		
 

			




	
	
	
		
 
    QSerialPort* serialPort;

			




	
	
	
		
 
    QToolBar* toolBar();

			




	
	
	
		
 

			




	
	
	
		
 
    /// 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();

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-13856
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support