Skip to content
This repository was archived by the owner on Nov 7, 2026. It is now read-only.

Commit 0cbbd44

Browse files
Merge pull request #23 from code4teaching/simulation-panels
Simulationsansicht: echte Hinweise und ausgewogenes Hochkant-Layout
2 parents b7dbd8b + 5dc7512 commit 0cbbd44

23 files changed

Lines changed: 228 additions & 159 deletions

File tree

‎VisuStruct-iOS/VisuStructXcodeOpen/VisuStruct/ContentView.swift‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,10 @@ struct ContentView: View {
771771
@ViewBuilder
772772
private var simulationDetailView: some View {
773773
GeometryReader { geo in
774-
let useColumns = geo.size.width >= 760
774+
// Seitenspalte nur im Querformat; hochkant wäre sie gequetscht und unter dem Diagramm bliebe Platz frei.
775+
let useColumns = geo.size.width >= 760 && geo.size.width > geo.size.height
776+
// iPad hochkant: Diagramm oben, Steuerfeld darunter über die volle Breite.
777+
let useWideStack = !useColumns && geo.size.width >= 600 && geo.size.height >= 700
775778
let panelWidth = min(max(geo.size.width * 0.32, 280), 360)
776779

777780
if useColumns {
@@ -792,6 +795,24 @@ struct ContentView: View {
792795
.frame(width: panelWidth)
793796
.frame(maxHeight: .infinity, alignment: .top)
794797
}
798+
} else if useWideStack {
799+
VStack(alignment: .leading, spacing: 16) {
800+
simulationCanvasBlock
801+
.frame(height: geo.size.height * 0.5)
802+
SimulationStatePanel(
803+
engine: simulationEngine,
804+
isPlaying: isSimulationPlaying,
805+
inputText: $simulationInputText,
806+
highlightModeRaw: $simulationHighlightModeRaw,
807+
onPlay: playSimulation,
808+
onPause: pauseSimulation,
809+
onStep: stepSimulation,
810+
onSubmitInput: submitSimulationInput,
811+
onStop: resetSimulation,
812+
usesWideLayout: true
813+
)
814+
.frame(maxHeight: .infinity)
815+
}
795816
} else {
796817
ScrollView {
797818
VStack(alignment: .leading, spacing: 16) {

‎VisuStruct-iOS/VisuStructXcodeOpen/VisuStruct/Simulation/SimulationPanels.swift‎

Lines changed: 143 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ struct SimulationStatePanel: View {
1515
let onStep: () -> Void
1616
let onSubmitInput: () -> Void
1717
let onStop: () -> Void
18+
/// Hochkant auf dem iPad: Steuerung links, Schritt/Variablen/Ausgabe rechts statt alles untereinander.
19+
var usesWideLayout: Bool = false
1820

1921
private var sortedVariables: [(String, VisuStructSimulationValue)] {
2022
engine.state.variables
@@ -26,7 +28,9 @@ struct SimulationStatePanel: View {
2628

2729
var body: some View {
2830
Group {
29-
if isWaitingForInput {
31+
if usesWideLayout {
32+
wideStack
33+
} else if isWaitingForInput {
3034
ScrollView {
3135
panelStack(flexibleCardsFillHeight: false)
3236
}
@@ -50,125 +54,169 @@ struct SimulationStatePanel: View {
5054
@ViewBuilder
5155
private func panelStack(flexibleCardsFillHeight: Bool) -> some View {
5256
VStack(alignment: .leading, spacing: 16) {
53-
VStack(alignment: .leading, spacing: 10) {
54-
Label(lang.tr("simulation_controls"), systemImage: "slider.horizontal.3")
55-
.font(.headline)
57+
controlsSection
58+
inputCard
59+
traceCard(flexibleCardsFillHeight: flexibleCardsFillHeight)
60+
variablesCard(flexibleCardsFillHeight: flexibleCardsFillHeight)
61+
outputCard(flexibleCardsFillHeight: flexibleCardsFillHeight)
62+
.layoutPriority(flexibleCardsFillHeight ? 1 : 0)
63+
noticeText
64+
}
65+
}
5666

57-
LazyVGrid(columns: [GridItem(.flexible()), GridItem(.flexible())], spacing: 10) {
58-
SimulationControlButton(title: lang.tr("simulation_play"), systemImage: "play.fill", isDisabled: isPlaying || !engine.canStep, action: onPlay)
59-
SimulationControlButton(title: lang.tr("simulation_pause"), systemImage: "pause.fill", isDisabled: !isPlaying, action: onPause)
60-
SimulationControlButton(title: lang.tr("simulation_step"), systemImage: "arrow.right.circle", isDisabled: isPlaying || !engine.canStep, action: onStep)
61-
SimulationControlButton(title: lang.tr("simulation_stop"), systemImage: "stop.fill", isDisabled: false, action: onStop)
67+
private var wideStack: some View {
68+
HStack(alignment: .top, spacing: 16) {
69+
ScrollView {
70+
VStack(alignment: .leading, spacing: 16) {
71+
controlsSection
72+
inputCard
73+
noticeText
6274
}
75+
}
76+
.scrollBounceBehavior(.basedOnSize)
77+
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
6378

64-
VStack(alignment: .leading, spacing: 6) {
65-
Text(lang.tr("simulation_highlight_label"))
66-
.font(.caption)
67-
.foregroundStyle(.secondary)
68-
Picker(lang.tr("simulation_highlight_label"), selection: $highlightModeRaw) {
69-
Text(lang.tr("simulation_highlight_last")).tag(SimulationHighlightMode.lastExecuted.rawValue)
70-
Text(lang.tr("simulation_highlight_next")).tag(SimulationHighlightMode.nextToExecute.rawValue)
71-
}
72-
.pickerStyle(.segmented)
79+
VStack(alignment: .leading, spacing: 16) {
80+
traceCard(flexibleCardsFillHeight: false)
81+
HStack(alignment: .top, spacing: 16) {
82+
variablesCard(flexibleCardsFillHeight: true)
83+
outputCard(flexibleCardsFillHeight: true)
7384
}
85+
.frame(maxHeight: .infinity)
7486
}
87+
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
88+
}
89+
}
7590

76-
SimulationInputCard(
77-
prompt: engine.state.inputRequest?.prompt,
78-
variableName: engine.state.inputRequest?.variableName,
79-
valueType: engine.state.inputRequest?.valueType,
80-
inputError: engine.state.inputErrorNotice?.localized(in: lang),
81-
inputText: $inputText,
82-
onSubmit: onSubmitInput
83-
)
91+
private var controlsSection: some View {
92+
VStack(alignment: .leading, spacing: 10) {
93+
Label(lang.tr("simulation_controls"), systemImage: "slider.horizontal.3")
94+
.font(.headline)
8495

85-
SimulationPlaceholderCard(
86-
title: lang.tr("simulation_trace"),
87-
systemImage: "arrow.left.arrow.right",
88-
minHeight: flexibleCardsFillHeight ? 130 : 88
89-
) {
90-
if let trace = engine.state.lastTrace {
91-
Text(trace)
92-
.font(.body.monospaced())
93-
.frame(maxWidth: .infinity, alignment: .leading)
94-
.fixedSize(horizontal: false, vertical: true)
95-
} else {
96-
Text(lang.tr("simulation_trace_placeholder"))
97-
.font(.body)
98-
.foregroundStyle(.secondary)
99-
.fixedSize(horizontal: false, vertical: true)
100-
}
96+
LazyVGrid(columns: [GridItem(.flexible()), GridItem(.flexible())], spacing: 10) {
97+
SimulationControlButton(title: lang.tr("simulation_play"), systemImage: "play.fill", isDisabled: isPlaying || !engine.canStep, action: onPlay)
98+
SimulationControlButton(title: lang.tr("simulation_pause"), systemImage: "pause.fill", isDisabled: !isPlaying, action: onPause)
99+
SimulationControlButton(title: lang.tr("simulation_step"), systemImage: "arrow.right.circle", isDisabled: isPlaying || !engine.canStep, action: onStep)
100+
SimulationControlButton(title: lang.tr("simulation_stop"), systemImage: "stop.fill", isDisabled: false, action: onStop)
101101
}
102102

103-
SimulationPlaceholderCard(
104-
title: lang.tr("simulation_variables"),
105-
systemImage: "curlybraces",
106-
minHeight: flexibleCardsFillHeight ? 190 : 96,
107-
contentFillsHeight: flexibleCardsFillHeight
108-
) {
109-
if sortedVariables.isEmpty {
110-
Text(lang.tr("simulation_variables_placeholder"))
111-
.font(.body)
112-
.foregroundStyle(.secondary)
113-
.fixedSize(horizontal: false, vertical: true)
114-
} else {
115-
ScrollView {
116-
VStack(alignment: .leading, spacing: 8) {
117-
ForEach(sortedVariables, id: \.0) { name, value in
118-
HStack(alignment: .firstTextBaseline) {
119-
Text(name)
120-
.font(.body.monospaced().weight(.semibold))
121-
Spacer(minLength: 12)
122-
Text(value.description)
123-
.font(.body.monospaced())
124-
.foregroundStyle(.secondary)
125-
}
126-
}
127-
}
128-
.padding(.trailing, 14)
129-
.frame(maxWidth: .infinity, alignment: .leading)
130-
}
131-
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
103+
VStack(alignment: .leading, spacing: 6) {
104+
Text(lang.tr("simulation_highlight_label"))
105+
.font(.caption)
106+
.foregroundStyle(.secondary)
107+
Picker(lang.tr("simulation_highlight_label"), selection: $highlightModeRaw) {
108+
Text(lang.tr("simulation_highlight_last")).tag(SimulationHighlightMode.lastExecuted.rawValue)
109+
Text(lang.tr("simulation_highlight_next")).tag(SimulationHighlightMode.nextToExecute.rawValue)
132110
}
111+
.pickerStyle(.segmented)
133112
}
113+
}
114+
}
134115

135-
SimulationPlaceholderCard(
136-
title: lang.tr("simulation_output"),
137-
systemImage: "terminal",
138-
minHeight: flexibleCardsFillHeight ? 170 : 96,
139-
contentFillsHeight: flexibleCardsFillHeight
140-
) {
141-
if engine.state.outputLines.isEmpty {
142-
Text(lang.tr("simulation_output_placeholder"))
143-
.font(.body)
144-
.foregroundStyle(.secondary)
145-
.fixedSize(horizontal: false, vertical: true)
146-
} else {
147-
ScrollView {
148-
VStack(alignment: .leading, spacing: 6) {
149-
ForEach(Array(engine.state.outputLines.enumerated()), id: \.offset) { _, line in
150-
Text(line)
116+
private var inputCard: some View {
117+
SimulationInputCard(
118+
prompt: engine.state.inputRequest?.prompt,
119+
variableName: engine.state.inputRequest?.variableName,
120+
valueType: engine.state.inputRequest?.valueType,
121+
inputError: engine.state.inputErrorNotice?.localized(in: lang),
122+
inputText: $inputText,
123+
onSubmit: onSubmitInput
124+
)
125+
}
126+
127+
private func traceCard(flexibleCardsFillHeight: Bool) -> some View {
128+
SimulationPlaceholderCard(
129+
title: lang.tr("simulation_trace"),
130+
systemImage: "arrow.left.arrow.right",
131+
minHeight: flexibleCardsFillHeight ? 130 : 88
132+
) {
133+
if let trace = engine.state.lastTrace {
134+
Text(trace)
135+
.font(.body.monospaced())
136+
.frame(maxWidth: .infinity, alignment: .leading)
137+
.fixedSize(horizontal: false, vertical: true)
138+
} else {
139+
Text(lang.tr("simulation_trace_placeholder"))
140+
.font(.body)
141+
.foregroundStyle(.secondary)
142+
.fixedSize(horizontal: false, vertical: true)
143+
}
144+
}
145+
}
146+
147+
private func variablesCard(flexibleCardsFillHeight: Bool) -> some View {
148+
SimulationPlaceholderCard(
149+
title: lang.tr("simulation_variables"),
150+
systemImage: "curlybraces",
151+
minHeight: flexibleCardsFillHeight ? 190 : 96,
152+
contentFillsHeight: flexibleCardsFillHeight
153+
) {
154+
if sortedVariables.isEmpty {
155+
Text(lang.tr("simulation_variables_placeholder"))
156+
.font(.body)
157+
.foregroundStyle(.secondary)
158+
.fixedSize(horizontal: false, vertical: true)
159+
} else {
160+
ScrollView {
161+
VStack(alignment: .leading, spacing: 8) {
162+
ForEach(sortedVariables, id: \.0) { name, value in
163+
HStack(alignment: .firstTextBaseline) {
164+
Text(name)
165+
.font(.body.monospaced().weight(.semibold))
166+
Spacer(minLength: 12)
167+
Text(value.description)
151168
.font(.body.monospaced())
152-
.frame(maxWidth: .infinity, alignment: .leading)
169+
.foregroundStyle(.secondary)
153170
}
154171
}
155-
.padding(.trailing, 4)
156-
.frame(maxWidth: .infinity, alignment: .leading)
157172
}
158-
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
173+
.padding(.trailing, 14)
174+
.frame(maxWidth: .infinity, alignment: .leading)
159175
}
176+
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
160177
}
161-
.layoutPriority(flexibleCardsFillHeight ? 1 : 0)
178+
}
179+
}
162180

163-
if let message = engine.state.notice?.localized(in: lang) {
164-
Text(message)
165-
.font(.caption)
181+
private func outputCard(flexibleCardsFillHeight: Bool) -> some View {
182+
SimulationPlaceholderCard(
183+
title: lang.tr("simulation_output"),
184+
systemImage: "terminal",
185+
minHeight: flexibleCardsFillHeight ? 170 : 96,
186+
contentFillsHeight: flexibleCardsFillHeight
187+
) {
188+
if engine.state.outputLines.isEmpty {
189+
Text(lang.tr("simulation_output_placeholder"))
190+
.font(.body)
166191
.foregroundStyle(.secondary)
167192
.fixedSize(horizontal: false, vertical: true)
193+
} else {
194+
ScrollView {
195+
VStack(alignment: .leading, spacing: 6) {
196+
ForEach(Array(engine.state.outputLines.enumerated()), id: \.offset) { _, line in
197+
Text(line)
198+
.font(.body.monospaced())
199+
.frame(maxWidth: .infinity, alignment: .leading)
200+
}
201+
}
202+
.padding(.trailing, 4)
203+
.frame(maxWidth: .infinity, alignment: .leading)
204+
}
205+
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
168206
}
169207
}
170208
}
171209

210+
@ViewBuilder
211+
private var noticeText: some View {
212+
if let message = engine.state.notice?.localized(in: lang) {
213+
Text(message)
214+
.font(.caption)
215+
.foregroundStyle(.secondary)
216+
.fixedSize(horizontal: false, vertical: true)
217+
}
218+
}
219+
172220
}
173221

174222
private struct SimulationInputCard: View {

‎VisuStruct-iOS/VisuStructXcodeOpen/VisuStruct/ar.lproj/Localizable.strings‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
"simulation_input_submit" = "OK";
2424
"simulation_input_invalid_int" = "يرجى إدخال عدد صحيح.";
2525
"simulation_trace" = "آخر خطوة";
26-
"simulation_trace_placeholder" = "سيتم شرح آخر خطوة تم تنفيذها هنا.";
26+
"simulation_trace_placeholder" = "لم يُنفَّذ أي خطوة بعد.";
2727
"simulation_variables" = "المتغيرات";
28-
"simulation_variables_placeholder" = "ستظهر قيم المتغيرات الحالية هنا لاحقًا.";
28+
"simulation_variables_placeholder" = "لا توجد متغيرات بعد.";
2929
"simulation_output" = "المخرجات";
30-
"simulation_output_placeholder" = "ستظهر مخرجات المحاكاة هنا لاحقًا.";
30+
"simulation_output_placeholder" = "لا يوجد إخراج بعد.";
3131
"action_delete_selection" = "حذف التحديد";
3232
"ctx_copy" = "نسخ";
3333
"ctx_cut" = "قص";

‎VisuStruct-iOS/VisuStructXcodeOpen/VisuStruct/da.lproj/Localizable.strings‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
"simulation_input_submit" = "OK";
2424
"simulation_input_invalid_int" = "Indtast et heltal.";
2525
"simulation_trace" = "Sidste trin";
26-
"simulation_trace_placeholder" = "Det senest udførte trin forklares her.";
26+
"simulation_trace_placeholder" = "Intet trin udført endnu.";
2727
"simulation_variables" = "Variabler";
28-
"simulation_variables_placeholder" = "Aktuelle variabelværdier vises her senere.";
28+
"simulation_variables_placeholder" = "Ingen variabler endnu.";
2929
"simulation_output" = "Output";
30-
"simulation_output_placeholder" = "Simulationens output vises her senere.";
30+
"simulation_output_placeholder" = "Intet output endnu.";
3131
"action_delete_selection" = "Slet markering";
3232
"ctx_copy" = "Kopiér";
3333
"ctx_cut" = "Klip";

‎VisuStruct-iOS/VisuStructXcodeOpen/VisuStruct/de.lproj/Localizable.strings‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
"simulation_input_submit" = "OK";
2424
"simulation_input_invalid_int" = "Bitte eine ganze Zahl eingeben.";
2525
"simulation_trace" = "Letzter Schritt";
26-
"simulation_trace_placeholder" = "Hier wird später der zuletzt ausgeführte Schritt erklärt.";
26+
"simulation_trace_placeholder" = "Noch kein Schritt ausgeführt.";
2727
"simulation_variables" = "Variablen";
28-
"simulation_variables_placeholder" = "Hier werden später die aktuellen Variablenwerte angezeigt.";
28+
"simulation_variables_placeholder" = "Noch keine Variablen.";
2929
"simulation_output" = "Ausgabe";
30-
"simulation_output_placeholder" = "Hier erscheint später die Ausgabe der Simulation.";
30+
"simulation_output_placeholder" = "Noch keine Ausgabe.";
3131
"action_delete_selection" = "Auswahl löschen";
3232
"ctx_copy" = "Kopieren";
3333
"ctx_cut" = "Ausschneiden";

‎VisuStruct-iOS/VisuStructXcodeOpen/VisuStruct/el.lproj/Localizable.strings‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
"simulation_input_submit" = "OK";
2424
"simulation_input_invalid_int" = "Πληκτρολογήστε έναν ακέραιο αριθμό.";
2525
"simulation_trace" = "Τελευταίο βήμα";
26-
"simulation_trace_placeholder" = "Το τελευταίο εκτελεσμένο βήμα θα εξηγείται εδώ.";
26+
"simulation_trace_placeholder" = "Δεν έχει εκτελεστεί ακόμη κανένα βήμα.";
2727
"simulation_variables" = "Μεταβλητές";
28-
"simulation_variables_placeholder" = "Οι τρέχουσες τιμές των μεταβλητών θα εμφανίζονται εδώ αργότερα.";
28+
"simulation_variables_placeholder" = "Δεν υπάρχουν ακόμη μεταβλητές.";
2929
"simulation_output" = "Έξοδος";
30-
"simulation_output_placeholder" = "Η έξοδος της προσομοίωσης θα εμφανίζεται εδώ αργότερα.";
30+
"simulation_output_placeholder" = "Δεν υπάρχει ακόμη έξοδος.";
3131
"action_delete_selection" = "Διαγραφή επιλογής";
3232
"ctx_copy" = "Αντιγραφή";
3333
"ctx_cut" = "Αποκοπή";

‎VisuStruct-iOS/VisuStructXcodeOpen/VisuStruct/en.lproj/Localizable.strings‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
"simulation_input_submit" = "OK";
2424
"simulation_input_invalid_int" = "Please enter a whole number.";
2525
"simulation_trace" = "Last Step";
26-
"simulation_trace_placeholder" = "The last executed step will be explained here.";
26+
"simulation_trace_placeholder" = "No step executed yet.";
2727
"simulation_variables" = "Variables";
28-
"simulation_variables_placeholder" = "Current variable values will be shown here later.";
28+
"simulation_variables_placeholder" = "No variables yet.";
2929
"simulation_output" = "Output";
30-
"simulation_output_placeholder" = "The simulation output will appear here later.";
30+
"simulation_output_placeholder" = "No output yet.";
3131
"action_delete_selection" = "Delete Selection";
3232
"ctx_copy" = "Copy";
3333
"ctx_cut" = "Cut";

0 commit comments

Comments
 (0)