From ad6a0663b419d3f5bdce8bced38f35f49a63b097 Mon Sep 17 00:00:00 2001 From: Lucio Maranta Date: Mon, 19 Aug 2019 14:53:36 +0000 Subject: [PATCH] Fix available language --- CMS_CORE_Application/Form1.cs | 9 -------- CMS_CORE_Library/Fanuc/Nc_Fanuc.cs | 17 ++++++++++---- CMS_CORE_Library/Osai/Nc_Osai.cs | 32 +++++++++++++++++++------- CMS_CORE_Library/Siemens/Nc_Siemens.cs | 18 +++++++++++---- 4 files changed, 49 insertions(+), 27 deletions(-) diff --git a/CMS_CORE_Application/Form1.cs b/CMS_CORE_Application/Form1.cs index a949f5c..5a6946e 100644 --- a/CMS_CORE_Application/Form1.cs +++ b/CMS_CORE_Application/Form1.cs @@ -138,15 +138,6 @@ namespace CMS_CORE_Application ICollection info = new List(); cmsError = N.NC_GetAvailableLanguages(ref info); - cmsError = N.NC_WLanguage(new CultureInfo("it")); - if (cmsError.IsError()) - { error = true; SetError(Lines, cmsError); } - - - cmsError = N.NC_WLanguage(new CultureInfo("en")); - if (cmsError.IsError()) - { error = true; SetError(Lines, cmsError); } - sw.Stop(); Console.WriteLine(sw.ElapsedMilliseconds); diff --git a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs index e7c75f3..b0f1c9a 100644 --- a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs +++ b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs @@ -211,13 +211,20 @@ namespace CMS_CORE_Library.Fanuc { foreach(string file in Directory.GetFiles(PLC_MESSAGE_PATH)) { - string fileName = Path.GetFileNameWithoutExtension(file); + if(Path.GetExtension(file) == ".txt") + { + string fileName = Path.GetFileNameWithoutExtension(file); - // Get lang from threeletter - var lang = GetCultureFromThreeLetter(fileName.Split('_')[1]); + var splittedFileName = fileName.Split('_'); + if (splittedFileName.Count() == 2) + { + // Get lang from threeletter + var lang = GetCultureFromThreeLetter(splittedFileName[1]); - if (lang != null) - languages.Add(lang); + if (lang != null) + languages.Add(lang); + } + } } } catch (Exception ex) diff --git a/CMS_CORE_Library/Osai/Nc_Osai.cs b/CMS_CORE_Library/Osai/Nc_Osai.cs index 5dac951..10b73f9 100644 --- a/CMS_CORE_Library/Osai/Nc_Osai.cs +++ b/CMS_CORE_Library/Osai/Nc_Osai.cs @@ -201,15 +201,23 @@ namespace CMS_CORE_Library.Osai { foreach (string file in Directory.GetFiles(PLC_MESSAGE_PATH)) { - string fileName = Path.GetFileNameWithoutExtension(file); + if (Path.GetExtension(file) == ".txt") + { + string fileName = Path.GetFileNameWithoutExtension(file); - var lang = CultureInfo - .GetCultures(CultureTypes.NeutralCultures) - .Where(ci => string.Equals(ci.EnglishName, fileName.Split('_')[1], StringComparison.OrdinalIgnoreCase)) - .FirstOrDefault(); + var splittedFileName = fileName.Split('_'); - if (lang != null) - languages.Add(lang); + if (splittedFileName.Count() == 2) + { + var lang = CultureInfo + .GetCultures(CultureTypes.NeutralCultures) + .Where(ci => string.Equals(ci.EnglishName, splittedFileName[1], StringComparison.OrdinalIgnoreCase)) + .FirstOrDefault(); + + if (lang != null) + languages.Add(lang); + } + } } } catch (Exception ex) @@ -1343,7 +1351,15 @@ namespace CMS_CORE_Library.Osai } public override CmsError PLC_WTerminateAssistedToolingProcedure() - { + { + // Terminate procedure with ACK-STROBE method + CmsError cmsError = PLC_ManageActiveAck(PLC_ASSISTED_TOOLING_STROBE.Address, PLC_ASSISTED_TOOLING_STROBE.SubAddress, + HMI_ASSISTED_TOOLING_ACK.Address, HMI_ASSISTED_TOOLING_ACK.SubAddress, + PLC_ASSISTED_TOOLING_STROBE.MemType); + + if (cmsError.IsError()) + return cmsError; + return NO_ERROR; } diff --git a/CMS_CORE_Library/Siemens/Nc_Siemens.cs b/CMS_CORE_Library/Siemens/Nc_Siemens.cs index 93b1384..d95421d 100644 --- a/CMS_CORE_Library/Siemens/Nc_Siemens.cs +++ b/CMS_CORE_Library/Siemens/Nc_Siemens.cs @@ -446,13 +446,21 @@ namespace CMS_CORE_Library.Siemens { foreach (string file in Directory.GetFiles(PLC_MESSAGES_FILE_PATH)) { - string fileName = Path.GetFileNameWithoutExtension(file); + if (Path.GetExtension(file) == ".ts") + { + string fileName = Path.GetFileNameWithoutExtension(file); - // Get lang from threeletter - var lang = GetCultureFromThreeLetter(fileName.Split('_')[1]); + var splittedFileName = fileName.Split('_'); - if (lang != null) - languages.Add(lang); + if (splittedFileName.Count() == 2) + { + // Get lang from threeletter + var lang = GetCultureFromThreeLetter(splittedFileName[1]); + + if (lang != null) + languages.Add(lang); + } + } } } catch (Exception ex)