From 1618884cd91c4917e432c534ef9262b8add6d7d6 Mon Sep 17 00:00:00 2001 From: AJ Date: Fri, 16 Nov 2018 09:34:32 -0500 Subject: [PATCH] Read MaterialLib.PierceNozzleStandoffRampTo --- CincyLib/Laser/MaterialLib.cs | 2 +- CincyLib/Laser/MaterialLibReader.cs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CincyLib/Laser/MaterialLib.cs b/CincyLib/Laser/MaterialLib.cs index f3d9f42..d280906 100644 --- a/CincyLib/Laser/MaterialLib.cs +++ b/CincyLib/Laser/MaterialLib.cs @@ -30,7 +30,7 @@ namespace CincyLib.Laser public double PierceNozzleStandoffRampFrom { get; set; } - //public float PierceNozzleStandoffRampTo { get; set; } + public double PierceNozzleStandoffRampTo { get; set; } public AssistGasType PierceAssistGas { get; set; } diff --git a/CincyLib/Laser/MaterialLibReader.cs b/CincyLib/Laser/MaterialLibReader.cs index 79d379c..d80d076 100644 --- a/CincyLib/Laser/MaterialLibReader.cs +++ b/CincyLib/Laser/MaterialLibReader.cs @@ -125,15 +125,18 @@ namespace CincyLib.Laser MaterialLib.PierceFocusFarField = Math.Round(reader.ReadSingle(), 4); // older files wont go this far... - const int seek = 76; + const int seek = 18; var hasExtendedInfo = reader.BaseStream.Length > reader.BaseStream.Position + seek; if (hasExtendedInfo) { reader.BaseStream.Seek(seek, SeekOrigin.Current); + MaterialLib.PierceNozzleStandoffRampTo = Math.Round(reader.ReadSingle(), 4); + reader.BaseStream.Seek(54, SeekOrigin.Current); var lensType = reader.ReadByte(); + switch (lensType) { case 0: