From 6578a6bb075d58f0c432db84b6baf451769fa263 Mon Sep 17 00:00:00 2001 From: luciomaranta Date: Wed, 1 Jul 2020 16:29:18 +0200 Subject: [PATCH] Fix siemens life writing --- CMS_CORE_Library/Siemens/Nc_Siemens.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMS_CORE_Library/Siemens/Nc_Siemens.cs b/CMS_CORE_Library/Siemens/Nc_Siemens.cs index 1cd17b5..c29a7b2 100644 --- a/CMS_CORE_Library/Siemens/Nc_Siemens.cs +++ b/CMS_CORE_Library/Siemens/Nc_Siemens.cs @@ -4333,8 +4333,8 @@ namespace CMS_CORE_Library.Siemens // Add item choosing based on life case SIEMENS_LIFE_TYPE.TIME: { - items.Add(new Item() { Path = string.Format("/Tool/Supervision/data[c{0}, {1}]", tool.Id, edgeLifeOffset + 1), Value = edge.PreAlmLife }); - items.Add(new Item() { Path = string.Format("/Tool/Supervision/data[c{0}, {1}]", tool.Id, edgeLifeOffset + 2), Value = edge.NominalLife }); + items.Add(new Item() { Path = string.Format("/Tool/Supervision/data[c{0}, {1}]", tool.Id, edgeLifeOffset + 2), Value = edge.PreAlmLife }); + items.Add(new Item() { Path = string.Format("/Tool/Supervision/data[c{0}, {1}]", tool.Id, edgeLifeOffset + 1), Value = edge.NominalLife }); items.Add(new Item() { Path = string.Format("/Tool/Supervision/data[c{0}, {1}]", tool.Id, edgeLifeOffset + 5), Value = edge.ResidualLife }); } break; @@ -5868,7 +5868,7 @@ namespace CMS_CORE_Library.Siemens { tool .EdgesData[edgeIndex] - .PreAlmLife = Convert.ToDouble(actualString.Split('=').LastOrDefault()); + .PreAlmLife = Convert.ToDouble(actualString.Split('=').LastOrDefault(), CultureInfo.InvariantCulture); } } break; @@ -5880,7 +5880,7 @@ namespace CMS_CORE_Library.Siemens { ToolTableData[toolIndex] .EdgesData[edgeIndex] - .ResidualLife = Convert.ToDouble(actualString.Split('=').LastOrDefault()); + .ResidualLife = Convert.ToDouble(actualString.Split('=').LastOrDefault(), CultureInfo.InvariantCulture); } } break; @@ -5892,7 +5892,7 @@ namespace CMS_CORE_Library.Siemens { ToolTableData[toolIndex] .EdgesData[edgeIndex] - .NominalLife = Convert.ToDouble(actualString.Split('=').LastOrDefault()); + .NominalLife = Convert.ToDouble(actualString.Split('=').LastOrDefault(), CultureInfo.InvariantCulture); } } break; @@ -6247,7 +6247,7 @@ namespace CMS_CORE_Library.Siemens { outputTool .EdgesData[edgeIndex] - .PreAlmLife = Convert.ToDouble(actualString.Split('=').LastOrDefault()); + .PreAlmLife = Convert.ToDouble(actualString.Split('=').LastOrDefault(), CultureInfo.InvariantCulture); } } break; @@ -6258,7 +6258,7 @@ namespace CMS_CORE_Library.Siemens { outputTool .EdgesData[edgeIndex] - .ResidualLife = Convert.ToDouble(actualString.Split('=').LastOrDefault()); + .ResidualLife = Convert.ToDouble(actualString.Split('=').LastOrDefault(, CultureInfo.InvariantCulture)); } } break; @@ -6269,7 +6269,7 @@ namespace CMS_CORE_Library.Siemens { outputTool .EdgesData[edgeIndex] - .NominalLife = Convert.ToDouble(actualString.Split('=').LastOrDefault()); + .NominalLife = Convert.ToDouble(actualString.Split('=').LastOrDefault(), CultureInfo.InvariantCulture); } } break;