Resolve conflict

design_viewer_v1.ui

@@ -1673,8 +1673,23 @@
         <bool>true</bool>
        </property>
        <property name="currentIndex">
-        <number>3</number>
+        <number>0</number>
        </property>
+       <item>
+        <property name="text">
+         <string>200</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>300</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>400</string>
+        </property>
+       </item>
        <item>
         <property name="text">
          <string>500</string>

project/view.py

@@ -93,14 +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)
-            self.HV_Box.currentIndexChanged.connect(self.set_HV_Box)
+
-            self.LV_Box.currentIndexChanged.connect(self.set_LV_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)
@@ -188,8 +186,6 @@ class Ui(QtWidgets.QMainWindow):
         self.Signal_Box.setCurrentIndex(int(data_in.signal))
         self.Channel_Box.setCurrentIndex(int(data_in.channel))
         self.DC_cut_Box.setCurrentIndex(int(data_in.dc_cut))
-        self.HV_Box.setCurrentIndex(int(data_in.hv))
-        self.LV_Box.setCurrentIndex(int(data_in.lv))
         self.RA_max_time_ms_BOX.setEditText(str(data_in.max_search_time))
         self.RA_min_sensitivity_BOX.setEditText(str(data_in.min_treshold))
         self.RA_max_sensitivity_BOX.setEditText(str(data_in.max_treshold))
@@ -209,23 +205,21 @@ 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.setCurrentIndex(data_in.hv_polarity)#fixed
+        self.hv_polarity_BOX.setValue(data_in.hv_polarity)
-        self.hv_mode_BOX.setCurrentIndex(data_in.hv_mode)#fixed
+        self.hv_mode_BOX.setValue(data_in.hv_mode)
         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.setCurrentIndex(data_in.lv_polarity)
+        self.lv_polarity_BOX.setValue(data_in.lv_polarity)
-        self.lv_mode_BOX.setCurrentIndex(data_in.lv_mode)
+        self.lv_mode_BOX.setValue(data_in.lv_mode)
-
+        self.t1_lv_shock_time_SpinBox().setValue(data_in.lv_shock_time / 10.0)
-        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.t2_lv_relax_time_spinBox.setValue(data_in.lv_relax_time)
+        self.u_lv_voltage_SpinBox().setValue(data_in.lv_voltage / 10.0)
-        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_spinBox.setValue(data_in.burst_period) #fixed
+        self.burst_period.setValue(data_in.burst_period)
 
 
     def timerEvent(self):
@@ -587,16 +581,6 @@ class Ui(QtWidgets.QMainWindow):
         param = int(self.DC_cut_Box.currentIndex())
         my_data.state_packet(self.send_mode, self.serial, 0x21, param, 1, int)
 
-    def set_HV_Box(self):
-        """Настройка активации режима высоковольтной стимуляции"""
-        param = int(self.HV_Box.currentIndex())
-        my_data.state_packet(self.send_mode, self.serial, 0x0F, param, 1, int)
-
-    def set_LV_Box(self):
-        """Настройка активации режима низковольтной стимуляции"""
-        param = int(self.LV_Box.currentIndex())
-        my_data.state_packet(self.send_mode, self.serial, 0x0E, param, 1, int)
-
     def set_Signal_Box(self):
         """Настройка вывода сигнала с/без фильтром(а)"""
         param = int(self.Signal_Box.currentIndex())
@@ -787,17 +771,12 @@ class Ui(QtWidgets.QMainWindow):
         """Выбор режима низковольтной стимуляции"""
         param = self.lv_mode_BOX.currentIndex()
         match param:
-            case 1:
+            case 3:
                 self.burst_frame.setVisible(True)
             case _:
                 self.burst_frame.setVisible(False)
         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):
         """Выбор полярности для НВ"""
@@ -815,7 +794,7 @@ class Ui(QtWidgets.QMainWindow):
         my_data.state_packet(self.send_mode, self.serial, 0x24, param, 1, int)
     def set_t2_lv_relax_time_spinBox(self):
         """Выбор времени стабилизации после НВ стимуляции"""
-        param = int(self.t2_lv_relax_time_spinBox.value())
+        param = int(self.t2_lv_relax_time_spinBox.value() * 10)
         my_data.state_packet(self.send_mode, self.serial, 0x25, param, 1, int)
     def set_burst_cnt_spinBox(self):
         """Выбор количества импульсов в пачке при НВ стимуляции"""