SF plotter use structure to aggregate argument data, add support for full plotting spec

[MichaelHuth]

This is a preparation for PR #2599 where the first part of #2599 was split off to this PR

• adds a structure for plotter function arguments to reduce number of arguments for sub functions

• refactor a few more code pieces out to separate functions

• add support for full plotting specification in plotter main loop

• add tests

close #2626

[Copilot]

Pull request overview

This PR refactors the SweepFormula plotter to reduce argument threading by introducing a plotter state structure, extracting some logic into helper functions, and adding support for a “full plotting specification” mode driven via wave-note metadata.

Changes:

• Introduces SF_PlotterGraphStruct to aggregate plotter state (graph/window, counters, metadata, formatting waves).
• Refactors metadata/result gathering into SF_FillPlotMetaData() and SF_FillFormulaResults().
• Adds /Plot (SF_META_PLOT) metadata and a new “full plotting spec” loop path in SF_FormulaPlotter().

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 7 comments.

File	Description
Packages/MIES/MIES_SweepFormula.ipf	Introduces plotter state struct, refactors plotter helpers, and adds full-plotting-spec execution path.
Packages/MIES/MIES_Constants.ipf	Adds SF_META_PLOT constant used to flag full plotting specification.

---

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

[timjarsky]

@MichaelHuth, it looks like the avg trace marker color (pink) can be reused. We should reserve pink for the avg trace. Also, it might be worth anticipating the need to change the marker type when plotting multiple average traces on the same plot.

[Copilot]

Pull request overview

Copilot reviewed 9 out of 9 changed files in this pull request and generated 5 comments.

---

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

[Copilot]

Pull request overview

Copilot reviewed 9 out of 9 changed files in this pull request and generated 7 comments.

Comments suppressed due to low confidence (1)

Packages/MIES/MIES_SweepFormula.ipf:1623

• SF_AddPlotTraceStyle is declared to return [STRUCT SF_PlotterGraphStruct pg] and uses pg.*, but it neither takes pg as an input nor returns it at the end. This will either fail to compile or return a default/empty struct, and it can’t apply styles to the intended window/state. Update the signature to accept STRUCT SF_PlotterGraphStruct &pg and return consistently (or drop the struct return entirely if you pass by reference).

static Function [STRUCT SF_PlotterGraphStruct pg] SF_AddPlotTraceStyle(variable formulasAreDifferent)

	variable i, j, numTraces, markerCode, lineCode, isCategoryAxis, tagCounter, lineStyle, overrideMarker, traceToFront
	string trace, info, tagText, name, wvName

	for(i = 0; i < pg.formulaCounter; i += 1)
		WAVE/WAVE plotFormData  = pg.collPlotFormData[i]
		WAVE/T    tracesInGraph = plotFormData[0]
		WAVE/WAVE dataInGraph   = plotFormData[1]
		numTraces  = DimSize(tracesInGraph, ROWS)
		markerCode = formulasAreDifferent ? i : 0
		markerCode = SFH_GetPlotMarkerCodeSelection(markerCode)
		lineCode   = formulasAreDifferent ? i : 0
		lineCode   = SFH_GetPlotLineCodeSelection(lineCode)
		for(j = 0; j < numTraces; j += 1)

			WAVE/Z wvX = dataInGraph[j][%WAVEX]
			WAVE   wvY = dataInGraph[j][%WAVEY]
			trace = tracesInGraph[j]

			info           = AxisInfo(pg.win, "left")
			isCategoryAxis = (NumberByKey("ISCAT", info) == 1)

			if(isCategoryAxis)
				WAVE traceColorHolder = wvX
			else
				WAVE traceColorHolder = wvY
			endif

			WAVE/Z traceColor = JWN_GetNumericWaveFromWaveNote(traceColorHolder, SF_META_TRACECOLOR)
			if(WaveExists(traceColor))
				switch(DimSize(traceColor, ROWS))
					case 3:
						ModifyGraph/W=$pg.win rgb($trace)=(traceColor[0], traceColor[1], traceColor[2])
						break
					case 4:
						ModifyGraph/W=$pg.win rgb($trace)=(traceColor[0], traceColor[1], traceColor[2], traceColor[3])
						break
					default:
						FATAL_ERROR("Invalid size of trace color wave")
				endswitch
			endif

			tagText = JWN_GetStringFromWaveNote(wvY, SF_META_TAG_TEXT)
			if(!IsEmpty(tagText))
				name = "tag" + num2str(tagCounter++)
				Tag/C/N=$name/W=$pg.win/F=0/L=0/X=0.00/Y=0.00 $trace, 0, tagText
			endif

			ModifyGraph/W=$pg.win mode($trace)=SF_DeriveTraceDisplayMode(wvX, wvY)

			lineStyle = JWN_GetNumberFromWaveNote(wvY, SF_META_LINESTYLE)
			if(IsValidTraceLineStyle(lineStyle))
				ModifyGraph/W=$pg.win lStyle($trace)=lineStyle
			elseif(formulasAreDifferent)
				ModifyGraph/W=$pg.win lStyle($trace)=lineCode
			endif

			WAVE/Z customMarkerAsFree = JWN_GetNumericWaveFromWaveNote(wvY, SF_META_MOD_MARKER)
			if(WaveExists(customMarkerAsFree))
				DFREF dfrWork = SFH_GetWorkingDF(pg.graph)
				wvName = "customMarker_" + NameOfWave(wvY)
				WAVE customMarker = MoveFreeWaveToPermanent(customMarkerAsFree, dfrWork, wvName)
				ASSERT(DimSize(wvY, ROWS) == DimSize(customMarker, ROWS), "Marker size mismatch")
				ModifyGraph/W=$pg.win zmrkNum($trace)={customMarker}
			else
				overrideMarker = JWN_GetNumberFromWaveNote(wvY, SF_META_MOD_MARKER)

				if(!IsNaN(overrideMarker))
					markerCode = overrideMarker
				endif

				ModifyGraph/W=$pg.win marker($trace)=markerCode
			endif

			traceToFront = JWN_GetNumberFromWaveNote(wvY, SF_META_TRACETOFRONT)
			traceToFront = IsNaN(traceToFront) ? 0 : !!traceToFront
			if(traceToFront)
				ReorderTraces/W=$pg.win _front_, {$trace}
			endif

		endfor
	endfor
End

---

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

[Copilot]

Pull request overview

Copilot reviewed 10 out of 10 changed files in this pull request and generated 7 comments.

Comments suppressed due to low confidence (2)

Packages/MIES/MIES_SweepFormula.ipf:970

• SF_CreateTracesForResultsImpl uses pg.graph/pg.plotMetaData/pg.colorGroups/pg.win, but pg is not an input parameter—it's only declared as a return value. This will run with an uninitialized struct and then overwrite the caller’s plotter state on return. Pass the current plotter state in as STRUCT SF_PlotterGraphStruct &pg (and similarly pass counters like dataCnt/gdIndex that are currently implicit).

static Function [variable dataCnt, STRUCT SF_PlotterGraphStruct pg, variable gdIndex, string annotation, variable formulaAddedOncePerDataset] SF_CreateTracesForResultsImpl(WAVE wvResultY, WAVE/Z wvResultX, variable dataNum, variable showInTable, WAVE plotFormData)

	STRUCT RGBColor color
	variable numTraces, yPoints, xPoints, yMxN, xMxN, idx, splitTraces
	variable i, isCategoryAxis, splitX, splitY

Packages/MIES/MIES_SweepFormula.ipf:1153

• SF_CreateTracesForResults is called to consume pg.formulaResults and update plotter state, but it takes no inputs and relies on pg as a return variable. As a result, pg.formulaResults/pg.wAnnotations/etc. will be uninitialized here. Make pg an explicit input parameter (preferably by reference) and return only real outputs.

static Function [variable dataCnt, STRUCT SF_PlotterGraphStruct pg] SF_CreateTracesForResults()

	variable i, idx, showInTable, numData, formulaAddedOncePerDataset
	variable gdIndex // indexes in tracesInGraph wave and dataInGraph wave in SF_CollectTraceData(), both waves are stored in plotformData
	string annotation = ""

---

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

[Copilot]

Pull request overview

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

---

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

[Copilot]

Pull request overview

Copilot reviewed 13 out of 13 changed files in this pull request and generated 2 comments.

---

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

[t-b]

@MichaelHuth LGTM. CI fails though.

[Copilot]

Pull request overview

Copilot reviewed 13 out of 13 changed files in this pull request and generated 1 comment.

---

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