Merge pull request #42 from Digital-Production-Aachen/definition_update

update ovf definition to latest version. Improved AddAllWorkPlanesPar…

ReaderWriter/OVFDefinition/JobExtensions.cs

@@ -102,14 +102,15 @@ namespace OpenVectorFormat
         /// <param name="GetWorkPlane"></param>
         public static void AddAllWorkPlanesParallel(this Job job, Func<int, WorkPlane> GetWorkPlane)
         {
-            ConcurrentBag<WorkPlane> wpBag = new ConcurrentBag<WorkPlane>();
-            Parallel.For(0, job.NumWorkPlanes, j =>
+            job.WorkPlanes.Clear();
+            job.WorkPlanes.Capacity = job.NumWorkPlanes;
+            // proto repeated does not allow null
+            var dummy = new WorkPlane();
+            while (job.WorkPlanes.Count < job.NumWorkPlanes) { job.WorkPlanes.Add(dummy); }
+            Parallel.For(0, job.NumWorkPlanes, wpNum =>
             {
-                var wpNum = j;
-                wpBag.Add(GetWorkPlane(wpNum));
+                job.WorkPlanes[wpNum] = GetWorkPlane(wpNum);
             });
-
-            job.WorkPlanes.AddRange(wpBag.OrderBy(x => x.WorkPlaneNumber));
         }
     }
 }

Streaming/OVFStreamingMerger.cs

@@ -87,27 +87,6 @@ namespace OpenVectorFormat.Streaming
             mergedJobShell.MarkingParamsMap.MergeFromWithRemap(
                 fileReaderToMerge.fr.JobShell.MarkingParamsMap, out var keyMapping);
             fileReaderToMerge.paramKeyMapping = keyMapping;
-
-            /*
-            foreach (var parameter in fileReaderToMerge.fr.JobShell.MarkingParamsMap)
-            {
-                bool found = false;
-                foreach(var mergedShellParam in mergedJobShell.MarkingParamsMap)
-                {
-                    if (mergedShellParam.Value.Equals(parameter.Value))
-                    {
-                        found = true;
-                        fileReaderToMerge.paramKeyMapping.Add(parameter.Key, mergedShellParam.Key);
-                        break;
-                    }
-                }
-                if (!found)
-                {
-                    maxParamsKey++;
-                    fileReaderToMerge.paramKeyMapping.Add(parameter.Key, maxParamsKey);
-                    mergedJobShell.MarkingParamsMap.Add(maxParamsKey, parameter.Value);
-                }
-            }*/
         }
 
         protected override void PostProcessVectorBlock(VectorBlock vectorBlock)

OpenVectorFormat @ b9045f7e

-Subproject commit 142a7e591cf8c4ce917b95da54fb765be662011d
+Subproject commit b9045f7e2389c3c850635e079ddbf19608dc2dd1