Repository navigation
Studio P0: preserve PTP–SV baseline; fix angle updates and professional operator layout #242
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,10 +52,9 @@ ApplicationWindow { | |
| function markScenarioDirty() { | ||
| if (restoringScenario) return | ||
| saveScenarioTimer.restart() | ||
| // All edits are a draft until the matching command is queued. | ||
| // Never label a visible draft as proven transmitted waveform data. | ||
| pendingApply = true | ||
| } | ||
| function restoreLocalScenario() { | ||
| const saved = scenarioSettings.lastScenario | ||
|
|
@@ -122,6 +121,7 @@ ApplicationWindow { | |
| property string ptpDesiredRole: "SOURCE" | ||
| property bool ptpRestoreAfterFirmware: false | ||
| property int ptpRestoreChecks: 0 | ||
| property bool ptpDefaultStartAttempted: false | ||
| property bool restoringScenario: false | ||
| property bool offlinePreviewRunning: false | ||
| property real currentScale: 1000.0 | ||
|
|
@@ -215,6 +215,23 @@ ApplicationWindow { | |
| } | ||
| } | ||
|
|
||
| // Operator-friendly default: start SOURCE with the verified profile | ||
| // once the connected board is READY, never in a blind reconnect loop. | ||
| // A deliberate OFF cancels this default for the rest of the session. | ||
| Timer { | ||
| interval: 500 | ||
| repeat: true | ||
| running: !root.ptpDefaultStartAttempted | ||
| onTriggered: { | ||
| const session = workflowBar.session | ||
| if (!session || !device.deviceVerified || !session.startReady || | ||
| session.updatingFirmware || device.ptpStarting) return | ||
| root.ptpDefaultStartAttempted = true | ||
| if (!device.ptpRunning && !root.startPtpRole("SOURCE")) | ||
|
There was a problem hiding this comment.
The automatic start calls AGENTS.md reference: AGENTS.md:L74-L76 Useful? React with 👍 / 👎. |
||
| root.showMessage("PTP could not start automatically; use PTP On to retry.", true) | ||
| } | ||
| } | ||
|
|
||
| Timer { | ||
| interval: 300 | ||
| repeat: true | ||
|
|
@@ -323,6 +340,7 @@ ApplicationWindow { | |
| } | ||
|
|
||
| function requestStopPtp() { | ||
| root.ptpDefaultStartAttempted = true | ||
| root.ptpDesiredForSession = false | ||
| root.ptpRestoreAfterFirmware = false | ||
| return workflowBar.session && workflowBar.session.requestStopPtp() | ||
|
|
@@ -467,9 +485,12 @@ ApplicationWindow { | |
|
|
||
| selectSignal(group, row) | ||
| markScenarioDirty() | ||
| if (workflowBar.injectionRunning && workflowBar.session && | ||
| workflowBar.session.liveControlReady) { | ||
| const queued = phaseLink && row < 3 | ||
| ? sendLinkedGroup(group) : sendSignal(group, row) | ||
| if (!queued) showMessage("Signal update not queued; retry or Stop/Start.", true) | ||
| else pendingApply = false | ||
|
Comment on lines
+492
to
+493
There was a problem hiding this comment.
A failed live update leaves AGENTS.md reference: AGENTS.md:L74-L76 Useful? React with 👍 / 👎. |
||
| } | ||
| return true | ||
| } | ||
|
|
@@ -487,6 +508,8 @@ ApplicationWindow { | |
| return ok | ||
| } | ||
| function startScenarioSnapshot() { | ||
| // START always serializes the same ListModels that draw the table, | ||
| // including all eight current phase angles and enabled flags. | ||
| var draft = scenarioSnapshot() | ||
| draft.currentScale = currentScale | ||
| draft.voltageScale = voltageScale | ||
|
|
@@ -698,10 +721,10 @@ ApplicationWindow { | |
| } | ||
| Rectangle { width: 1; height: 12; color: studioTheme.lineSoft } | ||
| Label { | ||
| text: root.pendingApply | ||
| ? "4I + 4V · Setpoints pending · Start to apply" | ||
| : "4I + 4V · 4000 samples/s" | ||
| color: root.pendingApply | ||
| ? studioTheme.amber : studioTheme.muted | ||
| font.family: root.uiFont | ||
| font.pixelSize: 9 | ||
|
|
@@ -1049,11 +1072,11 @@ ApplicationWindow { | |
| } | ||
| } | ||
|
|
||
| ColumnLayout { | ||
| Layout.fillWidth: true | ||
| Layout.preferredHeight: root.compactLayout ? 352 : 384 | ||
| Layout.maximumHeight: root.compactLayout ? 352 : 384 | ||
| spacing: 7 | ||
| SignalMatrix { | ||
| id: voltageMatrix | ||
| enabled: !workflowBar.startQueued | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When injection is RUNNING, every non-cell editor still calls
markScenarioDirty()before checking!pendingApply; this unconditional assignment therefore makes those checks permanently false. Frequency/waveform mode, CT shaping, channel enabled/quality, balanced/zero, and the group context-menu actions now change only the QML model while the physical SV stream continues using the old values, and Start cannot apply them until the operator stops injection. These handlers need the same RUNNING-aware queue behavior added toeditSignal, rather than using the draft flag to suppress transmission.AGENTS.md reference: AGENTS.md:L74-L76
Useful? React with 👍 / 👎.