SF: Add always legendPrefix from meta data to annotation if present

Author: MichaelHuth

Packages/MIES/MIES_SweepFormula.ipf

@@ -292,16 +292,16 @@ static Function/S SF_GetTraceAnnotationText(WAVE/T plotMetaData, WAVE data)
 	string channelId, prefix, legendPrefix
 	string traceAnnotation, annotationPrefix
 
-	prefix = RemoveEnding(ReplaceString(";", plotMetaData[%OPSTACK], " "), " ")
+	prefix       = RemoveEnding(ReplaceString(";", plotMetaData[%OPSTACK], " "), " ")
+	legendPrefix = JWN_GetStringFromWaveNote(data, SF_META_LEGEND_LINE_PREFIX)
 
 	strswitch(plotMetaData[%DATATYPE])
 		case SF_DATATYPE_EPOCHS: // fallthrough
 		case SF_DATATYPE_SWEEP: // fallthrough
 		case SF_DATATYPE_LABNOTEBOOK: // fallthrough
 		case SF_DATATYPE_ANAFUNCPARAM: // fallthrough
 		case SF_DATATYPE_TP:
-			sweepNo      = JWN_GetNumberFromWaveNote(data, SF_META_SWEEPNO)
-			legendPrefix = JWN_GetStringFromWaveNote(data, SF_META_LEGEND_LINE_PREFIX)
+			sweepNo = JWN_GetNumberFromWaveNote(data, SF_META_SWEEPNO)
 
 			if(!IsEmpty(legendPrefix))
 				legendPrefix = " " + legendPrefix + " "
@@ -320,7 +320,11 @@ static Function/S SF_GetTraceAnnotationText(WAVE/T plotMetaData, WAVE data)
 			break
 		default:
 			if(WhichListItem(SF_OP_DATA, plotMetaData[%OPSTACK]) == -1)
-				sprintf traceAnnotation, "%s", prefix
+				if(!IsEmpty(legendPrefix))
+					sprintf traceAnnotation, "%s %s", prefix, legendPrefix
+				else
+					sprintf traceAnnotation, "%s", prefix
+				endif
 			else
 				channelNumber = JWN_GetNumberFromWaveNote(data, SF_META_CHANNELNUMBER)
 				channelType   = JWN_GetNumberFromWaveNote(data, SF_META_CHANNELTYPE)