From ffd4741da815c2b82efcc696a4a0fb061cc43481 Mon Sep 17 00:00:00 2001 From: brotter Date: Mon, 2 Dec 2024 06:46:49 +0100 Subject: [PATCH] remove item_color option --- doc/Configuration/README.md | 1 - src/UserInterface/templates/car_map.html | 10 ---------- .../templates/staff_config_display_settings.html | 5 ----- src/config_file.json | 4 +--- test/dev_config_file.json | 4 +--- 5 files changed, 2 insertions(+), 22 deletions(-) diff --git a/doc/Configuration/README.md b/doc/Configuration/README.md index 93a58d3e..84f805e6 100644 --- a/doc/Configuration/README.md +++ b/doc/Configuration/README.md @@ -41,6 +41,5 @@ These parameters will be described in the following. | | "disp_cm_track_color" | "#001a54" | str | Hex color code, that defines the color of the track. | | | "disp_cm_track_border_color" | "#001a54" | str | Hex color code, that defines the color of the track borders. | | | "disp_cm_start_line_color" | "#dc46f3" | str | Hex color code, that defines the color of the start- and finish-line. | -| | "disp_cm_item_color" | "#96e7ff" | str | Hex color code, that defines the color of the items that appear on the track. | | | "disp_cm_default_settings" | | dict | Dict of display_settings configuration paramters from above, storing the default values. | diff --git a/src/UserInterface/templates/car_map.html b/src/UserInterface/templates/car_map.html index 6683b0ed..df34e7ee 100644 --- a/src/UserInterface/templates/car_map.html +++ b/src/UserInterface/templates/car_map.html @@ -108,7 +108,6 @@

The map isn't currently available

const item_image_cache = new Map(); const item_size = 30; - const item_color = disp_settings.disp_cm_item_color; addEventListener("resize", (event) => { resizeCanvas(); @@ -276,15 +275,6 @@

The map isn't currently available

x *= scale; y *= scale; ctx.save(); - /** - * ctx.beginPath(); - * ctx.fillStyle = item_color; - * ctx.strokeStyle = item_color; - * ctx.arc(x, y, item_size * scale, 0, 2 * Math.PI); - * ctx.fill(); - * ctx.stroke(); - * ctx.restore(); - */ let img = getItemImage("item_blue.svg"); ctx.drawImage(img, x - item_size * scale / 2, y - item_size * scale / 2, item_size * scale, item_size * scale); diff --git a/src/UserInterface/templates/staff_config_display_settings.html b/src/UserInterface/templates/staff_config_display_settings.html index cb93b83b..4e852fa1 100644 --- a/src/UserInterface/templates/staff_config_display_settings.html +++ b/src/UserInterface/templates/staff_config_display_settings.html @@ -58,10 +58,6 @@

Colors:

-
- - -
@@ -122,7 +118,6 @@

Colors:

document.getElementById('disp_cm_track_color').value = disp_settings.disp_cm_track_color; document.getElementById('disp_cm_track_border_color').value = disp_settings.disp_cm_track_border_color; document.getElementById('disp_cm_start_line_color').value = disp_settings.disp_cm_start_line_color; - document.getElementById('disp_cm_item_color').value = disp_settings.disp_cm_item_color; document.getElementById('disp_cm_qr_background_color').value = disp_settings.disp_cm_qr_background_color; document.getElementById('disp_cm_qr_codes_color').value = disp_settings.disp_cm_qr_codes_color; }; diff --git a/src/config_file.json b/src/config_file.json index 4aebe6b8..9b00a740 100644 --- a/src/config_file.json +++ b/src/config_file.json @@ -57,7 +57,6 @@ "disp_cm_track_color": "#001a54", "disp_cm_track_border_color": "#001a54", "disp_cm_start_line_color": "#5500b4", - "disp_cm_item_color": "#96e7ff", "disp_cm_default_settings": { "disp_cm_slogan_enabled": true, "disp_cm_slogan_text": "Can it be Safe without Security? - Find out while racing with us!", @@ -70,8 +69,7 @@ "disp_cm_background_color": "#5500b4", "disp_cm_track_color": "#001a54", "disp_cm_track_border_color": "#001a54", - "disp_cm_start_line_color": "#5500b4", - "disp_cm_item_color": "#96e7ff" + "disp_cm_start_line_color": "#5500b4" } } } \ No newline at end of file diff --git a/test/dev_config_file.json b/test/dev_config_file.json index ab95b4e8..b6184df1 100644 --- a/test/dev_config_file.json +++ b/test/dev_config_file.json @@ -57,7 +57,6 @@ "disp_cm_track_color": "#001a54", "disp_cm_track_border_color": "#001a54", "disp_cm_start_line_color": "#5500b4", - "disp_cm_item_color": "#96e7ff", "disp_cm_default_settings": { "disp_cm_slogan_enabled": true, "disp_cm_slogan_text": "Can it be Safe without Security? - Find out while racing with us!", @@ -70,8 +69,7 @@ "disp_cm_background_color": "#5500b4", "disp_cm_track_color": "#001a54", "disp_cm_track_border_color": "#001a54", - "disp_cm_start_line_color": "#5500b4", - "disp_cm_item_color": "#96e7ff" + "disp_cm_start_line_color": "#5500b4" }, "track": [ {