From 3244315a3dc1a9d376fcad81ef3efb4fde1544ea Mon Sep 17 00:00:00 2001 From: AJ Date: Fri, 16 Nov 2018 08:25:17 -0500 Subject: [PATCH] Changed lens data type to string --- CincyLib/Laser/MaterialLib.cs | 2 +- CincyLib/Laser/MaterialLibReader.cs | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/CincyLib/Laser/MaterialLib.cs b/CincyLib/Laser/MaterialLib.cs index 2cfd6e9..52923fa 100644 --- a/CincyLib/Laser/MaterialLib.cs +++ b/CincyLib/Laser/MaterialLib.cs @@ -34,7 +34,7 @@ namespace CincyLib.Laser public AssistGasType PierceAssistGas { get; set; } - public LensType Lens { get; set; } + public string Lens { get; set; } public string Nozzle { get; set; } diff --git a/CincyLib/Laser/MaterialLibReader.cs b/CincyLib/Laser/MaterialLibReader.cs index 6883c56..9b88f65 100644 --- a/CincyLib/Laser/MaterialLibReader.cs +++ b/CincyLib/Laser/MaterialLibReader.cs @@ -132,7 +132,26 @@ namespace CincyLib.Laser if (hasExtendedInfo) { reader.BaseStream.Seek(seek, SeekOrigin.Current); - MaterialLib.Lens = (LensType)reader.ReadByte(); + + var lensType = reader.ReadByte(); + switch (lensType) + { + case 0: + MaterialLib.Lens = "5\""; + break; + + case 1: + MaterialLib.Lens = "7.5\""; + break; + + case 2: + MaterialLib.Lens = "10\""; + break; + + case 3: + MaterialLib.Lens = "Any"; + break; + } reader.BaseStream.Seek(1, SeekOrigin.Current); MaterialLib.Nozzle = reader.ReadString();