Skip to content

Commit 0964909

Browse files
authored
Merge pull request #2592 from AllenInstitute/feature/2592-refactor_sf_plotter2
SweepFormula Plotter was changed that it creates plot windows inside the loop, such that after each formula evaluation it is decided if a new window needs to be created. Also a lot of refactoring where parts are moved to own functions.
2 parents 7716368 + 67c22d2 commit 0964909

11 files changed

+890
-606
lines changed

Packages/MIES/MIES_Constants.ipf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2579,3 +2579,19 @@ Constant SF_STEP_PARSER = 1
25792579
Constant SF_STEP_EXECUTOR = 2
25802580
Constant SF_STEP_OUTSIDE = 3
25812581
///@}
2582+
2583+
/// @name Sweepformula suffixes for formula plot windows (graph or table)
2584+
///
2585+
/// @anchor SFPlotWindowSuffixes
2586+
///@{
2587+
StrConstant SF_WINNAME_SUFFIX_GRAPH = "graph"
2588+
StrConstant SF_WINNAME_SUFFIX_TABLE = "table"
2589+
///@}
2590+
2591+
/// @name Sweepformula display type for formula plot windows (graph or table)
2592+
///
2593+
/// @anchor SFPlotWindowDisplayTypes
2594+
///@{
2595+
Constant SF_DISPLAYTYPE_GRAPH = 0
2596+
Constant SF_DISPLAYTYPE_TABLE = 1
2597+
///@}

Packages/MIES/MIES_Structures.ipf

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -630,15 +630,6 @@ Structure CheckParametersStruct
630630
string setName // name of the stimulus set
631631
EndStructure
632632

633-
/// @brief Helper struct for data gathered by SF formula plotter in SF_GatherFormulaResults
634-
Structure SF_PlotMetaData
635-
string dataType // from SF_META_DATATYPE constant
636-
string opStack // from SF_META_OPSTACK constant
637-
string argSetupStack // from SF_META_ARGSETUPSTACK constant
638-
string xAxisLabel // from SF_META_XAXISLABEL constant
639-
string yAxisLabel // from SF_META_YAXISLABEL constant
640-
EndStructure
641-
642633
/// @brief ReadOut Structure for ASYNC
643634
Structure ASYNC_ReadOutStruct
644635
DFREF dfr // dfr with output data

0 commit comments

Comments
 (0)