Disabling input length to get incorrect address #91

Author: sanny32

src/dialogs/dialogdisplaydefinition.cpp

@@ -24,7 +24,7 @@ DialogDisplayDefinition::DialogDisplayDefinition(DisplayDefinition dd, QWidget*
 
     ui->lineEditPointAddress->setInputMode(dd.HexAddress ? NumericLineEdit::HexMode : NumericLineEdit::Int32Mode);
     ui->lineEditPointAddress->setInputRange(ModbusLimits::addressRange(dd.AddrSpace, dd.ZeroBasedAddress));
-    ui->lineEditLength->setInputRange(ModbusLimits::lengthRange());
+    ui->lineEditLength->setInputRange(ModbusLimits::lengthRange(dd.PointAddress, dd.ZeroBasedAddress, dd.AddrSpace));
     ui->lineEditSlaveAddress->setInputRange(ModbusLimits::slaveRange());
     ui->lineEditLogLimit->setInputRange(4, 1000);
     ui->checkBoxAutoscrollLog->setChecked(dd.AutoscrollLog);
@@ -72,10 +72,42 @@ void DialogDisplayDefinition::accept()
 /// \brief DialogDisplayDefinition::on_comboBoxAddressBase_currentIndexChanged
 /// \param index
 ///
+void DialogDisplayDefinition::on_lineEditPointAddress_valueChanged(const QVariant&)
+{
+    const auto addrSpace = _displayDefinition.AddrSpace;
+    const bool zeroBased = (ui->comboBoxAddressBase->currentAddressBase() == AddressBase::Base0);
+    const int address = ui->lineEditPointAddress->value<int>();
+    const auto lenRange = ModbusLimits::lengthRange(address, zeroBased, addrSpace);
+
+    ui->lineEditLength->setInputRange(lenRange);
+    if(ui->lineEditLength->value<int>() > lenRange.to()) {
+        ui->lineEditLength->setValue(lenRange.to());
+        ui->lineEditLength->update();
+    }
+}
+
+///
+/// \brief DialogDisplayDefinition::on_lineEditLength_valueChanged
+///
+void DialogDisplayDefinition::on_lineEditLength_valueChanged(const QVariant&)
+{
+}
+
+///
+/// \brief DialogDisplayDefinition::on_comboBoxAddressBase_addressBaseChanged
+/// \param base
+///
 void DialogDisplayDefinition::on_comboBoxAddressBase_addressBaseChanged(AddressBase base)
 {
+    const auto addrSpace = _displayDefinition.AddrSpace;
+    const bool zeroBased = (base == AddressBase::Base0);
     const auto addr = ui->lineEditPointAddress->value<int>();
 
-    ui->lineEditPointAddress->setInputRange(ModbusLimits::addressRange(_displayDefinition.AddrSpace, base == AddressBase::Base0));
+    ui->lineEditPointAddress->setInputRange(ModbusLimits::addressRange(addrSpace, zeroBased));
     ui->lineEditPointAddress->setValue(base == AddressBase::Base1 ? qMax(1, addr + 1) : qMax(0, addr - 1));
+    const int newAddr = ui->lineEditPointAddress->value<int>();
+    const auto lenRange = ModbusLimits::lengthRange(newAddr, zeroBased, addrSpace);
+    ui->lineEditLength->setInputRange(lenRange);
+    if(ui->lineEditLength->value<int>() > lenRange.to())
+        ui->lineEditLength->setValue(lenRange.to());
 }

src/dialogs/dialogdisplaydefinition.h

@@ -27,6 +27,8 @@ class DialogDisplayDefinition : public QFixedSizeDialog
     void accept() override;
 
 private slots:
+    void on_lineEditPointAddress_valueChanged(const QVariant&);
+    void on_lineEditLength_valueChanged(const QVariant&);
     void on_comboBoxAddressBase_addressBaseChanged(AddressBase base);
 
 private:

src/dialogs/dialogsetuppresetdata.cpp

@@ -17,8 +17,9 @@ DialogSetupPresetData::DialogSetupPresetData(SetupPresetParams& params,  QModbus
     ui->setupUi(this);
     ui->lineEditAddress->setInputMode(hexAddress ? NumericLineEdit::HexMode : NumericLineEdit::Int32Mode);
     ui->lineEditAddress->setInputRange(ModbusLimits::addressRange(params.AddrSpace, params.ZeroBasedAddress));
-    ui->lineEditNumberOfPoints->setInputRange(ModbusLimits::lengthRange());
     ui->lineEditAddress->setValue(params.PointAddress);
+
+    ui->lineEditNumberOfPoints->setInputRange(ModbusLimits::lengthRange(params.PointAddress, params.ZeroBasedAddress, params.AddrSpace));
     ui->lineEditNumberOfPoints->setValue(params.Length);
 
     switch(pointType)
@@ -51,6 +52,20 @@ DialogSetupPresetData::~DialogSetupPresetData()
 }
 
 
+///
+/// \brief DialogSetupPresetData::on_lineEditAddress_valueChanged
+///
+void DialogSetupPresetData::on_lineEditAddress_valueChanged(const QVariant&)
+{
+    const int address = ui->lineEditAddress->value<int>();
+    const auto lenRange = ModbusLimits::lengthRange(address, _params.ZeroBasedAddress, _params.AddrSpace);
+
+    ui->lineEditNumberOfPoints->setInputRange(lenRange);
+    if(ui->lineEditNumberOfPoints->value<int>() > lenRange.to()) {
+        ui->lineEditNumberOfPoints->setValue(lenRange.to());
+    }
+}
+
 ///
 /// \brief DialogSetupPresetData::accept
 ///

src/dialogs/dialogsetuppresetdata.h

@@ -30,6 +30,9 @@ class DialogSetupPresetData : public QFixedSizeDialog
 
     void accept() override;
 
+private slots:
+    void on_lineEditAddress_valueChanged(const QVariant&);
+
 private:
     Ui::DialogSetupPresetData *ui;
     SetupPresetParams& _params;

src/displaydefinition.h

@@ -30,7 +30,8 @@ struct DisplayDefinition
         DeviceId = qMax<quint8>(ModbusLimits::slaveRange().from(), DeviceId);
         PointAddress = qMax<quint16>(ModbusLimits::addressRange(AddrSpace, ZeroBasedAddress).from(), PointAddress);
         PointType = qBound(QModbusDataUnit::DiscreteInputs, PointType, QModbusDataUnit::HoldingRegisters);
-        Length = qBound<quint16>(ModbusLimits::lengthRange().from(), Length, ModbusLimits::lengthRange().to());
+        Length = qBound<quint16>(ModbusLimits::lengthRange().from(), Length,
+                                 (quint16)ModbusLimits::lengthRange(PointAddress, ZeroBasedAddress, AddrSpace).to());
         LogViewLimit = qBound<quint16>(4, LogViewLimit, 1000);
         DataViewColumnsDistance = qBound<quint16>(1, DataViewColumnsDistance, 32);
     }

src/formmodsim.cpp

@@ -49,7 +49,7 @@ FormModSim::FormModSim(int id, ModbusMultiServer& server, QSharedPointer<DataSim
     ui->lineEditAddress->setInputRange(ModbusLimits::addressRange(mbDefs.AddrSpace, true));
     ui->lineEditAddress->setValue(0);
 
-    ui->lineEditLength->setInputRange(ModbusLimits::lengthRange());
+    ui->lineEditLength->setInputRange(ModbusLimits::lengthRange(0, true, mbDefs.AddrSpace));
     ui->lineEditLength->setValue(100);
 
     ui->comboBoxAddressBase->setCurrentAddressBase(AddressBase::Base1);
@@ -203,6 +203,7 @@ void FormModSim::setDisplayDefinition(const DisplayDefinition& dd)
 
     ui->lineEditLength->blockSignals(true);
     ui->lineEditLength->setLeadingZeroes(dd.LeadingZeros);
+    ui->lineEditLength->setInputRange(ModbusLimits::lengthRange(dd.PointAddress, dd.ZeroBasedAddress, defs.AddrSpace));
     ui->lineEditLength->setValue(dd.Length);
     ui->lineEditLength->blockSignals(false);
 
@@ -816,7 +817,18 @@ void FormModSim::show()
 ///
 void FormModSim::on_lineEditAddress_valueChanged(const QVariant&)
 {
-   onDefinitionChanged();
+    const auto defs = _mbMultiServer.getModbusDefinitions();
+    const bool zeroBased = (ui->comboBoxAddressBase->currentAddressBase() == AddressBase::Base0);
+    const int address = ui->lineEditAddress->value<int>();
+    const auto lenRange = ModbusLimits::lengthRange(address, zeroBased, defs.AddrSpace);
+
+    ui->lineEditLength->setInputRange(lenRange);
+    if(ui->lineEditLength->value<int>() > lenRange.to()) {
+        ui->lineEditLength->setValue(lenRange.to());
+        ui->lineEditLength->update();
+    }
+
+    onDefinitionChanged();
 }
 
 ///
@@ -1110,6 +1122,7 @@ void FormModSim::on_mbDefinitionsChanged(const ModbusDefinitions& defs)
     const auto dd = displayDefinition();
     const auto addr = dd.PointAddress - (dd.ZeroBasedAddress ? 0 : 1);
     ui->lineEditAddress->setInputRange(ModbusLimits::addressRange(defs.AddrSpace, dd.ZeroBasedAddress));
+    ui->lineEditLength->setInputRange(ModbusLimits::lengthRange(dd.PointAddress, dd.ZeroBasedAddress, defs.AddrSpace));
     ui->outputWidget->setup(dd, _dataSimulator->simulationMap(), _mbMultiServer.data(dd.DeviceId, dd.PointType, addr, dd.Length));
 }
 

src/modbuslimits.h

@@ -7,6 +7,9 @@
 class ModbusLimits final
 {
 public:
+    static int addressSpaceSize(AddressSpace space) {
+        return (space == AddressSpace::Addr5Digits) ? 9999 : 65536;
+    }
     static QRange<int> addressRange(AddressSpace space, bool zeroBased = false) {
         switch(space) {
         case AddressSpace::Addr5Digits:
@@ -16,8 +19,13 @@ class ModbusLimits final
         }
         return zeroBased ? QRange<int>(0, 65535) : QRange<int>(1, 65536);
     }
-    static QRange<int> lengthRange()   { return { 1, 200   }; }
-    static QRange<int> slaveRange()    { return { 1, 255   }; }
+    static QRange<int> lengthRange()   { return { 1, 200 }; }
+    static QRange<int> lengthRange(int address, bool zeroBased, AddressSpace space) {
+        const int offset = address - (zeroBased ? 0 : 1);
+        const int maxLen = qMin(lengthRange().to(), addressSpaceSize(space) - offset);
+        return { 1, qMax(1, maxLen) };
+    }
+    static QRange<int> slaveRange()    { return { 1, 255 }; }
 };
 
 #endif // MODBUSLIMITS_H