diff --git a/photo_service_gui/config/global_settings.json b/photo_service_gui/config/global_settings.json index 4a357b3..e3f43f8 100644 --- a/photo_service_gui/config/global_settings.json +++ b/photo_service_gui/config/global_settings.json @@ -22,5 +22,8 @@ "SHOW_VIDEO": "False", "VIDEO_URL": "https://harnaes.no/maalfoto/2023SkiMaal.mp4", "DETECTION_BOX_MINIMUM_SIZE": "0.08", - "DETECTION_BOX_MAXIMUM_SIZE": "0.9" + "DETECTION_BOX_MAXIMUM_SIZE": "0.9", + "SIMULATION_CROSSINGS_START": "False", + "SIMULATION_START_LIST_FILE": "tests/files/startliste.csv", + "SIMULATION_FASTEST_TIME": "300" } \ No newline at end of file diff --git a/photo_service_gui/static/styles.css b/photo_service_gui/static/styles.css index 445ca96..be6a7d6 100644 --- a/photo_service_gui/static/styles.css +++ b/photo_service_gui/static/styles.css @@ -141,6 +141,11 @@ border-right: 1px solid #ddd; color: black; font-weight: bold; } + +.black { + color: black; +} + #white-text { color: white; } diff --git a/photo_service_gui/templates/config.html b/photo_service_gui/templates/config.html index 287d593..de8ea09 100644 --- a/photo_service_gui/templates/config.html +++ b/photo_service_gui/templates/config.html @@ -22,12 +22,12 @@
- +
- +
diff --git a/photo_service_gui/templates/index.html b/photo_service_gui/templates/index.html index 25b3d8f..b008c2b 100644 --- a/photo_service_gui/templates/index.html +++ b/photo_service_gui/templates/index.html @@ -34,7 +34,7 @@ {% if username != "Gjest" %}
- +
{% endif %} diff --git a/photo_service_gui/templates/open_base.html b/photo_service_gui/templates/open_base.html index 6d8ca0f..aacb0fe 100644 --- a/photo_service_gui/templates/open_base.html +++ b/photo_service_gui/templates/open_base.html @@ -80,6 +80,7 @@ {% else %} Brukere Globale innstillinger + Docs Logg ut {% endif %} diff --git a/photo_service_gui/templates/video_events.html b/photo_service_gui/templates/video_events.html index 9d8a51e..6f840ee 100644 --- a/photo_service_gui/templates/video_events.html +++ b/photo_service_gui/templates/video_events.html @@ -26,6 +26,7 @@ mens informasjon sendes til Pubsub og legges på en meldingskø der interessenter kan abonnere på hendelsene.
Configuration - Mulighet for å skru av og på tjenestene (video analytics og pubsub) samt å stille inn video url og linje-koordinater.
Status - Her vises statusmeldinger for tjenesten. Både det som registreres på videoen og at meldingenr sendes videre til meldingskøen i Google (pubsub).
+
Simulering - (For testing) Her er det mulig å få systemet til å generere passeringer. Krever at en startliste gis som input.
@@ -152,7 +153,7 @@ Url - + @@ -173,6 +174,31 @@ + + +
Simulation settings
+ + +
+ + Start list + + + (file path or url - eksempel) + + + + Fastest time + + + + + + + + + +
  @@ -180,7 +206,7 @@ - +