Device List: add "Remove disconnected devices" button #480
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I tested this by:
|
blammit
force-pushed
the
device-list-disconnected
branch
2 times, most recently
from
5e446a6
to
a337eb6
Compare
This will allow the aggregate model to identify devices uniquely, in the case where a device of the same service may appear in multiple device models. For example, an inverter/charger may appear in both Global.veBusDevices.model and Global.acInputs.model.
blammit
force-pushed
the
device-list-disconnected
branch
from
a337eb6
to
33c5251
Compare
blammit
force-pushed
the
device-list-disconnected
branch
from
33c5251
to
f06e10d
Compare
|
Fixed build issue on cerbo. |
src/aggregatedevicemodel.cpp
Outdated
| int index = indexOf(DeviceInfo::infoId(device, sourceModel)); | ||
| if (index >= 0) { | ||
| // The device is already in the list, i.e. it was disconnected then reconnected. | ||
| QList<int> roles = QList<int>() << ConnectedRole; |
There was a problem hiding this comment.
maybe: QList roles(ConnectedRole);
here and elsewhere
There was a problem hiding this comment.
or roles { ConnectedRole };
src/aggregatedevicemodel.cpp
Outdated
| m_deviceInfos[index].device->disconnect(this); | ||
| } | ||
| m_deviceInfos[index].device.clear(); | ||
| static const QList<int> roles = QList<int>() << ConnectedRole << DeviceRole; |
There was a problem hiding this comment.
maybe: static const QList roles(ConnectedRole, DeviceRole);
There was a problem hiding this comment.
or roles { ConnectedRole, DeviceRole };
chriadam
approved these changes
Oct 25, 2023
The Device List should show devices that have been disconnected, i.e. those that have been removed from the source models as they are no longer valid. So, instead of automatically syncing the aggregate model when a source model removes a device, keep the device in the aggregate model, and remove it when the removeDisconnectedDevices() functionality is triggered. When a device is disconnected: - Show a cached copy of the device description, so that the list item text does not disappear. - Show "Not connected" as the secondary text; when the device is reconnected, the device status text should revert to whatever is appropriate for that device.
blammit
force-pushed
the
device-list-disconnected
branch
from
f06e10d
to
d0b5a34
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Device List should show devices that have been disconnected, i.e. those that have been removed from the source models as they are no longer valid.
So, instead of automatically syncing the aggregate model when a source model removes a device, keep the device in the aggregate model, and remove it when the removeDisconnectedDevices() functionality is triggered.
When a device is disconnected: