Remove buildExpression relay from ModbusPoll

AddRegisterWidget and RegisterDialog now reference AdapterManager
directly instead of going through ModbusPoll. ModbusPoll gains an
adapterManager() getter so MainWindow can pass the manager to
RegisterDialog without knowing its internals.

AdapterManager::buildExpression is marked virtual to allow test
subclassing. MockModbusPoll in tst_addregisterwidget is replaced by
MockAdapterManager, which overrides the virtual method and injects
results via the buildExpressionResult signal.

https://claude.ai/code/session_01AtVwF9u3BD3kqhLUfubEaX

Author: claude

src/ProtocolAdapter/adaptermanager.h

@@ -60,7 +60,7 @@ class AdapterManager : public QObject
      * \param dataType      Data type identifier (e.g. "16b"). Pass empty string for the adapter default.
      * \param deviceId      Device identifier. Pass 0 for the adapter default.
      */
-    void buildExpression(const QJsonObject& addressFields, const QString& dataType, deviceId_t deviceId);
+    virtual void buildExpression(const QJsonObject& addressFields, const QString& dataType, deviceId_t deviceId);
 
     /*!
      * \brief Route an adapter.diagnostic notification to the diagnostics log.

src/communication/modbuspoll.cpp

@@ -5,7 +5,6 @@
 #include "util/formatdatetime.h"
 #include "util/scopelogging.h"
 
-#include <QJsonArray>
 
 ModbusPoll::ModbusPoll(SettingsModel* pSettingsModel, QObject* parent) : QObject(parent), _bPollActive(false)
 {
@@ -20,7 +19,6 @@ ModbusPoll::ModbusPoll(SettingsModel* pSettingsModel, QObject* parent) : QObject
 
     connect(_pAdapterManager, &AdapterManager::sessionStarted, this, &ModbusPoll::triggerRegisterRead);
     connect(_pAdapterManager, &AdapterManager::readDataResult, this, &ModbusPoll::onReadDataResult);
-    connect(_pAdapterManager, &AdapterManager::buildExpressionResult, this, &ModbusPoll::buildExpressionResult);
     connect(_pAdapterManager, &AdapterManager::sessionStopped, this, &ModbusPoll::initAdapter);
     connect(_pAdapterManager, &AdapterManager::sessionError, this, [this](QString message) {
         qCWarning(scopeComm) << "AdapterClient error:" << message;
@@ -109,15 +107,11 @@ void ModbusPoll::onReadDataResult(ResultDoubleList results)
     }
 }
 
-/*!
- * \brief Request the adapter to construct a register expression from its component parts.
- * \param addressFields Address field values from the register schema form.
- * \param dataType      Data type identifier; empty string uses the adapter default.
- * \param deviceId      Device identifier; 0 uses the adapter default.
- */
-void ModbusPoll::buildExpression(const QJsonObject& addressFields, const QString& dataType, deviceId_t deviceId)
+
+/*! \brief Returns the AdapterManager owned by this instance. */
+AdapterManager* ModbusPoll::adapterManager() const
 {
-    _pAdapterManager->buildExpression(addressFields, dataType, deviceId);
+    return _pAdapterManager;
 }
 
 QStringList ModbusPoll::buildRegisterExpressions(const QList<DataPoint>& registerList)

src/communication/modbuspoll.h

@@ -5,7 +5,6 @@
 #include "communication/datapoint.h"
 #include "util/result.h"
 
-#include <QJsonObject>
 #include <QStringList>
 #include <QTimer>
 
@@ -27,25 +26,16 @@ class ModbusPoll : public QObject
     void resetCommunicationStats();
 
     /*!
-     * \brief Request the adapter to construct a register expression string from its component parts.
+     * \brief Returns the AdapterManager owned by this poll instance.
      *
-     * Delegates to AdapterManager::buildExpression(). Emits buildExpressionResult() on response.
-     *
-     * \param addressFields Address field values as returned by the register schema form.
-     * \param dataType      Data type identifier (e.g. "16b"). Pass empty string to use the adapter default.
-     * \param deviceId      Device identifier. Pass 0 to use the adapter default.
+     * Callers that need to interact with the adapter directly (e.g. to call
+     * buildExpression()) should use this accessor rather than going through ModbusPoll.
      */
-    virtual void buildExpression(const QJsonObject& addressFields, const QString& dataType, deviceId_t deviceId);
+    AdapterManager* adapterManager() const;
 
 signals:
     void registerDataReady(ResultDoubleList registers);
 
-    /*!
-     * \brief Emitted when an adapter.buildExpression response has been received.
-     * \param expression The constructed register expression string (e.g. \c ${h0:f32b}).
-     */
-    void buildExpressionResult(QString expression);
-
 private slots:
     void triggerRegisterRead();
     void onReadDataResult(ResultDoubleList results);

src/dialogs/addregisterwidget.cpp

@@ -1,7 +1,7 @@
 #include "addregisterwidget.h"
 #include "ui_addregisterwidget.h"
 
-#include "communication/modbuspoll.h"
+#include "ProtocolAdapter/adaptermanager.h"
 #include "customwidgets/schemaformwidget.h"
 #include "models/adapterdata.h"
 #include "models/device.h"
@@ -14,18 +14,18 @@
  * \brief Constructs the widget and populates it from the adapter's register schema.
  * \param pSettingsModel Pointer to the application settings model.
  * \param adapterId      Identifier of the adapter whose register schema to use.
- * \param pModbusPoll    Pointer to the Modbus poll instance used to build expression strings.
+ * \param pAdapterManager Pointer to the adapter manager used to build expression strings.
  * \param parent         Optional parent widget.
  */
 AddRegisterWidget::AddRegisterWidget(SettingsModel* pSettingsModel,
                                      const QString& adapterId,
-                                     ModbusPoll* pModbusPoll,
+                                     AdapterManager* pAdapterManager,
                                      QWidget* parent)
     : QWidget(parent),
       _pUi(new Ui::AddRegisterWidget),
       _pAddressForm(new SchemaFormWidget(this)),
       _pSettingsModel(pSettingsModel),
-      _pModbusPoll(pModbusPoll)
+      _pAdapterManager(pAdapterManager)
 {
     _pUi->setupUi(this);
 
@@ -77,7 +77,7 @@ AddRegisterWidget::AddRegisterWidget(SettingsModel* pSettingsModel,
     }
 
     connect(_pUi->btnAdd, &QPushButton::clicked, this, &AddRegisterWidget::handleResultAccept);
-    connect(_pModbusPoll, &ModbusPoll::buildExpressionResult, this, &AddRegisterWidget::onBuildExpressionResult);
+    connect(_pAdapterManager, &AdapterManager::buildExpressionResult, this, &AddRegisterWidget::onBuildExpressionResult);
 
     _axisGroup.setExclusive(true);
     _axisGroup.addButton(_pUi->radioPrimary);
@@ -111,7 +111,7 @@ void AddRegisterWidget::handleResultAccept()
     }
 
     _pUi->btnAdd->setEnabled(false);
-    _pModbusPoll->buildExpression(addressValues, typeId, deviceId);
+    _pAdapterManager->buildExpression(addressValues, typeId, deviceId);
 }
 
 void AddRegisterWidget::onBuildExpressionResult(const QString& expression)

src/dialogs/addregisterwidget.h

@@ -8,7 +8,7 @@
 #include <QJsonObject>
 #include <QWidget>
 
-class ModbusPoll;
+class AdapterManager;
 class SchemaFormWidget;
 class SettingsModel;
 
@@ -25,7 +25,7 @@ class AddRegisterWidget : public QWidget
 public:
     explicit AddRegisterWidget(SettingsModel* pSettingsModel,
                                const QString& adapterId,
-                               ModbusPoll* pModbusPoll,
+                               AdapterManager* pAdapterManager,
                                QWidget* parent = nullptr);
     ~AddRegisterWidget();
 
@@ -46,7 +46,7 @@ private slots:
     int _defaultTypeIndex{ 0 };
 
     SettingsModel* _pSettingsModel;
-    ModbusPoll* _pModbusPoll;
+    AdapterManager* _pAdapterManager;
 
     QButtonGroup _axisGroup;
 

src/dialogs/mainwindow.cpp

@@ -397,7 +397,7 @@ void MainWindow::showRegisterDialog()
         _pGuiModel->setGuiState(GuiState::INIT);
     }
 
-    RegisterDialog registerDialog(_pGraphDataModel, _pSettingsModel, _pModbusPoll, this);
+    RegisterDialog registerDialog(_pGraphDataModel, _pSettingsModel, _pModbusPoll->adapterManager(), this);
     registerDialog.exec();
 }
 

src/dialogs/registerdialog.cpp

@@ -1,7 +1,7 @@
 
 #include "registerdialog.h"
 
-#include "communication/modbuspoll.h"
+#include "ProtocolAdapter/adaptermanager.h"
 #include "customwidgets/actionbuttondelegate.h"
 #include "dialogs/addregisterwidget.h"
 #include "dialogs/expressionsdialog.h"
@@ -14,7 +14,7 @@
 
 RegisterDialog::RegisterDialog(GraphDataModel* pGraphDataModel,
                                SettingsModel* pSettingsModel,
-                               ModbusPoll* pModbusPoll,
+                               AdapterManager* pAdapterManager,
                                QWidget* parent)
     : QDialog(parent), _pUi(new Ui::RegisterDialog)
 {
@@ -25,7 +25,7 @@ RegisterDialog::RegisterDialog(GraphDataModel* pGraphDataModel,
 
     _pGraphDataModel = pGraphDataModel;
     _pSettingsModel = pSettingsModel;
-    _pModbusPoll = pModbusPoll;
+    _pAdapterManager = pAdapterManager;
 
     // Setup registerView
     _pUi->registerView->setModel(_pGraphDataModel);
@@ -76,7 +76,7 @@ RegisterDialog::RegisterDialog(GraphDataModel* pGraphDataModel,
     const QString adapterId = ids.isEmpty() ? QString() : ids.first();
     if (!adapterId.isEmpty())
     {
-        auto registerPopupMenu = new AddRegisterWidget(_pSettingsModel, adapterId, _pModbusPoll, this);
+        auto registerPopupMenu = new AddRegisterWidget(_pSettingsModel, adapterId, _pAdapterManager, this);
         connect(registerPopupMenu, &AddRegisterWidget::graphDataConfigured, this, &RegisterDialog::addRegister);
 
         _registerPopupAction = std::make_unique<QWidgetAction>(this);

src/dialogs/registerdialog.h

@@ -8,7 +8,7 @@
 
 /* Forward declaration */
 class GraphDataModel;
-class ModbusPoll;
+class AdapterManager;
 class SettingsModel;
 class RegisterValueAxisDelegate;
 class ActionButtonDelegate;
@@ -25,7 +25,7 @@ class RegisterDialog : public QDialog
 public:
     explicit RegisterDialog(GraphDataModel* pGraphDataModel,
                             SettingsModel* pSettingsModel,
-                            ModbusPoll* pModbusPoll,
+                            AdapterManager* pAdapterManager,
                             QWidget* parent = nullptr);
     ~RegisterDialog();
 
@@ -45,7 +45,7 @@ private slots:
 
     GraphDataModel* _pGraphDataModel;
     SettingsModel* _pSettingsModel;
-    ModbusPoll* _pModbusPoll;
+    AdapterManager* _pAdapterManager;
 
     CenteredBoxProxyStyle _centeredBoxStyle;
 

tests/dialogs/tst_addregisterwidget.cpp

@@ -66,16 +66,16 @@ void TestAddRegisterWidget::init()
     _settingsModel.setAdapterRegisterSchema("modbus", buildTestRegisterSchema());
     _settingsModel.deviceSettings(Device::cFirstDeviceId)->setAdapterId("modbus");
 
-    _pMockModbusPoll = new MockModbusPoll(&_settingsModel);
-    _pRegWidget = new AddRegisterWidget(&_settingsModel, QStringLiteral("modbus"), _pMockModbusPoll);
+    _pMockAdapterManager = new MockAdapterManager(&_settingsModel);
+    _pRegWidget = new AddRegisterWidget(&_settingsModel, QStringLiteral("modbus"), _pMockAdapterManager);
 }
 
 void TestAddRegisterWidget::cleanup()
 {
     delete _pRegWidget;
     _pRegWidget = nullptr;
-    delete _pMockModbusPoll;
-    _pMockModbusPoll = nullptr;
+    delete _pMockAdapterManager;
+    _pMockAdapterManager = nullptr;
 }
 
 void TestAddRegisterWidget::registerDefault()
@@ -94,11 +94,11 @@ void TestAddRegisterWidget::registerDefault()
     QCOMPARE(graphData.expression(), QStringLiteral("${h100}"));
     QVERIFY(graphData.isActive());
 
-    QCOMPARE(_pMockModbusPoll->buildCalls.size(), 1);
-    QCOMPARE(_pMockModbusPoll->buildCalls[0].fields["objectType"].toString(), QStringLiteral("holding-register"));
-    QCOMPARE(_pMockModbusPoll->buildCalls[0].fields["address"].toInt(), 100);
-    QCOMPARE(_pMockModbusPoll->buildCalls[0].dataType, QStringLiteral("16b"));
-    QCOMPARE(_pMockModbusPoll->buildCalls[0].deviceId, Device::cFirstDeviceId);
+    QCOMPARE(_pMockAdapterManager->buildCalls.size(), 1);
+    QCOMPARE(_pMockAdapterManager->buildCalls[0].fields["objectType"].toString(), QStringLiteral("holding-register"));
+    QCOMPARE(_pMockAdapterManager->buildCalls[0].fields["address"].toInt(), 100);
+    QCOMPARE(_pMockAdapterManager->buildCalls[0].dataType, QStringLiteral("16b"));
+    QCOMPARE(_pMockAdapterManager->buildCalls[0].deviceId, Device::cFirstDeviceId);
 }
 
 void TestAddRegisterWidget::registerType()
@@ -114,7 +114,7 @@ void TestAddRegisterWidget::registerType()
     addRegister(graphData, QStringLiteral("${h0:32b}"));
 
     QCOMPARE(graphData.expression(), QStringLiteral("${h0:32b}"));
-    QCOMPARE(_pMockModbusPoll->buildCalls[0].dataType, QStringLiteral("32b"));
+    QCOMPARE(_pMockAdapterManager->buildCalls[0].dataType, QStringLiteral("32b"));
 }
 
 void TestAddRegisterWidget::registerObjectType()
@@ -127,7 +127,7 @@ void TestAddRegisterWidget::registerObjectType()
     addRegister(graphData, QStringLiteral("${i0}"));
 
     QCOMPARE(graphData.expression(), QStringLiteral("${i0}"));
-    QCOMPARE(_pMockModbusPoll->buildCalls[0].fields["objectType"].toString(), QStringLiteral("input-register"));
+    QCOMPARE(_pMockAdapterManager->buildCalls[0].fields["objectType"].toString(), QStringLiteral("input-register"));
 }
 
 void TestAddRegisterWidget::registerDevice()
@@ -138,7 +138,7 @@ void TestAddRegisterWidget::registerDevice()
     const deviceId_t devId2 = _settingsModel.addNewDevice();
     _settingsModel.deviceSettings(devId2)->setAdapterId("modbus");
 
-    _pRegWidget = new AddRegisterWidget(&_settingsModel, QStringLiteral("modbus"), _pMockModbusPoll);
+    _pRegWidget = new AddRegisterWidget(&_settingsModel, QStringLiteral("modbus"), _pMockAdapterManager);
 
     _pRegWidget->_pAddressForm->setSchema(
       buildAddressSchema(), QJsonObject{ { QStringLiteral("objectType"), QStringLiteral("holding-register") },
@@ -151,7 +151,7 @@ void TestAddRegisterWidget::registerDevice()
     addRegister(graphData, QStringLiteral("${h0@2}"));
 
     QCOMPARE(graphData.expression(), QStringLiteral("${h0@2}"));
-    QCOMPARE(_pMockModbusPoll->buildCalls[0].deviceId, devId2);
+    QCOMPARE(_pMockAdapterManager->buildCalls[0].deviceId, devId2);
 }
 
 void TestAddRegisterWidget::registerValueAxis()
@@ -171,7 +171,7 @@ void TestAddRegisterWidget::buildExpressionEmptyResponseIgnored()
     clickAdd();
 
     /* Adapter returns empty expression — graphDataConfigured must not be emitted */
-    _pMockModbusPoll->injectBuildExpressionResult(QString());
+    _pMockAdapterManager->injectBuildExpressionResult(QString());
 
     QCOMPARE(spy.count(), 0);
     /* Button should be re-enabled even on empty response */
@@ -190,7 +190,7 @@ void TestAddRegisterWidget::addRegister(GraphData& graphData, const QString& exp
     clickAdd();
 
     /* Simulate the adapter returning the expression string */
-    _pMockModbusPoll->injectBuildExpressionResult(expression);
+    _pMockAdapterManager->injectBuildExpressionResult(expression);
 
     QCOMPARE(spyGraphDataConfigured.count(), 1);
 

tests/dialogs/tst_addregisterwidget.h

@@ -2,7 +2,7 @@
 #ifndef TST_ADDREGISTERWIDGET_H
 #define TST_ADDREGISTERWIDGET_H
 
-#include "communication/modbuspoll.h"
+#include "ProtocolAdapter/adaptermanager.h"
 #include "models/graphdata.h"
 #include "models/settingsmodel.h"
 
@@ -12,12 +12,12 @@
 class AddRegisterWidget;
 
 /*!
- * \brief Test double for ModbusPoll.
+ * \brief Test double for AdapterManager.
  *
  * Captures buildExpression() calls and provides an inject helper to simulate
  * the adapter.buildExpression response without a real adapter process.
  */
-class MockModbusPoll : public ModbusPoll
+class MockAdapterManager : public AdapterManager
 {
     Q_OBJECT
 
@@ -29,8 +29,8 @@ class MockModbusPoll : public ModbusPoll
         deviceId_t deviceId;
     };
 
-    explicit MockModbusPoll(SettingsModel* pSettingsModel, QObject* parent = nullptr)
-        : ModbusPoll(pSettingsModel, parent)
+    explicit MockAdapterManager(SettingsModel* pSettingsModel, QObject* parent = nullptr)
+        : AdapterManager(pSettingsModel, parent)
     {
     }
 
@@ -70,7 +70,7 @@ private slots:
     static QJsonObject buildTestRegisterSchema();
 
     SettingsModel _settingsModel;
-    MockModbusPoll* _pMockModbusPoll{ nullptr };
+    MockAdapterManager* _pMockAdapterManager{ nullptr };
     AddRegisterWidget* _pRegWidget{ nullptr };
 };