Merge pull request #117 from PHOENIXCONTACT/feature/add-inputs-to-visualinstructorparameter

Add automatic support for Inputs to the VisualInstructionParameters

Author: MathoMathiasCamara

src/Moryx.ControlSystem/VisualInstructions/VisualInstruction.cs

@@ -54,6 +54,7 @@ public class VisualInstruction
     /// <summary>
     /// Interface for classes that define instructions
     /// </summary>
+    //TODO: remove  in MORYX 10, will be replaced by VisualInstructionParameters
     public interface IVisualInstructions
     {
         /// <summary>

src/Moryx.ControlSystem/VisualInstructions/VisualInstructionParameters.cs

@@ -19,6 +19,11 @@ public class VisualInstructionParameters : Parameters, IVisualInstructions
         [EntrySerialize, DataMember]
         public VisualInstruction[] Instructions { get; set; }
 
+        /// <summary>
+        /// Inputs for this activity.
+        /// </summary>
+        public object Inputs { get; set; }
+
         /// <summary>
         /// Binder to resolve visual instruction bindings
         /// </summary>

src/Moryx.ControlSystem/VisualInstructions/VisualInstructorExtensions.cs

@@ -1,10 +1,11 @@
-// Copyright (c) 2024, Phoenix Contact GmbH & Co. KG
+// Copyright (c) 2024, Phoenix Contact GmbH & Co. KG
 // Licensed under the Apache License, Version 2.0
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Reflection.Metadata;
 using Moryx.AbstractionLayer;
 using Moryx.ControlSystem.Cells;
 
@@ -24,7 +25,9 @@ public static long Display(this IVisualInstructor instructor, string title, IVis
             return instructor.Display(new ActiveInstruction
             {
                 Title = title,
-                Instructions = parameter.Instructions
+                Instructions = parameter.Instructions,
+                //TODO: remove the casting in MORYX 10
+                Inputs = (parameter as VisualInstructionParameters)?.Inputs,
             });
         }
 
@@ -37,7 +40,9 @@ public static void Display(this IVisualInstructor instructor, string title, IVis
             instructor.Display(new ActiveInstruction
             {
                 Title = title,
-                Instructions = parameter.Instructions
+                Instructions = parameter.Instructions,
+                //TODO: remove the casting in MORYX 10
+                Inputs = (parameter as VisualInstructionParameters)?.Inputs,
             }, autoClearMs);
         }
 
@@ -50,7 +55,9 @@ public static long Display(this IVisualInstructor instructor, string title, Acti
             return instructor.Display(new ActiveInstruction
             {
                 Title = title,
-                Instructions = instructions
+                Instructions = instructions,
+                //TODO: remove the casting in MORYX 10
+                Inputs = (activityStart.Activity.Parameters as VisualInstructionParameters)?.Inputs,
             });
         }
 
@@ -122,7 +129,10 @@ public static long Execute(this IVisualInstructor instructor, string title, IVis
             {
                 Title = title,
                 Instructions = parameter.Instructions,
-                PossibleResults = results
+                PossibleResults = results,
+                Results = results.Select(r => new InstructionResult { Key = r, DisplayValue = r }).ToArray(),
+                //TODO: remove the casting in MORYX 10
+                Inputs = (parameter as VisualInstructionParameters)?.Inputs,
             }, callback);
         }
 
@@ -157,7 +167,9 @@ public static long Execute(this IVisualInstructor instructor, string title, Acti
                 Title = title,
                 Instructions = instructions,
                 PossibleResults = results,
-                Results = results.Select(r => new InstructionResult { Key = r, DisplayValue = r }).ToArray()
+                Results = results.Select(r => new InstructionResult { Key = r, DisplayValue = r }).ToArray(),
+                //TODO: remove the casting in MORYX 10
+                Inputs = (activityStart.Activity.Parameters as VisualInstructionParameters)?.Inputs,
             }, callback);
         }