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

@@ @@ -154,193 +154,193 @@ MainWindow::~MainWindow() @@
+    {
         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];
+        }
@@ @@ -539,131 +539,131 @@ void MainWindow::demoTimerTimeout() @@
             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

@@ @@ -53,209 +53,208 @@ PortControl::PortControl(QSerialPort* po @@
     // 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)