From c3053b58e16464936a162dadcfd55fed6b3594f0 Mon Sep 17 00:00:00 2001 From: Nicola Carminati Date: Thu, 30 Aug 2018 14:51:48 +0000 Subject: [PATCH] Fix Osai problems --- CMS_CORE_Library/DataStructures.cs | 2 +- CMS_CORE_Library/Osai/Nc_Osai.cs | 7 ++++--- CMS_CORE_Library/Utils/Nc_Utils.cs | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMS_CORE_Library/DataStructures.cs b/CMS_CORE_Library/DataStructures.cs index 911b916..c546f16 100644 --- a/CMS_CORE_Library/DataStructures.cs +++ b/CMS_CORE_Library/DataStructures.cs @@ -395,7 +395,7 @@ namespace CMS_CORE_Library public static readonly string[] VALID_PP_FORMATS = { ".txt", ".cnc", ".ini" }; public static readonly string[] VALID_IMAGE_FORMATS = { ".jpg", ".jpeg", ".png" }; - public static readonly string IMAGES_PATH = @"C:/CMS/STEP/pp_img/"; + public static readonly string IMAGES_PATH = @"C:\CMS\STEP\pp_img\"; public const int USER_SOFTKEYS_NUMBER = 128; public const int NC_SOFTKEYS_NUMBER = 32; diff --git a/CMS_CORE_Library/Osai/Nc_Osai.cs b/CMS_CORE_Library/Osai/Nc_Osai.cs index 67b2816..7e4ccdd 100644 --- a/CMS_CORE_Library/Osai/Nc_Osai.cs +++ b/CMS_CORE_Library/Osai/Nc_Osai.cs @@ -2006,7 +2006,8 @@ namespace CMS_CORE.Osai if (errorClass != 0 || errorNum != 0 || nReturn == 0) return GetNCError(errorClass, errorNum); - fileInfo.PreviewBase64 = FindImageBase64String(IMAGES_PATH, fileInfo.Name); + fileInfo.Name = filesearch.FileName; + fileInfo.PreviewBase64 = FindImageBase64String(IMAGES_PATH, GetFilepathWithoutExt(filesearch.FileName)); nReturn = OpenNC.LogFSFindClose(findHandler, out errorClass, out errorNum); @@ -2127,9 +2128,9 @@ namespace CMS_CORE.Osai { // Open file FileStream fileStream = new FileStream(localPath + "\\" + name, FileMode.Open); - newFilePath = NC_PROGRAM_UPLOAD_PATH + "\\" + name; + newFilePath = NC_PROGRAM_UPLOAD_PATH + name; // Transfer file on NC - CmsError cmsError = FILES_WProgramFromFile(NC_PROGRAM_UPLOAD_PATH + newFilePath, fileStream); + CmsError cmsError = FILES_WProgramFromFile(newFilePath, fileStream); if (cmsError.IsError()) return cmsError; diff --git a/CMS_CORE_Library/Utils/Nc_Utils.cs b/CMS_CORE_Library/Utils/Nc_Utils.cs index 00f692b..cba6838 100644 --- a/CMS_CORE_Library/Utils/Nc_Utils.cs +++ b/CMS_CORE_Library/Utils/Nc_Utils.cs @@ -176,10 +176,10 @@ namespace CMS_CORE.Utils { foreach (string ext in VALID_IMAGE_FORMATS) { - if (File.Exists(directoryPath + "/" + imageName + ext)) + if (File.Exists(directoryPath + "\\" + imageName + ext)) { // Convert image to a base 64 string - return "data:image/" + ext + ";base64," + Convert.ToBase64String(File.ReadAllBytes(directoryPath + "/" + imageName + ext)); + return "data:image/" + ext + ";base64," + Convert.ToBase64String(File.ReadAllBytes(directoryPath + "\\" + imageName + ext)); } }