Added a unittest for ILT with in-CLI marking parameters and fixed some bugs in ConvertILTStructure.

Tests are rudimentary: one CLI file has additional parameter change commands inserted manually.
ILT test is the same file with the modified CLI inserted back.
Binary CLI is not supported, netfabb seems to not write any parameter change commands when exporting to binary.

Author: max99-froehlich

ReaderWriter/3rdPartyFormatAdapters/CLI_ILT/ILTFileReaderAdapter/ILTFileReaderAdapter.cs

@@ -282,7 +282,6 @@ private void ConvertILTStructure(IFileReaderWriterProgress progress = null)
             double sectionProgress = 0;
             int modelSectionID = 0;
 
-            var markingParamsMap = new MapField<int, MarkingParams>();
             foreach (IModelSection section in buildJob.ModelSections)
             {
                 /*convert Modelsection to Part, ignore every "parts" in a Modelsection, since 
@@ -291,6 +290,7 @@ they don't provide any information*/
                 section.ID = modelSectionID++;
                 job.PartsMap.Add(section.ID, part);
 
+                // initialize with marking param from ILT, but allow each CLI-file to override them 
                 var markingParamsManager = new MarkingParamsManager(TranslateBuildParams(section.Parameters));
                 var addedVectorBlocks = new List<VectorBlock>();
                 for (int i = 0; i < section.Geometry.Layers.Count; i++)
@@ -346,7 +346,7 @@ they don't provide any information*/
                             + ((i / (double)section.Geometry.Layers.Count) * 100.0 / buildJob.ModelSections.Count)));
                     }
                 }
-                markingParamsMap.MergeFromWithRemap(markingParamsManager.MarkingParamsMap, out var keyMapping);
+                job.MarkingParamsMap.MergeFromWithRemap(markingParamsManager.MarkingParamsMap, out var keyMapping);
                 foreach (var vectorBlock in addedVectorBlocks) // update all vector block marking param keys after merge
                     vectorBlock.MarkingParamsKey = keyMapping[vectorBlock.MarkingParamsKey];
                 sectionProgress++;
@@ -395,8 +395,15 @@ private void ConvertCLIStructure(IFileReaderWriterProgress progress = null)
             foreach (int key in markingParamsManager.MarkingParamsMap.Keys)
                 job.MarkingParamsMap[key] = markingParamsManager.MarkingParamsMap[key];
             job.NumWorkPlanes = job.WorkPlanes.Count;
-        }
-
+        }
+
+        /// <summary>
+        /// Accumulate sequential parameter change commands into a map of ovf MarkingParams.
+        /// Each parameter set is assigned a unique key and added to the marking params map.
+        /// Each call to Update() changes the current parameter set. InsertCurrentParams()
+        /// records the current params (avoiding duplicate entries) and returns the key
+        /// for retreiving that parameter set from the map.
+        /// </summary>
         private class MarkingParamsManager
         {
             public MapField<int, MarkingParams> MarkingParamsMap { get; }
@@ -406,11 +413,6 @@ private class MarkingParamsManager
             private bool currentMPlocked = false;
             private int nextMPKey = 0;
 
-            /// <summary>
-            /// Accumulate sequential parameter change commands into ovf MarkingParameters.
-            /// Each parameter set is assigned a unique key and added to the marking params map.
-            /// </summary>
-            /// <param name="markingParamsMap"></param>
             public MarkingParamsManager(MarkingParams initialMarkingParams = null)
             {
                 MarkingParamsMap = new MapField<int, MarkingParams>();
@@ -456,7 +458,6 @@ private void SetJobData(IBuildJob buildJob)
             int i = 0;
             foreach (IModelSection section in buildJob.ModelSections)
             {
-                job.MarkingParamsMap.Add(i, TranslateBuildParams(section.Parameters));
                 ModelsectionMap.Add(section, i);
                 i++;
             }
@@ -484,9 +485,6 @@ private VectorBlock TranslateBlockData(IVectorBlock iltBlock, IModelSection mode
             //this information gets lost
             block.LpbfMetadata.Reexposure = false;
 
-            //SetJobData has to be called before using this
-            //block.MarkingParamsKey = ModelsectionMap[modelSection];
-            Debug.Assert(job.MarkingParamsMap.ContainsKey(block.MarkingParamsKey));
             /* vs=Volumen Schraffur, vk=Volumen Kontur, u steht fuer unten-> down,
              us=Downskin Schraffur, uk=Downskin Kontur, kv=Kontur Versatz, sx = single vector, support */
             switch (modelSection.SubType)

ReaderWriter/OVFDefinition/Utils.cs

@@ -44,12 +44,12 @@ public static void MergeFromWithRemap(this MapField<int, MarkingParams> map, Map
             foreach (var parameterToInsert in other)
             {
                 bool found = false;
-                foreach (var mergedShellParam in map)
+                foreach (var existingParameter in map)
                 {
-                    if (mergedShellParam.Value.Equals(parameterToInsert.Value))
+                    if (existingParameter.Value.Equals(parameterToInsert.Value))
                     {
                         found = true;
-                        keyMapping.Add(parameterToInsert.Key, mergedShellParam.Key);
+                        keyMapping.Add(parameterToInsert.Key, existingParameter.Key);
                         break;
                     }
                 }