Skip to content

Refactor SF plotter #2592

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
MichaelHuth merged 14 commits into from
Dec 17, 2025
Merged

Refactor SF plotter #2592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c0021a4
SF: Fix TestPlottingWithTablesSubWindows test, use WAVE/Z
MichaelHuth Dec 8, 2025
df8fbfd
SF: Refactor plotter, move creation of traces in own function
MichaelHuth Dec 8, 2025
92f2c04
SF: Change plotMetaData from structure type to text wave type
MichaelHuth Dec 9, 2025
5b56a49
SF: Change plotGraphs wave structure to waveRef with one row per disp…
MichaelHuth Dec 9, 2025
775e8bb
SF: Create display windows in plotter in the plotting loop
MichaelHuth Dec 9, 2025
790eff3
SF: Plotter: Move label setup for SF plots to separate function
MichaelHuth Dec 10, 2025
2d81f51
SF: Plotter: Move Legend setup to separate function
MichaelHuth Dec 10, 2025
b50ac9d
SF: Plotter: Move tick setup to separate function
MichaelHuth Dec 10, 2025
c1d7840
SF: Plotter: Move setup for trace style to separate function
MichaelHuth Dec 10, 2025
01730e5
SF: Use i instead of j for indexing loop in plotter
MichaelHuth Dec 10, 2025
a4a9af3
SF: SF_AddPlotTraceStyle: Use i, j as loop indices instead of k, l
MichaelHuth Dec 10, 2025
6bc8aa8
SF: Plotter: Reset formulasAreDifferent for each new graph window
MichaelHuth Dec 10, 2025
978cd00
SF: fix SFH_GetFormulaGraphForBrowser to properly handle table type w…
MichaelHuth Dec 10, 2025
67c22d2
SF Tests: Use constant for future proof name generation of SF graph/t…
MichaelHuth Dec 11, 2025
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
16 changes: 16 additions & 0 deletions Packages/MIES/MIES_Constants.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2579,3 +2579,19 @@ Constant SF_STEP_PARSER = 1
Constant SF_STEP_EXECUTOR = 2
Constant SF_STEP_OUTSIDE = 3
///@}

/// @name Sweepformula suffixes for formula plot windows (graph or table)
///
/// @anchor SFPlotWindowSuffixes
///@{
StrConstant SF_WINNAME_SUFFIX_GRAPH = "graph"
StrConstant SF_WINNAME_SUFFIX_TABLE = "table"
///@}

/// @name Sweepformula display type for formula plot windows (graph or table)
///
/// @anchor SFPlotWindowDisplayTypes
///@{
Constant SF_DISPLAYTYPE_GRAPH = 0
Constant SF_DISPLAYTYPE_TABLE = 1
///@}
9 changes: 0 additions & 9 deletions Packages/MIES/MIES_Structures.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,15 +630,6 @@ Structure CheckParametersStruct
string setName // name of the stimulus set
EndStructure

/// @brief Helper struct for data gathered by SF formula plotter in SF_GatherFormulaResults
Structure SF_PlotMetaData
string dataType // from SF_META_DATATYPE constant
string opStack // from SF_META_OPSTACK constant
string argSetupStack // from SF_META_ARGSETUPSTACK constant
string xAxisLabel // from SF_META_XAXISLABEL constant
string yAxisLabel // from SF_META_YAXISLABEL constant
EndStructure

/// @brief ReadOut Structure for ASYNC
Structure ASYNC_ReadOutStruct
DFREF dfr // dfr with output data
Expand Down
Loading