diff --git a/design_viewer_v1.ui b/design_viewer_v1.ui index 76cf96f..def1ee3 100644 --- a/design_viewer_v1.ui +++ b/design_viewer_v1.ui @@ -3123,6 +3123,11 @@ None + + + BURST + + VOO @@ -3133,11 +3138,6 @@ VVI - - - BURST - - diff --git a/project/__init__.py b/project/__init__.py index 704f64b..36f9895 100644 --- a/project/__init__.py +++ b/project/__init__.py @@ -4,5 +4,5 @@ DATA_RATE = 200 # скорость передачи данных # mes = "AT+CONA11899AA1670B\r\n" -mes = "AT+CONA11899AA21438\r\n" # для связи со стимулятором - +# mes = "AT+CONA11899AA21438\r\n" # для связи со стимулятором +mes = "AT+CONA11899AA166E1\r\n" # для связи со стимулятором diff --git a/project/view.py b/project/view.py index 8546e29..6eb3666 100644 --- a/project/view.py +++ b/project/view.py @@ -93,12 +93,12 @@ class Ui(QtWidgets.QMainWindow): self.Signal_Box.currentIndexChanged.connect(self.set_Signal_Box) self.Channel_Box.currentIndexChanged.connect(self.set_Channel_Box) self.DC_cut_Box.currentIndexChanged.connect(self.set_DC_cut_Box) - +# fixed self.High_Tf_spinBox.valueChanged.connect(self.set_High_Tf_spinBox) self.High_Tt2_spinBox.valueChanged.connect(self.set_High_Tt2_spinBox) self.High_Tt1_spinBox.valueChanged.connect(self.set_High_Tt1_spinBox) self.f_count_spinBox.valueChanged.connect(self.set_f_count_spinBox) - + # self.Work_Mode_pacemaker.editTextChanged.connect(self.set_Work_Mode_pacemaker) self.hv_step_number_spinBox.valueChanged.connect(self.set_hv_step_number_spinBox) self.min_energy_spinBox.valueChanged.connect(self.set_min_energy_spinBox) @@ -205,21 +205,23 @@ class Ui(QtWidgets.QMainWindow): self.redet_bad_spinBox.setValue(data_in.redet_bad) self.Work_Mode_pacemaker.setCurrentIndex(data_in.Work_Mode_pacemaker) self.Spi_spot_set_spinBox.setValue(data_in.spi_pot_set) - self.hv_polarity_BOX.setValue(data_in.hv_polarity) - self.hv_mode_BOX.setValue(data_in.hv_mode) + self.hv_polarity_BOX.setCurrentIndex(data_in.hv_polarity)#fixed + self.hv_mode_BOX.setCurrentIndex(data_in.hv_mode)#fixed self.t1_hv_phase_1_duration_SpinBox.setValue(data_in.hv_phase_1_duration / 10.0) self.t3_hv_phase_2_duration_SpinBox.setValue(data_in.hv_phase_2_duration / 10.0) self.t2_hv_switch_duration_SpinBox.setValue(data_in.hv_switch_duration / 10.0) self.u1_hv_switching_voltage_spinBox.setValue(data_in.hv_switching_voltage) self.u2_hv_cutoff_voltage_spinBox.setValue(data_in.hv_cutoff_voltage) - self.lv_polarity_BOX.setValue(data_in.lv_polarity) - self.lv_mode_BOX.setValue(data_in.lv_mode) - self.t1_lv_shock_time_SpinBox().setValue(data_in.lv_shock_time / 10.0) - self.t2_lv_relax_time_spinBox().setValue(data_in.lv_relax_time) - self.u_lv_voltage_SpinBox().setValue(data_in.lv_voltage / 10.0) + self.lv_polarity_BOX.setCurrentIndex(data_in.lv_polarity) + self.lv_mode_BOX.setCurrentIndex(data_in.lv_mode) + + self.t1_lv_shock_time_SpinBox.setValue(data_in.lv_shock_time / 10.0) + self.t2_lv_relax_time_spinBox.setValue(data_in.lv_relax_time) + self.u_lv_voltage_SpinBox.setValue(data_in.lv_voltage / 10.0) + self.burst_cnt_spinBox.setValue(data_in.burst_cnt) self.burst_voltage_SpinBox.setValue(data_in.burst_voltage / 10.0) - self.burst_period.setValue(data_in.burst_period) + self.burst_period_spinBox.setValue(data_in.burst_period) #fixed def timerEvent(self): @@ -771,14 +773,16 @@ class Ui(QtWidgets.QMainWindow): """Выбор режима низковольтной стимуляции""" param = self.lv_mode_BOX.currentIndex() match param: - case 3: + case 1: self.burst_frame.setVisible(True) case _: self.burst_frame.setVisible(False) - if param == 3: - my_data.state_packet(self.send_mode, self.serial, 0x23, 15, 1, int) - else: - my_data.state_packet(self.send_mode, self.serial, 0x23, param, 1, int) + my_data.state_packet(self.send_mode, self.serial, 0x23, param, 1, int) + + # if param == 3: + # my_data.state_packet(self.send_mode, self.serial, 0x23, 15, 1, int) + # else: + # my_data.state_packet(self.send_mode, self.serial, 0x23, param, 1, int) def set_lv_polarity_BOX(self):