Commit 32b497d
committed
Merge origin/main into claude/distracted-kalam-809418
Resolves Phase 1012 (live event markers + click-to-details) against main's
concurrent evolution (~30 commits since the merge-base at 6502d30):
Phase 1013 MEX binaries prebuilt
Phase 1014 MATLAB test migration for v2.0 Tag API
Phase 1015 showcase demo + theme trim
Phase 1016 time slider rework
PR #61 exclude .planning/ + .superpowers/ from repo (gitignore)
PR #62 widget audit bugs
PR #66 v2.0 test migration finish
PR #69 per-widget render progress bar
PR #72 Dashboard toolbar rework
Conflict resolution summary:
libs/Dashboard/FastSenseWidget.m (4 chunks, manual):
- properties block: both sides added properties; kept all
(ShowEventMarkers + EventStore + LiveViewMode)
- refresh() + update() try blocks: kept both post-updateData actions
(obj.refreshEventMarkers_() + obj.formatTimeAxis_(ax))
- private methods: kept both new methods side-by-side
(refreshEventMarkers_ and formatTimeAxis_)
libs/FastSense/FastSense.m — auto-merged cleanly (31 Phase-1012 markers + 13 main markers present)
libs/Dashboard/DashboardTheme.m — auto-merged cleanly (EventMarkerSize=8 preserved)
.planning/ + .superpowers/ — untracked via git rm -r --cached per main's PR #61
gitignore policy. Planning artifacts remain on disk for local reference.
No test runs yet; recommend running tests/suite/TestEventIsOpen,
TestMonitorTagOpenEvent, TestFastSenseEventClick, TestFastSenseWidgetEventMarkers
after pulling to verify the merged FastSenseWidget.m still satisfies
Phase-1012 contracts alongside main's FormatTimeAxis additions.570 files changed
Lines changed: 12346 additions & 109408 deletions
File tree
- .github/workflows
- .planning
- codebase
- debug
- milestones
- v1.0-cr-phases/01-dashboard-engine-code-review-fixes
- v1.0-phases
- 01-dashboard-performance-optimization
- 01-infrastructure-hardening
- 02-collapsible-sections
- 03-widget-info-tooltips
- 05-detachable-widgets
- 06-serialization-persistence
- 07-tech-debt-cleanup
- 08-widget-improvements-dividerwidget-collapsiblewidget-y-axis-limits
- 09-threshold-mini-labels-in-fastsense-plots
- 1000-dashboard-engine-performance-optimization-phase-2
- 1001-first-class-threshold-entities
- 1002-direct-widget-threshold-binding-statuswidget-gaugewidget-and-other-widgets-can-reference-threshold-objects-directly-without-requiring-a-sensor-enables-standalone-threshold-driven-status-indicators
- 1003-composite-thresholds-compositethreshold-class-that-aggregates-child-threshold-objects-for-hierarchical-status-component-a-is-green-only-if-children-a-a-and-a-b-are-both-green-enables-system-health-trees-and-nested-status-monitoring
- 1004-dashboard-image-export-button
- 1005-expand-ci-coverage-matlab-octave-tests-on-macos-and-windows-matlab-benchmark
- 1006-fix-137-matlab-test-failures-surfaced-by-matlab-on-every-push-ci-enablement-7-categories-from-r2025b-drift
- 999.1-mushroom-cards-for-dashboard-engine
- 999.3-graph-data-export-mat-csv
- v2.0-phases
- 1004-tag-foundation-golden-test
- 1005-sensortag-statetag-data-carriers
- 1006-monitortag-lazy-in-memory
- 1007-monitortag-streaming-persistence
- 1008-compositetag
- 1009-consumer-migration
- 1010-event-tag-binding-fastsense-overlay
- 1011-cleanup-collapse-parallel-hierarchy-delete-legacy
- 1012-live-event-markers-and-click-to-details-on-fastsense-and-fastsensewidget
- quick
- 260403-nvv-add-or-edit-example-script-showcasing-al
- 260405-l0t-add-example-script-showcasing-mushroom-c
- 260405-oqu-create-5-dedicated-widget-example-script
- 260405-ovf-update-project-readme-based-on-research-
- 260405-plc-change-the-edit-button-of-dashboardengin
- 260405-qa7-add-dashboard-performance-benchmarks-to-
- 260405-tff-integrate-new-threshold-system-into-all-
- 260405-wol-migrate-remaining-addthresholdrule-calls
- 260416-hau-fix-octave-11-abstract-methods-incompat-
- 260416-j6e-enable-matlab-ci-on-every-push-pr-upgrad
- 260416-jfo-ci-quick-wins-bundle-concurrency-groups-
- 260416-jnp-dry-refactor-extract-duplicated-octave-b
- 260416-k23-upgrade-octave-ci-containers-8-4-0-to-11
- research
- .superpowers/brainstorm
- 41798-1773354258
- 87491-1773859509
- 99581-1773865307
- demo/industrial_plant
- assets
- data
- private
- docs/superpowers
- plans
- specs
- examples
- 01-basics
- libs
- Dashboard
- EventDetection
- FastSense
- octave-macos-arm64
- private
- octave-macos-arm64
- SensorThreshold
- private
- octave-macos-arm64
- scripts
- tests
- suite
- private
- wiki
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
| 28 | + | |
27 | 29 | | |
| 30 | + | |
28 | 31 | | |
29 | | - | |
| 32 | + | |
30 | 33 | | |
31 | 34 | | |
32 | 35 | | |
| |||
38 | 41 | | |
39 | 42 | | |
40 | 43 | | |
| 44 | + | |
| 45 | + | |
41 | 46 | | |
| 47 | + | |
42 | 48 | | |
43 | 49 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
| 48 | + | |
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
This file was deleted.
0 commit comments