Index: simulator/plugins/treatmentstates/loader.py =================================================================== diff -u -rc13dc6ba2410716a3f1c446e564085aeb9114a60 -rf921975179b1c1ad61d841b9db5976c00432fdcc --- simulator/plugins/treatmentstates/loader.py (.../loader.py) (revision c13dc6ba2410716a3f1c446e564085aeb9114a60) +++ simulator/plugins/treatmentstates/loader.py (.../loader.py) (revision f921975179b1c1ad61d841b9db5976c00432fdcc) @@ -1,14 +1,15 @@ """ The Ultrafiltration ui loader """ -from runtimewidget import RunTimeWidget +import os +from simulator.dynamicloader import DynamicLoader from PySide2 import QtWidgets from PySide2.QtCore import Slot from dialin.squish import denaliMessages -from dialin.squish.denaliMessages import txStates, EResponse +from dialin.squish.denaliMessages import txStates -class TreatmentStates(RunTimeWidget): +class Loader(DynamicLoader): """ The Ultrafiltration ui loader """ @@ -18,15 +19,9 @@ tblHeparinStates: QtWidgets.QTableWidget def __init__(self): - super().__init__("plugins/treatmentstates/interface.ui") - self.initialize() - self.init_widgets() - self.init_connections() + super().__init__(os.path.dirname(__file__)) - # apply/send the initial states - self.do_treatment_states() - - def initialize(self): + def _init_loader(self): """ finds and creates widgets :return: none @@ -36,7 +31,7 @@ self.tblSalineStates = self.find_table_widget('tblSalineStates') self.tblHeparinStates = self.find_table_widget('tblHeparinStates') - def init_connections(self): + def _init_connections(self): """ initializes the widgets connections :return: none @@ -45,8 +40,10 @@ self.tblUFStates.cellClicked.connect(self.do_treatment_states) self.tblSalineStates.cellClicked.connect(self.do_treatment_states) self.tblHeparinStates.cellClicked.connect(self.do_treatment_states) + # apply/send the initial states + self.do_treatment_states() - def init_widgets(self): + def _init_widgets(self): """ initializes the widgets' properties :return: none