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

@@ @@ -226,49 +226,49 @@ void MainWindow::onDataReady() @@
     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;
@@ @@ -611,49 +611,49 @@ void MainWindow::onExportCsv() @@
         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;

portcontrol.cpp

➞

Show inline comments

@@ @@ -125,125 +125,124 @@ void PortControl::loadPortList() @@
         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)
+{

0 comments (0 inline, 0 general)