From a403270643afc7b7375157bd6104913d57beace7 Mon Sep 17 00:00:00 2001 From: torsten Date: Fri, 13 Nov 2026 14:43:21 +0100 Subject: [PATCH] refactor: Transportleiste als eigenes Panel (zweiter Node-Schnitt) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `PlaybackPanel` (src/whiteboard/view/playback_panel.gd) besitzt Play/Pause, Reset, Zeitschieber, Zeitanzeige und Tempoauswahl und meldet nur Absichten: `toggle_requested`, `reset_requested`, `seek_requested`, `speed_requested`. Der Controller behält Uhr, Tempo und Audio und ruft `set_state(time, duration, playing)`. Anders als beim Export war kein Umhängen nötig: Die Widgets bleiben in der Layout-Leiste, das Panel findet sie über unique_name_in_owner — ein Node ohne Control-Basis kann in einem HBox keine Kinder sinnvoll aufnehmen. - `_update_playback_ui` und `_update_play_button` sind zu `_sync_playback_ui()` verschmolzen. - `_on_speed_selected`/`_on_timeline_changed` entfallen; das Tempo kommt als Wert aus dem Panel. - Tests greifen über `controller.playback_panel.*` zu. Controller: 8.245 -> 8.194 Zeilen. Suite grün. --- docs/refactor-whiteboard-controller.md | 20 +++- docs/roadmap.md | 6 +- rinkplanner/scenes/whiteboard/whiteboard.tscn | 7 +- .../whiteboard/ctrl/whiteboard_controller.gd | 93 ++++------------- .../src/whiteboard/view/playback_panel.gd | 99 +++++++++++++++++++ .../src/whiteboard/view/playback_panel.gd.uid | 1 + rinkplanner/tests/run_playback_tests.gd | 34 +++---- rinkplanner/tests/run_presentation3d_tests.gd | 2 +- 8 files changed, 166 insertions(+), 96 deletions(-) create mode 100644 rinkplanner/src/whiteboard/view/playback_panel.gd create mode 100644 rinkplanner/src/whiteboard/view/playback_panel.gd.uid diff --git a/docs/refactor-whiteboard-controller.md b/docs/refactor-whiteboard-controller.md index 23d3ed1..5227bb1 100644 --- a/docs/refactor-whiteboard-controller.md +++ b/docs/refactor-whiteboard-controller.md @@ -4,7 +4,7 @@ Stand: 2026-11-13 Ziel: Der Controller war mit **9.092 Zeilen und 465 Funktionen** der größte Baustein im Projekt; die Roadmap nennt < 1.500 Zeilen pro Datei. Nach den -Etappen 1–9 sind es 8.245 Zeilen. Diese Notiz +Etappen 1–10 sind es 8.194 Zeilen. Diese Notiz hält die Reihenfolge fest, damit der Umbau in Etappen mit grüner Suite passiert und nicht als Big Bang. @@ -36,7 +36,8 @@ passiert und nicht als Big Bang. | Sync-Orchestrierung | Threads, OAuth, Konflikte, Küren verwalten | ~700 | Dialoge, Threads | offen | | `HubPanel` | Kür-Hub (Login, Upload, Downloads) | ~650 | Dialoge, Threads | 8 | | `PlaybackPose` | Position und Blickrichtung zur Zeit | 130 | keine | 8 ✅ | -| Playback-Rest | Steuerung, Musik, Timeline, 3D-Anbindung | ~470 | Canvas, Audio | offen | +| `PlaybackPanel` | Transportleiste: Play/Pause, Reset, Slider, Tempo | 110 | Szene | 10 ✅ | +| Playback-Rest | Musik, Timeline-Labels, 3D-Anbindung | ~360 | Canvas, Audio | offen | | `ElementInspector` | Element-Dialog, Features, Level, Kombinationen | ~800 | Dialog, Regeln | 10 | Danach bleibt ein Controller von grob 2.000–2.500 Zeilen: Verdrahtung, @@ -169,6 +170,21 @@ Was beim Umhängen der Szene zu beachten war: still null. - `load_steps` in der Kopfzeile muss mitwachsen. +### 10. `PlaybackPanel` ✅ + +Die Transportleiste (Play/Pause, Reset, Zeitschieber, Zeitanzeige, Tempo) ist +ein Node mit Signalen: `toggle_requested`, `reset_requested`, +`seek_requested(seconds)`, `speed_requested(speed)`. Der Controller besitzt +weiter Uhr, Tempo und Audio und ruft `set_state(time, duration, playing)`. + +Anders als beim Export brauchte es **kein Umhängen**: Die Widgets bleiben in +der Layout-Leiste, das Panel findet sie über `unique_name_in_owner`. Ein Node +ohne Control-Basis kann in einem HBox nicht sinnvoll Kindknoten aufnehmen. + +`_update_playback_ui` und `_update_play_button` sind zu `_sync_playback_ui()` +verschmolzen; die Zeitachse (`timeline_label_lane`) bleibt beim Controller, +weil sie zu den Timeline-Labels gehört. + ## Nächster Durchgang: weitere Node-Schnitte Die vier verbleibenden Blöcke (Sync-Orchestrierung, Hub, Playback-Rest, diff --git a/docs/roadmap.md b/docs/roadmap.md index 61dd5c1..3801ef9 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -270,10 +270,10 @@ Schritte. - [ ] `WhiteboardController` in Services/Panels zerlegen: Datei-I/O, Sync, Playback, Validierung, Element-Inspector, Section-Liste. Ziel: < 1.500 Zeilen pro Datei, keine 100 `%`-Lookups in einem Skript. In Etappen nach - `docs/refactor-whiteboard-controller.md`; Stand 2026-11-13: 8.245 Zeilen; `HelpContent`, `SeasonComparisonText`, + `docs/refactor-whiteboard-controller.md`; Stand 2026-11-13: 8.194 Zeilen; `HelpContent`, `SeasonComparisonText`, `ValidationReportView`, `ExportService`, `RulesContext`, - `SeasonPanelModel`, `SyncSummaryText`, `PlaybackPose` und `ExportPanel` - (erster Node-Schnitt) ausgelagert. + `SeasonPanelModel`, `SyncSummaryText`, `PlaybackPose`, `ExportPanel` und + `PlaybackPanel` (Node-Schnitte) ausgelagert. - [ ] Gemeinsamer Test-Harness (oder gdUnit4), Timeout pro Testlauf, Coverage; CI auf dem Gitea-/Forgejo-Remote mit `tools/test.sh` und `tools/check_export.sh`. diff --git a/rinkplanner/scenes/whiteboard/whiteboard.tscn b/rinkplanner/scenes/whiteboard/whiteboard.tscn index 3773b8f..f38d460 100644 --- a/rinkplanner/scenes/whiteboard/whiteboard.tscn +++ b/rinkplanner/scenes/whiteboard/whiteboard.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=23 format=3] +[gd_scene load_steps=24 format=3] [ext_resource type="Script" path="res://src/whiteboard/ctrl/whiteboard_controller.gd" id="1_controller"] [ext_resource type="Script" path="res://src/whiteboard/view/rink_canvas.gd" id="2_canvas"] [ext_resource type="Script" path="res://src/whiteboard/view/timeline_label_lane.gd" id="3_label_lane"] [ext_resource type="Script" path="res://src/whiteboard/view/export_panel.gd" id="3_export_panel"] +[ext_resource type="Script" path="res://src/whiteboard/view/playback_panel.gd" id="3_playback_panel"] [ext_resource type="Texture2D" path="res://assets/icons/tools/select.svg" id="4_tool_select"] [ext_resource type="Texture2D" path="res://assets/icons/tools/line.svg" id="5_tool_line"] [ext_resource type="Texture2D" path="res://assets/icons/tools/arc_left.svg" id="6_tool_arc_left"] @@ -1649,6 +1650,10 @@ theme_override_colors/font_color = Color(0.580392, 0.639216, 0.721569, 1) theme_override_font_sizes/font_size = 12 text = "Geschwindigkeit = Strecke / Zeit" +[node name="PlaybackPanel" type="Node" parent="."] +unique_name_in_owner = true +script = ExtResource("3_playback_panel") + [node name="ExportPanel" type="Node" parent="."] unique_name_in_owner = true script = ExtResource("3_export_panel") diff --git a/rinkplanner/src/whiteboard/ctrl/whiteboard_controller.gd b/rinkplanner/src/whiteboard/ctrl/whiteboard_controller.gd index 988d8c2..895c189 100644 --- a/rinkplanner/src/whiteboard/ctrl/whiteboard_controller.gd +++ b/rinkplanner/src/whiteboard/ctrl/whiteboard_controller.gd @@ -185,11 +185,7 @@ const UPDATE_FILE_NAMES := { @onready var open_list: VBoxContainer = %OpenList @onready var confirm_dialog: ConfirmationDialog = %ConfirmDialog @onready var message_dialog: AcceptDialog = %MessageDialog -@onready var play_button: Button = %PlayButton -@onready var reset_playback_button: Button = %ResetPlaybackButton -@onready var playback_time_label: Label = %PlaybackTimeLabel -@onready var playback_timeline: HSlider = %PlaybackTimeline -@onready var speed_option: OptionButton = %SpeedOption +@onready var playback_panel: PlaybackPanel = %PlaybackPanel @onready var music_button: Button = %MusicButton @onready var music_label: Label = %MusicLabel @onready var music_clear_button: Button = %MusicClearButton @@ -486,10 +482,10 @@ func _ready() -> void: save_as_dialog.confirmed.connect(_on_save_as_confirmed) confirm_dialog.confirmed.connect(_on_confirm_discard_confirmed) confirm_dialog.canceled.connect(_on_confirm_discard_canceled) - play_button.pressed.connect(_toggle_playback) - reset_playback_button.pressed.connect(reset_playback) - playback_timeline.value_changed.connect(_on_timeline_changed) - speed_option.item_selected.connect(_on_speed_selected) + playback_panel.toggle_requested.connect(_toggle_playback) + playback_panel.reset_requested.connect(reset_playback) + playback_panel.seek_requested.connect(seek_playback) + playback_panel.speed_requested.connect(_on_speed_requested) music_button.pressed.connect(_open_music_dialog) music_clear_button.pressed.connect(_clear_music) music_file_dialog.file_selected.connect(_on_music_file_selected) @@ -3863,8 +3859,7 @@ func play() -> void: _playing = true _update_playback_state(0.0, true) _start_music() - _update_play_button() - _update_playback_ui() + _sync_playback_ui() _update_status() _sync_trail_fade() @@ -3874,8 +3869,7 @@ func pause() -> void: return _playing = false _stop_music() - _update_play_button() - _update_playback_ui() + _sync_playback_ui() _sync_trail_fade() @@ -3885,12 +3879,11 @@ func reset_playback() -> void: _playback_section_id = "" _playback_segment_id = "" _stop_music() - _update_play_button() rink_canvas.clear_playback_state() _update_section_buttons() if _view_3d_active and _presentation_3d != null: _presentation_3d.clear_pose() - _update_playback_ui() + _sync_playback_ui() _sync_trail_fade() @@ -3905,7 +3898,7 @@ func seek_playback(time: float) -> void: _update_playback_state(0.0, true) if _playing: _seek_music(_playback_time) - _update_playback_ui() + _sync_playback_ui() _sync_trail_fade() @@ -3923,8 +3916,7 @@ func advance_playback(delta: float) -> void: _update_playback_state(0.0, true) _playing = false _stop_music() - _update_play_button() - _update_playback_ui() + _sync_playback_ui() _sync_trail_fade() return @@ -3944,21 +3936,8 @@ func _process(delta: float) -> void: func _setup_playback_controls() -> void: - speed_option.clear() - speed_option.add_item("0,25×", 25) - speed_option.add_item("0,5×", 50) - speed_option.add_item("1×", 100) - speed_option.add_item("1,5×", 150) - speed_option.add_item("2×", 200) - speed_option.select(speed_option.get_item_index(100)) - _playback_speed = 1.0 - - playback_timeline.min_value = 0.0 - playback_timeline.max_value = 0.0 - playback_timeline.step = 0.01 - playback_timeline.editable = false - play_button.disabled = true - reset_playback_button.disabled = true + playback_panel.setup() + playback_panel.set_speed(_playback_speed) music_file_dialog.filters = PackedStringArray([ "*.mp3, *.m4a, *.aac ; MP3 / M4A / AAC", "*.ogg ; OGG-Musik", @@ -3967,7 +3946,7 @@ func _setup_playback_controls() -> void: music_player.pitch_scale = 1.0 timeline_label_edit.max_length = RoutineFile.MAX_TIMELINE_LABEL_LENGTH _update_music_ui() - _update_play_button() + _sync_playback_ui() func _toggle_playback() -> void: @@ -3977,8 +3956,8 @@ func _toggle_playback() -> void: play() -func _on_speed_selected(index: int) -> void: - _playback_speed = float(speed_option.get_item_id(index)) / 100.0 +func _on_speed_requested(speed: float) -> void: + _playback_speed = speed # The audio follows the routine clock. Changing the pitch also changes the # playback rate, so the music stays aligned at every speed. music_player.pitch_scale = _playback_speed @@ -3986,12 +3965,6 @@ func _on_speed_selected(index: int) -> void: _seek_music(_playback_time) -func _on_timeline_changed(value: float) -> void: - if _updating_timeline: - return - seek_playback(value) - - func _refresh_playback_timeline() -> void: var entries: Array[Dictionary] = [] var total := 0.0 @@ -4036,8 +4009,7 @@ func _refresh_playback_timeline() -> void: _playing = false _stop_music() - _update_play_button() - _update_playback_ui() + _sync_playback_ui() if total > 0.0 and (_playing or _playback_time > 0.0): _update_playback_state(0.0, true) @@ -4089,40 +4061,17 @@ func _update_playback_state( pose.segment, _playback_time ) - _update_playback_ui() + _sync_playback_ui() -func _update_playback_ui() -> void: - _updating_timeline = true - playback_timeline.max_value = maxf(_playback_total_duration, 0.0) - playback_timeline.value = clampf( +func _sync_playback_ui() -> void: + playback_panel.set_state( _playback_time, - 0.0, - _playback_total_duration + _playback_total_duration, + _playing ) - _updating_timeline = false - timeline_label_lane.set_playhead(_playback_time) - playback_time_label.text = "%s / %s s" % [ - _format_seconds(_playback_time), - _format_seconds(_playback_total_duration), - ] - - var has_playback := _playback_total_duration > 0.0 - play_button.disabled = not has_playback - reset_playback_button.disabled = not has_playback - playback_timeline.editable = has_playback - - -func _update_play_button() -> void: - play_button.text = "" - play_button.icon = PLAYBACK_PAUSE_ICON if _playing else PLAYBACK_PLAY_ICON - play_button.tooltip_text = "Pause" if _playing else "Abspielen" - - -## --- Timeline-Labels ------------------------------------------------------ - func get_timeline_labels() -> Array[Dictionary]: var result: Array[Dictionary] = [] diff --git a/rinkplanner/src/whiteboard/view/playback_panel.gd b/rinkplanner/src/whiteboard/view/playback_panel.gd new file mode 100644 index 0000000..aa601ab --- /dev/null +++ b/rinkplanner/src/whiteboard/view/playback_panel.gd @@ -0,0 +1,99 @@ +class_name PlaybackPanel +extends Node + +## Transport controls of the playback bar: play/pause, reset, the timeline +## slider, the time label and the speed choice. +## +## The panel only shows state and reports intents. The controller owns the +## routine clock, the speed value and the audio, and calls [method set_state] +## whenever time or duration change. + +signal toggle_requested +signal reset_requested +signal seek_requested(seconds: float) +signal speed_requested(speed: float) + +const PLAY_ICON := preload("res://assets/icons/playback/play.svg") +const PAUSE_ICON := preload("res://assets/icons/playback/pause.svg") +const SPEEDS := [25, 50, 100, 150, 200] + +@onready var play_button: Button = %PlayButton +@onready var reset_button: Button = %ResetPlaybackButton +@onready var time_label: Label = %PlaybackTimeLabel +@onready var timeline: HSlider = %PlaybackTimeline +@onready var speed_option: OptionButton = %SpeedOption + +var _updating_timeline := false + + +func setup() -> void: + speed_option.clear() + for percent: int in SPEEDS: + speed_option.add_item(_speed_label(percent), percent) + speed_option.select(speed_option.get_item_index(100)) + + timeline.min_value = 0.0 + timeline.max_value = 0.0 + timeline.step = 0.01 + timeline.editable = false + play_button.disabled = true + reset_button.disabled = true + + play_button.pressed.connect(func() -> void: toggle_requested.emit()) + reset_button.pressed.connect(func() -> void: reset_requested.emit()) + timeline.value_changed.connect(_on_timeline_changed) + speed_option.item_selected.connect(_on_speed_selected) + + +## Updates slider, time label and button states for [param time] seconds of a +## [param duration] seconds long routine. +func set_state(time: float, duration: float, playing: bool) -> void: + _updating_timeline = true + timeline.max_value = maxf(duration, 0.0) + timeline.value = clampf(time, 0.0, maxf(duration, 0.0)) + _updating_timeline = false + + time_label.text = "%s / %s s" % [_seconds(time), _seconds(duration)] + + var has_playback := duration > 0.0 + play_button.disabled = not has_playback + reset_button.disabled = not has_playback + timeline.editable = has_playback + + play_button.text = "" + play_button.icon = PAUSE_ICON if playing else PLAY_ICON + play_button.tooltip_text = "Pause" if playing else "Abspielen" + + +func set_speed(speed: float) -> void: + var percent := int(roundf(speed * 100.0)) + var index := speed_option.get_item_index(percent) + if index >= 0: + speed_option.select(index) + + +func _on_timeline_changed(value: float) -> void: + if _updating_timeline: + return + seek_requested.emit(value) + + +func _on_speed_selected(index: int) -> void: + speed_requested.emit(float(speed_option.get_item_id(index)) / 100.0) + + +static func _speed_label(percent: int) -> String: + match percent: + 25: + return "0,25×" + 50: + return "0,5×" + 150: + return "1,5×" + 200: + return "2×" + return "1×" if percent == 100 else "%d×" % (percent / 100) + + +static func _seconds(value: float) -> String: + return ("%.1f" % value).replace(".", ",") diff --git a/rinkplanner/src/whiteboard/view/playback_panel.gd.uid b/rinkplanner/src/whiteboard/view/playback_panel.gd.uid new file mode 100644 index 0000000..788ee8c --- /dev/null +++ b/rinkplanner/src/whiteboard/view/playback_panel.gd.uid @@ -0,0 +1 @@ +uid://s8khec6xpwjv diff --git a/rinkplanner/tests/run_playback_tests.gd b/rinkplanner/tests/run_playback_tests.gd index a0ed223..a59ef74 100644 --- a/rinkplanner/tests/run_playback_tests.gd +++ b/rinkplanner/tests/run_playback_tests.gd @@ -32,8 +32,8 @@ func _run() -> void: return _check_approx(controller.get_playback_duration(), 0.0, "empty routine has no duration") - _check(controller.play_button.disabled, "play is disabled without segments") - _check(controller.playback_timeline.editable == false, "timeline is disabled without segments") + _check(controller.playback_panel.play_button.disabled, "play is disabled without segments") + _check(controller.playback_panel.timeline.editable == false, "timeline is disabled without segments") var section_one := controller.get_active_section() var forward := controller.add_segment( @@ -62,10 +62,10 @@ func _run() -> void: controller._update_status() _check_approx(controller.get_playback_duration(), 6.0, "duration sums all sections") - _check(not controller.play_button.disabled, "play is enabled with segments") - _check(controller.playback_timeline.editable, "timeline is enabled with segments") + _check(not controller.playback_panel.play_button.disabled, "play is enabled with segments") + _check(controller.playback_panel.timeline.editable, "timeline is enabled with segments") _check_approx( - controller.playback_timeline.max_value, + controller.playback_panel.timeline.max_value, 6.0, "timeline covers the whole routine" ) @@ -80,7 +80,7 @@ func _run() -> void: "selecting a section moves the playback to its start" ) _check_approx( - controller.playback_timeline.value, + controller.playback_panel.timeline.value, 4.0, "timeline slider jumps to the section start" ) @@ -101,7 +101,7 @@ func _run() -> void: "switching back moves the playback to the first section" ) _check_approx( - controller.playback_timeline.value, + controller.playback_panel.timeline.value, 0.0, "timeline slider returns to the first section" ) @@ -199,20 +199,20 @@ func _run() -> void: "faded section banner has no alpha" ) - controller.play_button.pressed.emit() + controller.playback_panel.play_button.pressed.emit() _check(controller.is_playing(), "play button starts playback") - controller.play_button.pressed.emit() + controller.playback_panel.play_button.pressed.emit() _check(not controller.is_playing(), "play button pauses playback") controller.play() _check(controller.is_playing(), "play starts playback") - _check(controller.play_button.icon == PAUSE_ICON, "play button switches to pause") + _check(controller.playback_panel.play_button.icon == PAUSE_ICON, "play button switches to pause") controller.advance_playback(0.5) _check_approx(controller.get_playback_time(), 5.5, "playback advances by delta") controller.advance_playback(1.0) _check(not controller.is_playing(), "playback stops at the end") _check_approx(controller.get_playback_time(), 6.0, "playback ends at the total duration") - _check(controller.play_button.icon == PLAY_ICON, "play button switches back after the end") + _check(controller.playback_panel.play_button.icon == PLAY_ICON, "play button switches back after the end") controller.play() _check_approx( @@ -223,21 +223,21 @@ func _run() -> void: _check(controller.is_playing(), "restarted playback is running") controller.pause() _check(not controller.is_playing(), "pause stops playback") - controller.reset_playback_button.pressed.emit() + controller.playback_panel.reset_button.pressed.emit() _check_approx(controller.get_playback_time(), 0.0, "reset returns to the start") _check( controller.rink_canvas.get_playback_section_id().is_empty(), "reset clears the playback highlight" ) - controller.playback_timeline.value = 2.5 + controller.playback_panel.timeline.value = 2.5 _check_approx( controller.get_playback_time(), 2.5, "timeline scrubbing seeks the playback" ) - controller.speed_option.item_selected.emit(4) + controller.playback_panel.speed_option.item_selected.emit(4) _check_approx(controller.get_playback_speed(), 2.0, "speed option selects 2x") controller.reset_playback() controller.play() @@ -248,7 +248,7 @@ func _run() -> void: "2x speed doubles the elapsed routine time" ) controller.pause() - controller.speed_option.item_selected.emit(2) + controller.playback_panel.speed_option.item_selected.emit(2) _check_approx(controller.get_playback_speed(), 1.0, "speed option returns to 1x") # Element markers take their stand time from the element, not the geometry, @@ -656,13 +656,13 @@ func _run() -> void: 3.0, "scrubbing moves the routine clock" ) - controller.speed_option.item_selected.emit(4) + controller.playback_panel.speed_option.item_selected.emit(4) _check_approx( controller.music_player.pitch_scale, 2.0, "music follows the selected playback speed" ) - controller.speed_option.item_selected.emit(2) + controller.playback_panel.speed_option.item_selected.emit(2) controller.reset_playback() _check(not controller.music_player.playing, "reset stops the music") _check_approx( diff --git a/rinkplanner/tests/run_presentation3d_tests.gd b/rinkplanner/tests/run_presentation3d_tests.gd index a1ce86d..ad969c4 100644 --- a/rinkplanner/tests/run_presentation3d_tests.gd +++ b/rinkplanner/tests/run_presentation3d_tests.gd @@ -303,7 +303,7 @@ func _test_controller() -> void: _check(not controller.sections_panel.visible, "section panel is hidden in 3D") _check(not controller.timing_bar.visible, "timing bar is hidden in 3D") _check(not controller.delete_segment_button.visible, "delete button is hidden in 3D") - _check(controller.play_button.visible, "playback bar stays visible in 3D") + _check(controller.playback_panel.play_button.visible, "playback bar stays visible in 3D") var presentation := controller.get_presentation_3d() _check(presentation != null, "controller owns a presentation")