Skip to content

H
HEV - High Energy Ventilator
Commit 631e4759 authored by Tiago Sarmento's avatar Tiago Sarmento
Browse files
Options

nearly final clean up

parent 1e77f473
Pipeline #1865 canceled with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 127 additions and 143 deletions
      NativeUI/NativeUI.py
      View file @ 631e4759
      ......@@ -370,16 +370,16 @@ class NativeUI(HEVClient, QMainWindow):
      # Startup next and skip buttons should move from the startup widget to the main
      # display
      self.widgets.nextButton.pressed.connect(
      self.widgets.startup_nextButton.pressed.connect(
      lambda: self.display_stack.setCurrentWidget(self.main_display)
      )
      self.widgets.skipButton.pressed.connect(
      self.widgets.startup_backButton.pressed.connect(
      lambda: self.display_stack.setCurrentWidget(self.main_display)
      )
      self.widgets.lock_button.PageButtonPressed.connect(self.toggle_editability)
      # Startup next button should send the ventilator start command.
      self.widgets.nextButton.pressed.connect(
      self.widgets.startup_nextButton.pressed.connect(
      lambda: self.q_send_cmd("GENERAL", "START")
      )
      ......@@ -447,22 +447,22 @@ class NativeUI(HEVClient, QMainWindow):
      # When mode is switched from mode page, various other locations must respond
      for widget in self.mode_handler.spinDict.values():
      self.mode_handler.UpdateModes.connect(widget.update_value)
      widget.simpleSpin.manualChanged.connect(
      widget.signalling_spin.manualChanged.connect(
      lambda i=widget: self.clinical_handler.setpoint_changed(i)
      )
      widget.simpleSpin.manualChanged.connect(
      widget.signalling_spin.manualChanged.connect(
      lambda i=widget: self.mode_handler.propagate_modevalchange(i)
      )
      for widget in self.mode_handler.mainSpinDict.values():
      self.mode_handler.UpdateModes.connect(widget.update_value)
      widget.simpleSpin.manualChanged.connect(
      widget.signalling_spin.manualChanged.connect(
      lambda i=widget: self.clinical_handler.setpoint_changed(i)
      )
      widget.simpleSpin.manualChanged.connect(
      widget.signalling_spin.manualChanged.connect(
      lambda i=widget: self.mode_handler.propagate_modevalchange(i)
      )
      # widget.simpleSpin.manualChanged.connect(lambda i=widget: self.mode_handler.mode_value(i))
      # widget.signalling_spin.manualChanged.connect(lambda i=widget: self.mode_handler.mode_value(i))
      self.mode_handler.modeSwitched.connect(lambda i: self.set_current_mode(i))
      self.mode_handler.modeSwitched.connect(
      ......@@ -484,15 +484,15 @@ class NativeUI(HEVClient, QMainWindow):
      # mode_handler should respond to manual spin box changes
      for key, spin_widget in self.mode_handler.spinDict.items():
      spin_widget.simpleSpin.manualChanged.connect(
      spin_widget.signalling_spin.manualChanged.connect(
      lambda i=key: self.mode_handler.handle_manual_change(i)
      )
      for key, spin_widget in self.mode_handler.mainSpinDict.items():
      spin_widget.simpleSpin.manualChanged.connect(
      spin_widget.signalling_spin.manualChanged.connect(
      lambda i=key: self.mode_handler.handle_manual_change(i)
      )
      spin_widget.simpleSpin.programmaticallyChanged.connect(
      spin_widget.signalling_spin.programmaticallyChanged.connect(
      lambda i=key: self.mode_handler.handle_manual_change(i)
      )
      ......@@ -526,26 +526,26 @@ class NativeUI(HEVClient, QMainWindow):
      button_widget.pressed.connect(self.clinical_handler.commandSent)
      elif isinstance(button_widget, CancelButtonWidget):
      # mode = self.mode_handler.get_mode(key)
      button_widget.clicked.connect(
      button_widget.pressed.connect(
      lambda i=key: self.mode_handler.commandSent(i)
      )
      button_widget.pressed.connect(
      lambda i=key: self.clinical_handler.commandSent(i)
      self.clinical_handler.commandSent
      )
      for key, spin_widget in self.clinical_handler.limSpinDict.items():
      spin_widget.simpleSpin.manualChanged.connect(
      spin_widget.signalling_spin.manualChanged.connect(
      lambda i=key: self.clinical_handler.handle_manual_change(i)
      )
      for key, spin_widget in self.clinical_handler.setSpinDict.items():
      spin_widget.simpleSpin.manualChanged.connect(
      spin_widget.signalling_spin.manualChanged.connect(
      lambda i=spin_widget: self.clinical_handler.setpoint_changed(i)
      )
      spin_widget.simpleSpin.manualChanged.connect(
      spin_widget.signalling_spin.manualChanged.connect(
      lambda i=key: self.clinical_handler.handle_manual_change(i)
      )
      spin_widget.simpleSpin.manualChanged.connect(
      spin_widget.signalling_spin.manualChanged.connect(
      lambda i=spin_widget: self.mode_handler.propagate_modevalchange(i)
      )
      ......@@ -610,17 +610,17 @@ class NativeUI(HEVClient, QMainWindow):
      # Expert handler should respond to manual value changes
      for key, spin_widget in self.expert_handler.spinDict.items():
      spin_widget.simpleSpin.manualChanged.connect(
      spin_widget.signalling_spin.manualChanged.connect(
      lambda i=key: self.expert_handler.handle_manual_change(i)
      )
      # Expert handler should respond to manual value changes
      for key, spin_widget in self.personal_handler.spinDict.items():
      spin_widget.simpleSpin.manualChanged.connect(
      spin_widget.signalling_spin.manualChanged.connect(
      lambda i=key: self.personal_handler.handle_manual_change(i)
      )
      for key, spin_widget in self.personal_handler.textDict.items():
      spin_widget.simpleSpin.manualChanged.connect(
      spin_widget.signalling_spin.manualChanged.connect(
      lambda i=key: self.personal_handler.handle_manual_change(i)
      )
      ......
      NativeUI/global_widgets/global_spinbox.py
      View file @ 631e4759
      ......@@ -117,12 +117,8 @@ class labelledSpin(QtWidgets.QWidget):
      infoArray
      )
      elif len(infoArray) == 5:
      print('creating with 5')
      print(infoArray)
      self.label, self.units, self.tag, self.cmd_type, self.cmd_code = infoArray
      elif len(infoArray) == 3:
      print('creating with 3')
      print(infoArray)
      self.label, self.units, self.tag = infoArray
      self.manuallyUpdated = False
      ......@@ -135,7 +131,7 @@ class labelledSpin(QtWidgets.QWidget):
      self.nameLabel.setFont(NativeUI.text_font)
      self.nameLabel.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
      self.simpleSpin = signallingSpinBox(
      self.signalling_spin = signallingSpinBox(
      NativeUI,
      typeval_popup,
      self.label,
      ......@@ -146,7 +142,7 @@ class labelledSpin(QtWidgets.QWidget):
      self.decPlaces,
      )
      self.simpleSpin.setStyleSheet(
      self.signalling_spin.setStyleSheet(
      "QDoubleSpinBox{"
      "border:none;"
      "}"
      ......@@ -169,31 +165,29 @@ class labelledSpin(QtWidgets.QWidget):
      "red"].name() + ";"
      "}"
      )
      self.simpleSpin.setFont(NativeUI.text_font)
      self.simpleSpin.setProperty("textColour", "0")
      self.simpleSpin.setProperty("bgColour", "0")
      self.simpleSpin.setAlignment(QtCore.Qt.AlignCenter)
      self.signalling_spin.setFont(NativeUI.text_font)
      self.signalling_spin.setProperty("textColour", "0")
      self.signalling_spin.setProperty("bgColour", "0")
      self.signalling_spin.setAlignment(QtCore.Qt.AlignCenter)
      if self.cmd_type == "":
      print('cmd_type is empty')
      print(self.label)
      self.simpleSpin.setReadOnly(True)
      self.simpleSpin.setEditability(False)
      self.simpleSpin.style().polish(self.simpleSpin)
      self.signalling_spin.setReadOnly(True)
      self.signalling_spin.setEditability(False)
      self.signalling_spin.style().polish(self.signalling_spin)
      self.unitLabel = QtWidgets.QLabel()
      self.unitLabel.setFont(NativeUI.text_font)
      self.unitLabel.setStyleSheet(textStyle)
      self.unitLabel.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
      self.widgetList = [self.nameLabel, self.simpleSpin, self.unitLabel]
      self.widgetList = [self.nameLabel, self.signalling_spin, self.unitLabel]
      for widget in self.widgetList:
      self.layout.addWidget(widget)
      self.setLayout(self.layout)
      self.simpleSpin.manualChanged.connect(self.manualStep)
      self.simpleSpin.programmaticallyChanged.connect(self.manualStep)
      self.signalling_spin.manualChanged.connect(self.manualStep)
      self.signalling_spin.programmaticallyChanged.connect(self.manualStep)
      self.setEnabled(True)
      # self.simpleSpin.valueChanged.connect(self.valChange)
      # self.signalling_spin.valueChanged.connect(self.valChange)
      self.localise_text(NativeUI.text)
      ......@@ -203,32 +197,32 @@ class labelledSpin(QtWidgets.QWidget):
      roundVal = round(self.currentDbValue, self.decPlaces)
      if self.decPlaces == 0:
      roundVal = int(roundVal)
      if self.simpleSpin.value() == roundVal:
      self.simpleSpin.setProperty("textColour", "0")
      if self.signalling_spin.value() == roundVal:
      self.signalling_spin.setProperty("textColour", "0")
      self.manuallyUpdated = False
      self.simpleSpin.style().polish(self.simpleSpin)
      self.signalling_spin.style().polish(self.signalling_spin)
      else:
      self.simpleSpin.setProperty("textColour", "2")
      self.signalling_spin.setProperty("textColour", "2")
      self.manuallyUpdated = True
      self.simpleSpin.style().polish(self.simpleSpin)
      self.signalling_spin.style().polish(self.signalling_spin)
      return 0
      def isEnabled(self, *args, **kwargs):
      """Override isEnabled to return value of base spinbox"""
      return self.simpleSpin.isEnabled()
      return self.signalling_spin.isEnabled()
      def setEnabled(self, bool):
      """Override isEnabled to set value of base spinbox and modify colour"""
      self.simpleSpin.setEnabled(bool)
      self.simpleSpin.setProperty("bgColour", str(int(bool)))
      self.signalling_spin.setEnabled(bool)
      self.signalling_spin.setProperty("bgColour", str(int(bool)))
      if bool == False:
      self.simpleSpin.setProperty("textColour", "1")
      self.simpleSpin.lineEdit().removeEventFilter(self.simpleSpin)
      self.signalling_spin.setProperty("textColour", "1")
      self.signalling_spin.lineEdit().removeEventFilter(self.signalling_spin)
      else:
      self.simpleSpin.setProperty("textColour", str(int(not bool)))
      self.simpleSpin.lineEdit().installEventFilter(self.simpleSpin)
      self.signalling_spin.setProperty("textColour", str(int(not bool)))
      self.signalling_spin.lineEdit().installEventFilter(self.signalling_spin)
      self.simpleSpin.style().polish(self.simpleSpin)
      self.signalling_spin.style().polish(self.signalling_spin)
      def update_value(self, db):
      if self.tag == "":
      ......@@ -249,13 +243,13 @@ class labelledSpin(QtWidgets.QWidget):
      return 0
      self.currentDbValue = newVal
      self.simpleSpin.setValue(float(newVal))
      self.signalling_spin.setValue(float(newVal))
      if self.isEnabled():
      self.simpleSpin.setProperty("textColour", "0")
      self.signalling_spin.setProperty("textColour", "0")
      else:
      self.simpleSpin.setProperty("textColour", "1")
      self.simpleSpin.style().polish(self.simpleSpin)
      self.signalling_spin.setProperty("textColour", "1")
      self.signalling_spin.style().polish(self.signalling_spin)
      return 0
      def insertWidget(self, widget):
      ......@@ -273,31 +267,31 @@ class labelledSpin(QtWidgets.QWidget):
      return 0
      def get_value(self):
      return self.simpleSpin.value()
      return self.signalling_spin.value()
      def set_value(self, value):
      self.simpleSpin.setValue(value)
      self.signalling_spin.setValue(value)
      if self.isEnabled():
      self.simpleSpin.setProperty("textColour", "0")
      self.signalling_spin.setProperty("textColour", "0")
      else:
      self.simpleSpin.setProperty("textColour", "1")
      self.simpleSpin.style().polish(self.simpleSpin)
      self.signalling_spin.setProperty("textColour", "1")
      self.signalling_spin.style().polish(self.signalling_spin)
      return 0
      def set_maximum(self, max):
      """Update maximum and correct existing value"""
      self.max = max
      if self.simpleSpin.value() > self.max:
      self.simpleSpin.set_value(max)
      self.simpleSpin.setRange(self.min, self.max)
      if self.signalling_spin.value() > self.max:
      self.signalling_spin.set_value(max)
      self.signalling_spin.setRange(self.min, self.max)
      return 0
      def set_minimum(self, min):
      """Update minimimum and correct existing value"""
      self.min = min
      if self.simpleSpin.value() < self.min:
      self.simpleSpin.stepBy(self.min - self.simpleSpin.value())
      self.simpleSpin.setRange(self.min, self.max)
      if self.signalling_spin.value() < self.min:
      self.signalling_spin.stepBy(self.min - self.signalling_spin.value())
      self.signalling_spin.setRange(self.min, self.max)
      return 0
      def set_size(self, x: int, y: int, spacing: int = 5) -> int:
      ......@@ -314,7 +308,7 @@ class labelledSpin(QtWidgets.QWidget):
      self.insertedWidget.setFixedWidth(x_widget)
      else:
      self.nameLabel.setFixedWidth(3 * x_widget)
      self.simpleSpin.setFixedWidth(4 * x_widget)
      self.signalling_spin.setFixedWidth(4 * x_widget)
      self.unitLabel.setFixedWidth(1 * x_widget)
      if y is not None:
      self.setFixedHeight(y)
      ......@@ -322,7 +316,7 @@ class labelledSpin(QtWidgets.QWidget):
      widget.setFixedHeight(y)
      self.nameLabel.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
      self.simpleSpin.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
      self.signalling_spin.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
      self.unitLabel.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
      self.layout.setSpacing(0)
      return 0
      ......
      NativeUI/handler_library/clinical_handler.py
      View file @ 631e4759
      ......@@ -173,11 +173,11 @@ class ClinicalHandler(PayloadHandler):
      )
      in widget.cmd_type
      ):
      self.setSpinDict[attrName + "_set"].simpleSpin.set_value(
      self.setSpinDict[attrName + "_set"].signalling_spin.set_value(
      widget.get_value()
      )
      elif isinstance(widget, SpinButton):
      self.setSpinDict[attrName + "_set"].simpleSpin.set_value(
      self.setSpinDict[attrName + "_set"].signalling_spin.set_value(
      widget.get_value()
      )
      ......
      NativeUI/handler_library/mode_handler.py
      View file @ 631e4759
      ......@@ -231,7 +231,7 @@ class ModeHandler(PayloadHandler):
      in spin.cmd_type
      ):
      if spin.get_value() != widget.get_value() and widget != spin:
      spin.simpleSpin.set_value(widget.get_value())
      spin.signalling_spin.set_value(widget.get_value())
      self.refresh_button_colour()
      ......
      NativeUI/ui_layout.py
      View file @ 631e4759
      ......@@ -118,9 +118,9 @@ class Layout:
      self.widgets.startup_stack.setButtonSize(None, self.min_button_height)
      # Add buttons
      h_button_layout.addWidget(self.NativeUI.widgets.backButton)
      h_button_layout.addWidget(self.NativeUI.widgets.skipButton)
      h_button_layout.addWidget(self.NativeUI.widgets.nextButton)
      h_button_layout.addWidget(self.NativeUI.widgets.startup_backButton)
      #h_button_layout.addWidget(self.NativeUI.widgets.startup_skipButton)
      h_button_layout.addWidget(self.NativeUI.widgets.startup_nextButton)
      # Put the layouts together
      h_layout.addWidget(self.layout_startup_main())
      ......@@ -129,8 +129,8 @@ class Layout:
      v_layout.addLayout(h_button_layout)
      # Ensure that next and skip buttons are disabled by default.
      self.NativeUI.widgets.skipButton.setEnabled(False)
      self.NativeUI.widgets.nextButton.setEnabled(False)
      #self.NativeUI.widgets.skipButton.setEnabled(False)
      #self.NativeUI.widgets.nextButton.setEnabled(False)
      return v_layout
      ......@@ -852,7 +852,7 @@ class Layout:
      widg = self.NativeUI.widgets.get_widget(attrName)
      if setting[0] in modeDict["radioSettings"]:
      stack.addWidget(widg)
      #widg.simpleSpin.setFont(self.NativeUI.value_font)
      #widg.signalling_spin.setFont(self.NativeUI.value_font)
      #widg.label.setFont(self.NativeUI.text_font)
      if "IE Ratio" in widg.label_text:
      stack.setCurrentWidget(widg)
      ......@@ -886,24 +886,15 @@ class Layout:
      if setting[0] in modeDict["mainPageSettings"]:
      attrName = "CURRENT_" + setting[2]
      self.NativeUI.widgets.get_widget(attrName).setFixedSize(x_spin, y_spin)
      self.NativeUI.widgets.get_widget(attrName).simpleSpin.setFixedSize(
      self.NativeUI.widgets.get_widget(attrName).signalling_spin.setFixedSize(
      x_spin, 0.7 * y_spin
      )
      # self.NativeUI.widgets.get_widget(attrName).simpleSpin.setFont(
      # self.NativeUI.value_font
      # )
      # self.NativeUI.widgets.get_widget(attrName).label.setFont(
      # self.NativeUI.text_font
      # )
      stack.setFixedSize(x_spin, y_spin)
      cancelButton.setFixedSize(x_spin, int(y_spin / 2) - spacing)
      okButton.setFixedSize(x_spin, int(y_spin / 2) - spacing)
      # spin_buttons.set_label_font(self.NativeUI.text_font)
      # spin_buttons.set_value_font(self.NativeUI.value_font
      return combined_spin_buttons
      def layout_tab_clinical_limits(self):
      ......@@ -930,9 +921,6 @@ class Layout:
      for setting in clinicalDict["settings"]:
      attrName = "clinical_spin_" + setting[0][2]
      hlayout = QtWidgets.QHBoxLayout()
      # hlayout.setMargin(0)
      # hlayout.setSpacing(0)
      # hlayout.addStretch(5)
      if 'VTI' in setting[0][0]:
      vtlayout1.addWidget(self.NativeUI.widgets.get_widget(attrName + "_min") )
      ......
      NativeUI/ui_widgets.py
      View file @ 631e4759
      ......@@ -144,16 +144,14 @@ class Widgets:
      )
      self.add_handled_widget(
      OkButtonWidget(NativeUI), "nextButton", self.startup_handler
      OkButtonWidget(NativeUI), "startup_nextButton", self.startup_handler
      )
      self.nextButton.setColour(0)
      self.add_handled_widget(
      OkSendButtonWidget(NativeUI), "skipButton", self.startup_handler
      )
      self.skipButton.setColour(0)
      self.startup_nextButton.setColour(0)
      self.add_handled_widget(
      CancelButtonWidget(NativeUI), "backButton", self.startup_handler
      CancelButtonWidget(NativeUI), "startup_backButton", self.startup_handler
      )
      self.startup_backButton.setColour(1)
      # Top bar widgets
      self.tab_modeswitch = TabModeswitchButton(NativeUI)
      ......
      NativeUI/widget_library/line_edit_widget.py
      View file @ 631e4759
      ......@@ -72,9 +72,9 @@ class LabelledLineEditWidget(QtWidgets.QWidget):
      )
      self.widgetList.append(self.nameLabel)
      self.simpleSpin = SignallingLineEditWidget(NativeUI, popup, self.label)
      self.simpleSpin.setText(self.initText)
      self.simpleSpin.setStyleSheet(
      self.signalling_spin = SignallingLineEditWidget(NativeUI, popup, self.label)
      self.signalling_spin.setText(self.initText)
      self.signalling_spin.setStyleSheet(
      "QLineEdit{"
      " border: none;"
      " color:" + NativeUI.colors["page_foreground"].name() + ";"
      ......@@ -98,15 +98,15 @@ class LabelledLineEditWidget(QtWidgets.QWidget):
      "}"
      )
      self.simpleSpin.setFont(NativeUI.text_font)
      self.simpleSpin.setProperty("textColour", "1")
      self.simpleSpin.setProperty("bgColour", "1")
      self.signalling_spin.setFont(NativeUI.text_font)
      self.signalling_spin.setProperty("textColour", "1")
      self.signalling_spin.setProperty("bgColour", "1")
      self.simpleSpin.textChanged.connect(self.textUpdate)
      self.signalling_spin.textChanged.connect(self.textUpdate)
      if self.cmd_type == "":
      self.simpleSpin.setReadOnly(True)
      self.simpleSpin.setProperty("bgColour", "1")
      self.widgetList.append(self.simpleSpin)
      self.signalling_spin.setReadOnly(True)
      self.signalling_spin.setProperty("bgColour", "1")
      self.widgetList.append(self.signalling_spin)
      # if self.units != "":
      self.unitLabel = QtWidgets.QLabel()
      ......@@ -124,8 +124,8 @@ class LabelledLineEditWidget(QtWidgets.QWidget):
      def textUpdate(self):
      self.manuallyUpdated = True
      self.simpleSpin.setProperty("textColour", "2")
      self.simpleSpin.style().polish(self.simpleSpin)
      self.signalling_spin.setProperty("textColour", "2")
      self.signalling_spin.style().polish(self.signalling_spin)
      def update_value(self, db):
      newVal = db[self.tag]
      ......@@ -133,12 +133,12 @@ class LabelledLineEditWidget(QtWidgets.QWidget):
      a = 1 # do nothing
      else:
      logging.debug("got a personal db")
      self.simpleSpin.setText(newVal)
      self.simpleSpin.setProperty("textColour", "1")
      self.simpleSpin.style().polish(self.simpleSpin)
      self.signalling_spin.setText(newVal)
      self.signalling_spin.setProperty("textColour", "1")
      self.signalling_spin.style().polish(self.signalling_spin)
      def get_value(self):
      return self.simpleSpin.text()
      return self.signalling_spin.text()
      def set_size(self, x: int, y: int, spacing: int = 5) -> int:
      """
      ......@@ -151,7 +151,7 @@ class LabelledLineEditWidget(QtWidgets.QWidget):
      self.setFixedWidth(x)
      x_widget = int(0.9 * x / 8)
      self.nameLabel.setFixedWidth(3 * x_widget)
      self.simpleSpin.setFixedWidth(4 * x_widget)
      self.signalling_spin.setFixedWidth(4 * x_widget)
      self.unitLabel.setFixedWidth(1 * x_widget)
      if y is not None:
      self.setFixedHeight(y)
      ......@@ -159,7 +159,7 @@ class LabelledLineEditWidget(QtWidgets.QWidget):
      widget.setFixedHeight(y)
      self.nameLabel.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
      self.simpleSpin.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
      self.signalling_spin.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
      self.unitLabel.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
      self.layout.setSpacing(0)
      # self.layout.setSpacing(spacing)
      ......
      NativeUI/widget_library/spin_buttons_widget.py
      View file @ 631e4759
      ......@@ -66,7 +66,7 @@ class SpinButton(QtWidgets.QFrame):
      self.label.setAlignment(QtCore.Qt.AlignCenter)
      self.layout.addWidget(self.label)
      self.simpleSpin = signallingSpinBox(
      self.signalling_spin = signallingSpinBox(
      NativeUI,
      popup,
      self.label_text,
      ......@@ -76,7 +76,7 @@ class SpinButton(QtWidgets.QFrame):
      self.step,
      self.decPlaces,
      )
      # self.simpleSpin.lineEdit().setStyleSheet("border:blue;")
      # self.signalling_spin.lineEdit().setStyleSheet("border:blue;")
      boxStyleString = (
      "QDoubleSpinBox{"
      ......@@ -98,21 +98,21 @@ class SpinButton(QtWidgets.QFrame):
      downButtonStyleString = upButtonStyleString.replace("up", "down")
      upButtonStyleString = "QDoubleSpinBox::up-button{" "height:30;" "width:40;" "}"
      downButtonStyleString = upButtonStyleString.replace("up", "down")
      self.simpleSpin.setStyleSheet(
      self.signalling_spin.setStyleSheet(
      boxStyleString + upButtonStyleString + downButtonStyleString
      )
      self.simpleSpin.setProperty("colour", "1")
      self.simpleSpin.setButtonSymbols(
      self.signalling_spin.setProperty("colour", "1")
      self.signalling_spin.setButtonSymbols(
      QtWidgets.QAbstractSpinBox.ButtonSymbols.PlusMinus
      )
      self.simpleSpin.setAlignment(QtCore.Qt.AlignCenter)
      self.simpleSpin.manualChanged.connect(self.manualChanged)
      self.simpleSpin.programmaticallyChanged.connect(self.manualChanged)
      self.simpleSpin.setSizePolicy(
      self.signalling_spin.setAlignment(QtCore.Qt.AlignCenter)
      self.signalling_spin.manualChanged.connect(self.manualChanged)
      self.signalling_spin.programmaticallyChanged.connect(self.manualChanged)
      self.signalling_spin.setSizePolicy(
      QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed
      )
      self.simpleSpin.setFont(self.NativeUI.value_font)
      self.layout.addWidget(self.simpleSpin)
      self.signalling_spin.setFont(self.NativeUI.value_font)
      self.layout.addWidget(self.signalling_spin)
      self.setLayout(self.layout)
      self.setFixedWidth(300)
      # self.setStyleSheet("border:2px solid white; border-radius:4px; padding:0px;")
      ......@@ -123,22 +123,22 @@ class SpinButton(QtWidgets.QFrame):
      a = 1 # do nothing
      else:
      if not self.manuallyUpdated:
      self.simpleSpin.setValue(newVal[self.tag])
      self.signalling_spin.setValue(newVal[self.tag])
      self.setTextColour(1)
      else:
      if round(self.simpleSpin.value(), self.decPlaces) == round(
      if round(self.signalling_spin.value(), self.decPlaces) == round(
      newVal[self.tag], self.decPlaces
      ):
      self.manuallyUpdated = False
      self.setTextColour(1)
      def get_value(self):
      return self.simpleSpin.value()
      return self.signalling_spin.value()
      def set_value(self, value):
      self.simpleSpin.setValue(value)
      self.signalling_spin.setValue(value)
      self.manuallyUpdated = True
      self.simpleSpin.programmaticallyChanged.emit()
      self.signalling_spin.programmaticallyChanged.emit()
      def manualChanged(self):
      """Called when user manually makes a change. Stops value from updating and changes colour"""
      ......@@ -148,9 +148,9 @@ class SpinButton(QtWidgets.QFrame):
      def setTextColour(self, option):
      """Set text colour and unpolish polish widget to show change"""
      self.simpleSpin.setProperty("colour", option)
      self.simpleSpin.style().unpolish(self.simpleSpin)
      self.simpleSpin.style().polish(self.simpleSpin)
      self.signalling_spin.setProperty("colour", option)
      self.signalling_spin.style().unpolish(self.signalling_spin)
      self.signalling_spin.style().polish(self.signalling_spin)
      return 0
      def set_label_font(self, font) -> int:
      ......@@ -164,7 +164,7 @@ class SpinButton(QtWidgets.QFrame):
      """
      Set the font for the spinbox value display.
      """
      self.simpleSpin.setFont(font)
      self.signalling_spin.setFont(font)
      return 0
      def localise_text(self, text: dict) -> int:
      ......
      NativeUI/widget_library/startup_handler.py
      View file @ 631e4759
      ......@@ -99,7 +99,7 @@ class StartupHandler(
      self.calibs_done_dict[calibrationWidget.key] = True
      if self.all_calibs_done():
      for key in ["nextButton", "skipButton"]:
      for key in ["startup_nextButton"]:
      self.buttonDict[key].setEnabled(True)
      self.buttonDict[key].setColour(1)
      ......@@ -110,8 +110,12 @@ class StartupHandler(
      Check if all required calibrations are complete. For now this is as simple as
      comparing the self.calibs_done_dict to the self.calibDict.
      """
      print(self.calibDict)
      for key in self.calibDict:
      if key not in self.calibs_done_dict:
      print(key)
      print(self.calibs_done_dict)
      return False
      return True
      ......@@ -139,10 +143,10 @@ class StartupHandler(
      totalLength = stack.count()
      stack.setCurrentIndex(nextIndex)
      if nextIndex == totalLength - 1:
      self.buttonDict["nextButton"].setColour(0)
      self.buttonDict["startup_nextButton"].setColour(0)
      else:
      self.buttonDict["nextButton"].setColour(1)
      self.buttonDict["backButton"].setColour(1)
      self.buttonDict["startup_nextButton"].setColour(1)
      self.buttonDict["startup_backButton"].setColour(1)
      def handle_backbutton(self, stack):
      logging.debug("backbutton pressed")
      ......@@ -150,10 +154,10 @@ class StartupHandler(
      nextIndex = currentIndex - 1
      stack.setCurrentIndex(nextIndex)
      if nextIndex == 0:
      self.buttonDict["backButton"].setColour(0)
      self.buttonDict["startup_backButton"].setColour(0)
      else:
      self.buttonDict["backButton"].setColour(1)
      self.buttonDict["nextButton"].setColour(1)
      self.buttonDict["startup_backButton"].setColour(1)
      self.buttonDict["startup_nextButton"].setColour(1)
      def get_mode(self, key: str):
      for mode in self.NativeUI.modeList:
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment