diff --git a/CMS_CORE_Library/DataStructures.cs b/CMS_CORE_Library/DataStructures.cs index 4c97afe..9207c94 100644 --- a/CMS_CORE_Library/DataStructures.cs +++ b/CMS_CORE_Library/DataStructures.cs @@ -671,6 +671,7 @@ namespace CMS_CORE_Library public class FamiliesConfiguration { public List FamilyConfiguration; + public List FamilyReadOnlyConfiguration; public List ToolsConfiguration; } diff --git a/CMS_CORE_Library/Siemens/Nc_Siemens.cs b/CMS_CORE_Library/Siemens/Nc_Siemens.cs index 429c427..96526a3 100644 --- a/CMS_CORE_Library/Siemens/Nc_Siemens.cs +++ b/CMS_CORE_Library/Siemens/Nc_Siemens.cs @@ -1879,16 +1879,16 @@ namespace CMS_CORE.Siemens try { FileSvc fileSvc = new FileSvc(); - - //var splittedPath = path.Split('/'); - //path = String.Join(@"/", splittedPath.Take(splittedPath.Count() - 1)); + var splittedPath = path.Split('/'); + var filePath = String.Join(@"/", splittedPath.Take(splittedPath.Count() - 1)); + var fileName = splittedPath[splittedPath.Count() - 1]; // Preapare folder node - Node folderNode = new Node(BASE_FILE_PATH + path); + Node folderNode = new Node(BASE_FILE_PATH + filePath); // Read files in the folder Node[] nodeArray = fileSvc.List(folderNode); - fileInfo = nodeArray.Where(x => x.Name == "MPF0").Select(x => + fileInfo = nodeArray.Where(x => x.Name == fileName).Select(x => new InfoFile() { CreationDate = nodeArray[0].Attributes.LastAccess, @@ -1913,6 +1913,8 @@ namespace CMS_CORE.Siemens public override CmsError FILES_WDeactivateProgram(int processId) { + + return NO_ERROR; } @@ -2130,6 +2132,7 @@ namespace CMS_CORE.Siemens PiSvc pi = new PiSvc(piArgs); pi.Start(); + // Get new tool id tool.Id = GetLastToolId(); diff --git a/CMS_CORE_Library/ToolConfigurations.cs b/CMS_CORE_Library/ToolConfigurations.cs index ced1313..177945c 100644 --- a/CMS_CORE_Library/ToolConfigurations.cs +++ b/CMS_CORE_Library/ToolConfigurations.cs @@ -178,8 +178,8 @@ namespace CMS_CORE_Library public static List NcToolFieldsConfig = new List() { new FieldsConfiguration{ Name = "id", Type = "int", SelectValues = null, Category = "general", ReadOnly = true, MinValue = 0, MaxValue = 0}, - new FieldsConfiguration{ Name = "familyId", Type = "int", SelectValues = null, Category = "general", ReadOnly = false, MinValue = 1, MaxValue = ushort.MaxValue}, - new FieldsConfiguration{ Name = "shankId", Type = "int", SelectValues = null, Category = "general", ReadOnly = false, MinValue = 1, MaxValue = ushort.MaxValue}, + new FieldsConfiguration{ Name = "shankId", Type = "int", SelectValues = null, Category = "general", ReadOnly = true, MinValue = 0, MaxValue = 0}, + new FieldsConfiguration{ Name = "familyId", Type = "int", SelectValues = null, Category = "general", ReadOnly = false, MinValue = 0, MaxValue = ushort.MaxValue}, new FieldsConfiguration{ Name = "offsetLength", Type = "int", SelectValues = null, Category = "general", ReadOnly = false, MinValue = 0, MaxValue = ushort.MaxValue}, new FieldsConfiguration{ Name = "disabled", Type = "boolean", SelectValues = null, Category = "status", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue}, new FieldsConfiguration{ Name = "broken", Type = "boolean", SelectValues = null, Category = "status", ReadOnly = false, MinValue = 0, MaxValue = int.MaxValue}, @@ -225,6 +225,36 @@ namespace CMS_CORE_Library new FieldsConfiguration{ Name = "nominalLife", Type = "int", SelectValues = null, Category = "life", ReadOnly = false, MinValue = 0, MaxValue = ushort.MaxValue}, new FieldsConfiguration{ Name = "reviveDelta", Type = "int", SelectValues = null, Category = "revive", ReadOnly = false, MinValue = 0, MaxValue = ushort.MaxValue}, }, + FamilyReadOnlyConfiguration = new List() + { + new FieldsConfiguration{ Name = "name", Type = "string", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = 0}, + new FieldsConfiguration{ Name = "toolType", Type = "int", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "leftSize", Type = "int", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "rightSize", Type = "int", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "tcpTable", Type = "int", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "gamma", Type = "int", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "rotationType", Type = "int", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + + new FieldsConfiguration{ Name = "cooling", Type = "boolean", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = int.MaxValue}, + new FieldsConfiguration{ Name = "cooling1", Type = "boolean", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = int.MaxValue}, + new FieldsConfiguration{ Name = "cooling2", Type = "boolean", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = int.MaxValue}, + new FieldsConfiguration{ Name = "cooling3", Type = "boolean", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = int.MaxValue}, + new FieldsConfiguration{ Name = "cooling4", Type = "boolean", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = int.MaxValue}, + new FieldsConfiguration{ Name = "cooling5", Type = "boolean", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = int.MaxValue}, + new FieldsConfiguration{ Name = "cooling6", Type = "boolean", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = int.MaxValue}, + new FieldsConfiguration{ Name = "cooling7", Type = "boolean", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = int.MaxValue}, + + new FieldsConfiguration{ Name = "maxSpeed", Type = "int", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = ushort.MaxValue}, + new FieldsConfiguration{ Name = "maxLoad", Type = "int", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "minLoadPctAutoload", Type = "int", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "maxLoadPctAutoload", Type = "int", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "dynamicCompensation", Type = "int", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "minLoadDynamicCompensation", Type = "int", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "maxLoadDynamicCompensation", Type = "int", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "lifeType", Type = "int", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "nominalLife", Type = "int", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = ushort.MaxValue}, + new FieldsConfiguration{ Name = "reviveDelta", Type = "int", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = ushort.MaxValue}, + }, ToolsConfiguration = new List() { new FieldsConfiguration{ Name = "id", Type = "int", SelectValues = null, Category = "general", ReadOnly = true, MinValue = 0, MaxValue = 0 },