Updated merging of temporary MarkingParamsMap with the job's MarkingParamsMap.

Sven Erb · Sven Erb · commit 072436894740 · 2025-01-10T16:58:45.000+01:00
diff --git a/ReaderWriter/3rdPartyFormatAdapters/GCODE/GCodeReaderWriter/GCodeReader.cs b/ReaderWriter/3rdPartyFormatAdapters/GCODE/GCodeReaderWriter/GCodeReader.cs
@@ -244,7 +244,6 @@ public void ParseGCodeFile()
 
             }
 
-
             foreach (GCodeCommand currentGCodeCommand in gCodeCommands.Skip(1))
             {
                 VBlocked = false;
@@ -364,7 +363,7 @@ public void ParseGCodeFile()
                 {
                     // processMiscCmd(miscCmd);
                 }
-                CompleteJob.MarkingParamsMap.MergeFromWithRemap(MPsMap, out var keyMapping);
+                CompleteJob.MarkingParamsMap.MergeFrom(MPsMap);
             }
 
             _cacheState = CacheState.CompleteJobCached;

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,6 @@ public void ParseGCodeFile()`
`244`	`244`
`245`	`245`	`}`
`246`	`246`
`247`		`-`
`248`	`247`	`foreach (GCodeCommand currentGCodeCommand in gCodeCommands.Skip(1))`
`249`	`248`	`{`
`250`	`249`	`VBlocked = false;`
`@@ -364,7 +363,7 @@ public void ParseGCodeFile()`
`364`	`363`	`{`
`365`	`364`	`// processMiscCmd(miscCmd);`
`366`	`365`	`}`
`367`		`- CompleteJob.MarkingParamsMap.MergeFromWithRemap(MPsMap, out var keyMapping);`
	`366`	`+ CompleteJob.MarkingParamsMap.MergeFrom(MPsMap);`
`368`	`367`	`}`
`369`	`368`
`370`	`369`	`_cacheState = CacheState.CompleteJobCached;`