Connection settings

adapters/describe.json

@@ -12,6 +12,7 @@
             {
                 "id": 1,
                 "ip": "127.0.0.1",
+                "name": "Connection 1",
                 "persistent": true,
                 "port": 502,
                 "timeout": 1000,
@@ -21,6 +22,7 @@
                 "baudrate": 115200,
                 "databits": 8,
                 "id": 2,
+                "name": "Connection 2",
                 "parity": "N",
                 "persistent": true,
                 "portName": "COM1",
@@ -147,6 +149,11 @@
                             "title": "Connection ID",
                             "type": "integer"
                         },
+                        "name": {
+                            "description": "Human-readable connection name (default: \"Connection <id>\")",
+                            "title": "Connection Name",
+                            "type": "string"
+                        },
                         "persistent": {
                             "description": "Keep connection open between reads",
                             "title": "Keep Connection Persistent",
@@ -258,5 +265,5 @@
         },
         "type": "object"
     },
-    "version": "0.0.1-master"
+    "version": "0.0.1-master:ac7eec7"
 }

adapters/json-rpc-spec.md

@@ -187,6 +187,7 @@ Adapter-wide settings. Currently empty; reserved for future use.
 | Field | Type | Required | Description |
 | --- | --- | --- | --- |
 | `id` | integer | yes | Connection index: `0`, `1`, or `2` |
+| `name` | string | no | Human-readable label (default: `"Connection <id>"`) |
 | `type` | string | yes | `"tcp"` or `"serial"` |
 | `timeout` | integer | no | Timeout in milliseconds (default: `1000`) |
 | `persistent` | boolean | no | Keep connection open between reads (default: `false`) |

src/customwidgets/addabletabwidget.cpp

@@ -21,9 +21,8 @@ void AddableTabWidget::handleCloseTab(int index)
         return;
     }
 
-    emit tabClosed(index);
-
     QWidget* page = widget(index);
+    emit tabClosed(page);
     removeTab(index);
     if (page)
     {

src/customwidgets/addabletabwidget.h

@@ -22,7 +22,7 @@ class AddableTabWidget : public QTabWidget
     QWidget* tabContent(int index) const;
 
 signals:
-    void tabClosed(int index);
+    void tabClosed(QWidget* widget);
     void addTabRequested(); // Emitted when user clicks the "+" button
 
 public slots:

src/customwidgets/deviceconfigtab.cpp

@@ -17,14 +17,13 @@ DeviceConfigTab::DeviceConfigTab(SettingsModel* pSettingsModel,
                                  const QJsonObject& deviceValues,
                                  QWidget* parent)
     : QWidget(parent),
-      _pLayout(nullptr),
+      _pLayout(new QVBoxLayout(this)),
       _pNameEdit(new QLineEdit(this)),
       _pAdapterCombo(new QComboBox(this)),
       _pSchemaForm(nullptr),
       _pSettingsModel(pSettingsModel),
       _deviceId(deviceValues.value("id").toInt(-1))
 {
-    _pLayout = new QVBoxLayout(this);
     setLayout(_pLayout);
 
     auto* nameRow = new QHBoxLayout;
@@ -33,10 +32,9 @@ DeviceConfigTab::DeviceConfigTab(SettingsModel* pSettingsModel,
     nameRow->addStretch();
     _pLayout->addLayout(nameRow);
 
-    int deviceId = deviceValues.value("id").toInt(-1);
-    if (deviceId >= 0 && pSettingsModel->deviceList().contains(static_cast<deviceId_t>(deviceId)))
+    if (_deviceId >= 0 && pSettingsModel->hasDevice(static_cast<deviceId_t>(_deviceId)))
     {
-        _pNameEdit->setText(pSettingsModel->deviceSettings(static_cast<deviceId_t>(deviceId))->name());
+        _pNameEdit->setText(pSettingsModel->deviceSettings(static_cast<deviceId_t>(_deviceId))->name());
     }
 
     auto* adapterRow = new QHBoxLayout;
@@ -66,6 +64,7 @@ DeviceConfigTab::DeviceConfigTab(SettingsModel* pSettingsModel,
         _pAdapterCombo->setCurrentIndex(idx);
     }
 
+    connect(_pNameEdit, &QLineEdit::textChanged, this, &DeviceConfigTab::onNameChanged);
     connect(_pAdapterCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
             &DeviceConfigTab::onAdapterChanged);
 
@@ -96,15 +95,29 @@ void DeviceConfigTab::onAdapterChanged(int index)
     }
     defaultValues["id"] = currentId;
 
+    if (_deviceId >= 0 && _pSettingsModel->hasDevice(static_cast<deviceId_t>(_deviceId)))
+    {
+        _pSettingsModel->deviceSettings(static_cast<deviceId_t>(_deviceId))->setAdapterId(newAdapterId);
+    }
+
     rebuildSchemaForm(newAdapterId, defaultValues);
 }
 
+void DeviceConfigTab::onNameChanged(const QString& name)
+{
+    if (_deviceId >= 0 && _pSettingsModel->hasDevice(static_cast<deviceId_t>(_deviceId)))
+    {
+        _pSettingsModel->deviceSettings(static_cast<deviceId_t>(_deviceId))->setName(name);
+    }
+    emit nameChanged(name);
+}
+
 void DeviceConfigTab::rebuildSchemaForm(const QString& adapterId, const QJsonObject& deviceValues)
 {
     if (_pSchemaForm)
     {
         _pLayout->removeWidget(_pSchemaForm);
-        delete _pSchemaForm;
+        _pSchemaForm->deleteLater();
         _pSchemaForm = nullptr;
     }
 
@@ -137,3 +150,8 @@ QString DeviceConfigTab::deviceName() const
 {
     return _pNameEdit->text();
 }
+
+int DeviceConfigTab::deviceId() const
+{
+    return _deviceId;
+}

src/customwidgets/deviceconfigtab.h

@@ -46,8 +46,19 @@ class DeviceConfigTab : public QWidget
      */
     QString deviceName() const;
 
+    /*!
+     * \brief Return the device ID assigned to this tab, or -1 if none.
+     * \return Device ID as int.
+     */
+    int deviceId() const;
+
+signals:
+    //! Emitted when the device name field changes.
+    void nameChanged(const QString& name);
+
 private slots:
     void onAdapterChanged(int index);
+    void onNameChanged(const QString& name);
 
 private:
     void rebuildSchemaForm(const QString& adapterId, const QJsonObject& deviceValues);

src/customwidgets/deviceform.cpp

@@ -1,8 +1,8 @@
 #include "deviceform.h"
 #include "ui_deviceform.h"
 
-DeviceForm::DeviceForm(SettingsModel* pSettingsModel, deviceId_t _deviceId, QWidget* parent)
-    : QWidget(parent), _pUi(new Ui::DeviceForm), _pSettingsModel(pSettingsModel), _deviceId(_deviceId)
+DeviceForm::DeviceForm(SettingsModel* pSettingsModel, deviceId_t deviceId, QWidget* parent)
+    : QWidget(parent), _pUi(new Ui::DeviceForm), _pSettingsModel(pSettingsModel), _deviceId(deviceId)
 {
     _pUi->setupUi(this);
 
@@ -11,11 +11,7 @@ DeviceForm::DeviceForm(SettingsModel* pSettingsModel, deviceId_t _deviceId, QWid
     _pUi->lineName->setText(dev->name());
     _pUi->spinId->setValue(static_cast<int>(this->_deviceId));
 
-    connect(_pUi->lineName, &QLineEdit::textChanged, this, [this](const QString& newName) {
-        Device* device = _pSettingsModel->deviceSettings(this->_deviceId);
-        device->setName(newName);
-        emit deviceIdentifiersChanged(this->_deviceId);
-    });
+    connect(_pUi->lineName, &QLineEdit::textChanged, this, &DeviceForm::onNameChanged);
     connect(_pUi->spinId, QOverload<int>::of(&QSpinBox::valueChanged), this, [this](int newId) {
         _pSettingsModel->updateDeviceId(this->_deviceId, static_cast<deviceId_t>(newId));
         this->_deviceId = newId;
@@ -32,3 +28,10 @@ deviceId_t DeviceForm::deviceId()
 {
     return _deviceId;
 }
+
+void DeviceForm::onNameChanged(const QString& newName)
+{
+    Device* device = _pSettingsModel->deviceSettings(_deviceId);
+    device->setName(newName);
+    emit deviceIdentifiersChanged(_deviceId);
+}

src/customwidgets/deviceform.h

@@ -14,14 +14,17 @@ class DeviceForm : public QWidget
     Q_OBJECT
 
 public:
-    explicit DeviceForm(SettingsModel* pSettingsModel, deviceId_t _deviceId, QWidget* parent = nullptr);
+    explicit DeviceForm(SettingsModel* pSettingsModel, deviceId_t deviceId, QWidget* parent = nullptr);
     ~DeviceForm();
 
     deviceId_t deviceId();
 
 signals:
     void deviceIdentifiersChanged(deviceId_t devId);
 
+private slots:
+    void onNameChanged(const QString& newName);
+
 private:
     Ui::DeviceForm* _pUi;
 

src/customwidgets/schemaformwidget.cpp

@@ -75,6 +75,7 @@ void SchemaFormWidget::setSchema(const QJsonObject& schema, const QJsonObject& v
 
         QString label = propSchema.value("title").toString(key);
         QWidget* widget = createWidgetForProperty(propSchema, currentValue);
+        wireFieldChanged(key, widget);
         _fields.append({ key, widget });
         _pFormLayout->addRow(label + ":", widget);
     }
@@ -90,6 +91,7 @@ void SchemaFormWidget::setSchema(const QJsonObject& schema, const QJsonObject& v
         QJsonObject propSchema = thenProps.value(key).toObject();
         QString label = propSchema.value("title").toString(key);
         QWidget* widget = createWidgetForProperty(propSchema, values.value(key));
+        wireFieldChanged(key, widget);
         _fields.append({ key, widget });
         _pFormLayout->addRow(label + ":", widget);
     }
@@ -100,6 +102,7 @@ void SchemaFormWidget::setSchema(const QJsonObject& schema, const QJsonObject& v
         QJsonObject propSchema = elseProps.value(key).toObject();
         QString label = propSchema.value("title").toString(key);
         QWidget* widget = createWidgetForProperty(propSchema, values.value(key));
+        wireFieldChanged(key, widget);
         _fields.append({ key, widget });
         _pFormLayout->addRow(label + ":", widget);
     }
@@ -212,6 +215,16 @@ QWidget* SchemaFormWidget::createWidgetForProperty(const QJsonObject& propSchema
     }
 }
 
+void SchemaFormWidget::wireFieldChanged(const QString& key, QWidget* widget)
+{
+    auto* edit = qobject_cast<QLineEdit*>(widget);
+    if (edit == nullptr)
+    {
+        return;
+    }
+    connect(edit, &QLineEdit::textChanged, this, [this, key](const QString& text) { emit fieldChanged(key, text); });
+}
+
 bool SchemaFormWidget::parseConditional(const QJsonObject& schema)
 {
     const QJsonObject ifObj = schema.value("if").toObject();
@@ -223,19 +236,24 @@ bool SchemaFormWidget::parseConditional(const QJsonObject& schema)
         return false;
     }
 
+    const QJsonObject ifProperties = ifObj.value("properties").toObject();
+
+    QString triggerKey;
     const QJsonArray required = ifObj.value("required").toArray();
-    if (required.size() != 1)
+    if (required.size() == 1)
     {
-        return false;
+        triggerKey = required.at(0).toString();
+    }
+    else if (ifProperties.size() == 1)
+    {
+        triggerKey = ifProperties.constBegin().key();
     }
 
-    const QString triggerKey = required.at(0).toString();
     if (triggerKey.isEmpty())
     {
         return false;
     }
 
-    const QJsonObject ifProperties = ifObj.value("properties").toObject();
     const QJsonObject constObj = ifProperties.value(triggerKey).toObject();
     if (!constObj.contains("const"))
     {

src/customwidgets/schemaformwidget.h

@@ -44,13 +44,20 @@ class SchemaFormWidget : public QWidget
      */
     QJsonObject values() const;
 
+signals:
+    //! Emitted when a string field's value changes; \a key is the property name.
+    void fieldChanged(const QString& key, const QString& value);
+
 private slots:
     //! Called when the trigger combo selection changes; re-evaluates conditional visibility.
     void onTriggerChanged(int index);
 
 private:
     QWidget* createWidgetForProperty(const QJsonObject& propSchema, const QJsonValue& value);
 
+    //! If \a widget is a QLineEdit, connects its textChanged to emit fieldChanged(\a key).
+    void wireFieldChanged(const QString& key, QWidget* widget);
+
     /*!
      * \brief Parse the top-level \c if/then/else block and populate conditional state.
      *