Made a general setting for AddressType for all dialogs and other windows

Author: serhmarch

src/core/core/core_global.cpp

@@ -22,6 +22,9 @@
 */
 #include "core_global.h"
 
+#include <QComboBox>
+#include <QSpinBox>
+
 namespace mb {
 
 MBSETTINGS parseExtendedAttributesStr(const QString &str)
@@ -81,4 +84,87 @@ QVariantList availableFlowControl()
     return ls;
 }
 
+Address getModbusAddress(QComboBox *cmb, QSpinBox *sp, AddressNotation notation)
+{
+    mb::Address adr;
+    switch (cmb->currentIndex())
+    {
+    case 0:
+        adr.type = Modbus::Memory_0x;
+        break;
+    case 1:
+        adr.type = Modbus::Memory_1x;
+        break;
+    case 2:
+        adr.type = Modbus::Memory_3x;
+        break;
+    default:
+        adr.type = Modbus::Memory_4x;
+        break;
+    }
+
+    switch (notation)
+    {
+    case mb::Address_IEC61131:
+        adr.offset = static_cast<quint16>(sp->value());
+        break;
+    default:
+        adr.offset = static_cast<quint16>(sp->value()-1);
+        break;
+    }
+    return adr;
+}
+
+void setModbusAddress(QComboBox *cmb, QSpinBox *sp, Address adr, AddressNotation notation)
+{
+    switch (adr.type)
+    {
+    case Modbus::Memory_0x:
+        cmb->setCurrentIndex(0);
+        break;
+    case Modbus::Memory_1x:
+        cmb->setCurrentIndex(1);
+        break;
+    case Modbus::Memory_3x:
+        cmb->setCurrentIndex(2);
+        break;
+    default:
+        cmb->setCurrentIndex(3);
+        break;
+    }
+
+    switch (notation)
+    {
+    case mb::Address_IEC61131:
+        sp->setValue(adr.offset);
+        break;
+    default:
+        sp->setValue(adr.offset+1);
+        break;
+    }
+}
+
+void fillModbusAddressUi(QComboBox *cmb, QSpinBox *sp, Address adr, AddressNotation notation)
+{
+    cmb->clear();
+    cmb->addItem(mb::toModbusMemoryTypeString(Modbus::Memory_0x, notation));
+    cmb->addItem(mb::toModbusMemoryTypeString(Modbus::Memory_1x, notation));
+    cmb->addItem(mb::toModbusMemoryTypeString(Modbus::Memory_3x, notation));
+    cmb->addItem(mb::toModbusMemoryTypeString(Modbus::Memory_4x, notation));
+
+    switch (notation)
+    {
+    case mb::Address_IEC61131:
+        sp->setMinimum(0);
+        sp->setMaximum(USHRT_MAX);
+        break;
+    default:
+        sp->setMinimum(1);
+        sp->setMaximum(USHRT_MAX+1);
+        break;
+    }
+
+    setModbusAddress(cmb, sp, adr, notation);
+}
+
 } // namespace mb

src/core/core/core_global.h

@@ -23,6 +23,9 @@
 #ifndef CORE_GLOBAL_H
 #define CORE_GLOBAL_H
 
+class QComboBox;
+class QSpinBox;
+
 #include <mbcore.h>
 
 namespace mb {
@@ -44,6 +47,15 @@ MB_EXPORT QVariantList availableStopBits();
 /// \details Return list of `FlowControl` values
 MB_EXPORT QVariantList availableFlowControl();
 
+/// \details
+MB_EXPORT mb::Address getModbusAddress(QComboBox *cmb, QSpinBox *sp, mb::AddressNotation notation);
+
+/// \details
+MB_EXPORT void setModbusAddress(QComboBox *cmb, QSpinBox *sp, mb::Address adr, mb::AddressNotation notation);
+
+/// \details
+MB_EXPORT void fillModbusAddressUi(QComboBox *cmb, QSpinBox *sp, mb::Address address, mb::AddressNotation notation);
+
 } // namespace mb
 
 #endif // CORE_GLOBAL_H

src/core/gui/dialogs/core_dialogdataviewitem.cpp

@@ -60,6 +60,8 @@ mbCoreDialogDataViewItem::mbCoreDialogDataViewItem(QWidget *parent) :
     m_formatLast = static_cast<mb::Format>(-1);
 
     memset(&m_ui, 0, sizeof(m_ui));
+
+    connect(mbCore::globalCore(), &mbCore::addressNotationChanged, this, &mbCoreDialogDataViewItem::setModbusAddresNotation);
 }
 
 void mbCoreDialogDataViewItem::initializeBaseUi()
@@ -73,18 +75,9 @@ void mbCoreDialogDataViewItem::initializeBaseUi()
     cmb = m_ui.cmbDevice;
     connect(cmb, SIGNAL(currentIndexChanged(int)), this, SLOT(deviceChanged(int)));
 
-    // Address type
-    cmb = m_ui.cmbAdrType;
-    cmb->addItem(mb::toModbusMemoryTypeString(Modbus::Memory_0x));
-    cmb->addItem(mb::toModbusMemoryTypeString(Modbus::Memory_1x));
-    cmb->addItem(mb::toModbusMemoryTypeString(Modbus::Memory_3x));
-    cmb->addItem(mb::toModbusMemoryTypeString(Modbus::Memory_4x));
-    cmb->setCurrentIndex(3);
-
-    // Offset
-    sp = m_ui.spOffset;
-    sp->setMinimum(1);
-    sp->setMaximum(USHRT_MAX+1);
+    // Address type + Offset
+    m_ui.cmbAdrType->setMinimumWidth(55);
+    setModbusAddresNotation(mbCore::globalCore()->addressNotation());
 
     // Count
     sp = m_ui.spCount;
@@ -130,7 +123,6 @@ void mbCoreDialogDataViewItem::initializeBaseUi()
     ln->setText(nonDefaultByteArraySeparator());
     connect(m_ui.btnTogleDefaultByteArraySeparator, SIGNAL(clicked()), this, SLOT(togleDefaultByteArraySeparator()));
 
-
     // String Length Type
     cmb = m_ui.cmbStringLengthType;
     ls = mb::enumStringLengthTypeKeyList();
@@ -160,9 +152,7 @@ MBSETTINGS mbCoreDialogDataViewItem::cachedSettings() const
 
     MBSETTINGS m = mbCoreDialogEdit::cachedSettings();
 
-    mb::Address adr;
-    adr.type = mb::toModbusMemoryType(m_ui.cmbAdrType->currentText());
-    adr.offset = static_cast<quint16>(m_ui.spOffset->value()-1);
+    mb::Address adr = modbusAddress();
 
     m[prefix+vs.address         ] = mb::toInt(adr);
     m[prefix+vs.device          ] = m_ui.cmbDevice->currentText();
@@ -193,9 +183,7 @@ void mbCoreDialogDataViewItem::setCachedSettings(const MBSETTINGS &m)
     it = m.find(prefix+vs.address);
     if (it != end)
     {
-        mb::Address adr = mb::toAddress(it.value().toInt());
-        m_ui.cmbAdrType->setCurrentText(mb::toModbusMemoryTypeString(adr.type));
-        m_ui.spOffset->setValue(adr.offset+1);
+        setModbusAddress(it.value());
     }
 
     it = m.find(prefix+vs.device            ); if (it != end) m_ui.cmbDevice->setCurrentText(it.value().toString());
@@ -259,9 +247,7 @@ void mbCoreDialogDataViewItem::fillForm(const MBSETTINGS &settings)
         it = settings.find(sItem.address);
         if (it != end)
         {
-            mb::Address adr = mb::toAddress(it.value().toInt());
-            m_ui.cmbAdrType->setCurrentText(mb::toModbusMemoryTypeString(adr.type));
-            m_ui.spOffset->setValue(adr.offset+1);
+            setModbusAddress(it.value());
         }
 
         it = settings.find(sItem.format            ); if (it != end) fillFormFormat            (it.value());
@@ -464,9 +450,7 @@ void mbCoreDialogDataViewItem::fillData(MBSETTINGS &settings) const
     const Strings &s = Strings::instance();
     const mbCoreDataViewItem::Strings &sItem = mbCoreDataViewItem::Strings::instance();
 
-    mb::Address adr;
-    adr.type = mb::toModbusMemoryType(m_ui.cmbAdrType->currentText());
-    adr.offset = static_cast<quint16>(m_ui.spOffset->value()-1);
+    mb::Address adr = this->modbusAddress();
     mb::Format format = mb::enumFormatValueByIndex(m_ui.cmbFormat->currentIndex());
     settings[sItem.device] =  QVariant::fromValue<void*>(project->deviceCore(m_ui.cmbDevice->currentIndex()));
     settings[sItem.address] = mb::toInt(adr);
@@ -566,6 +550,26 @@ void mbCoreDialogDataViewItem::fillDataInner(MBSETTINGS &/*settings*/) const
     // base implementation do nothing
 }
 
+mb::Address mbCoreDialogDataViewItem::modbusAddress() const
+{
+    return mb::getModbusAddress(m_ui.cmbAdrType,
+                                m_ui.spOffset,
+                                mbCore::globalCore()->addressNotation());
+}
+
+void mbCoreDialogDataViewItem::setModbusAddress(const QVariant &v)
+{
+    mb::setModbusAddress(m_ui.cmbAdrType,
+                         m_ui.spOffset,
+                         mb::toAddress(v.toInt()),
+                         mbCore::globalCore()->addressNotation());
+}
+
+void mbCoreDialogDataViewItem::setModbusAddresNotation(mb::AddressNotation notation)
+{
+    mb::fillModbusAddressUi(m_ui.cmbAdrType, m_ui.spOffset, modbusAddress(), notation);
+}
+
 void mbCoreDialogDataViewItem::deviceChanged(int i)
 {
     mbCoreProject *project = mbCore::globalCore()->projectCore();

src/core/gui/dialogs/core_dialogdataviewitem.h

@@ -84,7 +84,12 @@ class MB_EXPORT mbCoreDialogDataViewItem : public mbCoreDialogEdit
     virtual void fillFormNewInner(const MBSETTINGS &settings);
     virtual void fillDataInner(MBSETTINGS &settings) const;
 
+protected:
+    mb::Address modbusAddress() const;
+    void setModbusAddress(const QVariant &v);
+
 protected Q_SLOTS:
+    void setModbusAddresNotation(mb::AddressNotation notation);
     void deviceChanged(int i);
     void adrTypeChanged(int i);
     void formatChanged(int i);

src/core/gui/dialogs/settings/core_dialogsettings.cpp

@@ -96,11 +96,11 @@ void mbCoreDialogSettings::fillForm(const MBSETTINGS &m)
     const mbCoreUi::Strings &sUi = mbCoreUi::Strings::instance();
 
     m_view->setUseNameWithSettings(m.value(sUi.settings_useNameWithSettings).toBool());
+    m_view->setAddressNotation(mb::toAddressNotation(mb::toAddressNotation(m.value(sCore.settings_addressNotation))));
 
 
     m_log->setLogFlags(static_cast<mb::LogFlag>(m.value(sCore.settings_logFlags).toInt()));
     m_log->setFormatDateTime(m.value(sCore.settings_formatDateTime).toString());
-    m_dataView->setAddressNotation(mb::toAddressNotation(mb::toAddressNotation(m.value(sCore.settings_addressNotation))));
     m_dataView->setColumns(m.value(sCore.settings_columns).toStringList());
 }
 
@@ -110,10 +110,10 @@ void mbCoreDialogSettings::fillData(MBSETTINGS &m)
     const mbCoreUi::Strings &sUi = mbCoreUi::Strings::instance();
 
     m[sUi.settings_useNameWithSettings] = m_view->useNameWithSettings();
+    m[sCore.settings_addressNotation] = m_view->addressNotation();
 
     m[sCore.settings_logFlags       ] = static_cast<int>(m_log->logFlags());
     m[sCore.settings_formatDateTime ] = m_log->formatDateTime();
-    m[sCore.settings_addressNotation] = m_dataView->addressNotation();
     m[sCore.settings_columns        ] = m_dataView->getColumns();
 
 }

src/core/gui/dialogs/settings/core_widgetsettingsdataview.cpp

@@ -11,12 +11,6 @@ mbCoreWidgetSettingsDataView::mbCoreWidgetSettingsDataView(QWidget *parent) :
 {
     ui->setupUi(this);
 
-    QComboBox *cmb;
-    cmb = ui->cmbAddressNotation;
-    cmb->addItem(mb::toFineString(mb::Address_Modbus));
-    cmb->addItem(mb::toFineString(mb::Address_IEC61131));
-    cmb->setCurrentIndex(0);
-
     QStringList columns = mbCore::globalCore()->availableDataViewColumns();
     setColumns(columns);
     connect(ui->btnEditDataViewColumns, &QPushButton::clicked, this, &mbCoreWidgetSettingsDataView::slotEditColumns);
@@ -27,16 +21,6 @@ mbCoreWidgetSettingsDataView::~mbCoreWidgetSettingsDataView()
     delete ui;
 }
 
-mb::AddressNotation mbCoreWidgetSettingsDataView::addressNotation() const
-{
-    return static_cast<mb::AddressNotation>(ui->cmbAddressNotation->currentIndex()+1);
-}
-
-void mbCoreWidgetSettingsDataView::setAddressNotation(mb::AddressNotation notation)
-{
-    ui->cmbAddressNotation->setCurrentIndex(notation-1);
-}
-
 QStringList mbCoreWidgetSettingsDataView::getColumns() const
 {
     QStringList res;

src/core/gui/dialogs/settings/core_widgetsettingsdataview.h

@@ -18,8 +18,6 @@ class mbCoreWidgetSettingsDataView : public QWidget
     ~mbCoreWidgetSettingsDataView();
 
 public: // properties
-    mb::AddressNotation addressNotation() const;
-    void setAddressNotation(mb::AddressNotation notation);
     QStringList getColumns() const;
     void setColumns(const QStringList &columns);
 

src/core/gui/dialogs/settings/core_widgetsettingsdataview.ui

@@ -15,23 +15,13 @@
   </property>
   <layout class="QFormLayout" name="formLayout">
    <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Address notation:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QComboBox" name="cmbAddressNotation"/>
-   </item>
-   <item row="1" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Columns</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="0" column="1">
     <widget class="QGroupBox" name="grDataViewColumns">
      <property name="title">
       <string/>

src/core/gui/dialogs/settings/core_widgetsettingsview.cpp

@@ -6,6 +6,12 @@ mbCoreWidgetSettingsView::mbCoreWidgetSettingsView(QWidget *parent) :
     ui(new Ui::mbCoreWidgetSettingsView)
 {
     ui->setupUi(this);
+
+    QComboBox *cmb;
+    cmb = ui->cmbAddressNotation;
+    cmb->addItem(mb::toFineString(mb::Address_Modbus));
+    cmb->addItem(mb::toFineString(mb::Address_IEC61131));
+    cmb->setCurrentIndex(0);
 }
 
 mbCoreWidgetSettingsView::~mbCoreWidgetSettingsView()
@@ -22,3 +28,14 @@ void mbCoreWidgetSettingsView::setUseNameWithSettings(bool use)
 {
     ui->chbUseNameWithSettings->setChecked(use);
 }
+
+mb::AddressNotation mbCoreWidgetSettingsView::addressNotation() const
+{
+    return static_cast<mb::AddressNotation>(ui->cmbAddressNotation->currentIndex()+1);
+}
+
+void mbCoreWidgetSettingsView::setAddressNotation(mb::AddressNotation notation)
+{
+    ui->cmbAddressNotation->setCurrentIndex(notation-1);
+}
+

src/core/gui/dialogs/settings/core_widgetsettingsview.h

@@ -3,6 +3,8 @@
 
 #include <QWidget>
 
+#include <mbcore.h>
+
 namespace Ui {
 class mbCoreWidgetSettingsView;
 }
@@ -18,6 +20,8 @@ class mbCoreWidgetSettingsView : public QWidget
 public: // properties
     bool useNameWithSettings() const;
     void setUseNameWithSettings(bool use);
+    mb::AddressNotation addressNotation() const;
+    void setAddressNotation(mb::AddressNotation notation);
 
 private:
     Ui::mbCoreWidgetSettingsView *ui;