Add global time metric to stats3, hide power in level viewer

Author: Jannled

app/statistics3/LogEventValidator.py

@@ -1,3 +1,4 @@
+from datetime import timedelta
 import logging
 
 from sqlalchemy.orm import Session
@@ -58,7 +59,8 @@ def handle_event(self, event: LogEvent, session: Session, statsParticipant: Stat
 				assert isinstance(event, ChronoEvent)
 				self.event_chrono(statsParticipant, player, event)
 			case StartSessionEvent.__tablename__:
-				pass
+				assert isinstance(event, StartSessionEvent)
+				self.event_start_session(statsParticipant, event)
 			case SkillAssessmentEvent.__tablename__:
 				pass
 			case QualiEvent.__tablename__:
@@ -204,6 +206,33 @@ def event_chrono(self,
 			raise LogValidationError(f'Unknown timer type "{event.timerType}"')
 
 
+	def event_start_session(self,
+		statsParticipant: StatsParticipant,
+		event: StartSessionEvent
+	):
+		assert event.timeClient is not None
+		assert event.phase is not None
+
+		# No need to set the page reload flag, if this is the first launch
+		if not statsParticipant.game_started:
+			statsParticipant.game_started = True
+			statsParticipant.start_time = event.timeClient
+			return
+
+		# Otherwise at this point this must be a page reload
+		statsParticipant.activePhase.reloaded = True
+		levelName = ''
+
+		if isinstance(statsParticipant.activePhase, StatsPhaseLevels):
+			statsParticipant.activePhase.activeLevel.reloaded = True
+			levelName = '@' + statsParticipant.activePhase.activeLevel.log_name
+
+		ui = getShortPseudo(statsParticipant.pseudonym)
+		reload_location = statsParticipant.activePhase.phaseType + levelName
+		logging.warning(f'Participant {ui} reloaded the page at "{reload_location}"')
+		statsParticipant.reloads.append(reload_location)
+
+
 	def event_quali(self,
 		statsParticipant: StatsParticipant,
 		event: QualiEvent
@@ -321,24 +350,14 @@ def start_phase(self, event: ChronoEvent, statsParticipant: StatsParticipant):
 		assert event.timeClient is not None
 		assert event.phase is not None
 
-		# Set the reload flag on page reload for phase and if applicable, also level
+		# Preload events follow directly after event_start_session
 		if event.phase.activePhase == PhaseType.Preload:
-			# No need to set the page reload flag, if this is the first launch
-			if not statsParticipant.game_started:
-				statsParticipant.game_started = True
-				return
-
-			statsParticipant.activePhase.reloaded = True
-			levelName = ''
-
-			if isinstance(statsParticipant.activePhase, StatsPhaseLevels):
-				statsParticipant.activePhase.activeLevel.reloaded = True
-				levelName = '@' + statsParticipant.activePhase.activeLevel.log_name
-
-			ui = getShortPseudo(statsParticipant.pseudonym)
-			reload_location = statsParticipant.activePhase.phaseType + levelName
-			logging.warning(f'Participant {ui} reloaded the page at "{reload_location}"')
-			statsParticipant.reloads.append(reload_location)
+			if not statsParticipant.game_started or statsParticipant.start_time is None:
+				raise LogValidationError('Preload Scene must follow directly after an event_start_phase')
+			
+			# The Preload event contains the time limit
+			if event.limit is not None:
+				statsParticipant.time_limit = timedelta(seconds=event.limit)
 
 		# If this is not a preload phase, start the phase as usual
 		else:

app/statistics3/StatsParticipant.py

@@ -22,6 +22,8 @@ class StatsParticipant:
 	game_started: bool = False
 	reloads: list[str] = field(default_factory=list[str])
 
+	start_time: TIMESTAMP_MS|None = None
+	finish_time: TIMESTAMP_MS|None = None
 	time_limit: timedelta|None = None
 
 	@property

app/statistics3/statistics3.py

@@ -160,8 +160,8 @@ def main():
 		.execution_options(sqlite_readonly = True))
 
 	try:
-		if args.beginning is not None and len(args.beginning) > 0:
-			start_time = datetime.fromisoformat(args.beginning)
+		if args.beginning is not None and len(args.beginning.strip()) > 0:
+			start_time = datetime.fromisoformat(args.beginning.strip())
 		else:
 			start_time = None
 	except Exception as e:

static/src/LevelEditor/LevelViewScene.js

@@ -55,11 +55,18 @@ class LevelViewScene extends BaseScene
 	 */
 	customSettings()
 	{
-		const url = new URL(window.location.href);
+		const searchParams = new URL(window.location.href).searchParams;
 
 		// Make the screen print friendly
-		if(!url.searchParams.has('darkMode'))
+		if(!searchParams.has('darkMode'))
 			this.setBrightMode();
+		
+		// Visualize the simulation state
+		if(searchParams.has('hidePower'))
+		{
+			this.state.outputStateVisible = false;
+			this.state.wireStateVisible = false;
+		}
 
 		this.showTextAnchors = false;
 		this.splittersAlwaysVisible = false;
@@ -155,8 +162,7 @@ class LevelViewScene extends BaseScene
 			else
 				this.circuit = new Circuit(this, this.levelFile.fileContent, this.splittersAlwaysVisible);
 
-			this.circuit.calculateOutputs();
-			this.circuit.wireDrawer.drawWires();
+			this.updateLevelState(false);
 
 			// Show the wire length if enabled
 			if(this.showWireLen)