Skip to content

SweepFormula: Groups multiple x-axis labels#2423

Merged
t-b merged 10 commits intomainfrom
bugfix/2423-sweepformula-multiple-axis-labels-for-x-axis
May 30, 2025
Merged

SweepFormula: Groups multiple x-axis labels#2423
t-b merged 10 commits intomainfrom
bugfix/2423-sweepformula-multiple-axis-labels-for-x-axis

Conversation

@t-b
Copy link
Copy Markdown
Collaborator

@t-b t-b commented May 9, 2025

This is an enhancement/fix requested in #2362.

t-b added 9 commits May 9, 2025 19:08
@t-b
SF_FormulaPlotter: Factor traceCnt check out
d45f0a8
@t-b
SF_CombineYUnits: Prefer TextWaveToList
799d588
@t-b
SF_GatherYUnits: Drop return value
6f4d298 
The returned wave is the same as was passed in. Although the current code
makes it clear what is input and what is output, this creates verbose code
as you can't have the same wave as input (RHS) and output (LHS) of an
equation.

So let's drop the returned wave.
@t-b
SF_FormulaPlotter: Generalize y axis label handling
7655d99 
And rename them to emphasize the label component as the y data unit is
only the fallback.
@t-b
SF_FormulaPlotter: Move SF_CombineAxisLabels closer to its usage
e5a8269
@t-b
Tests: Add TestAxisLabelGathering
bd95dc8
@t-b
SF_GatherFormulaResults: Skip special case for single x and y wave pairs
c333176 
In e26f03a (SF: Adapt logic how x-waves are mapped to y-waves,
2022-08-19) we added code to special case x/y wave mapping.

But we don't need to do that if we have single point x and y waves only.
@t-b
SF_GatherFormulaResults: Prefer Duplicate over new Make
7650ffb 
This preserves wave metadata like units.
@t-b
SF_FormatUnit: Factor it out
0b7355d
@t-b t-b assigned t-b and timjarsky and unassigned t-b May 9, 2025
@t-b t-b marked this pull request as ready for review May 9, 2025 17:14
@t-b t-b requested review from MichaelHuth and timjarsky as code owners May 9, 2025 17:14
@t-b t-b mentioned this pull request May 9, 2025
Merged
40 tasks
@t-b
SF_GatherAxisLabels: Also gather the x-labels
74a8ffd 
We also now always enclose units in parantheses.
@t-b t-b force-pushed the bugfix/2423-sweepformula-multiple-axis-labels-for-x-axis branch from 86a73e9 to 74a8ffd Compare May 9, 2025 22:20
@timjarsky
Copy link
Copy Markdown
Collaborator

timjarsky commented May 29, 2025

@t-b mixed axis labels looks good. Noted that the avg operation, in mode is not working in this branch

image

sel=select(selchannels(AD0),selrange([1800,inf]), selsweeps(8...10),selvis(all))

dat = data($sel)

$dat

and

mean($dat)

and

$dat

with

mean($dat, in)

@timjarsky timjarsky assigned t-b and unassigned timjarsky May 29, 2025
@t-b t-b merged commit de3a849 into main May 30, 2025
19 checks passed
@t-b t-b deleted the bugfix/2423-sweepformula-multiple-axis-labels-for-x-axis branch May 30, 2025 09:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@timjarsky timjarsky timjarsky approved these changes

@MichaelHuth MichaelHuth Awaiting requested review from MichaelHuth MichaelHuth is a code owner

Assignees

@t-b t-b

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@t-b @timjarsky