feat: self-documented any control as start and finish (#446)

sportorg · Oct 22, 2024 · cce7bce · cce7bce
1 parent b92bee7
commit cce7bce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/languages/ru_RU/LC_MESSAGES/sportorg.po b/languages/ru_RU/LC_MESSAGES/sportorg.po
@@ -603,8 +603,8 @@ msgstr "Из протокола"
 msgid "Start station"
 msgstr "Стартовая станция"
 
-msgid "Control point"
-msgstr "Контрольный пункт"
+msgid "Control point (0 – any)"
+msgstr "Контрольный пункт (0 – любой)"
 
 msgid "Start gate"
 msgstr "Стартовая калитка"

diff --git a/sportorg/gui/dialogs/timekeeping_properties.py b/sportorg/gui/dialogs/timekeeping_properties.py
@@ -162,8 +162,8 @@ def init_ui(self):
         self.start_layout.addRow(self.item_start_protocol)
         self.item_start_station = QRadioButton(translate('Start station'))
         self.start_layout.addRow(self.item_start_station)
-        self.item_start_cp = QRadioButton(translate('Control point'))
-        self.item_start_cp_value = AdvSpinBox(maximum=999, max_width=60)
+        self.item_start_cp = QRadioButton(translate('Control point (0 – any)'))
+        self.item_start_cp_value = AdvSpinBox(minimum=-1, maximum=999, max_width=60)
         self.start_layout.addRow(self.item_start_cp, self.item_start_cp_value)
         self.item_start_gate = QRadioButton(translate('Start gate'))
         self.item_start_gate.setDisabled(True)
@@ -176,8 +176,8 @@ def init_ui(self):
         self.item_finish_station = QRadioButton(translate('Finish station'))
         self.finish_layout.addRow(self.item_finish_station)
 
-        self.item_finish_cp = QRadioButton(translate('Control point'))
-        self.item_finish_cp_value = AdvSpinBox(-1, 999, max_width=60)
+        self.item_finish_cp = QRadioButton(translate('Control point (0 – any)'))
+        self.item_finish_cp_value = AdvSpinBox(minimum=-1, maximum=999, max_width=60)
         self.finish_layout.addRow(self.item_finish_cp, self.item_finish_cp_value)
         self.item_finish_beam = QRadioButton(translate('Light beam'))
         self.item_finish_beam.setDisabled(True)

diff --git a/sportorg/models/memory.py b/sportorg/models/memory.py
@@ -1011,7 +1011,7 @@ def get_start_time(self):
                 return self.__start_time
             if len(self.splits):
                 start_cp_number = obj.get_setting('system_start_cp_number', 31)
-                if start_cp_number == 0:
+                if start_cp_number in (0, -1):
                     self.__start_time = self.splits[0].time
                     return self.__start_time
                 for split in self.splits:
@@ -1034,7 +1034,7 @@ def get_finish_time(self) -> OTime:
                 return self.__finish_time
             if len(self.splits):
                 finish_cp_number = obj.get_setting('system_finish_cp_number', 90)
-                if finish_cp_number == -1:
+                if finish_cp_number in (0, -1):
                     self.__finish_time = self.splits[-1].time
                     return self.__finish_time
                 for split in reversed(self.splits):