diff --git a/CMS_CORE_Library/Models/SiemensToolModels.cs b/CMS_CORE_Library/Models/SiemensToolModels.cs index 8876e48..43f75da 100644 --- a/CMS_CORE_Library/Models/SiemensToolModels.cs +++ b/CMS_CORE_Library/Models/SiemensToolModels.cs @@ -165,6 +165,7 @@ namespace CMS_CORE_Library.Models public string Name; public string Type; public string Category; + public string SubCategory; public bool ReadOnly; public Dictionary SelectValues; public uint MinValue; diff --git a/CMS_CORE_Library/Osai/Nc_Osai.cs b/CMS_CORE_Library/Osai/Nc_Osai.cs index adf4766..efb7558 100644 --- a/CMS_CORE_Library/Osai/Nc_Osai.cs +++ b/CMS_CORE_Library/Osai/Nc_Osai.cs @@ -3826,7 +3826,7 @@ namespace CMS_CORE_Library.Osai try { //Execute the method - nReturn = OpenNC.GetActivePartProgramFullPath(procNumber, out Level, out mainPath, out SubPath, out errorClass, out errorNum); + nReturn = OpenNC.GetActivePartProgram(procNumber, out Level, out mainPath, out SubPath, out errorClass, out errorNum); //If there's an error launch exception\ if (errorClass != 0 || errorNum != 0 || nReturn == 0) diff --git a/CMS_CORE_Library/ToolConfigurations.cs b/CMS_CORE_Library/ToolConfigurations.cs index dbd337e..686853f 100644 --- a/CMS_CORE_Library/ToolConfigurations.cs +++ b/CMS_CORE_Library/ToolConfigurations.cs @@ -276,33 +276,33 @@ namespace CMS_CORE_Library }, FamilyReadOnlyConfiguration = new List() { - new FieldsConfiguration{ Name = "name", Type = "string", SelectValues = null, Category = "family", ReadOnly = true, MinValue = 0, MaxValue = 0}, - new FieldsConfiguration{ Name = "toolType", Type = "select", SelectValues = toolTypeCodeList, 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 = "name", Type = "string", SelectValues = null, Category = "family", SubCategory = "general", ReadOnly = true, MinValue = 0, MaxValue = 0}, + new FieldsConfiguration{ Name = "toolType", Type = "select", SelectValues = toolTypeCodeList, Category = "family", SubCategory = "general", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "leftSize", Type = "int", SelectValues = null, Category = "family", SubCategory = "general", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "rightSize", Type = "int", SelectValues = null, Category = "family", SubCategory = "general", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "tcpTable", Type = "int", SelectValues = null, Category = "family", SubCategory = "tcp", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "gamma", Type = "int", SelectValues = null, Category = "family", SubCategory = "gamma", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "rotationType", Type = "int", SelectValues = null, Category = "family", SubCategory = "general", 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 = "cooling", Type = "boolean", SelectValues = null, Category = "family", SubCategory = "cooling", ReadOnly = true, MinValue = 0, MaxValue = int.MaxValue}, + new FieldsConfiguration{ Name = "cooling1", Type = "boolean", SelectValues = null, Category = "family", SubCategory = "cooling", ReadOnly = true, MinValue = 0, MaxValue = int.MaxValue}, + new FieldsConfiguration{ Name = "cooling2", Type = "boolean", SelectValues = null, Category = "family", SubCategory = "cooling", ReadOnly = true, MinValue = 0, MaxValue = int.MaxValue}, + new FieldsConfiguration{ Name = "cooling3", Type = "boolean", SelectValues = null, Category = "family", SubCategory = "cooling", ReadOnly = true, MinValue = 0, MaxValue = int.MaxValue}, + new FieldsConfiguration{ Name = "cooling4", Type = "boolean", SelectValues = null, Category = "family", SubCategory = "cooling", ReadOnly = true, MinValue = 0, MaxValue = int.MaxValue}, + new FieldsConfiguration{ Name = "cooling5", Type = "boolean", SelectValues = null, Category = "family", SubCategory = "cooling", ReadOnly = true, MinValue = 0, MaxValue = int.MaxValue}, + new FieldsConfiguration{ Name = "cooling6", Type = "boolean", SelectValues = null, Category = "family", SubCategory = "cooling", ReadOnly = true, MinValue = 0, MaxValue = int.MaxValue}, + new FieldsConfiguration{ Name = "cooling7", Type = "boolean", SelectValues = null, Category = "family", SubCategory = "cooling", 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}, + new FieldsConfiguration{ Name = "maxSpeed", Type = "int", SelectValues = null, Category = "family", SubCategory = "limits", ReadOnly = true, MinValue = 0, MaxValue = ushort.MaxValue}, + new FieldsConfiguration{ Name = "maxLoad", Type = "int", SelectValues = null, Category = "family", SubCategory = "limits", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "minLoadPctAutoload", Type = "int", SelectValues = null, Category = "family", SubCategory = "selfAdaptive", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "maxLoadPctAutoload", Type = "int", SelectValues = null, Category = "family", SubCategory = "selfAdaptive", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "dynamicCompensation", Type = "int", SelectValues = null, Category = "family", SubCategory = "dynamicCompensation", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "minLoadDynamicCompensation", Type = "int", SelectValues = null, Category = "family", SubCategory = "dynamicCompensation", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "maxLoadDynamicCompensation", Type = "int", SelectValues = null, Category = "family", SubCategory = "dynamicCompensation", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "lifeType", Type = "int", SelectValues = null, Category = "family", SubCategory = "life", ReadOnly = true, MinValue = 0, MaxValue = byte.MaxValue}, + new FieldsConfiguration{ Name = "nominalLife", Type = "int", SelectValues = null, Category = "family", SubCategory = "life", ReadOnly = true, MinValue = 0, MaxValue = ushort.MaxValue}, + new FieldsConfiguration{ Name = "reviveDelta", Type = "int", SelectValues = null, Category = "family", SubCategory = "revive", ReadOnly = true, MinValue = 0, MaxValue = ushort.MaxValue}, }, ToolsConfiguration = new List() {