tempo-plotter Changeset - 9f791e07b3c2 · protofusion repositories

Changeset - 9f791e07b3c2

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Hasan Yavuz ÖZDERYA - 8 years ago 2017-11-05 03:30:38
hy@ozderya.net

move port error handling to portcontrol

4 files changed with 61 insertions and 63 deletions:

src/mainwindow.cpp

src/mainwindow.h

src/portcontrol.cpp

src/portcontrol.h

0 comments (0 inline, 0 general)

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -170,28 +170,24 @@ MainWindow::MainWindow(QWidget *parent) @@
             plotMan, &PlotManager::setXAxis);
     connect(&plotControlPanel, &PlotControlPanel::plotWidthChanged,
             plotMan, &PlotManager::setPlotWidth);
     // plot toolbar signals
     QObject::connect(ui->actionClear, SIGNAL(triggered(bool)),
                      this, SLOT(clearPlot()));
     QObject::connect(snapshotMan.takeSnapshotAction(), &QAction::triggered,
                      plotMan, &PlotManager::flashSnapshotOverlay);
     // init port signals
     QObject::connect(&(this->serialPort), SIGNAL(error(QSerialPort::SerialPortError)),
                      this, SLOT(onPortError(QSerialPort::SerialPortError)));
     // init data format and reader
     QObject::connect(&channelMan, &ChannelManager::dataAdded,
                      plotMan, &PlotManager::replot);
     QObject::connect(ui->actionPause, &QAction::triggered,
                      &channelMan, &ChannelManager::pause);
     QObject::connect(&recordPanel, &RecordPanel::recordStarted,
                      &dataFormatPanel, &DataFormatPanel::startRecording);
     QObject::connect(&recordPanel, &RecordPanel::recordStopped,
                      &dataFormatPanel, &DataFormatPanel::stopRecording);
@@ @@ -363,82 +359,24 @@ void MainWindow::setupAboutDialog() @@
     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::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! Error: " << serialPort.errorString();
             break;
         default:
             qCritical() << "Unhandled port error: " << error;
             break;
+    }
+}
 void MainWindow::clearPlot()
+{
     for (unsigned ci = 0; ci < channelMan.numOfChannels(); ci++)
+    {
         channelMan.channelBuffer(ci)->clear();
+    }
     plotMan->replot();
+}
 void MainWindow::onNumOfSamplesChanged(int value)
+{
     numOfSamples = value;

src/mainwindow.h

➞

Show inline comments

@@ @@ -103,25 +103,24 @@ private: @@
     /// Load settings for all modules
     void loadAllSettings(QSettings* settings);
     /// Stores main window settings into a `QSettings`
     void saveMWSettings(QSettings* settings);
     /// Loads main window settings from a `QSettings`
     void loadMWSettings(QSettings* settings);
     /// `QWidget::closeEvent` handler
     void closeEvent(QCloseEvent * event);
 private slots:
     void onPortToggled(bool open);
     void onPortError(QSerialPort::SerialPortError error);
     void onNumOfSamplesChanged(int value);
     void onNumOfChannelsChanged(unsigned value);
     void clearPlot();
     void onSpsChanged(unsigned sps);
     void enableDemo(bool enabled);
     void showBarPlot(bool show);
     void onExportCsv();
     void onSaveSettings();
     void onLoadSettings();

src/portcontrol.cpp

➞

Show inline comments

@@ @@ -39,24 +39,26 @@ const QMap<QSerialPort::Parity, QString> @@
     });
 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)),
             this, SLOT(onPortError(QSerialPort::SerialPortError)));
     // setup actions
     openAction.setCheckable(true);
     openAction.setShortcut(QKeySequence("F12"));
     openAction.setToolTip("Open Port");
     QObject::connect(&openAction, &QAction::triggered,
                      this, &PortControl::openActionTriggered);
     loadPortListAction.setToolTip("Reload port list");
     QObject::connect(&loadPortListAction, &QAction::triggered,
                      [this](bool checked){loadPortList();});
@@ @@ -353,24 +355,82 @@ void PortControl::openActionTriggered(bo @@
+}
 void PortControl::onCbPortListActivated(int index)
+{
     tbPortList.setCurrentIndex(index);
+}
 void PortControl::onTbPortListActivated(int index)
+{
     ui->cbPortList->setCurrentIndex(index);
+}
 void PortControl::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();
                 togglePort();
+            }
             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! 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(

src/portcontrol.h

➞

Show inline comments

@@ @@ -83,19 +83,20 @@ public slots: @@
     void selectPort(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
 private slots:
     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

0 comments (0 inline, 0 general)