Index: simulator/plugins/__init__.py =================================================================== diff -u -r15118be5139122e2129f00482d173d58503b338e -rf921975179b1c1ad61d841b9db5976c00432fdcc --- simulator/plugins/__init__.py (.../__init__.py) (revision 15118be5139122e2129f00482d173d58503b338e) +++ simulator/plugins/__init__.py (.../__init__.py) (revision f921975179b1c1ad61d841b9db5976c00432fdcc) @@ -4,10 +4,9 @@ import os available_plugin_folders = sorted(os.listdir('./plugins')) -available_plugins = [] # to be used as global variable in the simulator +available_plugins = [] # to be used as global variable in the simulator print('found plugin folders {}'.format(available_plugin_folders)) for folder in available_plugin_folders: if not folder.startswith('__') and not folder.startswith('.'): exec('from .{0}.loader import Loader as {0}'.format(folder)) available_plugins.append(folder) - Index: simulator/plugins/alarms/loader.py =================================================================== diff -u -r15118be5139122e2129f00482d173d58503b338e -rf921975179b1c1ad61d841b9db5976c00432fdcc --- simulator/plugins/alarms/loader.py (.../loader.py) (revision 15118be5139122e2129f00482d173d58503b338e) +++ simulator/plugins/alarms/loader.py (.../loader.py) (revision f921975179b1c1ad61d841b9db5976c00432fdcc) @@ -4,7 +4,7 @@ import os from simulator.dynamicloader import DynamicLoader from PySide2 import QtWidgets -from PySide2.QtCore import Slot, QObject, Qt, QSize +from PySide2.QtCore import Slot, QObject, Qt from dialin.squish import denaliMessages from datetime import datetime from dialin.common.prs_defs import AlarmPriority @@ -69,9 +69,6 @@ def __init__(self): super().__init__(os.path.dirname(__file__)) - # self.initialize() - # self.init_widgets() - # self.init_connections() def _init_loader(self): """ Index: simulator/plugins/createtreatment/loader.py =================================================================== diff -u -r9206e36aeff354823f2c37103d79f548221cd64c -rf921975179b1c1ad61d841b9db5976c00432fdcc --- simulator/plugins/createtreatment/loader.py (.../loader.py) (revision 9206e36aeff354823f2c37103d79f548221cd64c) +++ simulator/plugins/createtreatment/loader.py (.../loader.py) (revision f921975179b1c1ad61d841b9db5976c00432fdcc) @@ -6,11 +6,8 @@ from PySide2 import QtWidgets from PySide2.QtCore import Slot from dialin.squish import denaliMessages -from dialin import HDSimulator -hd_simulator = HDSimulator() - class Loader(DynamicLoader): """ The Saline Bolus ui loader class @@ -23,9 +20,6 @@ def __init__(self): super().__init__(os.path.dirname(__file__)) - # self.initialize() - # self.init_widgets() - # self.init_connections() def _init_loader(self): """ @@ -59,7 +53,7 @@ the slot for accept button :return: none """ - hd_simulator.cmd_send_start_treatment_response(1, 0) + self.hd_simulator.cmd_send_start_treatment_response(1, 0) self.lblAction.setText('Accepted ') @Slot() Index: simulator/plugins/heparin/loader.py =================================================================== diff -u -r9206e36aeff354823f2c37103d79f548221cd64c -rf921975179b1c1ad61d841b9db5976c00432fdcc --- simulator/plugins/heparin/loader.py (.../loader.py) (revision 9206e36aeff354823f2c37103d79f548221cd64c) +++ simulator/plugins/heparin/loader.py (.../loader.py) (revision f921975179b1c1ad61d841b9db5976c00432fdcc) @@ -26,9 +26,6 @@ def __init__(self): super().__init__(os.path.dirname(__file__)) self.requested_state = txStates.HEPARIN_STATE_PAUSED - # self.initialize() - # self.init_widgets() - # self.init_connections() def _init_loader(self): """ Index: simulator/plugins/inlinebloodpressures/loader.py =================================================================== diff -u -r9206e36aeff354823f2c37103d79f548221cd64c -rf921975179b1c1ad61d841b9db5976c00432fdcc --- simulator/plugins/inlinebloodpressures/loader.py (.../loader.py) (revision 9206e36aeff354823f2c37103d79f548221cd64c) +++ simulator/plugins/inlinebloodpressures/loader.py (.../loader.py) (revision f921975179b1c1ad61d841b9db5976c00432fdcc) @@ -37,9 +37,6 @@ def __init__(self): super().__init__(os.path.dirname(__file__)) self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE - # self.initialize() - # self.init_widgets() - # self.init_connections() def _init_loader(self): """ Index: simulator/plugins/salinebolus/loader.py =================================================================== diff -u -r9206e36aeff354823f2c37103d79f548221cd64c -rf921975179b1c1ad61d841b9db5976c00432fdcc --- simulator/plugins/salinebolus/loader.py (.../loader.py) (revision 9206e36aeff354823f2c37103d79f548221cd64c) +++ simulator/plugins/salinebolus/loader.py (.../loader.py) (revision f921975179b1c1ad61d841b9db5976c00432fdcc) @@ -28,9 +28,6 @@ def __init__(self): super().__init__(os.path.dirname(__file__)) self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE - # self.initialize() - # self.init_widgets() - # self.init_connections() def _init_loader(self): """ Index: simulator/plugins/treatmentranges/loader.py =================================================================== diff -u -r9206e36aeff354823f2c37103d79f548221cd64c -rf921975179b1c1ad61d841b9db5976c00432fdcc --- simulator/plugins/treatmentranges/loader.py (.../loader.py) (revision 9206e36aeff354823f2c37103d79f548221cd64c) +++ simulator/plugins/treatmentranges/loader.py (.../loader.py) (revision f921975179b1c1ad61d841b9db5976c00432fdcc) @@ -26,9 +26,6 @@ def __init__(self): super().__init__(os.path.dirname(__file__)) - # self.initialize() - # self.init_widgets() - # self.init_connections() def _init_loader(self): """ Index: simulator/plugins/treatmentstates/loader.py =================================================================== diff -u -r9206e36aeff354823f2c37103d79f548221cd64c -rf921975179b1c1ad61d841b9db5976c00432fdcc --- simulator/plugins/treatmentstates/loader.py (.../loader.py) (revision 9206e36aeff354823f2c37103d79f548221cd64c) +++ simulator/plugins/treatmentstates/loader.py (.../loader.py) (revision f921975179b1c1ad61d841b9db5976c00432fdcc) @@ -21,9 +21,6 @@ def __init__(self): super().__init__(os.path.dirname(__file__)) - # apply/send the initial states - self.do_treatment_states() - def _init_loader(self): """ finds and creates widgets @@ -43,6 +40,8 @@ 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): """ Index: simulator/simulator/dynamicloader.py =================================================================== diff -u -r15118be5139122e2129f00482d173d58503b338e -rf921975179b1c1ad61d841b9db5976c00432fdcc --- simulator/simulator/dynamicloader.py (.../dynamicloader.py) (revision 15118be5139122e2129f00482d173d58503b338e) +++ simulator/simulator/dynamicloader.py (.../dynamicloader.py) (revision f921975179b1c1ad61d841b9db5976c00432fdcc) @@ -5,6 +5,7 @@ from PySide2.QtUiTools import QUiLoader from PySide2.QtCore import QFile, QObject from PySide2 import QtWidgets +from dialin import HDSimulator class DynamicLoader(QObject): @@ -19,6 +20,8 @@ loader: QUiLoader window: QtWidgets.QWidget + hd_simulator: HDSimulator + def __init__(self, location: str): super().__init__(None) self.location = location Index: simulator/simulator/loader.py =================================================================== diff -u -r15118be5139122e2129f00482d173d58503b338e -rf921975179b1c1ad61d841b9db5976c00432fdcc --- simulator/simulator/loader.py (.../loader.py) (revision 15118be5139122e2129f00482d173d58503b338e) +++ simulator/simulator/loader.py (.../loader.py) (revision f921975179b1c1ad61d841b9db5976c00432fdcc) @@ -14,6 +14,7 @@ # it loads all the classes in plugin folder dynamically # so used * in here to load all from plugins import * +from dialin import HDSimulator class Simulator(DynamicLoader): @@ -33,6 +34,7 @@ super().__init__(os.path.dirname(__file__)) self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE if self.__check_can_bus(): + self.__hd_simulator = HDSimulator() self.__init_plugins() self.__init_actions() @@ -93,6 +95,7 @@ :param obj: the plugin object :return: False if the passed obj is None """ + obj.hd_simulator = self.__hd_simulator self.plugins.append(obj) wgt = obj.window sub = self.mdiArea.addSubWindow(wgt)