diff --git a/CMS_CORE_Application/Form1.cs b/CMS_CORE_Application/Form1.cs index d85790f..575bf26 100644 --- a/CMS_CORE_Application/Form1.cs +++ b/CMS_CORE_Application/Form1.cs @@ -107,10 +107,12 @@ namespace CMS_CORE_Application Stopwatch st = new Stopwatch(); sw.Restart(); ActiveProgramDataModel active = new ActiveProgramDataModel(); - + int a = 0; // N.FILES_WDeactivateProgram(1); - cmsError = N.FILES_WSetActiveProgram(1, "C:\\PartPrg\\nuovo.mpf", ref active); + if(a == 0) + cmsError = N.FILES_WSetActiveProgram(1, "C:\\PartPrg\\nuovo.mpf", ref active); + a++; Console.WriteLine("TIME " + sw.ElapsedMilliseconds); sw.Stop(); diff --git a/CMS_CORE_Library/Demo/Nc_Demo.cs b/CMS_CORE_Library/Demo/Nc_Demo.cs index 0282166..1322b06 100644 --- a/CMS_CORE_Library/Demo/Nc_Demo.cs +++ b/CMS_CORE_Library/Demo/Nc_Demo.cs @@ -25,7 +25,7 @@ namespace CMS_CORE_Library.Demo private ChannelFactory cf; private ILibraryService serverService; private DemoEdgesConfiguration DemoEdgesConfiguration = new DemoEdgesConfiguration(); - private const string PART_PROGRAM_FOLDER = "C:/CMS/STEP/DEMO/part_program/"; + private const string PART_PROGRAM_FOLDER = "C:/CMS/Active/DEMO/part_program/"; private const string JOB_PROGRAM_FOLDER = PART_PROGRAM_FOLDER + "\\job\\"; // Magazine config parameters @@ -36,7 +36,7 @@ namespace CMS_CORE_Library.Demo new SiemensMagazineConfigModel{Id = 3, Type = SIEMENS_MAGAZINE_TYPE.BOX_MAGAZINE, LoadingIsActive = false, Name = "MAG3"}, }; - /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////// #region Contructor & global methods diff --git a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs index c9accb6..751caae 100644 --- a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs +++ b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs @@ -38,11 +38,11 @@ namespace CMS_CORE_Library.Fanuc private static int MAX_OFFSET_NUM = 0; // Paths - private const string NC_SUPPORT_FILE_PATH = "//CNC_MEM/USER/PATH1/"; + private const string NC_SUPPORT_FILE_PATH = "//CNC_MEM/USER/PATH1/CMS/"; - private const string PLC_MESSAGE_PATH = @"C:\CMS\FANUC\"; + private const string PLC_MESSAGE_PATH = "C:/CMS/FANUC/"; - private const string BLANK_PART_PROGRAM_PATH = "//CNC_MEM/PATH1/BLANK"; + private const string BLANK_PART_PROGRAM_PATH = NC_SUPPORT_FILE_PATH + "BLANK"; // Const private const int TOOL_OFFSET = 300; @@ -2281,7 +2281,7 @@ namespace CMS_CORE_Library.Fanuc string tmpM198FilePath = string.Format(NC_SUPPORT_FILE_PATH + M198_FILE_NAME, processId); // Create new file - cmsError = WritePartProgramContent(NC_SUPPORT_FILE_PATH, fileContent); + cmsError = WritePPInCmsFolder(NC_SUPPORT_FILE_PATH, fileContent); if (cmsError.IsError()) return cmsError; @@ -2363,7 +2363,7 @@ namespace CMS_CORE_Library.Fanuc if (errorDetails.err_no == 2) { // Create standard file - cmsError = WritePartProgramContent(NC_SUPPORT_FILE_PATH, "%\n\n%"); + cmsError = WritePPInCmsFolder(NC_SUPPORT_FILE_PATH, "%\n\n%"); if (cmsError.IsError()) return cmsError; // Deactivate again @@ -3856,24 +3856,63 @@ namespace CMS_CORE_Library.Fanuc return GetNcError(nReturn); // int lenghtMax = fileData.Length; - Thread.Sleep(500); + int lenght = partProgramContent.Length; // Write program nReturn = Focas1.cnc_download4(nLibHandle[0], ref lenght, partProgramContent); if (nReturn != 0) return GetNcError(nReturn); + // Stop writing nReturn = Focas1.cnc_dwnend4(nLibHandle[0]); if (nReturn != 0) { Focas1.ODBERR errorDetails = new Focas1.ODBERR(); nReturn = Focas1.cnc_getdtailerr(nLibHandle[0], errorDetails); + + // I error is == 5 the filepath exist and the file is selected by NC + if (errorDetails.err_no == 5) + return PROGRAM_IS_SELECTED_ERROR; + return GetNcError(nReturn); } return NO_ERROR; } + private CmsError WritePPInCmsFolder(string partProgramPath, string partProgramContent) + { + //Check if the NC is Connected + CmsError cmsError = CheckConnection(); + if (cmsError.IsError()) + return cmsError; + + short nReturn; + + // Start write + nReturn = Focas1.cnc_dwnstart4(nLibHandle[0], 0, partProgramPath); + if (nReturn != 0) + { + // If path doesn't exist than create the CMS folder + if (nReturn == 5) + { + nReturn = Focas1.cnc_pdf_add(nLibHandle[0], NC_SUPPORT_FILE_PATH); + + nReturn = Focas1.cnc_dwnstart4(nLibHandle[0], 0, partProgramPath); + if (nReturn != 0) + return GetNcError(nReturn); + } + else + return GetNcError(nReturn); + } + nReturn = Focas1.cnc_dwnend4(nLibHandle[0]); + if (nReturn != 0) + return GetNcError(nReturn); + + + return WritePartProgramContent(partProgramPath, partProgramContent); + } + // Read Part program content private CmsError ReadPartProgramContent(string partProgramPath, ref string partProgramContent) { diff --git a/CMS_CORE_Library/Models/CmsError.cs b/CMS_CORE_Library/Models/CmsError.cs index a85d39a..2a17d8a 100644 --- a/CMS_CORE_Library/Models/CmsError.cs +++ b/CMS_CORE_Library/Models/CmsError.cs @@ -56,6 +56,7 @@ TOOL_AND_POSITION_NOT_MATCHING = 21, FILE_NOT_FOUND = 22, PLC_NOT_RUNNING = 23, - HMI_NOT_RESPONDING = 25 + HMI_NOT_RESPONDING = 24, + PROGRAM_IS_SELECTED = 25 } } \ No newline at end of file diff --git a/CMS_CORE_Library/Models/DataStructures.cs b/CMS_CORE_Library/Models/DataStructures.cs index 7471258..046fb58 100644 --- a/CMS_CORE_Library/Models/DataStructures.cs +++ b/CMS_CORE_Library/Models/DataStructures.cs @@ -14,7 +14,6 @@ namespace CMS_CORE_Library.Models public static readonly string[] VALID_PP_FORMATS = { ".txt", ".cnc", ".ini" }; public static readonly string[] VALID_IMAGE_FORMATS = { ".jpg", ".jpeg", ".png" }; - public const string IMAGES_PATH = @"C:\CMS\STEP\pp_img\"; public const string PART_PRG_PATH = "C:\\PartPrg\\"; public const string MILLIMETERS = "mm"; public const string INCHES = "inches"; @@ -179,6 +178,7 @@ namespace CMS_CORE_Library.Models public static CmsError FILE_NOT_FOUND_ERROR = new CmsError(CMS_ERROR_CODES.FILE_NOT_FOUND, "error_file_not_found"); public static CmsError PLC_NOT_RUNNING_ERROR = new CmsError(CMS_ERROR_CODES.PLC_NOT_RUNNING, "error_plc_not_running"); public static CmsError HMI_NOT_RESPONDING_ERROR = new CmsError(CMS_ERROR_CODES.HMI_NOT_RESPONDING, "error_hmi_not_responding"); + public static CmsError PROGRAM_IS_SELECTED_ERROR = new CmsError(CMS_ERROR_CODES.PROGRAM_IS_SELECTED, "error_program_is_selected"); #endregion Cms Errors Codes @@ -189,7 +189,7 @@ namespace CMS_CORE_Library.Models #region Data structure models // R-W MEMORY Cell - internal struct MEMORY_CELL + public struct MEMORY_CELL { public readonly MEMORY_TYPE MemType; public readonly int Address; diff --git a/CMS_CORE_Library/Siemens/Nc_Siemens.cs b/CMS_CORE_Library/Siemens/Nc_Siemens.cs index 03e256b..42fd743 100644 --- a/CMS_CORE_Library/Siemens/Nc_Siemens.cs +++ b/CMS_CORE_Library/Siemens/Nc_Siemens.cs @@ -3144,6 +3144,7 @@ namespace CMS_CORE_Library.Siemens { switch (tool.LifeType) { + // 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 }); @@ -3159,6 +3160,14 @@ namespace CMS_CORE_Library.Siemens items.Add(new Item() { Path = string.Format("/Tool/Supervision/data[c{0}, {1}]", tool.Id, edgeLifeOffset + 4), Value = edge.ResidualLife }); } break; + + case SIEMENS_LIFE_TYPE.WEAR: + { + items.Add(new Item() { Path = string.Format("/Tool/Supervision/data[c{0}, {1}]", tool.Id, edgeLifeOffset + 7), Value = edge.PreAlmLife }); + items.Add(new Item() { Path = string.Format("/Tool/Supervision/data[c{0}, {1}]", tool.Id, edgeLifeOffset + 9), Value = edge.NominalLife }); + items.Add(new Item() { Path = string.Format("/Tool/Supervision/data[c{0}, {1}]", tool.Id, edgeLifeOffset + 8), Value = edge.ResidualLife }); + } + break; } } // Edge params @@ -4218,25 +4227,6 @@ namespace CMS_CORE_Library.Siemens ToolTableData[toolIndex].LifeType = (SIEMENS_LIFE_TYPE)Convert.ToInt32(actualString.Split('=').LastOrDefault()); break; - case "$TC_TP25": - { - // Get tool general information - var toolInfo = Convert.ToInt32(actualString.Split('=').LastOrDefault()); - - // Convert rotation data - ROTATION rotation = ROTATION.NONE; - if (GetBitValue(toolInfo, 9)) - rotation = ROTATION.CLOCKWHISE; - else if (GetBitValue(toolInfo, 10)) - rotation = ROTATION.COUNTERCLOCKWHISE; - // Set new data - - ToolTableData[toolIndex].Cooling1 = GetBitValue(toolInfo, 11); - ToolTableData[toolIndex].Cooling2 = GetBitValue(toolInfo, 12); - ToolTableData[toolIndex].Rotation = rotation; - } - break; - case "$TC_TP_MAX_VELO": ToolTableData[toolIndex].MaxSpeed = Convert.ToDouble(actualString.Split('=').LastOrDefault(), numberFormat); break; @@ -4438,7 +4428,39 @@ namespace CMS_CORE_Library.Siemens } } break; - + case "$TC_MOP6": + { + SiemensToolModel tool = ToolTableData[toolIndex]; + if (tool.LifeType == SIEMENS_LIFE_TYPE.WEAR) + { + ToolTableData[toolIndex] + .EdgesData[edgeIndex] + .ResidualLife = Convert.ToDouble(actualString.Split('=').LastOrDefault()); + } + } + break; + case "$TC_MOP15": + { + SiemensToolModel tool = ToolTableData[toolIndex]; + if (tool.LifeType == SIEMENS_LIFE_TYPE.WEAR) + { + ToolTableData[toolIndex] + .EdgesData[edgeIndex] + .NominalLife = Convert.ToDouble(actualString.Split('=').LastOrDefault()); + } + } + break; + case "$TC_MOP5": + { + SiemensToolModel tool = ToolTableData[toolIndex]; + if (tool.LifeType == SIEMENS_LIFE_TYPE.WEAR) + { + ToolTableData[toolIndex] + .EdgesData[edgeIndex] + .PreAlmLife = Convert.ToDouble(actualString.Split('=').LastOrDefault()); + } + } + break; case "$TC_DP2": case "$TC_DP3": case "$TC_DP4": @@ -4459,7 +4481,6 @@ namespace CMS_CORE_Library.Siemens case "$TC_DP22": case "$TC_DP23": case "$TC_DP24": - case "$TC_DP25": case "$TC_DPV": case "$TC_DPV3": case "$TC_DPV4": @@ -4494,6 +4515,25 @@ namespace CMS_CORE_Library.Siemens } break; + case "$TC_DP25": + { + // Get tool general information + var toolInfo = Convert.ToInt32(actualString.Split('=').LastOrDefault()); + + // Convert rotation data + ROTATION rotation = ROTATION.NONE; + if (GetBitValue(toolInfo, 9)) + rotation = ROTATION.CLOCKWHISE; + else if (GetBitValue(toolInfo, 10)) + rotation = ROTATION.COUNTERCLOCKWHISE; + // Set new data + + ToolTableData[toolIndex].Cooling1 = GetBitValue(toolInfo, 11); + ToolTableData[toolIndex].Cooling2 = GetBitValue(toolInfo, 12); + ToolTableData[toolIndex].Rotation = rotation; + } + break; + case "$TC_MPP1": { MagazinePositionsData.Add(new PositionModel() diff --git a/CMS_CORE_Library/Utils/Nc_Utils.cs b/CMS_CORE_Library/Utils/Nc_Utils.cs index ecc99c5..2e7d68a 100644 --- a/CMS_CORE_Library/Utils/Nc_Utils.cs +++ b/CMS_CORE_Library/Utils/Nc_Utils.cs @@ -180,7 +180,7 @@ namespace CMS_CORE_Library.Utils } // Convert a byte into an array of bools - internal static bool[] ByteToBits(byte val) + public static bool[] ByteToBits(byte val) { return new BitArray(new byte[] { val }) .Cast() diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Constants.cs b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Constants.cs index 028dc91..27c2c5f 100644 --- a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Constants.cs +++ b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Constants.cs @@ -79,7 +79,7 @@ namespace Nc_Demo_Application // File - public const string FILE_FOLDER = "C:/CMS/STEP/DEMO/part_program/"; + public const string FILE_FOLDER = "./part_program/"; public const string LANGUAGE_FOLDER = "./Languages/"; } } diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.Designer.cs b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.Designer.cs index 35cd419..ab67fce 100644 --- a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.Designer.cs +++ b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.Designer.cs @@ -30,12 +30,12 @@ namespace Nc_Demo_Application /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DemoApplicationForm)); this.serverStatusLabel = new System.Windows.Forms.Label(); this.ncDataPage = new System.Windows.Forms.TabPage(); @@ -706,10 +706,10 @@ namespace Nc_Demo_Application // ncProcessIdColumn // this.ncProcessIdColumn.DataPropertyName = "id"; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.Black; - this.ncProcessIdColumn.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.Color.Black; + this.ncProcessIdColumn.DefaultCellStyle = dataGridViewCellStyle7; this.ncProcessIdColumn.HeaderText = "Process Id"; this.ncProcessIdColumn.Name = "ncProcessIdColumn"; this.ncProcessIdColumn.ReadOnly = true; @@ -967,10 +967,10 @@ namespace Nc_Demo_Application // BinaryMemoryAddressColumn // this.BinaryMemoryAddressColumn.DataPropertyName = "address"; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.Black; - this.BinaryMemoryAddressColumn.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.Black; + this.BinaryMemoryAddressColumn.DefaultCellStyle = dataGridViewCellStyle8; this.BinaryMemoryAddressColumn.HeaderText = "Byte Address"; this.BinaryMemoryAddressColumn.Name = "BinaryMemoryAddressColumn"; this.BinaryMemoryAddressColumn.ReadOnly = true; @@ -1321,10 +1321,10 @@ namespace Nc_Demo_Application // magazineId // this.magazineId.DataPropertyName = "magazineId"; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.Black; - this.magazineId.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.Black; + this.magazineId.DefaultCellStyle = dataGridViewCellStyle9; this.magazineId.FillWeight = 105.2829F; this.magazineId.HeaderText = "Magazine Id"; this.magazineId.Name = "magazineId"; @@ -1334,10 +1334,10 @@ namespace Nc_Demo_Application // positionId // this.positionId.DataPropertyName = "positionId"; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.Black; - this.positionId.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle10.SelectionForeColor = System.Drawing.Color.Black; + this.positionId.DefaultCellStyle = dataGridViewCellStyle10; this.positionId.FillWeight = 94.61015F; this.positionId.HeaderText = "Position Id"; this.positionId.Name = "positionId"; @@ -1560,10 +1560,10 @@ namespace Nc_Demo_Application // id // this.id.DataPropertyName = "id"; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.Black; - this.id.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.Color.Black; + this.id.DefaultCellStyle = dataGridViewCellStyle11; this.id.FillWeight = 60F; this.id.HeaderText = "Id"; this.id.Name = "id"; @@ -2138,11 +2138,11 @@ namespace Nc_Demo_Application // edgesId // this.edgesId.DataPropertyName = "child_id"; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle6.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.CornflowerBlue; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.Black; - this.edgesId.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle12.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle12.ForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.CornflowerBlue; + dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.Black; + this.edgesId.DefaultCellStyle = dataGridViewCellStyle12; this.edgesId.HeaderText = "Id"; this.edgesId.Name = "edgesId"; // @@ -2499,7 +2499,7 @@ namespace Nc_Demo_Application this.versionLabel.Name = "versionLabel"; this.versionLabel.Size = new System.Drawing.Size(89, 20); this.versionLabel.TabIndex = 11; - this.versionLabel.Text = "Version: 37"; + this.versionLabel.Text = "Version: 39"; // // DemoApplicationForm // diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.resx b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.resx index 1054131..2498896 100644 --- a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.resx +++ b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Views/DemoApplicationForm.resx @@ -120,21 +120,63 @@ 17, 17 + + 17, 17 + 122, 17 + + 122, 17 + + + 227, 17 + 227, 17 332, 17 + + 332, 17 + + + 437, 17 + 437, 17 542, 17 + + 542, 17 + + + 869, 17 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -159,6 +201,42 @@ 869, 17 + + 752, 17 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -198,9 +276,126 @@ True + + True + + + True + 752, 17 + + 647, 17 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -326,6 +521,24 @@ 986, 17 + + 986, 17 + + + True + + + True + + + True + + + True + + + True + True