Skip to content

Commit 5c75fa9

Browse files
author
Sven Erb
committed
Added System class reference to avoid confusion with Protobus classes.
1 parent 420394f commit 5c75fa9

1 file changed

Lines changed: 5 additions & 13 deletions

File tree

ReaderWriter/3rdPartyFormatAdapters/GCODE/GCodeReaderWriter/GCodeCommand.cs

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,6 @@ protected void ParseParams(Dictionary<char, float> commandParams)
129129

130130
public override string ToString()
131131
{
132-
/*
133-
string outString = gCode.ToString();
134-
foreach (var param in miscParams)
135-
{
136-
outString += $" {param.Key}{param.Value}";
137-
}
138-
return outString;
139-
*/
140132
return this.gCode.ToString();
141133
}
142134
}
@@ -545,7 +537,7 @@ public override string ToString()
545537

546538
public class GCodeCommandList : List<GCodeCommand>
547539
{
548-
private readonly Dictionary<int, Type> _gCodeTranslations = new Dictionary<int, Type>
540+
private readonly Dictionary<int, System.Type> _gCodeTranslations = new Dictionary<int, System.Type>
549541
{
550542
{0, typeof(LinearInterpolationCmd)},
551543
{1, typeof(LinearInterpolationCmd)},
@@ -554,9 +546,9 @@ public class GCodeCommandList : List<GCodeCommand>
554546
{4, typeof(PauseCommand)},
555547
};
556548

557-
private Dictionary<int, Type> _mCodeTranslations = new Dictionary<int, Type>();
549+
private Dictionary<int, System.Type> _mCodeTranslations = new Dictionary<int, System.Type>();
558550

559-
private Dictionary<int, Type> _tCodeTranslations = new Dictionary<int, Type>();
551+
private Dictionary<int, System.Type> _tCodeTranslations = new Dictionary<int, System.Type>();
560552

561553
public GCodeCommandList(string[] commandLines)
562554
{
@@ -612,7 +604,7 @@ public GCodeCommand ParseLine(string serializedCmdLine)
612604

613605
commandChar = char.ToUpper(commandArr[0][0]);
614606

615-
if (!Enum.TryParse(commandChar.ToString(), out PrepCode prepCode))
607+
if (!System.Enum.TryParse(commandChar.ToString(), out PrepCode prepCode))
616608
throw new ArgumentException($"Invalid preparatory function code: {commandChar} in line '{serializedCmdLine}'");
617609

618610
string commandNumber = commandArr[0].Substring(1);
@@ -637,7 +629,7 @@ public GCodeCommand ParseLine(string serializedCmdLine)
637629
}
638630
}
639631

640-
if (_gCodeTranslations.TryGetValue(codeNumber, out Type gCodeClassType))
632+
if (_gCodeTranslations.TryGetValue(codeNumber, out System.Type gCodeClassType))
641633
{
642634
return Activator.CreateInstance(gCodeClassType, new Object[] { prepCode, codeNumber, commandParams, commentString }) as GCodeCommand;
643635
}

0 commit comments

Comments
 (0)