Skip to content

fix(studio): legible native PTP/smpSynch selectors and honest simulation feedback #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
masarray merged 2 commits into from
Oct 16, 2026
Merged

fix(studio): legible native PTP/smpSynch selectors and honest simulation feedback #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8e86c9
fix(studio): shared dark PTP/smpSynch selectors with explicit rejecte…
masarray Oct 16, 2026
40a4263
fix(qml): retain device-confirmed smpSynch binding after operator sel…
masarray Oct 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/arstack_studio/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ qt_add_qml_module(arstack_studio
qml/ProfileInspector.qml
qml/ConfigurationHub.qml
qml/PtpExpertPanel.qml
qml/StudioDarkComboBox.qml
qml/DeviceExpertPanel.qml
qml/FirmwarePanel.qml
qml/WaveformExpertPanel.qml
Expand Down
96 changes: 33 additions & 63 deletions apps/arstack_studio/qml/PtpExpertPanel.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,59 +143,18 @@ SurfacePanel {
font.pixelSize: 9
font.weight: Font.DemiBold
}
ComboBox {
StudioDarkComboBox {
id: modeCombo
Layout.fillWidth: true
model: ["Source - provide lab PTP", "Follower - external GM discovery", "Monitor - observe only"]
theme: panel.theme
uiFont: panel.uiFont
model: ["Source — provide lab PTP", "Follower — auto-discover external GM", "Monitor — observe only"]
currentIndex: panel.roleIndex(panel.activeRole)
enabled: panel.session && panel.device.ptpAvailable && !panel.device.ptpRunning && !panel.startPending && !panel.session.updatingFirmware
font.family: panel.uiFont
font.pixelSize: 11
palette.text: panel.theme.text
palette.buttonText: panel.theme.text
palette.windowText: panel.theme.text
palette.base: panel.theme.surface2
palette.button: panel.theme.raised
background: Rectangle {
radius: 6
color: panel.theme.surface2
border.color: panel.theme.line
}
contentItem: Text {
text: modeCombo.displayText
color: panel.theme.text
font: modeCombo.font
verticalAlignment: Text.AlignVCenter
leftPadding: 10
rightPadding: 18
elide: Text.ElideRight
}
delegate: ItemDelegate {
width: modeCombo.width
text: modelData
highlighted: modeCombo.highlightedIndex === index
palette.text: panel.theme.text
background: Rectangle {
color: parent.highlighted ? panel.theme.accentSoft : panel.theme.raised
}
}
popup: Popup {
y: modeCombo.height
width: modeCombo.width
padding: 3
implicitHeight: contentItem.implicitHeight + 6
contentItem: ListView {
clip: true
implicitHeight: contentHeight
model: modeCombo.popup.visible ? modeCombo.delegateModel : null
currentIndex: modeCombo.highlightedIndex
}
background: Rectangle {
radius: 7
color: panel.theme.raised
border.color: panel.theme.line
}
}
enabled: panel.session && panel.device.ptpAvailable
&& !panel.device.ptpRunning && !panel.startPending
&& !panel.session.updatingFirmware
ToolTip.visible: hovered
ToolTip.text: "Choose one exclusive PTP role. Source transmits, Follower receives, Monitor listens."
}
}

Expand Down Expand Up @@ -235,20 +194,31 @@ SurfacePanel {
Label { text: "SV Sample Synchronization · lab simulation"; color: panel.theme.text; font.family: panel.uiFont; font.pixelSize: 12; font.weight: Font.DemiBold }
RowLayout {
Layout.fillWidth: true
ComboBox {
StudioDarkComboBox {
id: svSyncCombo
Layout.fillWidth: true
palette.text: panel.theme.text
palette.buttonText: panel.theme.text
palette.base: panel.theme.surface2
palette.windowText: panel.theme.text
background: Rectangle { radius: 6; color: panel.theme.surface2; border.color: panel.theme.line }
model: ["AUTO — measured PTP only", "0 — Not synchronized", "1 — Local synchronized (simulation)", "2 — Global synchronized (simulation)"]
theme: panel.theme
uiFont: panel.uiFont
model: ["AUTO — measured PTP only", "0 — Not synchronized",
"1 — Local sync (simulation)", "2 — Global sync (simulation)"]
currentIndex: panel.syncIndex(panel.device.smpSynchMode)
enabled: panel.session && panel.device.deviceVerified && !panel.session.updatingFirmware
font.family: panel.uiFont
font.pixelSize: 9
onActivated: panel.session.requestSmpSynch(["AUTO", "0", "1", "2"][currentIndex])
enabled: panel.session && panel.device.deviceVerified
&& !panel.session.updatingFirmware
ToolTip.visible: hovered
ToolTip.text: "This affects the emitted SV smpSynch flag; it does not discipline the sample timer."
onActivated: {
const requested = ["AUTO", "0", "1", "2"][currentIndex]
const accepted = panel.session && panel.session.requestSmpSynch(requested)
// Show the device-confirmed state until the board actually
// accepts/readbacks the new flag, then update reactively.
// Qt.binding preserves the declaration over reconnects,
// rejected commands and external serial changes.
currentIndex = Qt.binding(function() {
return panel.syncIndex(panel.device.smpSynchMode)
})
if (!accepted && panel.controller)
panel.controller.showMessage("SV sync choice was not accepted. Copy diagnostics for details.", true)
}
}
StateBadge {
theme: panel.theme
Expand All @@ -260,11 +230,11 @@ SurfacePanel {
}
Label {
Layout.fillWidth: true
text: "AUTO uses measured timing evidence. Select 0 / 1 / 2 to simulate subscriber behavior (the emitted SV flag will be marked SIMULATED)."
text: "AUTO = measured evidence; 0 / 1 / 2 = on-wire simulation flag only. PTP packets and sampling clock are separate."
wrapMode: Text.WordWrap
color: panel.theme.textSoft
font.family: panel.uiFont
font.pixelSize: 8
font.pixelSize: 11
}

RowLayout {
Expand Down
87 changes: 87 additions & 0 deletions apps/arstack_studio/qml/StudioDarkComboBox.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
// SPDX-License-Identifier: GPL-3.0-or-later
// Consistent Windows dark popup, shared by the PTP and SV simulation selectors.
// Deliberately presentation-only: no additional protocol/session state.
import QtQuick
import QtQuick.Controls

ComboBox {
id: combo
property var theme
property string uiFont: "Inter"

implicitHeight: 36
hoverEnabled: true
font.family: uiFont
font.pixelSize: 11
palette.text: theme.text
palette.buttonText: theme.text
palette.windowText: theme.text
palette.base: theme.surface2
palette.button: theme.raised

background: Rectangle {
radius: 7
color: combo.enabled ? (combo.hovered ? combo.theme.raisedHover : combo.theme.surface2)
: combo.theme.surface2
border.width: 1
border.color: combo.activeFocus ? combo.theme.accent : combo.theme.line
}

contentItem: Text {
text: combo.displayText
color: combo.enabled ? combo.theme.text : combo.theme.muted
font: combo.font
verticalAlignment: Text.AlignVCenter
leftPadding: 12
rightPadding: 28
elide: Text.ElideRight
}

indicator: Text {
text: "\u25be"
color: combo.enabled ? combo.theme.textSoft : combo.theme.muted
font.pixelSize: 14
anchors.right: parent.right
anchors.rightMargin: 11
anchors.verticalCenter: parent.verticalCenter
}

delegate: ItemDelegate {
width: combo.width - 8
implicitHeight: 36
highlighted: combo.highlightedIndex === index
contentItem: Text {
text: modelData
color: combo.theme.text
font: combo.font
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
leftPadding: 10
rightPadding: 8
}
background: Rectangle {
radius: 5
color: parent.highlighted ? combo.theme.accentSoft : combo.theme.raised
}
}

popup: Popup {
y: combo.height + 3
width: combo.width
padding: 4
implicitHeight: Math.min(contentItem.implicitHeight + 8, 176)
contentItem: ListView {
implicitHeight: contentHeight
clip: true
model: combo.popup.visible ? combo.delegateModel : null
currentIndex: combo.highlightedIndex
ScrollIndicator.vertical: ScrollIndicator {}
}
background: Rectangle {
color: combo.theme.raised
radius: 8
border.width: 1
border.color: combo.theme.line
}
}
}
Loading