CanConnection: Convert switches to enumeration and add documentation

And add or remove default labels to silence Clang compiler warnings.
This commit is contained in:
Andre Hartmann
2017-11-26 18:00:28 +01:00
parent cfc024f98a
commit 55273a1b85
+44 -33
View File
@@ -11,6 +11,16 @@ CANConnectionModel::~CANConnectionModel()
{ {
} }
enum class Column {
Bus = 0, ///< A sequential number describing the bus
Type = 1, ///< The CAN driver/backend type, e.g. GVRET, peakcan, or socketcan
Port = 2, ///< The CAN hardware port, e.g. can0 for socketcan
Speed = 3, ///< The bus speed in bit/second
ListenOnly = 4, ///< True if the bus is in listen-only mode
SingleWire = 5, ///< True if the bus operates in single-wire mode
Active = 6, ///< True if the bus is activated for sending and receiving
Status = 7 ///< The bus status as text message
};
QVariant CANConnectionModel::headerData(int section, Qt::Orientation orientation, int role) const QVariant CANConnectionModel::headerData(int section, Qt::Orientation orientation, int role) const
{ {
@@ -19,23 +29,23 @@ QVariant CANConnectionModel::headerData(int section, Qt::Orientation orientation
if (orientation == Qt::Horizontal) if (orientation == Qt::Horizontal)
{ {
switch (section) switch (Column(section))
{ {
case 0: case Column::Bus:
return QString(tr("Bus")); return QString(tr("Bus"));
case 1: case Column::Type:
return QString(tr("Type")); return QString(tr("Type"));
case 2: case Column::Port:
return QString(tr("Port")); return QString(tr("Port"));
case 3: case Column::Speed:
return QString(tr("Speed")); return QString(tr("Speed"));
case 4: case Column::ListenOnly:
return QString(tr("Listen Only")); return QString(tr("Listen Only"));
case 5: case Column::SingleWire:
return QString(tr("Single Wire")); return QString(tr("Single Wire"));
case 6: case Column::Active:
return QString(tr("Active")); return QString(tr("Active"));
case 7: case Column::Status:
return QString(tr("Status")); return QString(tr("Status"));
} }
} }
@@ -82,16 +92,16 @@ Qt::ItemFlags CANConnectionModel::flags(const QModelIndex &index) const
bool editParams = false; bool editParams = false;
if (conn_p->getType() == CANCon::GVRET_SERIAL) editParams = true; if (conn_p->getType() == CANCon::GVRET_SERIAL) editParams = true;
switch (index.column()) switch (Column(index.column()))
{ {
case 3: //speed case Column::Speed:
if (editParams) return Qt::ItemFlag::ItemIsEditable | Qt::ItemFlag::ItemIsEnabled; if (editParams) return Qt::ItemFlag::ItemIsEditable | Qt::ItemFlag::ItemIsEnabled;
return Qt::ItemFlag::NoItemFlags; return Qt::ItemFlag::NoItemFlags;
case 4: //listen only case Column::ListenOnly:
case 5: //single wire case Column::SingleWire:
if (editParams) return Qt::ItemFlag::ItemIsEditable | Qt::ItemFlag::ItemIsEnabled | Qt::ItemFlag::ItemIsUserCheckable; if (editParams) return Qt::ItemFlag::ItemIsEditable | Qt::ItemFlag::ItemIsEnabled | Qt::ItemFlag::ItemIsUserCheckable;
return Qt::ItemFlag::NoItemFlags; return Qt::ItemFlag::NoItemFlags;
case 6: //enabled case Column::Active:
return Qt::ItemFlag::ItemIsEditable | Qt::ItemFlag::ItemIsEnabled | Qt::ItemFlag::ItemIsUserCheckable; return Qt::ItemFlag::ItemIsEditable | Qt::ItemFlag::ItemIsEnabled | Qt::ItemFlag::ItemIsUserCheckable;
default: default:
return Qt::ItemFlag::ItemIsEnabled; return Qt::ItemFlag::ItemIsEnabled;
@@ -110,20 +120,21 @@ bool CANConnectionModel::setData(const QModelIndex &index, const QVariant &value
ret = conn_p->getBusSettings(busId, bus); ret = conn_p->getBusSettings(busId, bus);
if (!ret) return false; if (!ret) return false;
switch (index.column()) switch (Column(index.column()))
{ {
case 3: //speed case Column::Speed:
bus.speed = value.toInt(); bus.speed = value.toInt();
break; break;
case 4: //listen only case Column::ListenOnly:
bus.listenOnly = value.toBool(); bus.listenOnly = value.toBool();
break; break;
case 5: //single wire case Column::SingleWire:
bus.singleWire = value.toBool(); bus.singleWire = value.toBool();
break; break;
case 6: //active case Column::Active:
bus.active = value.toBool(); bus.active = value.toBool();
break; break;
default: {}
} }
conn_p->setBusSettings(busId, bus); conn_p->setBusSettings(busId, bus);
return true; return true;
@@ -147,12 +158,12 @@ QVariant CANConnectionModel::data(const QModelIndex &index, int role) const
if (role == Qt::DisplayRole) { if (role == Qt::DisplayRole) {
switch (index.column()) switch (Column(index.column()))
{ {
case 0: //bus case Column::Bus:
//return QString::number(busId); //return QString::number(busId);
return QString::number(index.row()); return QString::number(index.row());
case 1: //type case Column::Type:
if (conn_p) if (conn_p)
switch (conn_p->getType()) { switch (conn_p->getType()) {
case CANCon::KVASER: return "KVASER"; case CANCon::KVASER: return "KVASER";
@@ -162,35 +173,35 @@ QVariant CANConnectionModel::data(const QModelIndex &index, int role) const
} }
else qDebug() << "Tried to show connection type but connection was NULL"; else qDebug() << "Tried to show connection type but connection was NULL";
break; break;
case 2: //port case Column::Port:
if (conn_p) return conn_p->getPort(); if (conn_p) return conn_p->getPort();
else qDebug() << "Tried to show connection port but connection was NULL"; else qDebug() << "Tried to show connection port but connection was NULL";
break; break;
case 3: //speed case Column::Speed:
if(!ret) return QVariant(); if(!ret) return QVariant();
if (!isSocketCAN) return QString::number(bus.speed); if (!isSocketCAN) return QString::number(bus.speed);
else return QString("N/A"); else return QString("N/A");
case 4: //Listen Only case Column::ListenOnly:
return QVariant(); return QVariant();
case 5: //Single Wire case Column::SingleWire:
return QVariant(); return QVariant();
case 6: //Status case Column::Active:
return QVariant(); return QVariant();
case 7: //Active case Column::Status:
return (conn_p->getStatus()==CANCon::CONNECTED) ? "Connected" : "Not Connected"; return (conn_p->getStatus()==CANCon::CONNECTED) ? "Connected" : "Not Connected";
default: {}
} }
} }
if (role == Qt::CheckStateRole) if (role == Qt::CheckStateRole)
{ {
switch (index.column()) switch (Column(index.column()))
{ {
case 4: case Column::ListenOnly:
return (bus.listenOnly) ? Qt::Checked : Qt::Unchecked; return (bus.listenOnly) ? Qt::Checked : Qt::Unchecked;
case 5: case Column::SingleWire:
return (bus.singleWire) ? Qt::Checked : Qt::Unchecked; return (bus.singleWire) ? Qt::Checked : Qt::Unchecked;
case 6: case Column::Active:
return (bus.active) ? Qt::Checked : Qt::Unchecked; return (bus.active) ? Qt::Checked : Qt::Unchecked;
default: {}
} }
} }