diff --git a/design_viewer_v1.ui b/design_viewer_v1.ui index 02ce863..21f8f68 100644 --- a/design_viewer_v1.ui +++ b/design_viewer_v1.ui @@ -86,55 +86,25 @@ - - - Выбор устройства + + + 1 устройство - - false - - - - - 10 - 10 - 31 - 20 - - + - 1 - - - true - - - - - - 10 - 30 - 31 - 17 - + 1 устройство + + - 2 - - - - - - 50 - 20 - 31 - 17 - + 2 устройство + + - 3 + 3 устройство - + diff --git a/project/view.py b/project/view.py index e9baef5..b28fcb4 100644 --- a/project/view.py +++ b/project/view.py @@ -282,11 +282,11 @@ class Ui(QtWidgets.QMainWindow): self.serial.setPortName(self.Port_ch.currentText()) self.serial.open(QIODevice.ReadWrite) self.serial.flush() - if self.device1_radioButton.isChecked(): + if self.device.currentIndex() == 0: self.serial.write(mes1.encode()) - if self.device2_radioButton.isChecked(): + if self.device.currentIndex() == 1: self.serial.write(mes2.encode()) - if self.device3_radioButton.isChecked(): + if self.device.currentIndex() == 2: self.serial.write(mes3.encode()) self.on_close() MODE_COM_PORT = True @@ -603,7 +603,7 @@ class Ui(QtWidgets.QMainWindow): self.Close_file.setVisible(True) self.Restart.setVisible(True) self.horizontalScrollBar.setVisible(False) - self.device_groupBox.setVisible(True) + self.device.setVisible(True) else: self.on_stop() self.OpenB.setVisible(True) @@ -619,7 +619,7 @@ class Ui(QtWidgets.QMainWindow): self.Close_file.setVisible(False) self.Restart.setVisible(False) self.horizontalScrollBar.setVisible(True) - self.device_groupBox.setVisible(False) + self.device.setVisible(False) def set_send_mode(self): """Установка режима передачи данных (Bluetooth/433)""" diff --git a/viewer.exe b/viewer.exe index 737a1a4..5bd728e 100644 Binary files a/viewer.exe and b/viewer.exe differ