feat: Geschwister einer Step Sequence türkis hervorheben
Wird ein Segment aus einer Elementgruppe ausgewählt, umrandet der Canvas die übrigen Mitglieder türkis; das gewählte Segment behält den gelben Halo. Damit ist auf einen Blick sichtbar, welche Teilstrecken zur Sequenz gehören. - RinkCanvas.get_group_member_segment_ids() liefert die Geschwister (gleiche element_group_id, ohne Auswahl, ohne bereits mit ausgewählte) - Zeichnung unter dem gelben Halo, gestrichelt bei Rückwärtssegmenten - Tests in run_canvas_tests.gd, Sichtprüfung über tests/manual/capture_group_highlight.gd - Findings zu den Step-Sequence-Gruppen aktualisiert
This commit is contained in:
parent
512292870d
commit
a1d399f575
5 changed files with 201 additions and 2 deletions
|
|
@ -48,12 +48,27 @@ gemeinsame `element_group_id` darauf.
|
|||
Undo-Schritt zusammen. Lücken, Marker und bestehende Elemente blockieren
|
||||
die Aktion.
|
||||
|
||||
## Gruppen-Hervorhebung (2026-11-12)
|
||||
|
||||
Beim Auswählen eines Gruppenmitglieds zeichnet der Canvas die übrigen
|
||||
Mitglieder mit einem türkisen Halo (`GROUP_HALO_COLOR`, Breite
|
||||
`_segment_width() + 5`), das gewählte Segment behält den gelben Halo. Die
|
||||
Hilfsfunktion `RinkCanvas.get_group_member_segment_ids()` liefert dafür die
|
||||
Geschwister: gleiche `element_group_id`, ohne das gewählte Segment und ohne
|
||||
bereits mit ausgewählte Segmente (die bleiben gelb). Einzelelemente ohne
|
||||
Gruppen-ID bekommen keinen zusätzlichen Halo.
|
||||
|
||||
Nur der Canvas ist betroffen; SVG-/PNG-Export und Präsentationsmodus bleiben
|
||||
unverändert. Sichtprüfung:
|
||||
`tests/manual/capture_group_highlight.gd`.
|
||||
|
||||
## Offene Punkte
|
||||
|
||||
1. **Teilen/Zusammenführen:** Eine Gruppe kann derzeit nur über Löschen oder
|
||||
„Kein Element“ verändert werden; ein explizites Teilen fehlt.
|
||||
2. **Gruppen-Hervorhebung:** Der Canvas markiert beim Auswählen nur das
|
||||
gewählte Segment, nicht die gesamte Gruppe.
|
||||
2. ~~**Gruppen-Hervorhebung:** Der Canvas markiert beim Auswählen nur das
|
||||
gewählte Segment, nicht die gesamte Gruppe.~~ Erledigt am 2026-11-12:
|
||||
Die übrigen Mitglieder werden türkis umrandet (siehe unten).
|
||||
3. **Einzelne Sequenz-Tags zusammenführen:** Bereits separat getaggte
|
||||
Sequenzen müssen vor dem Gruppieren über „Kein Element“ gelöst werden;
|
||||
ein automatisches Zusammenführen mit Metadaten-Konfliktlösung fehlt.
|
||||
|
|
|
|||
|
|
@ -46,6 +46,8 @@ const CIRCLE_COLOR := Color("#94a3b8")
|
|||
const OUTSIDE_EDGE_COLOR := Color("#DC2626")
|
||||
const INSIDE_EDGE_COLOR := Color("#2563EB")
|
||||
const SELECTION_HALO_COLOR := Color(0.98, 0.75, 0.14, 0.55)
|
||||
const GROUP_HALO_COLOR := Color(0.05, 0.78, 0.74, 0.85)
|
||||
const GROUP_HALO_EXTRA_WIDTH := 5.0
|
||||
const HANDLE_FILL_COLOR := Color("#f8fafc")
|
||||
const HANDLE_BORDER_COLOR := Color("#0f172a")
|
||||
const BULGE_HANDLE_COLOR := Color("#f59e0b")
|
||||
|
|
@ -417,6 +419,7 @@ func _draw() -> void:
|
|||
_draw_center_line()
|
||||
_draw_center_circle()
|
||||
if not presentation_mode:
|
||||
_draw_group_members_highlight()
|
||||
_draw_selection_highlight()
|
||||
_draw_routine()
|
||||
|
||||
|
|
@ -1135,6 +1138,47 @@ func _draw_selection_highlight() -> void:
|
|||
draw_polyline(points, SELECTION_HALO_COLOR, halo_width, true)
|
||||
|
||||
|
||||
## Segments that share the element group of the primary selection, without the
|
||||
## selected segment itself. Empty when the selection is not part of a group.
|
||||
func get_group_member_segment_ids() -> PackedStringArray:
|
||||
var result := PackedStringArray()
|
||||
var selected := _get_selected_segment()
|
||||
if selected == null or selected.element_group_id.is_empty():
|
||||
return result
|
||||
var active := _get_active_section()
|
||||
if active == null:
|
||||
return result
|
||||
for segment: PathSegment in active.get_element_group_segments(
|
||||
selected.element_group_id
|
||||
):
|
||||
if segment == null or segment.segment_id == selected.segment_id:
|
||||
continue
|
||||
if _selected_segment_ids.has(segment.segment_id):
|
||||
continue
|
||||
result.append(segment.segment_id)
|
||||
return result
|
||||
|
||||
|
||||
## Draws the siblings of a grouped element in turquoise so the whole step
|
||||
## sequence is visible while one of its segments is selected.
|
||||
func _draw_group_members_highlight() -> void:
|
||||
var active := _get_active_section()
|
||||
if active == null:
|
||||
return
|
||||
var halo_width := _segment_width() + GROUP_HALO_EXTRA_WIDTH
|
||||
for segment_id: String in get_group_member_segment_ids():
|
||||
var segment := active.get_segment_by_id(segment_id)
|
||||
if segment == null:
|
||||
continue
|
||||
var points := _sample_segment_screen(segment)
|
||||
if points.size() < 2:
|
||||
continue
|
||||
if segment.direction == PathSegment.Direction.BACKWARD:
|
||||
_draw_dashed_polyline(points, GROUP_HALO_COLOR, halo_width)
|
||||
else:
|
||||
draw_polyline(points, GROUP_HALO_COLOR, halo_width, true)
|
||||
|
||||
|
||||
func _draw_selection_handles() -> void:
|
||||
var segment := _get_selected_segment()
|
||||
if segment == null:
|
||||
|
|
|
|||
69
rinkplanner/tests/manual/capture_group_highlight.gd
Normal file
69
rinkplanner/tests/manual/capture_group_highlight.gd
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
extends SceneTree
|
||||
|
||||
## Rendert das Canvas mit einer ausgewählten Step Sequence, um die
|
||||
## Türkis-Hervorhebung der Gruppengeschwister zu prüfen.
|
||||
##
|
||||
## Aufruf:
|
||||
## godot --path rinkplanner --script res://tests/manual/capture_group_highlight.gd -- /tmp/opencode/gruppe.png
|
||||
|
||||
func _init() -> void:
|
||||
_capture.call_deferred()
|
||||
|
||||
|
||||
func _capture() -> void:
|
||||
var args := OS.get_cmdline_user_args()
|
||||
var output := args[0] if args.size() > 0 else "/tmp/opencode/group_highlight.png"
|
||||
|
||||
var routine: Routine = Routine.new()
|
||||
var section: RoutineSection = RoutineSection.new()
|
||||
section.section_id = "sec-demo"
|
||||
section.title = "Step Sequence"
|
||||
section.segments = [
|
||||
_make_segment("seg-1", Vector2(-12.0, -2.0), Vector2(-4.0, 2.0), "el-demo", true),
|
||||
_make_segment("seg-2", Vector2(-4.0, 2.0), Vector2(2.0, -3.0), "el-demo", false),
|
||||
_make_segment("seg-3", Vector2(2.0, -3.0), Vector2(9.0, 1.0), "el-demo", false),
|
||||
_make_segment("seg-solo", Vector2(9.0, 5.0), Vector2(16.0, 5.0), "", true),
|
||||
]
|
||||
routine.sections = [section]
|
||||
|
||||
var viewport := SubViewport.new()
|
||||
viewport.size = Vector2i(1000, 620)
|
||||
viewport.render_target_update_mode = SubViewport.UPDATE_ALWAYS
|
||||
root.add_child(viewport)
|
||||
|
||||
var canvas := RinkCanvas.new()
|
||||
canvas.size = Vector2(1000, 620)
|
||||
viewport.add_child(canvas)
|
||||
canvas.set_routine(routine, true)
|
||||
canvas.set_active_section("sec-demo")
|
||||
canvas.set_selection_enabled(true)
|
||||
canvas.set_selected_segment("seg-2")
|
||||
|
||||
await process_frame
|
||||
await process_frame
|
||||
await process_frame
|
||||
|
||||
print("SIBLINGS ", canvas.get_group_member_segment_ids())
|
||||
var image := viewport.get_texture().get_image()
|
||||
image.save_png(output)
|
||||
print("SAVED ", output)
|
||||
quit(0)
|
||||
|
||||
|
||||
func _make_segment(
|
||||
segment_id: String,
|
||||
from: Vector2,
|
||||
to: Vector2,
|
||||
group_id: String,
|
||||
lead: bool
|
||||
) -> PathSegment:
|
||||
var segment: PathSegment = PathSegment.new()
|
||||
segment.segment_id = segment_id
|
||||
segment.element_group_id = group_id
|
||||
var curve := Curve2D.new()
|
||||
curve.add_point(from)
|
||||
curve.add_point(to)
|
||||
segment.curve = curve
|
||||
if lead:
|
||||
segment.set_element(PathSegment.ElementType.SEQUENCE, "StSq", 2)
|
||||
return segment
|
||||
1
rinkplanner/tests/manual/capture_group_highlight.gd.uid
Normal file
1
rinkplanner/tests/manual/capture_group_highlight.gd.uid
Normal file
|
|
@ -0,0 +1 @@
|
|||
uid://bgw6gqp3cu6m7
|
||||
|
|
@ -22,6 +22,7 @@ func _init() -> void:
|
|||
_test_visible_rect()
|
||||
_test_rink_outline()
|
||||
_test_arc_geometry()
|
||||
_test_group_member_highlight()
|
||||
_finish()
|
||||
|
||||
|
||||
|
|
@ -163,6 +164,75 @@ func _test_arc_geometry() -> void:
|
|||
)
|
||||
|
||||
|
||||
func _test_group_member_highlight() -> void:
|
||||
var canvas := RinkCanvas.new()
|
||||
var routine: Routine = Routine.new()
|
||||
var section: RoutineSection = RoutineSection.new()
|
||||
section.section_id = "sec-steps"
|
||||
|
||||
var first := _make_step_segment("seg-steps-1", "el-steps")
|
||||
var second := _make_step_segment("seg-steps-2", "el-steps")
|
||||
var third := _make_step_segment("seg-steps-3", "el-steps")
|
||||
first.set_element(PathSegment.ElementType.SEQUENCE, "StSq", 2)
|
||||
var solo := _make_step_segment("seg-solo", "")
|
||||
solo.set_element(PathSegment.ElementType.SEQUENCE, "StSq", 2)
|
||||
|
||||
section.segments = [first, second, third, solo]
|
||||
routine.sections = [section]
|
||||
canvas.set_routine(routine, false)
|
||||
canvas.set_active_section("sec-steps")
|
||||
|
||||
canvas.set_selected_segment("seg-steps-2")
|
||||
var siblings := canvas.get_group_member_segment_ids()
|
||||
_check(siblings.size() == 2, "a group member reports its two siblings")
|
||||
_check(
|
||||
siblings.has("seg-steps-1") and siblings.has("seg-steps-3"),
|
||||
"the siblings are the other group members"
|
||||
)
|
||||
_check(
|
||||
not siblings.has("seg-steps-2"),
|
||||
"the selected segment is not its own sibling"
|
||||
)
|
||||
_check(
|
||||
not siblings.has("seg-solo"),
|
||||
"segments outside the group are ignored"
|
||||
)
|
||||
|
||||
canvas.set_selected_segment("seg-solo")
|
||||
_check(
|
||||
canvas.get_group_member_segment_ids().is_empty(),
|
||||
"a standalone element has no siblings"
|
||||
)
|
||||
|
||||
canvas.set_selected_segments(
|
||||
PackedStringArray(["seg-steps-1", "seg-steps-2"]),
|
||||
"seg-steps-2"
|
||||
)
|
||||
var multi := canvas.get_group_member_segment_ids()
|
||||
_check(
|
||||
multi.size() == 1 and multi.has("seg-steps-3"),
|
||||
"already selected siblings are not highlighted twice"
|
||||
)
|
||||
|
||||
canvas.set_selected_segment("")
|
||||
_check(
|
||||
canvas.get_group_member_segment_ids().is_empty(),
|
||||
"no selection means no sibling highlight"
|
||||
)
|
||||
canvas.free()
|
||||
|
||||
|
||||
func _make_step_segment(segment_id: String, group_id: String) -> PathSegment:
|
||||
var segment: PathSegment = PathSegment.new()
|
||||
segment.segment_id = segment_id
|
||||
segment.element_group_id = group_id
|
||||
var curve := Curve2D.new()
|
||||
curve.add_point(Vector2.ZERO)
|
||||
curve.add_point(Vector2(1.0, 0.0))
|
||||
segment.curve = curve
|
||||
return segment
|
||||
|
||||
|
||||
func _check(condition: bool, message: String) -> void:
|
||||
_assertions += 1
|
||||
if not condition:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue