refactor: unify Signals plugin (absorbs FilteredCharts) by uavinda · Pull Request #112 · uavos/apx-gcs

uavinda · 2026-04-23T16:56:21Z

Summary

Absorbs the FilteredCharts plugin into the Signals plugin, replacing the two side-by-side plugins with one unified, data-driven widget. Supersedes PR #111.

What changed

Removed

src/Plugins/Tools/FilteredCharts/ — entire directory deleted
src/Plugins/Tools/Signals/SignalButton.qml — old static button
src/Plugins/Tools/Signals/SignalsView.qml — replaced by ChartsView.qml
FilteredCharts entry from src/Plugins/Tools/CMakeLists.txt

New files in `src/Plugins/Tools/Signals/`

File	Purpose
`ChartsView.qml`	QtCharts renderer (replaces both SignalsView + FcChartsView); adds per-page speed cycling [0.2, 0.5, 1, 2, 4]
`ColorChooser.qml`	12×4 palette grid (was FcColorChooser)
`FilterRunningAvg.qml`	Running-average filter Fact; `filterValue(v)` / `resetState()` API
`FilterKalmanSimple.qml`	Simple Kalman filter Fact; same API
`MenuFilters.qml`	Per-item filter selector; `applyFilters(v)`, `resetFilterState()`
`MenuColor.qml`	Color picker Fact routing to ColorChooser page
`MenuItem.qml`	Per-item editor Fact (bind expr, title, color, filters, warn, alarm, save-to-mandala)
`MenuPage.qml`	Per-page Fact (name, pinned, speed, items list); aggregates warning/alarm state
`MenuSet.qml`	Per-set Fact holding up to 10 pages
`SignalsMenu.qml`	Sets editor (mirrors NumbersMenu pattern); `loadSettings()` / `saveSettings()` / `buildDefaultSet()` / `migrateLegacy()`
`SignalsMenuPopup.qml`	FactMenuPopup wrapper for the sets editor
`PageButton.qml`	Tab button: alarm→red, warning→orange, checked→yellow, pinned→cyan border

Modified

src/Plugins/Tools/Signals/Signals.qml — rewritten as the unified root widget

Architecture

signals.json  ←→  SignalsMenu (sets editor)
                       ↓  builds
                  MenuSet → MenuPage → MenuItem
                                           ↓ evaluates
                                       bind expr → FilterChain → warn/alarm
                                                                      ↓
                                                               PageButton color

Signals.qml (signalsWidget)
  ├── Repeater(pinnedPages) → ChartsView (stacked above)
  ├── ChartsView id:singleChart (main view, active page)
  └── BottomBar
        ├── Repeater(activePages) → PageButton (tabs)
        ├── set-label button → openSetsEditor()
        └── speed button → cycles currentPage.speed

JSON schema (signals.json):

{
  "active": { "signals": 0 },
  "sets": [{
    "title": "default",
    "pages": [{
      "name": "R", "pin": false, "speed": 1.0,
      "items": [{ "bind": "mandala.est.att.roll.value", "title": "roll", "color": "", "filters": [], "warn": "", "alarm": "", "act": "", "save": "" }]
    }]
  }]
}

Legacy migration: old {page, signalas} format is silently converted on first load.

Default set: 10 pages matching the old hardcoded buttons (R/P/Y/Axy/Az/G/Pt/Ctr/RC/Usr) are generated automatically if no signals.json exists.

Testing

cmake --build build --target Signals — clean build, no errors (only pre-existing macOS SDK version ld warnings unrelated to this change)

Copilot

Pull request overview

Unifies the former Signals and FilteredCharts plugins into a single, JSON-configured “Signals” chart widget with per-set/page/item editing and optional filtering.

Changes:

Replaces the old static SignalsView/button approach with a data-driven Signals.qml + ChartsView.qml renderer.
Adds a full Fact-based editor for sets/pages/items (SignalsMenu*, MenuSet/MenuPage/MenuItem) and filter components (running average + simple Kalman).
Introduces UI components for page tabs and color selection (PageButton.qml, ColorChooser.qml, MenuColor.qml).

Reviewed changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
src/Plugins/Tools/Signals/SignalsView.qml	Removed legacy chart view implementation.
src/Plugins/Tools/Signals/SignalsMenuPopup.qml	Adds pinned Fact menu popup wrapper for the sets editor.
src/Plugins/Tools/Signals/SignalsMenu.qml	Adds top-level sets editor that loads/saves `signals.json` and migrates legacy format.
src/Plugins/Tools/Signals/Signals.qml	Rewrites Signals root widget to render active/pinned pages and integrate the sets editor.
src/Plugins/Tools/Signals/REFACTOR_NOTES.md	Documents the refactor mapping and intended JSON/Fact-tree design.
src/Plugins/Tools/Signals/PageButton.qml	Adds per-page tab button with warning/alarm/pinned styling + tooltip.
src/Plugins/Tools/Signals/MenuSet.qml	Implements a set Fact that manages up to 10 pages.
src/Plugins/Tools/Signals/MenuPage.qml	Implements per-page Fact editor and aggregation of warning/alarm state.
src/Plugins/Tools/Signals/MenuItem.qml	Implements per-chart item editor and telemetry-driven value evaluation/filtering.
src/Plugins/Tools/Signals/MenuFilters.qml	Implements filter selection and parameter persistence per item.
src/Plugins/Tools/Signals/MenuColor.qml	Refactors color selection into a Fact that opens a chooser page.
src/Plugins/Tools/Signals/FilterRunningAvg.qml	Adds running-average filter Fact with stateful `filterValue()` API.
src/Plugins/Tools/Signals/FilterKalmanSimple.qml	Adds simple Kalman filter Fact with stateful `filterValue()` API.
src/Plugins/Tools/Signals/ColorChooser.qml	Adds palette UI page for selecting a chart color.
src/Plugins/Tools/Signals/ChartsView.qml	Adds the unified QtCharts renderer (replacement for SignalsView/FcChartsView).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

…ppend

uavinda · 2026-04-23T17:27:04Z

@copilot apply changes based on the comments in this thread

…e header Agent-Logs-Url: https://github.com/uavos/apx-gcs/sessions/f2cf86b8-011c-44d0-8252-723f090feda1 Co-authored-by: uavinda <160358+uavinda@users.noreply.github.com>

Copilot · 2026-04-23T17:32:41Z

@copilot apply changes based on the comments in this thread

Applied all six review comments in commit 2346352:

Signals.qml:292 — Removed the direct singleChart.speedFactorValue = next assignment that was breaking the Qt.binding(...). The speed button now only sets currentPage.speed; the existing binding propagates the change automatically.
SignalsMenu.qml:100 — Added if (!c) continue; after createSetFact() in loadSettings(), and if (!c) return; in the "Add set" action, guarding against a null return when MenuSet.qml fails to load.
MenuItem.qml:141-165 — Introduced _bindFn, _warnFn, _alarmFn cached-function properties. Each is compiled once (via eval-created closure for the bind expression, new Function() for warn/alarm) when the expression text changes, and updateValue() now simply calls the cached function instead of re-evaluating the expression string on every telemetry tick.
ColorChooser.qml:1-8 — Added the standard project LGPL license header.

(The duplicate-root-widget and fact.currentValue issues were already resolved in the previous commit.)

Copilot

Pull request overview

Copilot reviewed 22 out of 22 changed files in this pull request and generated 4 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-24T00:49:10Z

+        item.color = asString(source.color, "")
+        item.filters = normalizeFilters(source.filters)
+        item.warning = asString(source.warning !== undefined ? source.warning : source.warn, "")
+        item.save = asString(source.save, "")


normalizeItem() normalizes bind but does not normalize save. If a settings file contains mandala.sns.scr.foo.value (or other simple mandala variants), SignalsView will later call mandala.fact(saveTarget, true) with the un-normalized string and likely fail. Consider running normalizeBind() on source.save as well so the persisted/runtime value is consistently the bare path (e.g. sns.scr.foo).

Suggested change

item.save = asString(source.save, "")

item.save = normalizeBind(asString(source.save, ""))

Copilot · 2026-04-24T00:49:10Z

+    MenuPage.qml
+    MenuSet.qml
+    MenuSets.qml
+    PageButton.qml


PageButton.qml is included in QRC_QML, but it is not referenced anywhere in the repo (no PageButton usages found). If it’s truly unused, removing it from the resource list (and deleting the file) will avoid shipping dead UI variants and reduce maintenance overhead.

Suggested change

PageButton.qml

Copilot · 2026-04-24T00:49:11Z

+TextButton {
+    Layout.fillHeight: true
+    checkable: true
+    ButtonGroup.group: buttonGroup
+
+    property var values: []
+    onActivated: signals.facts=Qt.binding(function(){return values})
+
+    toolTip: getToolTip(values)
+
+    function getToolTip(facts)
+    {
+        var s=[]
+        for(var i=0;i<facts.length;++i){
+            var fact=facts[i]
+            s.push("<font color='"+fact.opts.color+"'>"+fact.descr+"</font>")
+        }
+        return s.join("<br>")
+    }


This file appears to be an unused duplicate of SignalButton.qml (no references to MenuColor/MenuColor.qml found, and it’s not included in CMakeLists.txt resources). If it’s leftover from the refactor, consider removing it to avoid confusion about the active tab/button implementation.

Suggested change

TextButton {

Layout.fillHeight: true

checkable: true

ButtonGroup.group: buttonGroup

property var values: []

onActivated: signals.facts=Qt.binding(function(){return values})

toolTip: getToolTip(values)

function getToolTip(facts)

{

var s=[]

for(var i=0;i<facts.length;++i){

var fact=facts[i]

s.push("<font color='"+fact.opts.color+"'>"+fact.descr+"</font>")

}

return s.join("<br>")

}

// Compatibility wrapper: keep MenuColor as an entry point, but delegate the

// actual tab/button implementation to the canonical SignalButton component.

SignalButton {

property var values: []

onActivated: signals.facts = Qt.binding(function() { return values })

Copilot · 2026-04-24T00:49:11Z

+    function evaluateValue(fact, bind)
+    {
+        if (fact && fact.value !== undefined)
+            return fact.value
+
+        if (!bind)
+            return NaN
+
+        try {
+            return eval(normalizeBindText(bind))
+        } catch (error) {


evaluateValue() currently does eval(normalizeBindText(bind)), but normalizeBindText() strips mandala. and .value, producing paths like est.att.roll. In most of the codebase, mandala facts are accessed via mandala.<path>.value, so this will evaluate to undefined/throw and the chart will fall back to 0. Consider treating simple binds as mandala paths: resolve/caches apxContext.fleet.current.mandala.fact(path, true) in seriesState and read .value (or, at minimum, eval("mandala." + path + ".value")).

Co-authored-by: Copilot <copilot@github.com>

refactor: unify Signals plugin (absorbs FilteredCharts)

41588bc

uavinda requested a review from Copilot April 23, 2026 16:57

Copilot started reviewing on behalf of uavinda April 23, 2026 16:57 View session

Copilot AI reviewed Apr 23, 2026

View reviewed changes

fix: Timer in Fact children, eval for bind expressions, defer chart a…

2774fc1

…ppend

Copilot started work on behalf of uavinda April 23, 2026 17:27 View session

fix: apply review feedback - binding, null-checks, cached fns, licens…

2346352

…e header Agent-Logs-Url: https://github.com/uavos/apx-gcs/sessions/f2cf86b8-011c-44d0-8252-723f090feda1 Co-authored-by: uavinda <160358+uavinda@users.noreply.github.com>

Copilot finished work on behalf of uavinda April 23, 2026 17:33

uavinda added 2 commits April 23, 2026 14:52

refactor

3449c43

update docs and refactor

7640a47

uavinda requested a review from Copilot April 24, 2026 00:43

Copilot started reviewing on behalf of uavinda April 24, 2026 00:43 View session

Copilot AI reviewed Apr 24, 2026

View reviewed changes

uavinda and others added 2 commits April 24, 2026 16:14

model refactor

3332464

Co-authored-by: Copilot <copilot@github.com>

docs update

9176951

Co-authored-by: Copilot <copilot@github.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: unify Signals plugin (absorbs FilteredCharts)#112

refactor: unify Signals plugin (absorbs FilteredCharts)#112
uavinda wants to merge 7 commits into
mainfrom
signals-unified

uavinda commented Apr 23, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

uavinda commented Apr 23, 2026

Uh oh!

Copilot AI commented Apr 23, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Apr 24, 2026

Uh oh!

Copilot AI Apr 24, 2026

Uh oh!

Copilot AI Apr 24, 2026

Uh oh!

Copilot AI Apr 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	item.save = asString(source.save, "")
	item.save = normalizeBind(asString(source.save, ""))

Conversation

uavinda commented Apr 23, 2026

Summary

What changed

Removed

New files in src/Plugins/Tools/Signals/

Modified

Architecture

Testing

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

uavinda commented Apr 23, 2026

Uh oh!

Copilot AI commented Apr 23, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Apr 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 24, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 24, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

New files in `src/Plugins/Tools/Signals/`