ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #243: Update device names when changed by the plugin

pull/253/head
Jenkins nymea 2020-01-22 23:47:15 +01:00
parent 6552c7e221 b3ebbc18c0
commit 670bda1e28
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libnymea-core/devices/devicemanagerimplementation.cpp
View File

@ -473,8 +473,6 @@ Device::DeviceError DeviceManagerImplementation::editDevice(const DeviceId &devi
return Device::DeviceErrorDeviceNotFound;
device->setName(name);
storeConfiguredDevices();
emit deviceChanged(device);
return Device::DeviceErrorNoError;
}
@ -1567,6 +1565,16 @@ void DeviceManagerImplementation::slotDeviceSettingChanged(const ParamTypeId &pa
emit deviceSettingChanged(device->id(), paramTypeId, value);
}
void DeviceManagerImplementation::slotDeviceNameChanged()
{
Device *device = qobject_cast<Device*>(sender());
if (!device) {
return;
}
storeConfiguredDevices();
emit deviceChanged(device);
}
ParamList DeviceManagerImplementation::buildParams(const ParamTypes &types, const ParamList &first, const ParamList &second)
{
// Merge params from discovered descriptor and additional overrides provided on API call. User provided params have higher priority than discovery params.
@ -1648,6 +1656,7 @@ DeviceSetupInfo* DeviceManagerImplementation::setupDevice(Device *device)
connect(device, &Device::stateValueChanged, this, &DeviceManagerImplementation::slotDeviceStateValueChanged);
connect(device, &Device::settingChanged, this, &DeviceManagerImplementation::slotDeviceSettingChanged);
connect(device, &Device::nameChanged, this, &DeviceManagerImplementation::slotDeviceNameChanged);
DeviceSetupInfo *info = new DeviceSetupInfo(device, this, 30000);

1
libnymea-core/devices/devicemanagerimplementation.h
View File

@ -129,6 +129,7 @@ private slots:
// Only connect this to Devices. It will query the sender()
void slotDeviceStateValueChanged(const StateTypeId &stateTypeId, const QVariant &value);
void slotDeviceSettingChanged(const ParamTypeId &paramTypeId, const QVariant &value);
void slotDeviceNameChanged();
private:
// Builds a list of params ready to create a device.