JSON schema: add a name property for traces.

Author: agarny

src/renderer/src/components/views/SimulationExperimentView.vue

@@ -193,8 +193,8 @@ const standardConsoleContents = vue.ref<string>(`<b>${props.file.path()}</b>`);
 
 populateParameters(standardParameters, standardInstanceTask);
 
-function traceName(xValue: string, yValue: string): string {
-  return `${yValue} <i>vs.</i> ${xValue}`;
+function traceName(name: string | undefined, xValue: string, yValue: string): string {
+  return name !== undefined ? name : `${yValue} <i>vs.</i> ${xValue}`;
 }
 
 function onRun(): void {
@@ -220,7 +220,7 @@ const yInfo = vue.computed(() => locCommon.simulationDataInfo(standardInstanceTa
 
 function updatePlot() {
   standardData.value = {
-    name: traceName(standardXParameter.value, standardYParameter.value),
+    name: traceName(undefined, standardXParameter.value, standardYParameter.value),
     xValues: locCommon.simulationData(standardInstanceTask, xInfo.value),
     yValues: locCommon.simulationData(standardInstanceTask, yInfo.value)
   };
@@ -359,14 +359,14 @@ function updateInteractiveSimulation(): void {
 
     plot.additionalTraces?.forEach((additionalTrace: locApi.IUiJsonOutputPlotAdditionalTrace) => {
       additionalTraces.push({
-        name: traceName(additionalTrace.xValue, additionalTrace.yValue),
+        name: traceName(additionalTrace.name, additionalTrace.xValue, additionalTrace.yValue),
         xValues: parser.evaluate(additionalTrace.xValue),
         yValues: parser.evaluate(additionalTrace.yValue)
       });
     });
 
     return {
-      name: traceName(plot.xValue, plot.yValue),
+      name: traceName(plot.name, plot.xValue, plot.yValue),
       xAxisTitle: plot.xAxisTitle,
       xValues: parser.evaluate(plot.xValue),
       yAxisTitle: plot.yAxisTitle,

src/renderer/src/libopencor/locUiJsonApi.ts

@@ -48,13 +48,15 @@ export interface IUiJsonOutputData {
 export interface IUiJsonOutputPlotAdditionalTrace {
   xValue: string;
   yValue: string;
+  name?: string;
 }
 
 export interface IUiJsonOutputPlot {
   xAxisTitle?: string;
   xValue: string;
   yAxisTitle?: string;
   yValue: string;
+  name?: string;
   additionalTraces?: IUiJsonOutputPlotAdditionalTrace[];
 }
 
@@ -208,6 +210,9 @@ export function uiJsonIssues(uiJson: IUiJson | undefined): IIssue[] {
                   required: true,
                   type: 'string'
                 },
+                name: {
+                  type: 'string'
+                },
                 additionalTraces: {
                   items: {
                     additionalProperties: false,
@@ -219,6 +224,9 @@ export function uiJsonIssues(uiJson: IUiJson | undefined): IIssue[] {
                       yValue: {
                         required: true,
                         type: 'string'
+                      },
+                      name: {
+                        type: 'string'
                       }
                     },
                     type: 'object'
@@ -481,6 +489,13 @@ export function uiJsonIssues(uiJson: IUiJson | undefined): IIssue[] {
       });
     }
 
+    if (outputPlot.name === '') {
+      res.push({
+        type: EIssueType.WARNING,
+        description: 'UI JSON: an output plot name must not be empty.'
+      });
+    }
+
     if (outputPlot.additionalTraces !== undefined) {
       for (const additionalTrace of outputPlot.additionalTraces) {
         if (additionalTrace.xValue === '') {
@@ -496,6 +511,13 @@ export function uiJsonIssues(uiJson: IUiJson | undefined): IIssue[] {
             description: 'UI JSON: an output plot additional trace Y value must not be empty.'
           });
         }
+
+        if (additionalTrace.name === '') {
+          res.push({
+            type: EIssueType.WARNING,
+            description: 'UI JSON: an output plot additional trace name must not be empty.'
+          });
+        }
       }
     }
   }