Release v3.1.50-20240424141333

esitarski · Apr 24, 2024 · fd89a6e · fd89a6e
2 parents bc47f5f + abadf68
commit fd89a6e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/.github/workflows/devbuild.yml b/.github/workflows/devbuild.yml
@@ -22,7 +22,7 @@ jobs:
             - name: Setup Python environment
               uses: actions/setup-python@v5
               with:
-                python-version: 3.9.*
+                python-version: 3.10.*
             - name: Checkout code
               #uses: actions/checkout@master
               uses: actions/checkout@v4

diff --git a/CrossMgrLocale/fr/LC_MESSAGES/messages.po b/CrossMgrLocale/fr/LC_MESSAGES/messages.po
@@ -976,6 +976,14 @@ msgstr "Nom2:"
 msgid "Bib"
 msgstr "Dossard"
 
+#: Setup.py
+msgid "Early Bell Time"
+msgstr "Heure de cloche anticipée"
+
+#: Setup.py
+msgid "Early Bell"
+msgstr "Cloche anticipée"
+
 #: EditEntry.py:404
 msgid "Clock Time"
 msgstr "Temps d'horloge"

diff --git a/GetResults.py b/GetResults.py
@@ -374,6 +374,7 @@ def _GetResultsCore( category ):
 		# Apply the early bell time.  Early bell time signifies the beginning of the last lap for all riders.
 		if riderCategory.earlyBellTime and not race.isTimeTrial and times:
 			try:
+				# While a not-last lap starts after earlyBellTime, delete the last lap.
 				while times[-3] >= riderCategory.earlyBellTime:	# This is confusing.  Don't change it!
 					times.pop()
 					interp.pop()

diff --git a/RaceHUD.py b/RaceHUD.py
@@ -275,7 +275,7 @@ def drawTooSmall():
 				dc.DrawBitmap( self.checkeredFlag, x - self.checkeredFlag.GetWidth() - 1, round(yTop + hMiddle - self.checkeredFlag.GetHeight() / 2), False )
 				dc.DrawText( tCur, round(x - textWidth - textHeight / 8), round(yTop + hMiddle - tickHeight - textHeight) )
 
-				# Draw broom.
+				# Draw the broom.
 				t = raceTimes[-1]
 				tCur = Utils.formatTime( t )
 				textWidth, textHeight = dc.GetTextExtent( tCur )
@@ -300,8 +300,12 @@ def drawTooSmall():
 				except (TypeError, IndexError):
 					ebt = None
 				if ebt:
-					x = xLeft + int( ebt * xMult )
-					dc.DrawBitmap( self.bell, round(x), round(yTop + hMiddle - self.bell.GetHeight()*1.5) )
+					x = round(xLeft + ebt * xMult )
+					dc.DrawBitmap( self.bell, x, round(yTop + hMiddle - self.bell.GetHeight()*1.5) )
+					penSave = dc.GetPen()
+					dc.SetPen( wx.Pen(wx.Colour(220,0,0), 3) )
+					dc.DrawLine( x, round(yTop + hMiddle - tickHeight), x, round(yTop + hMiddle + tickHeight) )
+					dc.SetPen( penSave )
 
 				ctx.SetPen( wx.BLACK_PEN )