Skip to content

Remove the insignificant zeros for non-data fields. #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
raspopov wants to merge 1 commit into
base: dev
Choose a base branch
from
+3 −6
Open

Remove the insignificant zeros for non-data fields. #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/formmodsim.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ FormModSim::FormModSim(int id, ModbusMultiServer& server, QSharedPointer<DataSim

ui->lineEditDeviceId->setInputRange(ModbusLimits::slaveRange());
ui->lineEditDeviceId->setValue(1);
ui->lineEditDeviceId->setLeadingZeroes(true);
ui->lineEditDeviceId->setHexButtonVisible(true);
server.addDeviceId(ui->lineEditDeviceId->value<int>());

Expand All @@ -45,7 +44,6 @@ FormModSim::FormModSim(int id, ModbusMultiServer& server, QSharedPointer<DataSim

const auto mbDefs = _mbMultiServer.getModbusDefinitions();

ui->lineEditAddress->setLeadingZeroes(true);
ui->lineEditAddress->setInputRange(ModbusLimits::addressRange(mbDefs.AddrSpace, true));
ui->lineEditAddress->setValue(0);
ui->lineEditAddress->setHexButtonVisible(true);
Expand Down Expand Up @@ -183,7 +181,7 @@ DisplayDefinition FormModSim::displayDefinition() const
dd.HexViewLength = ui->lineEditLength->hexView();
dd.AddrSpace = _mbMultiServer.getModbusDefinitions().AddrSpace;
dd.DataViewColumnsDistance = ui->outputWidget->dataViewColumnsDistance();
dd.LeadingZeros = ui->lineEditDeviceId->leadingZeroes();
dd.LeadingZeros = _leadingZeros;
dd.ScriptCfg = _scriptSettings;

return dd;
Expand All @@ -200,21 +198,18 @@ void FormModSim::setDisplayDefinition(const DisplayDefinition& dd)

const auto defs = _mbMultiServer.getModbusDefinitions();

ui->lineEditDeviceId->setLeadingZeroes(dd.LeadingZeros);
ui->lineEditDeviceId->setValue(dd.DeviceId);

ui->comboBoxAddressBase->blockSignals(true);
ui->comboBoxAddressBase->setCurrentAddressBase(dd.ZeroBasedAddress ? AddressBase::Base0 : AddressBase::Base1);
ui->comboBoxAddressBase->blockSignals(false);

ui->lineEditAddress->blockSignals(true);
ui->lineEditAddress->setLeadingZeroes(dd.LeadingZeros);
ui->lineEditAddress->setInputRange(ModbusLimits::addressRange(defs.AddrSpace, dd.ZeroBasedAddress));
ui->lineEditAddress->setValue(dd.PointAddress);
ui->lineEditAddress->blockSignals(false);

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);
Expand All @@ -228,6 +223,7 @@ void FormModSim::setDisplayDefinition(const DisplayDefinition& dd)
ui->outputWidget->setAutosctollLogView(dd.AutoscrollLog);

_verboseLogging = dd.VerboseLogging;
_leadingZeros = dd.LeadingZeros;

setScriptSettings(dd.ScriptCfg);
setDisplayHexAddresses(dd.HexAddress);
Expand Down
1 change: 1 addition & 0 deletions src/formmodsim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ private slots:
int _formId;
QString _filename;
bool _verboseLogging;
bool _leadingZeros = true;
ScriptSettings _scriptSettings;
ModbusMultiServer& _mbMultiServer;
QSharedPointer<DataSimulator> _dataSimulator;
Expand Down