Index: simulator/run.py =================================================================== diff -u -r313132b681260cc0761c65d46200adb40b72f478 -r967521dff94783ce48b50abc8db6bcd67bb501bf --- simulator/run.py (.../run.py) (revision 313132b681260cc0761c65d46200adb40b72f478) +++ simulator/run.py (.../run.py) (revision 967521dff94783ce48b50abc8db6bcd67bb501bf) @@ -5,9 +5,8 @@ import sys from dialin.ui import utils from PySide2 import QtCore, QtWidgets -from simulator.loader import Simulator -from dialin.ui.hd_simulator import HDSimulator -from dialin.ui.hd_simulator_alarms import HDAlarmsSimulator, HIGH +from simulator.simulator import Simulator +from simulator.interface import SimulationInterface def main(): @@ -23,30 +22,16 @@ simulator = Simulator() simulator.show() - hd_simulator_instance_counter_check() + SimulationInterface.hd_instance_counter_check() + SimulationInterface.dg_instance_counter_check() + SimulationInterface.alarm_instance_counter_check() utils.tstDone() # start qt application main loop sys.exit(app.exec_()) -def hd_simulator_instance_counter_check(): - """ - Checks to make sure only one instance of the HDSimulator has been created. - this code shall be part of the HDSimulator __init__ but other codes are not ready for this. - so only the simulator is checking it now. - """ - if HDSimulator.instanceCount > 1: - raise Exception("more than one instance of HDSimulator shall not be created.") - else: - if HDAlarmsSimulator.instanceCount > 1: - raise Exception("more than one instance of HDAlarmsSimulator shall not be created.") - else: - print("HDAlarmsSimulator number of instances is ", HDAlarmsSimulator.instanceCount) - print("HDSimulator number of instances is ", HDSimulator.instanceCount) - - if __name__ == "__main__": QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_ShareOpenGLContexts) main()