GitHub-Mirror/qt-openzwave
2
0
Fork 0
mirror of https://github.com/Fishwaldo/qt-openzwave.git synced 2025-07-06 13:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use . instead of : to seperate Node/Instance in assocation models

Browse source
This commit is contained in:
Justin Hammond 2019-12-27 17:34:46 +08:00
parent a18fc443bf
commit c970e3d081
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qt-openzwave/source/qtozwassociationmodel_p.cpp
View file

@ -114,7 +114,7 @@ void QTOZW_Associations_internal::addAssociation(quint8 _nodeID, quint8 _groupID
return; return;
} }
QString target; QString target;
target.append(QString::number(_targetNode)).append(":").append(QString::number(_targetInstance)); target.append(QString::number(_targetNode)).append(".").append(QString::number(_targetInstance));
QStringList targetlist = this->m_associationData[row][associationColumns::Members].toStringList(); QStringList targetlist = this->m_associationData[row][associationColumns::Members].toStringList();
if (targetlist.contains(target)) { if (targetlist.contains(target)) {
qCWarning(associationModel) << "addAssociation: Target " << target << "already exists in Group " << _groupIDX << "for node " << _nodeID; qCWarning(associationModel) << "addAssociation: Target " << target << "already exists in Group " << _groupIDX << "for node " << _nodeID;
@ -134,7 +134,7 @@ void QTOZW_Associations_internal::delAssociation(quint8 _nodeID, quint8 _groupID
return; return;
} }
QString target; QString target;
target.append(QString::number(_targetNode)).append(":").append(QString::number(_targetInstance)); target.append(QString::number(_targetNode)).append(".").append(QString::number(_targetInstance));
QStringList targetlist = this->m_associationData[row][associationColumns::Members].toStringList(); QStringList targetlist = this->m_associationData[row][associationColumns::Members].toStringList();
if (!targetlist.contains(target)) { if (!targetlist.contains(target)) {
qCWarning(associationModel) << "delAssociation: Target " << target << "does not exist in Group " << _groupIDX << "for node " << _nodeID; qCWarning(associationModel) << "delAssociation: Target " << target << "does not exist in Group " << _groupIDX << "for node " << _nodeID;
@ -154,7 +154,7 @@ bool QTOZW_Associations_internal::findAssociation(quint8 _nodeID, quint8 _groupI
return false; return false;
} }
QString target; QString target;
target.append(QString::number(_targetNode)).append(":").append(QString::number(_targetInstance)); target.append(QString::number(_targetNode)).append(".").append(QString::number(_targetInstance));
QStringList targetlist = this->m_associationData[row][associationColumns::Members].toStringList(); QStringList targetlist = this->m_associationData[row][associationColumns::Members].toStringList();
if (!targetlist.contains(target)) { if (!targetlist.contains(target)) {
return false; return false;

4
qt-openzwave/source/qtozwmanager_p.cpp
View file

@ -1152,8 +1152,8 @@ void QTOZWManager_Internal::pvt_nodeGroupChanged(quint8 node, quint8 group)
QStringList removeitems; QStringList removeitems;
for (int i = 0; i < list.size(); ++i) { for (int i = 0; i < list.size(); ++i) {
QString member = list.at(i); QString member = list.at(i);
int targetnode = member.split(":")[0].toInt(); int targetnode = member.split(".")[0].toInt();
int targetinstance = member.split(":")[1].toInt(); int targetinstance = member.split(".")[1].toInt();
bool found = false; bool found = false;
for (quint32 j = 0; j < count; j++) { for (quint32 j = 0; j < count; j++) {
if (targetnode == ia[i].m_nodeId && targetinstance == ia[i].m_instance) if (targetnode == ia[i].m_nodeId && targetinstance == ia[i].m_instance)