feat: punch system selection in timekeeping properties dialog (#534)

Author: sembruk

changelog.md

@@ -16,6 +16,7 @@
 + Competitors' numbers in relay format (e.g., 15.1, [#501](https://github.com/sportorg/pysport/issues/501))
 + Reverse row numbering in the results tab ([#519](https://github.com/sportorg/pysport/issues/519))
 + Templates can compress data (gzip) to reduce the size of html files
++ Punch system selection in timekeeping properties dialog
 
 ### Fixes
 + Fixed: multi day race processing - all days are refreshed on the file opening

changelog_ru.md

@@ -15,6 +15,7 @@
 + Номера участников в эстафетном формате (15.1, [#501](https://github.com/sportorg/pysport/issues/501))
 + Обратная нумерация строк во вкладке результатов ([#519](https://github.com/sportorg/pysport/issues/519))
 + В шаблонах можно сжимать данные (gzip) для уменьшения размера файлов html файлов
++ Выбор системы отметки в диалоге настроек хронометража
 
 ### Исправление
 + Исправлена работа типа соревнований "многодневная гонка" - при открытии базы все дни перепроверяются

languages/ru_RU/LC_MESSAGES/sportorg.po

@@ -1032,6 +1032,9 @@ msgstr "Ввести Шахматку"
 msgid "Service"
 msgstr "Сервис"
 
+msgid "On/Off card readout"
+msgstr "Запустить/остановить чтение чипов"
+
 msgid "on/off SPORTident readout"
 msgstr "Запустить/остановить чтение чипов SPORTident"
 
@@ -1041,6 +1044,9 @@ msgstr "Запустить/остановить чтение чипов Sportidu
 msgid "on/off SFR readout"
 msgstr "Запустить/остановить чтение чипов SFR"
 
+msgid "Punch system"
+msgstr "Система отметки"
+
 msgid "Send selected"
 msgstr "Отправить выбранные"
 

sportorg/gui/dialogs/timekeeping_properties.py

@@ -33,7 +33,7 @@
 from sportorg.gui.global_access import GlobalAccess
 from sportorg.gui.utils.custom_controls import AdvComboBox, AdvSpinBox, AdvTimeEdit
 from sportorg.language import translate
-from sportorg.models.memory import race
+from sportorg.models.memory import race, SystemType
 from sportorg.models.result.result_tools import recalculate_results
 from sportorg.modules.sportident.sireader import SIReaderClient
 
@@ -70,6 +70,22 @@ def init_ui(self):
         self.item_si_port.addItems(SIReaderClient().get_ports())
         self.tk_layout.addRow(self.label_si_port, self.item_si_port)
 
+        self.punch_system_box = QGroupBox(translate("Punch system"))
+        self.punch_system_layout = QFormLayout()
+        self.punch_system_si = QRadioButton(translate("SPORTident"))
+        self.punch_system_layout.addRow(self.punch_system_si)
+        self.punch_system_sfr = QRadioButton(translate("SFR"))
+        self.punch_system_layout.addRow(self.punch_system_sfr)
+        self.punch_system_sportiduino = QRadioButton(translate("Sportiduino (Clever)"))
+        self.punch_system_layout.addRow(self.punch_system_sportiduino)
+        self.punch_system_impinj = QRadioButton(translate("RFID Impinj"))
+        self.punch_system_layout.addRow(self.punch_system_impinj)
+        self.punch_system_srpid = QRadioButton(translate("SRPID"))
+        self.punch_system_layout.addRow(self.punch_system_srpid)
+        self.punch_system_si.setChecked(True)
+        self.punch_system_box.setLayout(self.punch_system_layout)
+        self.tk_layout.addRow(self.punch_system_box)
+
         self.chip_reading_box = QGroupBox(translate("Assigning a chip when reading"))
         self.chip_reading_layout = QFormLayout()
         self.chip_reading_off = QRadioButton(translate("Off"))
@@ -443,6 +459,8 @@ def set_values_from_model(self):
             "ignore_punches_before_start", False
         )
         si_port = cur_race.get_setting("system_port", "")
+        punch_system = cur_race.get_punch_system()
+
         readout_duplicate_timeout = OTime(
             msec=cur_race.get_setting("readout_duplicate_timeout", 15000)
         )
@@ -451,6 +469,17 @@ def set_values_from_model(self):
 
         self.item_si_port.setCurrentText(si_port)
 
+        if punch_system == SystemType.SFR:
+            self.punch_system_sfr.setChecked(True)
+        elif punch_system == SystemType.SPORTIDUINO:
+            self.punch_system_sportiduino.setChecked(True)
+        elif punch_system == SystemType.RFID_IMPINJ:
+            self.punch_system_impinj.setChecked(True)
+        elif punch_system == SystemType.SRPID:
+            self.punch_system_srpid.setChecked(True)
+        else:
+            self.punch_system_si.setChecked(True)
+
         if start_source == "protocol":
             self.item_start_protocol.setChecked(True)
         elif start_source == "station":
@@ -675,6 +704,17 @@ def apply_changes_impl(self):
 
         obj.set_setting("system_port", self.item_si_port.currentText())
 
+        if self.punch_system_sfr.isChecked():
+            obj.set_setting("punch_system", SystemType.SFR.value)
+        elif self.punch_system_sportiduino.isChecked():
+            obj.set_setting("punch_system", SystemType.SPORTIDUINO.value)
+        elif self.punch_system_impinj.isChecked():
+            obj.set_setting("punch_system", SystemType.RFID_IMPINJ.value)
+        elif self.punch_system_srpid.isChecked():
+            obj.set_setting("punch_system", SystemType.SRPID.value)
+        else:
+            obj.set_setting("punch_system", SystemType.SPORTIDENT.value)
+
         obj.set_setting("system_start_source", start_source)
         obj.set_setting("system_finish_source", finish_source)
         obj.set_setting("system_missed_finish", missed_finish)

sportorg/gui/menu/actions.py

@@ -53,7 +53,7 @@
 from sportorg.language import translate
 from sportorg.libs.sfr import sfrximporter
 from sportorg.libs.winorient.wdb import write_wdb
-from sportorg.models.memory import ResultManual, ResultStatus, race
+from sportorg.models.memory import ResultManual, ResultStatus, race, SystemType
 from sportorg.models.result.result_checker import ResultChecker
 from sportorg.models.result.result_tools import recalculate_results
 from sportorg.models.start.start_preparation import (
@@ -600,37 +600,19 @@ def execute(self):
         self.app.refresh()
 
 
-class SPORTidentReadoutAction(Action, metaclass=ActionFactory):
+class CardReadoutAction(Action, metaclass=ActionFactory):
     def execute(self):
-        SIReaderClient().toggle()
-        time.sleep(0.5)
-        self.app.interval()
-
-
-class SportiduinoReadoutAction(Action, metaclass=ActionFactory):
-    def execute(self):
-        SportiduinoClient().toggle()
-        time.sleep(0.5)
-        self.app.interval()
-
-
-class ImpinjReadoutAction(Action, metaclass=ActionFactory):
-    def execute(self):
-        ImpinjClient().toggle()
-        time.sleep(0.5)
-        self.app.interval()
-
-
-class SrpidReadoutAction(Action, metaclass=ActionFactory):
-    def execute(self):
-        SrpidClient().toggle()
-        time.sleep(0.5)
-        self.app.interval()
-
-
-class SFRReadoutAction(Action, metaclass=ActionFactory):
-    def execute(self):
-        SFRReaderClient().toggle()
+        punch_system = race().get_punch_system()
+        if punch_system == SystemType.SFR:
+            SFRReaderClient().toggle()
+        elif punch_system == SystemType.SPORTIDUINO:
+            SportiduinoClient().toggle()
+        elif punch_system == SystemType.RFID_IMPINJ:
+            ImpinjClient().toggle()
+        elif punch_system == SystemType.SRPID:
+            SrpidClient().toggle()
+        else:
+            SIReaderClient().toggle()
         time.sleep(0.5)
         self.app.interval()
 

sportorg/gui/menu/menu.py

@@ -369,30 +369,10 @@ def menu_list():
             "title": translate("Service"),
             "actions": [
                 {
-                    "title": translate("on/off SPORTident readout"),
+                    "title": translate("On/Off card readout"),
                     "icon": config.icon_dir("sportident.png"),
                     "shortcut": "F8",
-                    "action": "SPORTidentReadoutAction",
-                },
-                {
-                    "title": translate("on/off Sportiduino readout"),
-                    "icon": config.icon_dir("sportiduino.png"),
-                    "action": "SportiduinoReadoutAction",
-                },
-                {
-                    "title": translate("on/off SFR readout"),
-                    "icon": config.icon_dir("sfr.png"),
-                    "action": "SFRReadoutAction",
-                },
-                {
-                    "title": translate("on/off RFID Impinj readout"),
-                    "icon": config.icon_dir("rfid_impinj.png"),
-                    "action": "ImpinjReadoutAction",
-                },
-                {
-                    "title": translate("on/off SRPid readout"),
-                    "icon": config.icon_dir("srpid.png"),
-                    "action": "SrpidReadoutAction",
+                    "action": "CardReadoutAction",
                 },
                 {
                     "title": translate("Teamwork"),

sportorg/models/memory.py

@@ -1852,6 +1852,9 @@ def get_setting(self, setting, nvl_value=None):
         else:
             return nvl_value
 
+    def get_punch_system(self):
+        return SystemType(self.get_setting("punch_system", SystemType.SPORTIDENT.value))
+
     def get_days(self, date_=None):
         return self.data.get_days(date_)