feat: Segmente beschriften und Labels ein-/ausblenden

- Freitext-Label pro PathSegment (max. 40 Zeichen), getrimmt, mit
  Undo/Redo, Dirty-State und Persistenz
- Label-Dialog für das ausgewählte Segment; leeren entfernt die
  Beschriftung, Enter übernimmt direkt
- Globaler Schalter „Labels“ in der Timing-Leiste blendet alle
  Beschriftungen in der Ansicht aus
- Canvas zeichnet Labels am Segmentmittelpunkt mit Pill-Hintergrund,
  ausgewähltes Segment mit Akzentrahmen; Präsentation zeigt sie
- SVG-Export mit weiß umrandeten Labels, PNG-Export immer mit Labels
- Esc hebt die Segmentauswahl auf
- Tests: Label-API, Dialog, Undo/Redo, Persistenz, SVG-Ausgabe
- Manueller Visual-Check für Labels (tests/manual/capture_labels.gd)
This commit is contained in:
torsten 2026-10-30 10:34:21 +01:00
parent c4488a8eb5
commit 3ca794194f
12 changed files with 476 additions and 14 deletions

View file

@ -0,0 +1,60 @@
extends SceneTree
## Manual visual smoke test for segment labels.
##
## Usage:
## xvfb-run -a godot --path rinkplanner \
## --script res://tests/manual/capture_labels.gd -- 1400 876 /tmp/labels.png
func _init() -> void:
_capture.call_deferred()
func _capture() -> void:
var args := OS.get_cmdline_user_args()
var width := int(args[0]) if args.size() > 0 else 1400
var height := int(args[1]) if args.size() > 1 else 876
var output := args[2] if args.size() > 2 else "user://capture_labels.png"
var packed := load("res://scenes/whiteboard/whiteboard.tscn") as PackedScene
var controller := packed.instantiate() as WhiteboardController
controller.restore_autosave = false
controller.autosave_enabled = false
root.add_child(controller)
root.size = Vector2i(width, height)
await process_frame
await process_frame
var labels := [
["Eingang", Vector2(-24.0, -12.0), Vector2(-14.0, -12.0), Tool_LINE],
["3Lz", Vector2(-12.0, -12.0), Vector2(-2.0, -6.0), Tool_LINE],
["Choreo", Vector2(-2.0, -6.0), Vector2(12.0, -6.0), Tool_ARC],
["Pirouette", Vector2(14.0, 2.0), Vector2(18.0, 8.0), Tool_LINE],
]
for entry: Array in labels:
var segment := controller.add_segment(
entry[1], entry[2], PathSegment.Direction.FORWARD,
PathSegment.Edge.OUTSIDE, entry[3]
)
segment.label = entry[0]
controller.set_active_section(controller.get_active_section().section_id)
if args.size() > 3 and args[3] in ["select", "dialog"]:
var segments := controller.get_active_section().segments
controller.select_segment(segments[segments.size() - 1].segment_id)
if args.size() > 3 and args[3] == "dialog":
controller.label_button.pressed.emit()
controller.rink_canvas.fit_rink()
controller.rink_canvas.refresh()
await process_frame
await process_frame
await RenderingServer.frame_post_draw
var path := ProjectSettings.globalize_path(output)
root.get_texture().get_image().save_png(path)
print("Saved %s at %dx%d" % [path, width, height])
quit(0)
const Tool_LINE := WhiteboardController.Tool.LINE
const Tool_ARC := WhiteboardController.Tool.ARC_LEFT

View file

@ -0,0 +1 @@
uid://bgo5ewh7x1288

View file

@ -29,6 +29,14 @@ func _run() -> void:
_check(svg.contains("#2563EB"), "SVG contains inside-edge color")
_check(svg.contains("stroke-dasharray="), "SVG encodes backward segments as dashes")
_check(_count(svg, "<polyline") == 3, "SVG contains all routine segments")
_check(
svg.contains(">3Lz &amp; &lt;Spin&gt;</text>"),
"SVG contains and escapes segment labels"
)
_check(
svg.contains('paint-order="stroke"'),
"SVG labels get a white outline"
)
var section_svg := RoutineSvgExporter.build(routine, "section-1")
_check(
@ -91,14 +99,16 @@ func _make_routine() -> Routine:
section_one.section_id = "section-1"
section_one.title = "Abschnitt 1"
section_one.sequence_order = 0
var labelled := _make_segment(
"seg-1",
Vector2(-20.0, -8.0),
Vector2(-10.0, -8.0),
PathSegment.Direction.FORWARD,
PathSegment.Edge.OUTSIDE
)
labelled.label = "3Lz & <Spin>"
section_one.segments = [
_make_segment(
"seg-1",
Vector2(-20.0, -8.0),
Vector2(-10.0, -8.0),
PathSegment.Direction.FORWARD,
PathSegment.Edge.OUTSIDE
),
labelled,
_make_segment(
"seg-2",
Vector2(-10.0, -8.0),

View file

@ -199,6 +199,30 @@ func _run() -> void:
"redo reapplies the arc start"
)
controller.select_segment(arc.segment_id)
_check(
controller.get_selected_segment() != null,
"segment can be selected for labelling"
)
controller.set_selected_segment_label("Eingang")
var labelled := controller.get_selected_segment()
_check(
labelled != null and labelled.label == "Eingang",
"label edit is applied"
)
_check(controller.undo(), "undo label edit")
var unlabelled := controller.get_active_section().get_segment_by_id(arc.segment_id)
_check(
unlabelled != null and unlabelled.label.is_empty(),
"undo clears the label"
)
_check(controller.redo(), "redo label edit")
var relabelled := controller.get_active_section().get_segment_by_id(arc.segment_id)
_check(
relabelled != null and relabelled.label == "Eingang",
"redo restores the label"
)
controller.new_routine()
_check(controller.undo_button.disabled, "new routine clears undo history")
_check(controller.redo_button.disabled, "new routine clears redo history")

View file

@ -540,6 +540,85 @@ func _run() -> void:
"rename dialog applies the edited title"
)
# Segment labels.
controller.select_segment(arc_left.segment_id)
_check(
not controller.label_button.disabled,
"label button is enabled with a selection"
)
_check(
controller.get_selected_segment_label().is_empty(),
"segments start without a label"
)
_check(
controller.set_selected_segment_label(" Eingang "),
"label can be set"
)
_check(
controller.get_selected_segment_label() == "Eingang",
"label is trimmed"
)
_check(controller.is_dirty(), "label edit marks the routine dirty")
_check(
not controller.set_selected_segment_label("Eingang"),
"unchanged label records no history"
)
_check(controller.are_labels_visible(), "labels are visible by default")
_check(
controller.labels_toggle.button_pressed,
"labels toggle starts pressed"
)
controller.set_labels_visible(false)
_check(not controller.are_labels_visible(), "labels can be hidden")
_check(
not controller.labels_toggle.button_pressed,
"toggle reflects hidden labels"
)
controller.set_labels_visible(true)
_check(controller.are_labels_visible(), "labels can be shown again")
_check(
controller.labels_toggle.button_pressed,
"toggle reflects visible labels"
)
controller.clear_selection()
_check(
controller.get_selected_segment() == null,
"clear_selection removes the selection"
)
_check(
controller.label_button.disabled,
"label button is disabled without a selection"
)
controller.select_segment(arc_left.segment_id)
_check(
controller.label_button.disabled == false,
"label button is enabled again after selecting"
)
controller.label_button.pressed.emit()
_check(
controller.segment_label_dialog.visible,
"label button opens the label dialog"
)
_check(
controller.segment_label_edit.text == "Eingang",
"label dialog is prefilled"
)
controller.segment_label_edit.text = "Ausgang"
controller.segment_label_dialog.confirmed.emit()
_check(
controller.get_selected_segment_label() == "Ausgang",
"label dialog applies the edited text"
)
controller.segment_label_edit.text = ""
controller.segment_label_dialog.confirmed.emit()
_check(
controller.get_selected_segment_label().is_empty(),
"empty text removes the label"
)
controller.segment_label_dialog.hide()
controller.set_selected_segment_label("Eingang")
var saved_label := controller.get_selected_segment_label()
# Save/load round-trip.
var roundtrip_path := "user://test_roundtrip.tres"
var saved_section_title := controller.get_active_section().title
@ -595,6 +674,10 @@ func _run() -> void:
loaded_arc.curve.point_count > 2,
"load restores the sampled arc curve"
)
_check(
loaded_arc.label == saved_label,
"load restores the segment label"
)
DirAccess.remove_absolute(roundtrip_path)