From 227deaf686f5bbc17ce90fc0cd176a31e150b8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D1=8F=D1=87=D0=B5=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A8?= =?UTF-8?q?=D1=82=D0=B5=D0=B9=D0=B1=D0=B5=D0=B7=D0=B0=D0=BD=D0=B4=D1=82?= Date: Thu, 16 Oct 2025 09:23:18 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=B4=D0=B8=D0=B0=D0=BF=D0=B0=D0=B7=D0=BE=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B8=20?= =?UTF-8?q?=D1=83=D1=81=D1=82=D0=B0=D0=B2=D0=BE=D0=BA=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D1=87=D0=B5=D1=82=D0=B2=D1=91=D1=80=D1=82=D0=BE=D0=B9=20=D0=BF?= =?UTF-8?q?=D0=BB=D0=B0=D1=82=D0=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- M3KTE_TERM/multiplesettings.cpp | 22 +++++++++++++--------- M3KTE_TERM/multiplesettings.h | 1 + 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/M3KTE_TERM/multiplesettings.cpp b/M3KTE_TERM/multiplesettings.cpp index ffcfeb0..cfe1773 100644 --- a/M3KTE_TERM/multiplesettings.cpp +++ b/M3KTE_TERM/multiplesettings.cpp @@ -8,6 +8,7 @@ MultipleSettings::MultipleSettings(QWidget *parent) : ui->setupUi(this); ui->buttonBox->button(QDialogButtonBox::Ok)->setText("Записать"); ui->buttonBox->button(QDialogButtonBox::SaveAll)->setText("Записать и установить"); + selectedBoard = 0; } MultipleSettings::~MultipleSettings() @@ -36,14 +37,22 @@ void MultipleSettings::on_buttonBox_clicked(QAbstractButton *button) void MultipleSettings::on_regTypeBox_currentIndexChanged(int index) { + short maxRange = 0; + switch (ui->boardBox->currentIndex()) { + case 3: + maxRange = 64; + break; + default: + maxRange = 84; + } switch (index) { case 0: case 1: - ui->adrBox->setRange(0, 84); + ui->adrBox->setRange(0, maxRange); ui->adrBox->setValue(0); break; case 2: - ui->adrBox->setRange(85, 170); + ui->adrBox->setRange(85, 85+maxRange); ui->adrBox->setValue(85); break; } @@ -51,13 +60,8 @@ void MultipleSettings::on_regTypeBox_currentIndexChanged(int index) void MultipleSettings::on_boardBox_currentIndexChanged(int index) { - switch (index) { - case 3: - ui->countBox->setRange(1, 65-ui->adrBox->value()+85*ui->regTypeBox->currentIndex()/2); - break; - default: - ui->countBox->setRange(1, 85-ui->adrBox->value()+85*ui->regTypeBox->currentIndex()/2); - } + selectedBoard = index; + on_regTypeBox_currentIndexChanged(ui->regTypeBox->currentIndex()); } void MultipleSettings::on_adrBox_valueChanged(int arg1) diff --git a/M3KTE_TERM/multiplesettings.h b/M3KTE_TERM/multiplesettings.h index e20076a..a04ba97 100644 --- a/M3KTE_TERM/multiplesettings.h +++ b/M3KTE_TERM/multiplesettings.h @@ -40,6 +40,7 @@ private: unsigned countReg; short typeReg; short boardId; + short selectedBoard; }; #endif // MULTIPLESETTINGS_H