tempo-plotter Changeset - 130806291698 · protofusion repositories

Changeset - 130806291698

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-05-29 08:45:03
hy@ozderya.net

improved error messages by using qWarning and qCritical

2 files changed with 10 insertions and 11 deletions:

mainwindow.cpp

portcontrol.cpp

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -58,612 +58,612 @@ MainWindow::MainWindow(QWidget *parent) @@
     QObject::connect(&portControl, &PortControl::skipByteRequested,
                      this, &MainWindow::skipByte);
     QObject::connect(ui->spNumOfSamples, SELECT<int>::OVERLOAD_OF(&QSpinBox::valueChanged),
                      this, &MainWindow::onNumOfSamplesChanged);
     QObject::connect(ui->cbAutoScale, &QCheckBox::toggled,
                      this, &MainWindow::onAutoScaleChecked);
     QObject::connect(ui->spYmin, SIGNAL(valueChanged(double)),
                      this, SLOT(onYScaleChanged()));
     QObject::connect(ui->spYmax, SIGNAL(valueChanged(double)),
                      this, SLOT(onYScaleChanged()));
     QObject::connect(ui->actionClear, SIGNAL(triggered(bool)),
                      this, SLOT(clearPlot()));
     // setup number 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
     numOfSamples = ui->spNumOfSamples->value();
     numOfChannels = 1;
     dataX.resize(numOfSamples);
     for (int i = 0; i < dataX.size(); i++)
+    {
         dataX[i] = i;
+    }
     // init channel data and curve list
     for (unsigned int i = 0; i < numOfChannels; i++)
+    {
         channelsData.append(DataArray(numOfSamples, 0.0));
         curves.append(new QwtPlotCurve());
         curves[i]->setSamples(dataX, channelsData[i]);
         curves[i]->setPen(makeColor(i));
         curves[i]->attach(ui->plot);
+    }
     // init number format
     if (numberFormatButtons.checkedId() >= 0)
+    {
         selectNumberFormat((NumberFormat) numberFormatButtons.checkedId());
+    }
     else
+    {
         selectNumberFormat(NumberFormat_uint8);
+    }
     // Init demo mode
     demoCount = 0;
     demoTimer.setInterval(100);
     QObject::connect(&demoTimer, &QTimer::timeout,
                      this, &MainWindow::demoTimerTimeout);
     QObject::connect(ui->actionDemoMode, &QAction::toggled,
                      this, &MainWindow::enableDemo);
+}
 MainWindow::~MainWindow()
+{
     for (auto curve : curves)
+    {
         delete curve;
+    }
     if (serialPort.isOpen())
+    {
         serialPort.close();
+    }
     delete ui;
+}
 void MainWindow::setupAboutDialog()
+{
     Ui_AboutDialog uiAboutDialog;
     uiAboutDialog.setupUi(&aboutDialog);
     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);
+}
 void MainWindow::onDataReady()
+{
     if (!ui->actionPause->isChecked())
+    {
         // 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;
+        }
         else
+        {
             int numOfPackagesToRead =
                 (bytesAvailable - (bytesAvailable % packageSize)) / packageSize;
             QVector<DataArray> channelSamples(numOfChannels);
             for (unsigned int ci = 0; ci < numOfChannels; ci++)
+            {
                 channelSamples[ci].resize(numOfPackagesToRead);
+            }
             int i = 0;
             while(i < numOfPackagesToRead)
+            {
                 for (unsigned int ci = 0; ci < numOfChannels; ci++)
+                {
                     channelSamples[ci].replace(i, (this->*readSample)());
+                }
                 i++;
+            }
             for (unsigned int ci = 0; ci < numOfChannels; ci++)
+            {
                 addChannelData(ci, channelSamples[ci]);
+            }
+        }
+    }
     else
+    {
         serialPort.clear(QSerialPort::Input);
+    }
+}
 void MainWindow::onDataReadyASCII()
+{
     while(serialPort.canReadLine())
+    {
         QByteArray line = serialPort.readLine();
         line = line.trimmed();
         auto separatedValues = line.split(',');
         if (separatedValues.length() >= int(numOfChannels))
+        {
             for (unsigned int ci = 0; ci < numOfChannels; ci++)
+            {
                 double channelSample = separatedValues[ci].toDouble();
                 addChannelData(ci, DataArray({channelSample}));
+            }
+        }
         else // there is missing channel data
+        {
-            qDebug() << "Incoming data is missing data for some channels!";
+            qWarning() << "Incoming data is missing data for some channels!";
             for (int ci = 0; ci < separatedValues.length(); ci++)
+            {
                 double channelSample = separatedValues[ci].toDouble();
                 addChannelData(ci, DataArray({channelSample}));
+            }
+        }
+    }
+}
 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();
+            }
             portControl.loadPortList();
             break;
         case QSerialPort::DeviceNotFoundError:
             qCritical() << "Device doesn't exists: " << serialPort.portName();
             break;
         case QSerialPort::PermissionError:
             qCritical() << "Permission denied. Either you don't have \
 required privileges or device is already opened by another process.";
             break;
         case QSerialPort::OpenError:
             qWarning() << "Device is already opened!";
             break;
         case QSerialPort::NotOpenError:
             qCritical() << "Device is not open!";
             break;
         case QSerialPort::ParityError:
             qCritical() << "Parity error detected.";
             break;
         case QSerialPort::FramingError:
             qCritical() << "Framing error detected.";
             break;
         case QSerialPort::BreakConditionError:
             qCritical() << "Break condition is detected.";
             break;
         case QSerialPort::WriteError:
             qCritical() << "An error occurred while writing data.";
             break;
         case QSerialPort::ReadError:
             qCritical() << "An error occurred while reading data.";
             break;
         case QSerialPort::UnsupportedOperationError:
             qCritical() << "Operation is not supported.";
             break;
         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, DataArray data)
+{
     DataArray* channelDataArray = &(channelsData[channel]);
     int offset = numOfSamples - data.size();
     if (offset < 0)
+    {
         for (unsigned int i = 0; i < numOfSamples; i++)
+        {
             (*channelDataArray)[i] = data[i - offset];
+        }
+    }
     else if (offset == 0)
+    {
         (*channelDataArray) = data;
+    }
     else
+    {
         // shift old samples
         int shift = data.size();
         for (int i = 0; i < offset; i++)
+        {
             (*channelDataArray)[i] = (*channelDataArray)[i + shift];
+        }
         // place new samples
         for (int i = 0; i < data.size(); i++)
+        {
             (*channelDataArray)[offset + i] = data[i];
+        }
+    }
     // update plot
     curves[channel]->setSamples(dataX, (*channelDataArray));
     ui->plot->replot(); // TODO: replot after all channel data updated
+}
 void MainWindow::clearPlot()
+{
     for (unsigned int ci = 0; ci < numOfChannels; ci++)
+    {
         channelsData[ci].fill(0.0);
         curves[ci]->setSamples(dataX, channelsData[ci]);
+    }
     // update plot
     ui->plot->replot();
+}
 void MainWindow::onNumOfSamplesChanged(int value)
+{
     unsigned int oldNum = this->numOfSamples;
     numOfSamples = value;
     // resize data arrays
     if (numOfSamples < oldNum)
+    {
         dataX.resize(numOfSamples);
         for (unsigned int ci = 0; ci < numOfChannels; ci++)
+        {
             channelsData[ci].remove(0, oldNum - numOfSamples);
+        }
+    }
     else if(numOfSamples > oldNum)
+    {
         dataX.resize(numOfSamples);
         for (unsigned int i = oldNum; i < numOfSamples; i++)
+        {
             dataX[i] = i;
             for (unsigned int ci = 0; ci < numOfChannels; ci++)
+            {
                 channelsData[ci].prepend(0);
+            }
+        }
+    }
+}
 void MainWindow::onNumOfChannelsChanged(int value)
+{
     unsigned int oldNum = this->numOfChannels;
     this->numOfChannels = value;
     if (numOfChannels > oldNum)
+    {
         // add new channels
         for (unsigned int i = 0; i < numOfChannels - oldNum; i++)
+        {
             channelsData.append(DataArray(numOfSamples, 0.0));
             curves.append(new QwtPlotCurve());
             curves.last()->setSamples(dataX, channelsData.last());
             curves.last()->setPen(makeColor(curves.length()-1));
             curves.last()->attach(ui->plot);
+        }
+    }
     else if(numOfChannels < oldNum)
+    {
         // remove channels
         for (unsigned int i = 0; i < oldNum - numOfChannels; i++)
+        {
             channelsData.removeLast();
             auto curve = curves.takeLast();
             curve->detach();
             delete curve;
+        }
+    }
+}
 void MainWindow::onAutoScaleChecked(bool checked)
+{
     if (checked)
+    {
         ui->plot->setAxisAutoScale(QwtPlot::yLeft);
         ui->lYmin->setEnabled(false);
         ui->lYmax->setEnabled(false);
         ui->spYmin->setEnabled(false);
         ui->spYmax->setEnabled(false);
+    }
     else
+    {
         ui->lYmin->setEnabled(true);
         ui->lYmax->setEnabled(true);
         ui->spYmin->setEnabled(true);
         ui->spYmax->setEnabled(true);
         ui->plot->setAxisScale(QwtPlot::yLeft, ui->spYmin->value(),
                                ui->spYmax->value());
+    }
+}
 void MainWindow::onYScaleChanged()
+{
     ui->plot->setAxisScale(QwtPlot::yLeft, ui->spYmin->value(),
                            ui->spYmax->value());
+}
 void MainWindow::onNumberFormatButtonToggled(int numberFormatId, bool checked)
+{
     if (checked) selectNumberFormat((NumberFormat) numberFormatId);
+}
 void MainWindow::selectNumberFormat(NumberFormat numberFormatId)
+{
     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));
     return double(data);
+}
 bool MainWindow::isDemoRunning()
+{
     return ui->actionDemoMode->isChecked();
+}
 void MainWindow::demoTimerTimeout()
+{
     demoCount++;
     if (demoCount > 100) demoCount = 0;
     if (!ui->actionPause->isChecked())
+    {
         for (unsigned int ci = 0; ci < numOfChannels; ci++)
+        {
             DataArray data(1);
             data.replace(0, (ci + 1)*demoCount);
             addChannelData(ci, data);
+        }
+    }
+}
 void MainWindow::enableDemo(bool enabled)
+{
     if (enabled)
+    {
         if (!serialPort.isOpen())
+        {
             demoTimer.start();
             ui->actionDemoMode->setChecked(true);
+        }
         else
+        {
             ui->actionDemoMode->setChecked(false);
+        }
+    }
     else
+    {
         demoTimer.stop();
         ui->actionDemoMode->setChecked(false);
+    }
+}
 /*
   Below crude drawing demostrates how color selection occurs for
   given channel index
 °                     <--Hue Value-->                           360°
   |* . o . + . o . * . o . + . o . * . o . + . o . * . o . + . o . |
   * -> 0-3
   + -> 4-7
   o -> 8-15
   . -> 16-31
  */
 QColor MainWindow::makeColor(unsigned int channelIndex)
+{
     auto i = channelIndex;
     if (i < 4)
+    {
         return QColor::fromHsv(360*i/4, 255, 230);
+    }
     else
+    {
         double p = floor(log2(i));
         double n = pow(2, p);
         i = i - n;
         return QColor::fromHsv(360*i/n + 360/pow(2,p+1), 255, 230);
+    }
+}
 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);
             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 << channelsData[ci][i];
                     if (ci != numOfChannels-1) fileStream << ",";
+                }
                 fileStream << '\n';
+            }
+        }
         else
+        {
-            qDebug() << "File open error during export: " << file.error();
+            qCritical() << "File open error during export: " << file.error();
+        }
+    }
+}
 void MainWindow::messageHandler(QtMsgType type,
                                 const QMessageLogContext &context,
                                 const QString &msg)
+{
     QString logString;
     switch (type)
+    {
         case QtDebugMsg:
             logString = "[Debug] " + msg;
             break;
         case QtWarningMsg:
             logString = "[Warning] " + msg;
             break;
         case QtCriticalMsg:
             logString = "[Error] " + msg;
             break;
         case QtFatalMsg:
             logString = "[Fatal] " + msg;
             break;
+    }
     ui->ptLog->appendPlainText(logString);
     std::cerr << logString.toStdString() << std::endl;
     if (type != QtDebugMsg)
+    {
         ui->statusBar->showMessage(msg, 5000);
+    }
+}

portcontrol.cpp

➞

Show inline comments

 /*
   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 "portcontrol.h"
 #include "ui_portcontrol.h"
 #include <QSerialPortInfo>
 #include <QtDebug>
 #include "utils.h"
 PortControl::PortControl(QSerialPort* port, QWidget* parent) :
     QWidget(parent),
     ui(new Ui::PortControl)
+{
     ui->setupUi(this);
     serialPort = port;
     QObject::connect(ui->pbReloadPorts, &QPushButton::clicked,
                      this, &PortControl::loadPortList);
     QObject::connect(ui->pbOpenPort, &QPushButton::clicked,
                      this, &PortControl::togglePort);
     QObject::connect(ui->cbPortList,
                      SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::selectPort);
     QObject::connect(ui->cbPortList,
                      SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::onPortNameChanged);
     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);
     // init skip byte button
     QObject::connect(ui->pbSkipByte, &QPushButton::clicked,
                      [this](){emit skipByteRequested();});
     loadPortList();
     loadBaudRateList();
     ui->cbBaudRate->setCurrentIndex(ui->cbBaudRate->findText("9600"));
+}
 PortControl::~PortControl()
+{
     delete ui;
+}
 void PortControl::loadPortList()
+{
     QString currentSelection = ui->cbPortList->currentText();
     ui->cbPortList->clear();
     discoveredPorts.clear();
     for (auto port : QSerialPortInfo::availablePorts())
+    {
         ui->cbPortList->addItem(port.portName());
         discoveredPorts << port.portName();
+    }
     ui->cbPortList->addItems(userEnteredPorts);
     // find current selection in the new list, maybe it doesn't exist anymore?
     int currentSelectionIndex = ui->cbPortList->findText(currentSelection);
     if (currentSelectionIndex >= 0)
+    {
         ui->cbPortList->setCurrentIndex(currentSelectionIndex);
+    }
     else // our port doesn't exist anymore, close port if it's open
+    {
         if (serialPort->isOpen()) togglePort();
+    }
+}
 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()))
+        {
             qDebug() << "Set baud rate failed during select: "
                      << serialPort->error();
             qCritical() << "Can't set baud rate!";
+        }
         else
+        {
-            qDebug() << "Baud rate changed: " << serialPort->baudRate();
+            qDebug() << "Baud rate changed to" << serialPort->baudRate();
+        }
+    }
+}
 void PortControl::selectParity(int parity)
+{
     if (serialPort->isOpen())
+    {
         if(!serialPort->setParity((QSerialPort::Parity) parity))
+        {
-            qDebug() << "Set parity failed: " << serialPort->error();
+            qCritical() << "Can't set parity option!";
+        }
+    }
+}
 void PortControl::selectDataBits(int dataBits)
+{
     if (serialPort->isOpen())
+    {
         if(!serialPort->setDataBits((QSerialPort::DataBits) dataBits))
+        {
-            qDebug() << "Set data bits failed: " << serialPort->error();
+            qCritical() << "Can't set numer of data bits!";
+        }
+    }
+}
 void PortControl::selectStopBits(int stopBits)
+{
     if (serialPort->isOpen())
+    {
         if(!serialPort->setStopBits((QSerialPort::StopBits) stopBits))
+        {
-            qDebug() << "Set stop bits failed: " << serialPort->error();
+            qCritical() << "Can't set number of stop bits!";
+        }
+    }
+}
 void PortControl::selectFlowControl(int flowControl)
+{
     if (serialPort->isOpen())
+    {
         if(!serialPort->setFlowControl((QSerialPort::FlowControl) flowControl))
+        {
-            qDebug() << "Set flow control failed: " << serialPort->error();
+            qCritical() << "Can't set flow control option!";
+        }
+    }
+}
 void PortControl::togglePort()
+{
     if (serialPort->isOpen())
+    {
         serialPort->close();
-        qDebug() << "Port closed, " << serialPort->portName();
+        qDebug() << "Closed port:" << serialPort->portName();
         emit portToggled(false);
+    }
     else
+    {
         serialPort->setPortName(ui->cbPortList->currentText());
         // 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());
-            qDebug() << "Port opened, " << serialPort->portName();
+            qDebug() << "Opened port:" << serialPort->portName();
             emit portToggled(true);
+        }
+    }
     ui->pbOpenPort->setChecked(serialPort->isOpen());
+}
 void PortControl::selectPort(QString portName)
+{
     // has selection actually changed
     if (portName != serialPort->portName())
+    {
         // if another port is already open, close it by toggling
         if (serialPort->isOpen())
+        {
             togglePort();
             // open new selection by toggling
             togglePort();
+        }
+    }
+}
 void PortControl::enableSkipByte(bool enabled)
+{
     ui->pbSkipByte->setDisabled(enabled);
+}
 void PortControl::onPortNameChanged(QString portName)
+{
     // was this a user entered name?
     if(!discoveredPorts.contains(portName) &&
        !userEnteredPorts.contains(portName))
+    {
         userEnteredPorts << portName;
+    }
+}

0 comments (0 inline, 0 general)