summaryrefslogtreecommitdiffstats
path: root/examples/serialbus
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2017-07-06 20:26:21 +0200
committerAndré Hartmann <aha_1980@gmx.de>2017-07-11 09:00:24 +0000
commit41b46ae9fe32481582bf07cd48bda2d3595c90f7 (patch)
treeb1146fb2ef209a0c8c358296a768446608e0ed9d /examples/serialbus
parent484a79bc7182d1a5d05ce5024716662542ea3a1d (diff)
CAN-Example: Show errors and number of frames written in the UI
Change-Id: I1a8a14abee0cb533d454f67c8fca35099d8b4c1d Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'examples/serialbus')
-rw-r--r--examples/serialbus/can/mainwindow.cpp13
-rw-r--r--examples/serialbus/can/mainwindow.h2
2 files changed, 11 insertions, 4 deletions
diff --git a/examples/serialbus/can/mainwindow.cpp b/examples/serialbus/can/mainwindow.cpp
index 96c3058..fa6519b 100644
--- a/examples/serialbus/can/mainwindow.cpp
+++ b/examples/serialbus/can/mainwindow.cpp
@@ -46,7 +46,6 @@
#include <QCanBusFrame>
#include <QCloseEvent>
#include <QDesktopServices>
-#include <QtDebug>
#include <QTimer>
MainWindow::MainWindow(QWidget *parent) :
@@ -58,7 +57,10 @@ MainWindow::MainWindow(QWidget *parent) :
m_connectDialog = new ConnectDialog;
m_status = new QLabel;
- m_ui->statusBar->addWidget(m_status);
+ m_ui->statusBar->addPermanentWidget(m_status);
+
+ m_written = new QLabel;
+ m_ui->statusBar->addWidget(m_written);
initActionsConnections();
QTimer::singleShot(50, m_connectDialog, &ConnectDialog::show);
@@ -97,7 +99,7 @@ void MainWindow::processErrors(QCanBusDevice::CanBusError error) const
case QCanBusDevice::ConnectionError:
case QCanBusDevice::ConfigurationError:
case QCanBusDevice::UnknownError:
- qWarning() << m_canDevice->errorString();
+ m_status->setText(m_canDevice->errorString());
default:
break;
}
@@ -116,6 +118,8 @@ void MainWindow::connectDevice()
return;
}
+ m_numberFramesWritten = 0;
+
connect(m_canDevice, &QCanBusDevice::errorOccurred, this, &MainWindow::processErrors);
connect(m_canDevice, &QCanBusDevice::framesReceived, this, &MainWindow::processReceivedFrames);
connect(m_canDevice, &QCanBusDevice::framesWritten, this, &MainWindow::processFramesWritten);
@@ -167,7 +171,8 @@ void MainWindow::disconnectDevice()
void MainWindow::processFramesWritten(qint64 count)
{
- qDebug() << "Number of frames written:" << count;
+ m_numberFramesWritten += count;
+ m_written->setText(tr("%1 frames written").arg(m_numberFramesWritten));
}
void MainWindow::closeEvent(QCloseEvent *event)
diff --git a/examples/serialbus/can/mainwindow.h b/examples/serialbus/can/mainwindow.h
index a23fbae..b0c6ef9 100644
--- a/examples/serialbus/can/mainwindow.h
+++ b/examples/serialbus/can/mainwindow.h
@@ -80,8 +80,10 @@ protected:
private:
void initActionsConnections();
+ qint64 m_numberFramesWritten = 0;
Ui::MainWindow *m_ui = nullptr;
QLabel *m_status = nullptr;
+ QLabel *m_written = nullptr;
ConnectDialog *m_connectDialog = nullptr;
QCanBusDevice *m_canDevice = nullptr;
};