changes

Author: t-b

Packages/MIES/MIES_Constants.ipf

@@ -2518,6 +2518,7 @@ StrConstant SF_OP_SELECTIVSCCSWEEPQC  = "selivsccsweepqc"
 StrConstant SF_OP_SELECTIVSCCSETQC    = "selivsccsetqc"
 StrConstant SF_OP_SELECTRANGE         = "selrange"
 StrConstant SF_OP_POWERSPECTRUM       = "powerspectrum"
+StrConstant SF_OP_TABLE               = "table"
 StrConstant SF_OP_TPSS                = "tpss"
 StrConstant SF_OP_TPINST              = "tpinst"
 StrConstant SF_OP_TPBASE              = "tpbase"

Packages/MIES/MIES_SweepFormula.ipf

@@ -70,7 +70,7 @@ Function/WAVE SF_GetNamedOperations()
 	                  SF_OP_MERGE, SF_OP_FIT, SF_OP_FITLINE, SF_OP_DATASET, SF_OP_SELECTVIS, SF_OP_SELECTCM, SF_OP_SELECTSTIMSET,       \
 	                  SF_OP_SELECTIVSCCSWEEPQC, SF_OP_SELECTIVSCCSETQC, SF_OP_SELECTRANGE, SF_OP_SELECTEXP, SF_OP_SELECTDEV,            \
 	                  SF_OP_SELECTEXPANDSCI, SF_OP_SELECTEXPANDRAC, SF_OP_SELECTSETCYCLECOUNT, SF_OP_SELECTSETSWEEPCOUNT,               \
-	                  SF_OP_SELECTSCIINDEX, SF_OP_SELECTRACINDEX, SF_OP_ANAFUNCPARAM, SF_OP_CONCAT}
+	                  SF_OP_SELECTSCIINDEX, SF_OP_SELECTRACINDEX, SF_OP_ANAFUNCPARAM, SF_OP_CONCAT, SF_OP_TABLE}
 
 	return wt
 End
@@ -932,6 +932,13 @@ static Function SF_FormulaPlotter(string graph, string formula, [variable dmMode
 					WAVE wvX   = dummy
 				endif
 
+				variable useTable = !!JWN_GetNumberFromWaveNote(wvY, "Table")
+
+				if(useTable)
+					Edit/HOST=$win/FG=(FL, FT, FR, FB) wvY.d
+					continue
+				endif
+
 				if(!WaveExists(wvX))
 					numTraces = yMxN
 					SF_CheckNumTraces(graph, numTraces)

Packages/MIES/MIES_SweepFormula_Executor.ipf

@@ -511,6 +511,9 @@ Function/WAVE SFE_FormulaExecutor(STRUCT SF_ExecutionData &exd, [variable srcLoc
 		case SF_OP_SELECTRANGE:
 			WAVE out = SFOS_OperationSelectRange(exdop)
 			break
+		case SF_OP_TABLE:
+			WAVE out = SFO_OperationTable(exdop)
+			break
 		default:
 			SFH_FATAL_ERROR("Undefined Operation", jsonId = exdop.jsonId)
 	endswitch

Packages/MIES/MIES_SweepFormula_Operations.ipf

@@ -2420,3 +2420,18 @@ threadsafe static Function/WAVE SFO_SweepAverageHelper(WAVE/WAVE group)
 
 	return avgResult[0]
 End
+
+Function/WAVE SFO_OperationTable(STRUCT SF_ExecutionData &exd)
+
+	SFH_CheckArgumentCount(exd, SF_OP_TABLE, 1, maxArgs = 1)
+
+	WAVE/WAVE input = SF_ResolveDatasetFromJSON(exd, 0)
+
+	WAVE/WAVE output = SFH_CreateSFRefWave(exd.graph, SF_OP_TABLE, DimSize(input, ROWS))
+
+	output[] = input[p]
+
+	JWN_SetNumberInWaveNote(input, "Table", 1)
+
+	return SFH_GetOutputForExecutor(output, exd.graph, SF_OP_TABLE)
+End