Change the reported number of connected buses to be the number of actually connected buses not the total number of buses

This commit is contained in:
Collin Kidder
2017-01-05 19:04:32 -05:00
parent d950ff2d88
commit b00984c266
2 changed files with 14 additions and 2 deletions
+13 -2
View File
@@ -21,6 +21,8 @@ CANConManager::CANConManager(QObject *parent): QObject(parent)
mTimer.setSingleShot(false); mTimer.setSingleShot(false);
mTimer.start(); mTimer.start();
mNumActiveBuses = 0;
resetTimeBasis(); resetTimeBasis();
} }
@@ -39,7 +41,6 @@ CANConManager::~CANConManager()
void CANConManager::add(CANConnection* pConn_p) void CANConManager::add(CANConnection* pConn_p)
{ {
mConns.append(pConn_p); mConns.append(pConn_p);
emit connectionStatusUpdated(getNumBuses());
} }
@@ -47,7 +48,6 @@ void CANConManager::remove(CANConnection* pConn_p)
{ {
//disconnect(pConn_p, 0, this, 0); //disconnect(pConn_p, 0, this, 0);
mConns.removeOne(pConn_p); mConns.removeOne(pConn_p);
emit connectionStatusUpdated(getNumBuses());
} }
//Get total number of buses currently registered with the program //Get total number of buses currently registered with the program
@@ -104,6 +104,17 @@ CANConnection* CANConManager::getByName(const QString& pName) const
void CANConManager::refreshConnection(CANConnection* pConn_p) void CANConManager::refreshConnection(CANConnection* pConn_p)
{ {
int buses = 0;
foreach(CANConnection* conn_p, mConns)
{
if (conn_p->getStatus() == CANCon::CONNECTED) buses += conn_p->getNumBuses();
}
if (buses != mNumActiveBuses)
{
mNumActiveBuses = buses;
emit connectionStatusUpdated(buses);
}
if (pConn_p->getQueue().peek() == NULL) return; if (pConn_p->getQueue().peek() == NULL) return;
CANFrame* frame_p = NULL; CANFrame* frame_p = NULL;
+1
View File
@@ -73,6 +73,7 @@ private:
QList<CANConnection*> mConns; QList<CANConnection*> mConns;
QTimer mTimer; QTimer mTimer;
uint64_t mTimestampBasis; uint64_t mTimestampBasis;
uint32_t mNumActiveBuses;
}; };
#endif // CANCONNECTIONMODEL_H #endif // CANCONNECTIONMODEL_H