Index: simulator/plugins/accelerometer/interface.ui
===================================================================
diff -u -reb6acf9c1a4748852875c350568192999be9d3dd -r4da03e2d7ca1895efdbdff0c59114cdca1bfd6b7
--- simulator/plugins/accelerometer/interface.ui (.../interface.ui) (revision eb6acf9c1a4748852875c350568192999be9d3dd)
+++ simulator/plugins/accelerometer/interface.ui (.../interface.ui) (revision 4da03e2d7ca1895efdbdff0c59114cdca1bfd6b7)
@@ -6,7 +6,7 @@
0
0
- 548
+ 160
502
Index: simulator/plugins/alarms/interface.ui
===================================================================
diff -u -r1b402ab005844b85b8361ae611664731cfa39e0b -r4da03e2d7ca1895efdbdff0c59114cdca1bfd6b7
--- simulator/plugins/alarms/interface.ui (.../interface.ui) (revision 1b402ab005844b85b8361ae611664731cfa39e0b)
+++ simulator/plugins/alarms/interface.ui (.../interface.ui) (revision 4da03e2d7ca1895efdbdff0c59114cdca1bfd6b7)
@@ -6,8 +6,8 @@
0
0
- 937
- 808
+ 472
+ 652
@@ -569,12 +569,6 @@
0
-
-
- 0
- 200
-
-
QAbstractItemView::NoEditTriggers
Index: simulator/plugins/alarms/loader.py
===================================================================
diff -u -r967521dff94783ce48b50abc8db6bcd67bb501bf -r4da03e2d7ca1895efdbdff0c59114cdca1bfd6b7
--- simulator/plugins/alarms/loader.py (.../loader.py) (revision 967521dff94783ce48b50abc8db6bcd67bb501bf)
+++ simulator/plugins/alarms/loader.py (.../loader.py) (revision 4da03e2d7ca1895efdbdff0c59114cdca1bfd6b7)
@@ -6,7 +6,7 @@
from datetime import datetime
# Qt
from PySide2 import QtWidgets
-from PySide2.QtCore import Slot, QObject, Qt
+from PySide2.QtCore import Slot, QTimer, Qt
# parent
from simulator.dynamicloader import DynamicLoader
# hd Simulator
@@ -21,6 +21,7 @@
"""
canMaximize = True
+ timer: QTimer
btnTrigger: QtWidgets.QPushButton
btnClear: QtWidgets.QPushButton
@@ -145,6 +146,9 @@
initializes the widgets' properties
:return: none
"""
+ self.timer = QTimer()
+ self.timer.start(1000)
+
self.__populate_status_ids_columns()
self.rdoPriorityNone.setStyleSheet('background-color: {};'.format(self.styles[AlarmPriority.ALARM_NONE]))
self.rdoPriorityLow.setStyleSheet('background-color: {};'.format(self.styles[AlarmPriority.ALARM_LOW]))
@@ -159,6 +163,8 @@
initializes the widgets connections
:return:
"""
+ self.timer.timeout.connect(self.do_timer_timeout)
+
self.btnTrigger.clicked.connect(self.do_trigger)
self.btnClear.clicked.connect(self.do_clear)
self.btnCondition.clicked.connect(self.do_clear_condition)
@@ -194,6 +200,10 @@
self.flags &= ~bit
@Slot()
+ def do_timer_timeout(self):
+ self.do_send()
+
+ @Slot()
def do_set_priority_none(self):
"""
the slot for priority buttons
Index: simulator/plugins/bloodPrime/interface.ui
===================================================================
diff -u -reb6acf9c1a4748852875c350568192999be9d3dd -r4da03e2d7ca1895efdbdff0c59114cdca1bfd6b7
--- simulator/plugins/bloodPrime/interface.ui (.../interface.ui) (revision eb6acf9c1a4748852875c350568192999be9d3dd)
+++ simulator/plugins/bloodPrime/interface.ui (.../interface.ui) (revision 4da03e2d7ca1895efdbdff0c59114cdca1bfd6b7)
@@ -10,18 +10,6 @@
115
-
-
- 375
- 115
-
-
-
-
- 16777215
- 115
-
-
&2 Pre-Treatment/&9 Blood Prime
Index: simulator/plugins/createtreatment/interface.ui
===================================================================
diff -u -reb6acf9c1a4748852875c350568192999be9d3dd -r4da03e2d7ca1895efdbdff0c59114cdca1bfd6b7
--- simulator/plugins/createtreatment/interface.ui (.../interface.ui) (revision eb6acf9c1a4748852875c350568192999be9d3dd)
+++ simulator/plugins/createtreatment/interface.ui (.../interface.ui) (revision 4da03e2d7ca1895efdbdff0c59114cdca1bfd6b7)
@@ -6,7 +6,7 @@
0
0
- 770
+ 294
240
Index: simulator/plugins/disinfection/interface.ui
===================================================================
diff -u -re25c762014f029632c278b0b324b05f353ea8986 -r4da03e2d7ca1895efdbdff0c59114cdca1bfd6b7
--- simulator/plugins/disinfection/interface.ui (.../interface.ui) (revision e25c762014f029632c278b0b324b05f353ea8986)
+++ simulator/plugins/disinfection/interface.ui (.../interface.ui) (revision 4da03e2d7ca1895efdbdff0c59114cdca1bfd6b7)
@@ -6,7 +6,7 @@
0
0
- 392
+ 294
406
Index: simulator/simulator/interface.py
===================================================================
diff -u -r967521dff94783ce48b50abc8db6bcd67bb501bf -r4da03e2d7ca1895efdbdff0c59114cdca1bfd6b7
--- simulator/simulator/interface.py (.../interface.py) (revision 967521dff94783ce48b50abc8db6bcd67bb501bf)
+++ simulator/simulator/interface.py (.../interface.py) (revision 4da03e2d7ca1895efdbdff0c59114cdca1bfd6b7)
@@ -16,8 +16,8 @@
alarm: HDAlarmsSimulator = None
def __init__(self):
- self.hd = HDSimulator(console_out=True, passive_mode=True)
- self.dg = DGSimulator(console_out=True, passive_mode=True)
+ self.hd = HDSimulator(console_out=True, passive_mode=False)
+ self.dg = DGSimulator(console_out=True, passive_mode=False)
self.alarm = HDAlarmsSimulator(self.hd.can_interface, self.hd.logger)
@staticmethod