From cdbd82f8c0a023f3883c2a372d4bba6c8ff07435 Mon Sep 17 00:00:00 2001 From: Lucio Maranta Date: Thu, 2 Aug 2018 07:51:54 +0000 Subject: [PATCH] Refactor --- CMS_CORE_Application/Form1.cs | 169 +---- CMS_CORE_Library/Demo/Nc_Demo.cs | 2 +- CMS_CORE_Library/Fanuc/Nc_Fanuc.cs | 2 +- CMS_CORE_Library/Nc.cs | 286 ++++++++- CMS_CORE_Library/Osai/Nc_Osai.cs | 70 +- CMS_CORE_Library/Siemens/Nc_Siemens.cs | 96 +-- .../Database/DatabaseController.cs | 15 + .../Server/Service/LibraryService.cs | 6 +- .../Views/DemoApplicationForm.Designer.cs | 600 +++++++++--------- 9 files changed, 692 insertions(+), 554 deletions(-) diff --git a/CMS_CORE_Application/Form1.cs b/CMS_CORE_Application/Form1.cs index 72139d8..2fdf00f 100644 --- a/CMS_CORE_Application/Form1.cs +++ b/CMS_CORE_Application/Form1.cs @@ -72,74 +72,7 @@ namespace CMS_CORE_Application PreAndPostPowerOnModel powerOn = new PreAndPostPowerOnModel(); List ncAlarms = new List(); List Lines = new List(); - List keys = new List(); - List headsTest = new List(); - List axesNames = new List(); - List functionality = new List(); - AxisResetDataModel axesReset = new AxisResetDataModel(); - ProcessDataModel processData = new ProcessDataModel(); - ToolTableConfiguration toolsConfig = new ToolTableConfiguration(); - List dataTable = new List(); - List shanks = new List(); - List famiies = new List(); - List positions = new List(); - List magazine = new List(); - SiemensToolModel newTool = new SiemensToolModel() - { - FamilyName = "TEST1", - ChildId = 1, - Id = 6, - MagazinePositionType = 1, - ToolType = 110, - LeftSize = 1, - RightSize = 1, - Rotation = ROTATION.CLOCKWHISE, - LifeType = SIEMENS_LIFE_TYPE.COUNT, - Cooling1 = true, - Cooling2 = false, - IsActive = true, - InFixedPlace = true, - IsInhibited = true, - IsMeasured = true, - InChangeTool = true, - IsInUse = false, - PreAlarm = false, - EdgesData = null - }; - - EdgeModel newEdge = new EdgeModel() - { - Id = 1, - NominalLife = 22, - PreAlmLife = 21, - ResidualLife = 20, - EdgeAdditionalParams = new Dictionary() - { - { "cuttingEdge", 1 }, - { "lenght", 12 } - } - }; - - ShankModel newShank = new ShankModel() - { - Name = "MULTITOOLLISsimo", - MagazinePositionType = 1, - LeftSize = 1, - RightSize = 1, - IsEnabled = true, - InFixedPlace = true, - IsInhibited = true, - InChangeTool = true, - InUse = true - }; - - List newMagazine = new List() - { - new NewToolInMagazineModel{ PositionId = 1, ToolId = 1 }, - new NewToolInMagazineModel{ PositionId = 2, ToolId = 6 }, - new NewToolInMagazineModel{ PositionId = 3, ToolId = 7 }, - }; - OffsetModel offset = new OffsetModel(); + N = SetNcByType(); CmsError cmsError = N.NC_Connect(); @@ -156,18 +89,21 @@ namespace CMS_CORE_Application error = true; SetError(Lines, cmsError); } + cmsError = N.PROC_RStatus(1, ref status); if (cmsError.IsError()) { error = true; SetError(Lines, cmsError); } + cmsError = N.PROC_RActiveAlarms(1, ref procAlarms); if (cmsError.IsError()) { error = true; SetError(Lines, cmsError); } + cmsError = N.NC_RActiveAlarms(ref ncAlarms); if (cmsError.IsError()) { @@ -196,103 +132,6 @@ namespace CMS_CORE_Application SetError(Lines, cmsError); } - if (cmsError.IsError()) - { - error = true; - SetError(Lines, cmsError); - } - - N.PLC_RPowerOnData(ref powerOn); - if (cmsError.IsError()) - { - error = true; - SetError(Lines, cmsError); - } - Dictionary updatedStatus = null; - Dictionary updatedLives = null; - List files = new List(); - N.FILES_RGetFileList("", ref files); - // cmsError = N.TOOLS_WStopEditTooling(1); - // List config = new List(); - //cmsError = N.TOOLS_RMagazineConfig(ref config); - N.TOOLS_RUpdatedToolsData(ref updatedStatus, ref updatedLives); - // N.TOOLS_WStartEditData(); - // cmsError = N.TOOLS_WStartEditTooling(1); - // cmsError = N.TOOLS_WRestoreBackup(); - // cmsError = N.FILES_CopyProgram("C:\\TO_INI.INI", @"test\\OEM\\CMS\\SYS\\STEP\\testLocal", true); - //cmsError = N.TOOLS_WStopEditTooling(1); - // cmsError = N.TOOLS_WAddShank(ref newShank); - // List a = new List() ; - // N.TOOLS_RMagazineTools(1, ref a); - // cmsError = N.TOOLS_WDeleteShank(4); - //cmsError = N.TOOLS_WUpdateEdge(1, ref newEdge); - //List c = new List(); - //List b = new List(); - // cmsError = N.TOOLS_RAvailableTools(ref c, ref b); - //cmsError = N.TOOLS_RConfiguration(ref toolsConfig); - //cmsError = N.TOOLS_WUpdatePosition(new PositionModel() - //{ - // Disabled = false, - // MagazineId = 1, - // PositionId = 1 - //}); - // cmsError = N.TOOLS_WUnloadToolInMagazine(1, 53); - // cmsError = N.TOOLS_WLoadToolInMagazine(1, new NewToolInMagazineModel() { PositionId = 1, ToolId = 4 }); - //cmsError = N.TOOLS_ROffset(1, ref offset); - // cmsError = N.TOOLS_WStartEdit(); - // cmsError = N.TOOLS_WOffset(3, offset); - //cmsError = N.TOOLS_WAddTool(); - //cmsError = N.PLC_WRefreshAllMessages(); - //cmsError = N.PLC_RHeadsData(headsTest, 1); - - // cmsError = N.TOOLS_WLoadToolIntoShank(5, 1, 10); - // cmsError = N.TOOLS_WAddEdge(24, ref newEdge); - - //cmsError = N.TOOLS_RToolsData(ref dataTable); - //cmsError = N.TOOLS_RShanksData(ref shanks); - //cmsError = N.TOOLS_RFamilyData(ref famiies); - //cmsError = N.TOOLS_RMagazinePositions(ref positions); - // cmsError = N.TOOLS_WAddTool(ref newTool); - - //ShankModel shank = new ShankModel(); - // newShank.Name = newShank.Name + "1"; - // cmsError = N.TOOLS_WAddShank(ref newShank); - //FamilyModel family = new FamilyModel - //{ - // Name = "Da demo" - //}; - //cmsError = N.TOOLS_WDeleteTool(11); - //// cmsError = N.TOOLS_WAddFamily(ref family); - //cmsError = N.TOOLS_RConfiguration(ref toolsConfig); - //cmsError = N.TOOLS_WUpdateTool(newTool); - //cmsError = N.TOOLS_RMagazineTools(1, ref magazine); - //cmsError = N.TOOLS_RAvailableTools(ref multiTools, ref tools); - //cmsError = N.TOOLS_WUpdateMagazineTools(1, newMagazine); - // N.PLC_WPowerOnData(6, true); - //N.PLC_RFunctionAccess(ref functionality); - - //N.PLC_RAxesResetData(ref axesReset); - //cmsError = N.PLC_RUserSoftKeys(ref keys); - //cmsError = N.PLC_RNcSoftKeys(ref keys); - - //N.PROC_RSelectedProcess(ref procnum); - //cmsError = N.PLC_WNcSoftKey(1); - //// cmsError = N.PLC_WUserSoftKey(1); - - //N.PROC_RStatusAndData(1, ref processData); - //sw.Restart(); - //cmsError = N.AXES_RAxesNames(1, ref axesNames); - ////cmsError = N.AXES_WSelectAxis(2); - ////N.PROC_WSelectProcess(4); - //cmsError = N.AXES_RSelectedAxis(ref axisId); - ////cmsError = N.PLC_WRefreshAllMessages(); - //cmsError = N.PLC_WHeadOverride(1, HEAD_OVERRIDE_SIGN.MINUS); - - //Dictionary messages = new Dictionary(); - //cmsError = N.NC_GetTranslatedPlcMessages("it", ref messages); - //MessageBox.Show(messages.Count.ToString() + " " + messages.FirstOrDefault()); - ////cmsError = N.PROC_RSelectedProcess(ref procnum); - sw.Stop(); if (!this.IsDisposed && this.InvokeRequired) { diff --git a/CMS_CORE_Library/Demo/Nc_Demo.cs b/CMS_CORE_Library/Demo/Nc_Demo.cs index 5063202..e632510 100644 --- a/CMS_CORE_Library/Demo/Nc_Demo.cs +++ b/CMS_CORE_Library/Demo/Nc_Demo.cs @@ -2477,7 +2477,7 @@ namespace CMS_CORE.Demo } } - public override CmsError TOOLS_WUnloadToolInMagazine(int magazineId, int positionId) + public override CmsError TOOLS_WUnloadToolFromMagazine(int magazineId, int positionId) { // Check if the NC Demo is Connected CmsError cmsError = CheckConnection(); diff --git a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs index 4970f3d..f779a38 100644 --- a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs +++ b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs @@ -1796,7 +1796,7 @@ namespace CMS_CORE.Fanuc return NO_ERROR; } - public override CmsError TOOLS_WUnloadToolInMagazine(int magazineId, int positionId) + public override CmsError TOOLS_WUnloadToolFromMagazine(int magazineId, int positionId) { return NO_ERROR; } diff --git a/CMS_CORE_Library/Nc.cs b/CMS_CORE_Library/Nc.cs index 4b2f0f7..d48020c 100644 --- a/CMS_CORE_Library/Nc.cs +++ b/CMS_CORE_Library/Nc.cs @@ -1218,9 +1218,63 @@ namespace CMS_CORE #region File Management (To override) + /** + * Get file list of a specific path + * + * Compatibility: Fanuc | Osai | Demo | Siemens + * + * + * Returns an error when an internal or a library error occours + * Directory path to read file list + * */ + + public abstract CmsError FILES_RGetFileList(string directoryPath, ref List files); + + /** + * Get file generic informations + * + * Compatibility: Fanuc | Osai | Demo | Siemens + * + * + * Returns an error when an internal or a library error occours + * File path to read file data + * */ + + public abstract CmsError FILES_RGetFileInfo(string filePath, ref InfoFile fileInfo); + + /** + * Set a program, stored in the NC, as active for the process + * + * Compatibility: Fanuc | Osai | Demo | Siemens + * + * + * Returns an error when an internal or a library error occours + * Process where the program is going to be activated + * Path of the part program + * */ + public abstract CmsError FILES_WSetActiveProgram(int processId, string filePath, ref ActiveProgramDataModel data); + + /** + * Deactivate active program on + * + * Compatibility: Fanuc | Osai | Demo | Siemens + * + * + * Process where the program is going to be deactivated + * */ + public abstract CmsError FILES_WDeactivateProgram(int processId); + /** + * Read active program on data + * + * Compatibility: Fanuc | Osai | Demo | Siemens + * + * + * Process id where the program is active + * */ + public abstract CmsError FILES_RActiveProgramData(int processId, ref ActiveProgramDataModel data); /** @@ -1257,10 +1311,15 @@ namespace CMS_CORE * * * Returns an error when an internal or a library error occours - * Path where the Part Program is saved in the NC + * Path where the part program is going to be stored in the NC * Path of the copy Part Program destination - * - * */ + * + * : Return an error if file exists. + * + * : Overwrite file if exists + * + * + */ public abstract CmsError FILES_CopyProgram(string partProgramPath, string newPartProgramPath, bool failIfExist); @@ -1283,15 +1342,10 @@ namespace CMS_CORE #region Tool Table Siemens - public abstract CmsError FILES_RGetFileList(string path, ref List files); - - public abstract CmsError FILES_RGetFileInfo(string path, ref InfoFile fileInfo); - - /** * Read tool table configuration * - * Compatibility: Fanuc | Osai | Demo | Siemens + * Compatibility: Siemens * * * Returns an error when an internal or a library error occours @@ -1348,44 +1402,248 @@ namespace CMS_CORE public abstract CmsError TOOLS_RMagazinePositions(ref List positions); + /** + * Add a new tool + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + **/ + public abstract CmsError TOOLS_WAddTool(ref SiemensToolModel tool); + /** + * Add a new family + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + **/ + public abstract CmsError TOOLS_WAddFamily(ref FamilyModel family); + /** + * Add a new shank + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + **/ + public abstract CmsError TOOLS_WAddShank(ref ShankModel shank); + /** + * Update family name + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + * Family identifier + * New family name value + **/ + public abstract CmsError TOOLS_WUpdateFamilyData(string oldName, string newName); - public abstract CmsError TOOLS_WUpdatePosition(PositionModel position); + /** + * Update magazine position data + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + * New position data + **/ - public abstract CmsError TOOLS_WUpdateTool(ref SiemensToolModel tool); + public abstract CmsError TOOLS_WUpdatePosition(PositionModel positionData); + + /** + * Update tool data + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + * New tool data + **/ + + public abstract CmsError TOOLS_WUpdateTool(ref SiemensToolModel toolData); + + /** + * Delete tool + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + * Tool identifier + **/ public abstract CmsError TOOLS_WDeleteTool(int id); + /** + * Delete shank + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + * Shank id + **/ + public abstract CmsError TOOLS_WDeleteShank(int id); + /** + * Delete family + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + * Family identifier + **/ + public abstract CmsError TOOLS_WDeleteFamily(string name); + /** + * Delete edge + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + * Tool id + * Edge id + **/ + public abstract CmsError TOOLS_WDeleteEdge(int toolId, int edgeId); + /** + * Add a new edge to tool + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + * Tool id + **/ + public abstract CmsError TOOLS_WAddEdge(int toolId, ref EdgeModel edge); + /** + * Update edge + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + * Tool id + * New edge data + **/ + public abstract CmsError TOOLS_WUpdateEdge(int toolId, ref EdgeModel newEdge); - public abstract CmsError TOOLS_WUpdateShank(ref ShankModel shank); + /** + * Update shank + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + * New shank data + **/ + + public abstract CmsError TOOLS_WUpdateShank(ref ShankModel shankData); + + /** + * Read mounted tool in magazine + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + * Magazine id + **/ public abstract CmsError TOOLS_RMagazineTools(int magazineId, ref List magazinePos); + /** + * Read available tools/multitools (not mounted) + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + * Magazine id + **/ + public abstract CmsError TOOLS_RAvailableTools(ref List multitools, ref List tools); - public abstract CmsError TOOLS_WLoadToolInMagazine(int magazine, NewToolInMagazineModel newMagazineTool); + /** + * Load a tool in magazine + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + * Magazine id + * Object that contains references to position id and tool id + **/ - public abstract CmsError TOOLS_WUnloadToolInMagazine(int magazineId, int positionId); + public abstract CmsError TOOLS_WLoadToolInMagazine(int magazineId, NewToolInMagazineModel newMagazineTool); + + /** + * Unload tool from magazine + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + * Magazine id + * Position id + **/ + + public abstract CmsError TOOLS_WUnloadToolFromMagazine(int magazineId, int positionId); + + /** + * Load tool into shank + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + * Shank id + * Position id + * Tool id + **/ public abstract CmsError TOOLS_WLoadToolIntoShank(int shankId, int positionId, int toolId); + /** + * Unload tool from shank + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + * Shank id + * Position id + **/ + public abstract CmsError TOOLS_WUnloadToolFromShank(int shankId, int positionId); + /** + * Get actual magazine status + * + * Compatibility: Siemens + * + * + * Returns an error when an internal or a library error occours + **/ + public abstract CmsError TOOLS_GetMagazinesStatus(ref MagazineActionModel magazineAction); #endregion Tool Table Siemens diff --git a/CMS_CORE_Library/Osai/Nc_Osai.cs b/CMS_CORE_Library/Osai/Nc_Osai.cs index 0a40d71..00c880f 100644 --- a/CMS_CORE_Library/Osai/Nc_Osai.cs +++ b/CMS_CORE_Library/Osai/Nc_Osai.cs @@ -2188,7 +2188,7 @@ namespace CMS_CORE.Osai return NO_ERROR; } - public override CmsError TOOLS_WUnloadToolInMagazine(int magazineId, int positionId) + public override CmsError TOOLS_WUnloadToolFromMagazine(int magazineId, int positionId) { return NO_ERROR; } @@ -2795,22 +2795,24 @@ namespace CMS_CORE.Osai //Setup the connection Binding private void SetupConnection() { - HttpBinding = new BasicHttpBinding(BasicHttpSecurityMode.None); - HttpBinding.Name = "OPENcontrol"; - HttpBinding.CloseTimeout = TimeSpan.Parse("00:00:10"); - HttpBinding.OpenTimeout = TimeSpan.Parse("00:00:10"); - HttpBinding.ReceiveTimeout = new TimeSpan(TimeSpan.TicksPerMillisecond * timeOutConn); - HttpBinding.SendTimeout = new TimeSpan(TimeSpan.TicksPerMillisecond * timeOutConn); - HttpBinding.AllowCookies = false; - HttpBinding.BypassProxyOnLocal = true; - HttpBinding.HostNameComparisonMode = HostNameComparisonMode.StrongWildcard; - HttpBinding.MaxBufferSize = 65536; - HttpBinding.MaxBufferPoolSize = 524288; - HttpBinding.MaxReceivedMessageSize = 65536; - HttpBinding.MessageEncoding = WSMessageEncoding.Text; - HttpBinding.TextEncoding = Encoding.UTF8; - HttpBinding.TransferMode = TransferMode.Buffered; - HttpBinding.UseDefaultWebProxy = UseProxy; + HttpBinding = new BasicHttpBinding(BasicHttpSecurityMode.None) + { + Name = "OPENcontrol", + CloseTimeout = TimeSpan.Parse("00:00:10"), + OpenTimeout = TimeSpan.Parse("00:00:10"), + ReceiveTimeout = new TimeSpan(TimeSpan.TicksPerMillisecond * timeOutConn), + SendTimeout = new TimeSpan(TimeSpan.TicksPerMillisecond * timeOutConn), + AllowCookies = false, + BypassProxyOnLocal = true, + HostNameComparisonMode = HostNameComparisonMode.StrongWildcard, + MaxBufferSize = 65536, + MaxBufferPoolSize = 524288, + MaxReceivedMessageSize = 65536, + MessageEncoding = WSMessageEncoding.Text, + TextEncoding = Encoding.UTF8, + TransferMode = TransferMode.Buffered, + UseDefaultWebProxy = UseProxy + }; } //Check if NC is connected @@ -3002,15 +3004,16 @@ namespace CMS_CORE.Osai //Convert error from Open To Cndex private Cndex.MSG_ERROR ConverToCndexMessage(MSGERROR OpenError) { - Cndex.MSG_ERROR OsaiSerie10Err = new Cndex.MSG_ERROR(); - - OsaiSerie10Err.BootID = (int)OpenError.BootID; - OsaiSerie10Err.UnIdSeq = (int)OpenError.UnIdSeq; - OsaiSerie10Err.Code_Err = (int)OpenError.CodeErr; - OsaiSerie10Err.Comando = (byte)OpenError.Comando; - OsaiSerie10Err.FormatTxt = OpenError.FormatTxt; - OsaiSerie10Err.Process = OpenError.Process; - OsaiSerie10Err.SubCom = (byte)OpenError.SubCom; + Cndex.MSG_ERROR OsaiSerie10Err = new Cndex.MSG_ERROR + { + BootID = (int)OpenError.BootID, + UnIdSeq = (int)OpenError.UnIdSeq, + Code_Err = (int)OpenError.CodeErr, + Comando = (byte)OpenError.Comando, + FormatTxt = OpenError.FormatTxt, + Process = OpenError.Process, + SubCom = (byte)OpenError.SubCom + }; return OsaiSerie10Err; } @@ -3018,13 +3021,14 @@ namespace CMS_CORE.Osai //Convert error from Open To Cndex private Cndex.MSG_EMERGENCY ConverToCndexMessage(MSGEMERGENCY OpenError) { - Cndex.MSG_EMERGENCY OsaiSerie10Err = new Cndex.MSG_EMERGENCY(); - - OsaiSerie10Err.BootID = (int)OpenError.BootID; - OsaiSerie10Err.UnIdSeq = (int)OpenError.UnIdSeq; - OsaiSerie10Err.Code_Err = (int)OpenError.CodeErr; - OsaiSerie10Err.FormatTxt = OpenError.FormatTxt; - OsaiSerie10Err.Process = OpenError.Process; + Cndex.MSG_EMERGENCY OsaiSerie10Err = new Cndex.MSG_EMERGENCY + { + BootID = (int)OpenError.BootID, + UnIdSeq = (int)OpenError.UnIdSeq, + Code_Err = (int)OpenError.CodeErr, + FormatTxt = OpenError.FormatTxt, + Process = OpenError.Process + }; return OsaiSerie10Err; } diff --git a/CMS_CORE_Library/Siemens/Nc_Siemens.cs b/CMS_CORE_Library/Siemens/Nc_Siemens.cs index 17e3182..77eb620 100644 --- a/CMS_CORE_Library/Siemens/Nc_Siemens.cs +++ b/CMS_CORE_Library/Siemens/Nc_Siemens.cs @@ -321,7 +321,7 @@ namespace CMS_CORE.Siemens .Select(x => new { Key = Convert.ToInt32(x.Element("source").Value.Split('/').FirstOrDefault()), - Value = x.Element("translation").Value + x.Element("translation").Value }); foreach (var message in messagesList) @@ -430,9 +430,11 @@ namespace CMS_CORE.Siemens try { //Setup variables - DataSvc Data = new DataSvc(); - Data.Timeout = TimeoutConn; - Data.PriorityFlag = SlPriority.lowPriority; + DataSvc Data = new DataSvc + { + Timeout = TimeoutConn, + PriorityFlag = SlPriority.lowPriority + }; Item ReadItem = new Item(NC_TIME_PATH); //Read Data @@ -944,9 +946,11 @@ namespace CMS_CORE.Siemens try { //Setup variables - DataSvc Data = new DataSvc(); - Data.Timeout = TimeoutConn; - Data.PriorityFlag = SlPriority.highPriority; + DataSvc Data = new DataSvc + { + Timeout = TimeoutConn, + PriorityFlag = SlPriority.highPriority + }; Item ReadItem = new Item(NC_GENERIC_MODE_PATH + "[u" + ProcNumber + "]"); Item ReadItemIncr = new Item(JOG_INCR_PATH + "[u" + ProcNumber + "]"); Item ReadItemAdv = new Item(ADVANCED_JOG_PATH + "[u" + ProcNumber + "]"); @@ -979,9 +983,11 @@ namespace CMS_CORE.Siemens try { //Setup variables - DataSvc Data = new DataSvc(); - Data.Timeout = TimeoutConn; - Data.PriorityFlag = SlPriority.highPriority; + DataSvc Data = new DataSvc + { + Timeout = TimeoutConn, + PriorityFlag = SlPriority.highPriority + }; Item ReadItem = new Item(NC_GENERIC_STATE_PATH + "[u" + ProcNumber + "]"); //Read Data @@ -1011,9 +1017,11 @@ namespace CMS_CORE.Siemens try { //Setup variables - DataSvc Data = new DataSvc(); - Data.Timeout = TimeoutConn; - Data.PriorityFlag = SlPriority.highPriority; + DataSvc Data = new DataSvc + { + Timeout = TimeoutConn, + PriorityFlag = SlPriority.highPriority + }; Item ReadItem = new Item(ACT_PROG_LINES_PATH + "[u" + ProcNumber + "]"); //Read Data @@ -1054,9 +1062,11 @@ namespace CMS_CORE.Siemens try { //Setup variables - DataSvc Data = new DataSvc(); - Data.Timeout = TimeoutConn; - Data.PriorityFlag = SlPriority.highPriority; + DataSvc Data = new DataSvc + { + Timeout = TimeoutConn, + PriorityFlag = SlPriority.highPriority + }; Item ReadItem = new Item(ACT_PROG_NAME_PATH + "[u" + ProcNumber + "]"); //Read Data @@ -1507,9 +1517,11 @@ namespace CMS_CORE.Siemens try { //Setup variables - DataSvc Data = new DataSvc(); - Data.Timeout = TimeoutConn; - Data.PriorityFlag = SlPriority.highPriority; + DataSvc Data = new DataSvc + { + Timeout = TimeoutConn, + PriorityFlag = SlPriority.highPriority + }; cmsError = ConvertMemToPath(MemType, MemTable, MemIndex, 0, (bWrite) ? Value.Count : Number, 'B', out string itemString); if (cmsError.IsError()) @@ -1553,9 +1565,11 @@ namespace CMS_CORE.Siemens try { //Setup variables - DataSvc Data = new DataSvc(); - Data.Timeout = TimeoutConn; - Data.PriorityFlag = SlPriority.highPriority; + DataSvc Data = new DataSvc + { + Timeout = TimeoutConn, + PriorityFlag = SlPriority.highPriority + }; cmsError = ConvertMemToPath(MemType, MemTable, MemIndex, 0, (bWrite) ? Value.Count : Number, 'W', out string itemString); if (cmsError.IsError()) @@ -1599,9 +1613,11 @@ namespace CMS_CORE.Siemens try { //Setup variables - DataSvc Data = new DataSvc(); - Data.Timeout = TimeoutConn; - Data.PriorityFlag = SlPriority.highPriority; + DataSvc Data = new DataSvc + { + Timeout = TimeoutConn, + PriorityFlag = SlPriority.highPriority + }; cmsError = ConvertMemToPath(MemType, MemTable, MemIndex, 0, (bWrite) ? Value.Count : Number, 'W', out string itemString); if (cmsError.IsError()) @@ -1645,9 +1661,11 @@ namespace CMS_CORE.Siemens try { //Setup variables - DataSvc Data = new DataSvc(); - Data.Timeout = TimeoutConn; - Data.PriorityFlag = SlPriority.highPriority; + DataSvc Data = new DataSvc + { + Timeout = TimeoutConn, + PriorityFlag = SlPriority.highPriority + }; cmsError = ConvertMemToPath(MemType, MemTable, MemIndex, 0, (bWrite) ? Value.Count : Number, 'D', out string itemString); if (cmsError.IsError()) @@ -1690,9 +1708,11 @@ namespace CMS_CORE.Siemens try { //Setup variables - DataSvc Data = new DataSvc(); - Data.Timeout = TimeoutConn; - Data.PriorityFlag = SlPriority.highPriority; + DataSvc Data = new DataSvc + { + Timeout = TimeoutConn, + PriorityFlag = SlPriority.highPriority + }; cmsError = ConvertMemToPath(MemType, MemTable, MemIndex, 0, (bWrite) ? Value.Count : Number, 'D', out string itemString); if (cmsError.IsError()) @@ -2670,7 +2690,7 @@ namespace CMS_CORE.Siemens return NO_ERROR; } - public override CmsError TOOLS_WUnloadToolInMagazine(int magazineId, int positionId) + public override CmsError TOOLS_WUnloadToolFromMagazine(int magazineId, int positionId) { if (MagazineAction.Action != MAGAZINE_ACTIONS.NONE) return MAGAZINE_BUSY_ERROR; @@ -3120,9 +3140,11 @@ namespace CMS_CORE.Siemens //Try to get information try { - DataSvc ReadStaticData = new DataSvc(); - ReadStaticData.Timeout = TimeoutConn; - ReadStaticData.PriorityFlag = SlPriority.defaultPriority; + DataSvc ReadStaticData = new DataSvc + { + Timeout = TimeoutConn, + PriorityFlag = SlPriority.defaultPriority + }; Item ItemNcType = new Item(NC_TYPE_PATH); Item ItemNcVersion = new Item(NC_VERSION_PATH); Item ItemMaxChannelNo = new Item(MAX_CHANNEL_NO_PATH); @@ -3145,7 +3167,7 @@ namespace CMS_CORE.Siemens ReadStaticData.Read(ItemMachineNumber); //Setup variables - Cnc_name = getName((uint)ItemNcType.Value); + Cnc_name = GetName((uint)ItemNcType.Value); Cnc_SftVersion = Regex.Replace(((double)ItemNcVersion.Value).ToString(), ".{2}", "$0.").TrimEnd('.'); ; Cnc_SeriesNum = ((String)ItemSerialNumber.Value); @@ -3167,7 +3189,7 @@ namespace CMS_CORE.Siemens } // Convert the internal Name var in Readable STEP Name - private String getName(uint value) + private String GetName(uint value) { String name = "Siemens "; switch (value) diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Database/DatabaseController.cs b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Database/DatabaseController.cs index 160e0d4..f8f49af 100644 --- a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Database/DatabaseController.cs +++ b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Database/DatabaseController.cs @@ -346,6 +346,21 @@ namespace Nc_Demo_Application.Database UpdateDatabaseFromDataTable(ncProcessData, READ_NC_PROCESS_QUERY); } + + public void UpdateProcessProgram(int processId, string path) + { + // Update process part program path data + foreach (DataRow row in NcProcessDataTable.Rows) + { + if(Convert.ToInt32(row["id"]) == processId) + { + row["part_program_name"] = path; + } + } + + UpdateDatabaseFromDataTable(ActiveProgramDataTable, READ_ACT_PROGRAM_QUERY); + } + #endregion Nc Processes Data #region Nc Alarms Data diff --git a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Server/Service/LibraryService.cs b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Server/Service/LibraryService.cs index 8d13c08..878b1dd 100644 --- a/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Server/Service/LibraryService.cs +++ b/CMS_CORE_Nc_Demo_Application/Nc_Demo_Application/Server/Service/LibraryService.cs @@ -373,8 +373,8 @@ namespace Nc_Demo_Application.Server.Service public void GetFileList(string filePath, out List fileList) { - fileList = new List(); - + fileList = new List(); + string fullPath = FILE_FOLDER + filePath; // Check if directory exists @@ -418,7 +418,7 @@ namespace Nc_Demo_Application.Server.Service { string fullPath = FILE_FOLDER + filePath; - string imagePath, imageDirectory; + string imagePath, imageDirectory; if (!File.Exists(fullPath)) throw new WebFaultException(HttpStatusCode.NotFound); 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 bd25ac9..8619e5e 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 @@ -51,6 +51,8 @@ namespace Nc_Demo_Application this.maxToolTxb = new System.Windows.Forms.TextBox(); this.multitoolOptCheckbox = new System.Windows.Forms.CheckBox(); this.label27 = new System.Windows.Forms.Label(); + this.toolStrip5 = new Nc_Demo_Application.Views.ToolStripEx(); + this.saveNcDataButton = new System.Windows.Forms.ToolStripButton(); this.label6 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); @@ -70,6 +72,8 @@ namespace Nc_Demo_Application this.NCNameLabel = new System.Windows.Forms.Label(); this.ncTabControl = new System.Windows.Forms.TabControl(); this.processPage = new System.Windows.Forms.TabPage(); + this.toolStrip1 = new Nc_Demo_Application.Views.ToolStripEx(); + this.saveNcProcessData = new System.Windows.Forms.ToolStripButton(); this.ncProcessGridView = new System.Windows.Forms.DataGridView(); this.ncProcessIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ProcessPartProgram = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -77,12 +81,16 @@ namespace Nc_Demo_Application this.ncProcessStatusColumn = new System.Windows.Forms.DataGridViewComboBoxColumn(); this.ncProcessModeColumn = new System.Windows.Forms.DataGridViewComboBoxColumn(); this.alarms = new System.Windows.Forms.TabPage(); + this.toolStrip3 = new Nc_Demo_Application.Views.ToolStripEx(); + this.saveNcAlarmsButton = new System.Windows.Forms.ToolStripButton(); this.ncAlarmsGridView = new System.Windows.Forms.DataGridView(); this.ncAlarmCodeColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ncAlarmProcessIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ncAlarmTextColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ncAlarmIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ncAxesPage = new System.Windows.Forms.TabPage(); + this.toolStrip4 = new Nc_Demo_Application.Views.ToolStripEx(); + this.saveNcAxesButton = new System.Windows.Forms.ToolStripButton(); this.ncAxisGridView = new System.Windows.Forms.DataGridView(); this.axisIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.axisNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -100,6 +108,10 @@ namespace Nc_Demo_Application this.BinaryMemoryBinaryColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.BinaryMemoryWordColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.BinaryMemoryIntegerColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.toolStrip2 = new Nc_Demo_Application.Views.ToolStripEx(); + this.saveBinaryMemoryButton = new System.Windows.Forms.ToolStripButton(); + this.addRowsBinaryMemory = new System.Windows.Forms.ToolStripButton(); + this.deleteRowsBinaryMemory = new System.Windows.Forms.ToolStripButton(); this.partProgramPage = new System.Windows.Forms.TabPage(); this.timeLeftPicker = new System.Windows.Forms.DateTimePicker(); this.label35 = new System.Windows.Forms.Label(); @@ -109,6 +121,12 @@ namespace Nc_Demo_Application this.activeProgram = new System.Windows.Forms.TextBox(); this.fileContentTextBox = new System.Windows.Forms.TextBox(); this.fileTreeView = new System.Windows.Forms.TreeView(); + this.toolStrip6 = new Nc_Demo_Application.Views.ToolStripEx(); + this.refreshActiveProgram = new System.Windows.Forms.ToolStripButton(); + this.saveFileButton = new System.Windows.Forms.ToolStripButton(); + this.deleteFileButton = new System.Windows.Forms.ToolStripButton(); + this.addFileButton = new System.Windows.Forms.ToolStripButton(); + this.newFileNameTextBox = new System.Windows.Forms.ToolStripTextBox(); this.magazinesTab = new System.Windows.Forms.TabPage(); this.label26 = new System.Windows.Forms.Label(); this.label25 = new System.Windows.Forms.Label(); @@ -130,6 +148,8 @@ namespace Nc_Demo_Application this.ShankId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.magazineToolId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.disablePosition = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.toolStripEx2 = new Nc_Demo_Application.Views.ToolStripEx(); + this.saveMagazinesButton = new System.Windows.Forms.ToolStripButton(); this.familiesTab = new System.Windows.Forms.TabPage(); this.label18 = new System.Windows.Forms.Label(); this.shanksDataGridView = new System.Windows.Forms.DataGridView(); @@ -148,6 +168,8 @@ namespace Nc_Demo_Application this.familiesDataGridView = new System.Windows.Forms.DataGridView(); this.id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.toolStripEx1 = new Nc_Demo_Application.Views.ToolStripEx(); + this.saveFamiliesButton = new System.Windows.Forms.ToolStripButton(); this.toolsPage = new System.Windows.Forms.TabPage(); this.label32 = new System.Windows.Forms.Label(); this.multitoolIdTxb = new System.Windows.Forms.TextBox(); @@ -224,60 +246,38 @@ namespace Nc_Demo_Application this.param29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.param30 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.param34 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.stopServer = new System.Windows.Forms.Button(); - this.versionLabel = new System.Windows.Forms.Label(); - this.toolStrip5 = new Nc_Demo_Application.Views.ToolStripEx(); - this.saveNcDataButton = new System.Windows.Forms.ToolStripButton(); - this.toolStrip1 = new Nc_Demo_Application.Views.ToolStripEx(); - this.saveNcProcessData = new System.Windows.Forms.ToolStripButton(); - this.toolStrip3 = new Nc_Demo_Application.Views.ToolStripEx(); - this.saveNcAlarmsButton = new System.Windows.Forms.ToolStripButton(); - this.toolStrip4 = new Nc_Demo_Application.Views.ToolStripEx(); - this.saveNcAxesButton = new System.Windows.Forms.ToolStripButton(); - this.toolStrip2 = new Nc_Demo_Application.Views.ToolStripEx(); - this.saveBinaryMemoryButton = new System.Windows.Forms.ToolStripButton(); - this.addRowsBinaryMemory = new System.Windows.Forms.ToolStripButton(); - this.deleteRowsBinaryMemory = new System.Windows.Forms.ToolStripButton(); - this.toolStrip6 = new Nc_Demo_Application.Views.ToolStripEx(); - this.refreshActiveProgram = new System.Windows.Forms.ToolStripButton(); - this.saveFileButton = new System.Windows.Forms.ToolStripButton(); - this.deleteFileButton = new System.Windows.Forms.ToolStripButton(); - this.addFileButton = new System.Windows.Forms.ToolStripButton(); - this.newFileNameTextBox = new System.Windows.Forms.ToolStripTextBox(); - this.toolStripEx2 = new Nc_Demo_Application.Views.ToolStripEx(); - this.saveMagazinesButton = new System.Windows.Forms.ToolStripButton(); - this.toolStripEx1 = new Nc_Demo_Application.Views.ToolStripEx(); - this.saveFamiliesButton = new System.Windows.Forms.ToolStripButton(); this.toolStrip7 = new Nc_Demo_Application.Views.ToolStripEx(); this.refreshToolUI = new System.Windows.Forms.ToolStripButton(); this.removeTool = new System.Windows.Forms.ToolStripButton(); this.addTool = new System.Windows.Forms.ToolStripButton(); + this.stopServer = new System.Windows.Forms.Button(); + this.versionLabel = new System.Windows.Forms.Label(); this.ncDataPage.SuspendLayout(); + this.toolStrip5.SuspendLayout(); this.ncTabControl.SuspendLayout(); this.processPage.SuspendLayout(); + this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.ncProcessGridView)).BeginInit(); this.alarms.SuspendLayout(); + this.toolStrip3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.ncAlarmsGridView)).BeginInit(); this.ncAxesPage.SuspendLayout(); + this.toolStrip4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.ncAxisGridView)).BeginInit(); this.byteMemoryPage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.binaryMemoryGridView)).BeginInit(); + this.toolStrip2.SuspendLayout(); this.partProgramPage.SuspendLayout(); + this.toolStrip6.SuspendLayout(); this.magazinesTab.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.magazinesGridView)).BeginInit(); + this.toolStripEx2.SuspendLayout(); this.familiesTab.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.shanksDataGridView)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.familiesDataGridView)).BeginInit(); + this.toolStripEx1.SuspendLayout(); this.toolsPage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.edgesDataGridView)).BeginInit(); - this.toolStrip5.SuspendLayout(); - this.toolStrip1.SuspendLayout(); - this.toolStrip3.SuspendLayout(); - this.toolStrip4.SuspendLayout(); - this.toolStrip2.SuspendLayout(); - this.toolStrip6.SuspendLayout(); - this.toolStripEx2.SuspendLayout(); - this.toolStripEx1.SuspendLayout(); this.toolStrip7.SuspendLayout(); this.SuspendLayout(); // @@ -435,6 +435,27 @@ namespace Nc_Demo_Application this.label27.TabIndex = 54; this.label27.Text = "Configurations:"; // + // toolStrip5 + // + this.toolStrip5.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveNcDataButton}); + this.toolStrip5.Location = new System.Drawing.Point(3, 3); + this.toolStrip5.Name = "toolStrip5"; + this.toolStrip5.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; + this.toolStrip5.Size = new System.Drawing.Size(972, 25); + this.toolStrip5.TabIndex = 53; + this.toolStrip5.Text = "toolStrip5"; + // + // saveNcDataButton + // + this.saveNcDataButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveNcDataButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; + this.saveNcDataButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveNcDataButton.Name = "saveNcDataButton"; + this.saveNcDataButton.Size = new System.Drawing.Size(23, 22); + this.saveNcDataButton.Text = "toolStripButton1"; + this.saveNcDataButton.Click += new System.EventHandler(this.SaveCnDataButton_Click); + // // label6 // this.label6.AutoSize = true; @@ -605,6 +626,28 @@ namespace Nc_Demo_Application this.processPage.TabIndex = 1; this.processPage.Text = "Nc Process"; // + // toolStrip1 + // + this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None; + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveNcProcessData}); + this.toolStrip1.Location = new System.Drawing.Point(3, 3); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(35, 25); + this.toolStrip1.TabIndex = 9; + this.toolStrip1.Text = "toolStrip1"; + this.toolStrip1.Click += new System.EventHandler(this.SaveNcProcessData_Click); + // + // saveNcProcessData + // + this.saveNcProcessData.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveNcProcessData.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; + this.saveNcProcessData.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveNcProcessData.Name = "saveNcProcessData"; + this.saveNcProcessData.Size = new System.Drawing.Size(23, 22); + this.saveNcProcessData.Text = "Save"; + this.saveNcProcessData.Click += new System.EventHandler(this.SaveNcProcessData_Click); + // // ncProcessGridView // this.ncProcessGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -672,6 +715,32 @@ namespace Nc_Demo_Application this.alarms.Text = "NC Alarms"; this.alarms.UseVisualStyleBackColor = true; // + // toolStrip3 + // + this.toolStrip3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.toolStrip3.Dock = System.Windows.Forms.DockStyle.None; + this.toolStrip3.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveNcAlarmsButton}); + this.toolStrip3.Location = new System.Drawing.Point(0, 0); + this.toolStrip3.Name = "toolStrip3"; + this.toolStrip3.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; + this.toolStrip3.Size = new System.Drawing.Size(35, 25); + this.toolStrip3.TabIndex = 2; + this.toolStrip3.Text = "toolStrip3"; + this.toolStrip3.Click += new System.EventHandler(this.SaveNcAlarmsButton_Click); + // + // saveNcAlarmsButton + // + this.saveNcAlarmsButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveNcAlarmsButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; + this.saveNcAlarmsButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveNcAlarmsButton.Name = "saveNcAlarmsButton"; + this.saveNcAlarmsButton.Size = new System.Drawing.Size(23, 22); + this.saveNcAlarmsButton.Text = "Save"; + this.saveNcAlarmsButton.Click += new System.EventHandler(this.SaveNcAlarmsButton_Click); + // // ncAlarmsGridView // this.ncAlarmsGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -729,6 +798,26 @@ namespace Nc_Demo_Application this.ncAxesPage.Text = "Axes"; this.ncAxesPage.UseVisualStyleBackColor = true; // + // toolStrip4 + // + this.toolStrip4.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveNcAxesButton}); + this.toolStrip4.Location = new System.Drawing.Point(0, 0); + this.toolStrip4.Name = "toolStrip4"; + this.toolStrip4.Size = new System.Drawing.Size(978, 25); + this.toolStrip4.TabIndex = 53; + this.toolStrip4.Text = "toolStrip4"; + // + // saveNcAxesButton + // + this.saveNcAxesButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveNcAxesButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; + this.saveNcAxesButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveNcAxesButton.Name = "saveNcAxesButton"; + this.saveNcAxesButton.Size = new System.Drawing.Size(23, 22); + this.saveNcAxesButton.Text = "Save"; + this.saveNcAxesButton.Click += new System.EventHandler(this.SaveNcAxesButton_Click); + // // ncAxisGridView // this.ncAxisGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; @@ -875,6 +964,49 @@ namespace Nc_Demo_Application this.BinaryMemoryIntegerColumn.HeaderText = "Integer"; this.BinaryMemoryIntegerColumn.Name = "BinaryMemoryIntegerColumn"; // + // toolStrip2 + // + this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveBinaryMemoryButton, + this.addRowsBinaryMemory, + this.deleteRowsBinaryMemory}); + this.toolStrip2.Location = new System.Drawing.Point(0, 0); + this.toolStrip2.Name = "toolStrip2"; + this.toolStrip2.Size = new System.Drawing.Size(978, 25); + this.toolStrip2.TabIndex = 1; + this.toolStrip2.Text = "toolStrip2"; + // + // saveBinaryMemoryButton + // + this.saveBinaryMemoryButton.CheckOnClick = true; + this.saveBinaryMemoryButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveBinaryMemoryButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; + this.saveBinaryMemoryButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveBinaryMemoryButton.Name = "saveBinaryMemoryButton"; + this.saveBinaryMemoryButton.Size = new System.Drawing.Size(23, 22); + this.saveBinaryMemoryButton.Text = "Save"; + this.saveBinaryMemoryButton.Click += new System.EventHandler(this.SaveBinaryMemory_Click); + // + // addRowsBinaryMemory + // + this.addRowsBinaryMemory.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.addRowsBinaryMemory.Image = global::Nc_Demo_Application.Properties.Resources.addButton; + this.addRowsBinaryMemory.ImageTransparentColor = System.Drawing.Color.Magenta; + this.addRowsBinaryMemory.Name = "addRowsBinaryMemory"; + this.addRowsBinaryMemory.Size = new System.Drawing.Size(23, 22); + this.addRowsBinaryMemory.Text = "Add 4 Rows"; + this.addRowsBinaryMemory.Click += new System.EventHandler(this.AddRowsBinaryMemory_Click); + // + // deleteRowsBinaryMemory + // + this.deleteRowsBinaryMemory.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.deleteRowsBinaryMemory.Image = global::Nc_Demo_Application.Properties.Resources.removeButton; + this.deleteRowsBinaryMemory.ImageTransparentColor = System.Drawing.Color.Magenta; + this.deleteRowsBinaryMemory.Name = "deleteRowsBinaryMemory"; + this.deleteRowsBinaryMemory.Size = new System.Drawing.Size(23, 22); + this.deleteRowsBinaryMemory.Text = "Remove 4 rows"; + this.deleteRowsBinaryMemory.Click += new System.EventHandler(this.deleteRowsBinaryMemory_Click); + // // partProgramPage // this.partProgramPage.Controls.Add(this.timeLeftPicker); @@ -970,6 +1102,65 @@ namespace Nc_Demo_Application this.fileTreeView.TabIndex = 0; this.fileTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.FileTreeView_AfterSelect); // + // toolStrip6 + // + this.toolStrip6.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.refreshActiveProgram, + this.saveFileButton, + this.deleteFileButton, + this.addFileButton, + this.newFileNameTextBox}); + this.toolStrip6.Location = new System.Drawing.Point(3, 3); + this.toolStrip6.Name = "toolStrip6"; + this.toolStrip6.Size = new System.Drawing.Size(972, 25); + this.toolStrip6.TabIndex = 1; + this.toolStrip6.Text = "toolStrip6"; + // + // refreshActiveProgram + // + this.refreshActiveProgram.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.refreshActiveProgram.Image = global::Nc_Demo_Application.Properties.Resources.refresh; + this.refreshActiveProgram.ImageTransparentColor = System.Drawing.Color.Magenta; + this.refreshActiveProgram.Name = "refreshActiveProgram"; + this.refreshActiveProgram.Size = new System.Drawing.Size(23, 22); + this.refreshActiveProgram.Text = "toolStripButton1"; + this.refreshActiveProgram.Click += new System.EventHandler(this.toolStripButton1_Click); + // + // saveFileButton + // + this.saveFileButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveFileButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; + this.saveFileButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveFileButton.Name = "saveFileButton"; + this.saveFileButton.Size = new System.Drawing.Size(23, 22); + this.saveFileButton.Text = "Save file"; + this.saveFileButton.Click += new System.EventHandler(this.SaveFileButton_Click); + // + // deleteFileButton + // + this.deleteFileButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.deleteFileButton.Image = global::Nc_Demo_Application.Properties.Resources.removeButton; + this.deleteFileButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.deleteFileButton.Name = "deleteFileButton"; + this.deleteFileButton.Size = new System.Drawing.Size(23, 22); + this.deleteFileButton.Text = "Delete file"; + this.deleteFileButton.Click += new System.EventHandler(this.DeleteFile_Click); + // + // addFileButton + // + this.addFileButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.addFileButton.Image = global::Nc_Demo_Application.Properties.Resources.addButton; + this.addFileButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.addFileButton.Name = "addFileButton"; + this.addFileButton.Size = new System.Drawing.Size(23, 22); + this.addFileButton.Text = "Add file"; + this.addFileButton.Click += new System.EventHandler(this.AddFile_Click); + // + // newFileNameTextBox + // + this.newFileNameTextBox.Name = "newFileNameTextBox"; + this.newFileNameTextBox.Size = new System.Drawing.Size(100, 25); + // // magazinesTab // this.magazinesTab.Controls.Add(this.label26); @@ -1168,6 +1359,26 @@ namespace Nc_Demo_Application this.disablePosition.Name = "disablePosition"; this.disablePosition.TrueValue = "1"; // + // toolStripEx2 + // + this.toolStripEx2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveMagazinesButton}); + this.toolStripEx2.Location = new System.Drawing.Point(3, 3); + this.toolStripEx2.Name = "toolStripEx2"; + this.toolStripEx2.Size = new System.Drawing.Size(972, 25); + this.toolStripEx2.TabIndex = 1; + this.toolStripEx2.Text = "toolStripEx2"; + // + // saveMagazinesButton + // + this.saveMagazinesButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveMagazinesButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; + this.saveMagazinesButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveMagazinesButton.Name = "saveMagazinesButton"; + this.saveMagazinesButton.Size = new System.Drawing.Size(23, 22); + this.saveMagazinesButton.Text = "Save"; + this.saveMagazinesButton.Click += new System.EventHandler(this.SaveMagazinesButton_Click); + // // familiesTab // this.familiesTab.Controls.Add(this.label18); @@ -1348,6 +1559,25 @@ namespace Nc_Demo_Application this.name.HeaderText = "Name"; this.name.Name = "name"; // + // toolStripEx1 + // + this.toolStripEx1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveFamiliesButton}); + this.toolStripEx1.Location = new System.Drawing.Point(3, 3); + this.toolStripEx1.Name = "toolStripEx1"; + this.toolStripEx1.Size = new System.Drawing.Size(972, 25); + this.toolStripEx1.TabIndex = 0; + this.toolStripEx1.Text = "toolStripEx1"; + // + // saveFamiliesButton + // + this.saveFamiliesButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveFamiliesButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; + this.saveFamiliesButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.saveFamiliesButton.Name = "saveFamiliesButton"; + this.saveFamiliesButton.Size = new System.Drawing.Size(23, 22); + this.saveFamiliesButton.Click += new System.EventHandler(this.SaveFamiliesButton_Click); + // // toolsPage // this.toolsPage.Controls.Add(this.label32); @@ -2110,258 +2340,6 @@ namespace Nc_Demo_Application this.param34.HeaderText = "34"; this.param34.Name = "param34"; // - // stopServer - // - this.stopServer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.stopServer.Location = new System.Drawing.Point(906, 687); - this.stopServer.Name = "stopServer"; - this.stopServer.Size = new System.Drawing.Size(91, 30); - this.stopServer.TabIndex = 8; - this.stopServer.Text = "Stop"; - this.stopServer.UseVisualStyleBackColor = true; - this.stopServer.Click += new System.EventHandler(this.StopServer_Click); - // - // versionLabel - // - this.versionLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.versionLabel.AutoSize = true; - this.versionLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.versionLabel.Location = new System.Drawing.Point(811, 691); - this.versionLabel.Name = "versionLabel"; - this.versionLabel.Size = new System.Drawing.Size(89, 20); - this.versionLabel.TabIndex = 11; - this.versionLabel.Text = "Version: 32"; - // - // toolStrip5 - // - this.toolStrip5.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveNcDataButton}); - this.toolStrip5.Location = new System.Drawing.Point(3, 3); - this.toolStrip5.Name = "toolStrip5"; - this.toolStrip5.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - this.toolStrip5.Size = new System.Drawing.Size(972, 25); - this.toolStrip5.TabIndex = 53; - this.toolStrip5.Text = "toolStrip5"; - // - // saveNcDataButton - // - this.saveNcDataButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveNcDataButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; - this.saveNcDataButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveNcDataButton.Name = "saveNcDataButton"; - this.saveNcDataButton.Size = new System.Drawing.Size(23, 22); - this.saveNcDataButton.Text = "toolStripButton1"; - this.saveNcDataButton.Click += new System.EventHandler(this.SaveCnDataButton_Click); - // - // toolStrip1 - // - this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None; - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveNcProcessData}); - this.toolStrip1.Location = new System.Drawing.Point(3, 3); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(35, 25); - this.toolStrip1.TabIndex = 9; - this.toolStrip1.Text = "toolStrip1"; - this.toolStrip1.Click += new System.EventHandler(this.SaveNcProcessData_Click); - // - // saveNcProcessData - // - this.saveNcProcessData.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveNcProcessData.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; - this.saveNcProcessData.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveNcProcessData.Name = "saveNcProcessData"; - this.saveNcProcessData.Size = new System.Drawing.Size(23, 22); - this.saveNcProcessData.Text = "Save"; - this.saveNcProcessData.Click += new System.EventHandler(this.SaveNcProcessData_Click); - // - // toolStrip3 - // - this.toolStrip3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.toolStrip3.Dock = System.Windows.Forms.DockStyle.None; - this.toolStrip3.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveNcAlarmsButton}); - this.toolStrip3.Location = new System.Drawing.Point(0, 0); - this.toolStrip3.Name = "toolStrip3"; - this.toolStrip3.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.toolStrip3.Size = new System.Drawing.Size(35, 25); - this.toolStrip3.TabIndex = 2; - this.toolStrip3.Text = "toolStrip3"; - this.toolStrip3.Click += new System.EventHandler(this.SaveNcAlarmsButton_Click); - // - // saveNcAlarmsButton - // - this.saveNcAlarmsButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveNcAlarmsButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; - this.saveNcAlarmsButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveNcAlarmsButton.Name = "saveNcAlarmsButton"; - this.saveNcAlarmsButton.Size = new System.Drawing.Size(23, 22); - this.saveNcAlarmsButton.Text = "Save"; - this.saveNcAlarmsButton.Click += new System.EventHandler(this.SaveNcAlarmsButton_Click); - // - // toolStrip4 - // - this.toolStrip4.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveNcAxesButton}); - this.toolStrip4.Location = new System.Drawing.Point(0, 0); - this.toolStrip4.Name = "toolStrip4"; - this.toolStrip4.Size = new System.Drawing.Size(978, 25); - this.toolStrip4.TabIndex = 53; - this.toolStrip4.Text = "toolStrip4"; - // - // saveNcAxesButton - // - this.saveNcAxesButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveNcAxesButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; - this.saveNcAxesButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveNcAxesButton.Name = "saveNcAxesButton"; - this.saveNcAxesButton.Size = new System.Drawing.Size(23, 22); - this.saveNcAxesButton.Text = "Save"; - this.saveNcAxesButton.Click += new System.EventHandler(this.SaveNcAxesButton_Click); - // - // toolStrip2 - // - this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveBinaryMemoryButton, - this.addRowsBinaryMemory, - this.deleteRowsBinaryMemory}); - this.toolStrip2.Location = new System.Drawing.Point(0, 0); - this.toolStrip2.Name = "toolStrip2"; - this.toolStrip2.Size = new System.Drawing.Size(978, 25); - this.toolStrip2.TabIndex = 1; - this.toolStrip2.Text = "toolStrip2"; - // - // saveBinaryMemoryButton - // - this.saveBinaryMemoryButton.CheckOnClick = true; - this.saveBinaryMemoryButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveBinaryMemoryButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; - this.saveBinaryMemoryButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveBinaryMemoryButton.Name = "saveBinaryMemoryButton"; - this.saveBinaryMemoryButton.Size = new System.Drawing.Size(23, 22); - this.saveBinaryMemoryButton.Text = "Save"; - this.saveBinaryMemoryButton.Click += new System.EventHandler(this.SaveBinaryMemory_Click); - // - // addRowsBinaryMemory - // - this.addRowsBinaryMemory.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.addRowsBinaryMemory.Image = global::Nc_Demo_Application.Properties.Resources.addButton; - this.addRowsBinaryMemory.ImageTransparentColor = System.Drawing.Color.Magenta; - this.addRowsBinaryMemory.Name = "addRowsBinaryMemory"; - this.addRowsBinaryMemory.Size = new System.Drawing.Size(23, 22); - this.addRowsBinaryMemory.Text = "Add 4 Rows"; - this.addRowsBinaryMemory.Click += new System.EventHandler(this.AddRowsBinaryMemory_Click); - // - // deleteRowsBinaryMemory - // - this.deleteRowsBinaryMemory.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.deleteRowsBinaryMemory.Image = global::Nc_Demo_Application.Properties.Resources.removeButton; - this.deleteRowsBinaryMemory.ImageTransparentColor = System.Drawing.Color.Magenta; - this.deleteRowsBinaryMemory.Name = "deleteRowsBinaryMemory"; - this.deleteRowsBinaryMemory.Size = new System.Drawing.Size(23, 22); - this.deleteRowsBinaryMemory.Text = "Remove 4 rows"; - this.deleteRowsBinaryMemory.Click += new System.EventHandler(this.deleteRowsBinaryMemory_Click); - // - // toolStrip6 - // - this.toolStrip6.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.refreshActiveProgram, - this.saveFileButton, - this.deleteFileButton, - this.addFileButton, - this.newFileNameTextBox}); - this.toolStrip6.Location = new System.Drawing.Point(3, 3); - this.toolStrip6.Name = "toolStrip6"; - this.toolStrip6.Size = new System.Drawing.Size(972, 25); - this.toolStrip6.TabIndex = 1; - this.toolStrip6.Text = "toolStrip6"; - // - // refreshActiveProgram - // - this.refreshActiveProgram.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.refreshActiveProgram.Image = global::Nc_Demo_Application.Properties.Resources.refresh; - this.refreshActiveProgram.ImageTransparentColor = System.Drawing.Color.Magenta; - this.refreshActiveProgram.Name = "refreshActiveProgram"; - this.refreshActiveProgram.Size = new System.Drawing.Size(23, 22); - this.refreshActiveProgram.Text = "toolStripButton1"; - this.refreshActiveProgram.Click += new System.EventHandler(this.toolStripButton1_Click); - // - // saveFileButton - // - this.saveFileButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveFileButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; - this.saveFileButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveFileButton.Name = "saveFileButton"; - this.saveFileButton.Size = new System.Drawing.Size(23, 22); - this.saveFileButton.Text = "Save file"; - this.saveFileButton.Click += new System.EventHandler(this.SaveFileButton_Click); - // - // deleteFileButton - // - this.deleteFileButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.deleteFileButton.Image = global::Nc_Demo_Application.Properties.Resources.removeButton; - this.deleteFileButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.deleteFileButton.Name = "deleteFileButton"; - this.deleteFileButton.Size = new System.Drawing.Size(23, 22); - this.deleteFileButton.Text = "Delete file"; - this.deleteFileButton.Click += new System.EventHandler(this.DeleteFile_Click); - // - // addFileButton - // - this.addFileButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.addFileButton.Image = global::Nc_Demo_Application.Properties.Resources.addButton; - this.addFileButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.addFileButton.Name = "addFileButton"; - this.addFileButton.Size = new System.Drawing.Size(23, 22); - this.addFileButton.Text = "Add file"; - this.addFileButton.Click += new System.EventHandler(this.AddFile_Click); - // - // newFileNameTextBox - // - this.newFileNameTextBox.Name = "newFileNameTextBox"; - this.newFileNameTextBox.Size = new System.Drawing.Size(100, 25); - // - // toolStripEx2 - // - this.toolStripEx2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveMagazinesButton}); - this.toolStripEx2.Location = new System.Drawing.Point(3, 3); - this.toolStripEx2.Name = "toolStripEx2"; - this.toolStripEx2.Size = new System.Drawing.Size(972, 25); - this.toolStripEx2.TabIndex = 1; - this.toolStripEx2.Text = "toolStripEx2"; - // - // saveMagazinesButton - // - this.saveMagazinesButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveMagazinesButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; - this.saveMagazinesButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveMagazinesButton.Name = "saveMagazinesButton"; - this.saveMagazinesButton.Size = new System.Drawing.Size(23, 22); - this.saveMagazinesButton.Text = "Save"; - this.saveMagazinesButton.Click += new System.EventHandler(this.SaveMagazinesButton_Click); - // - // toolStripEx1 - // - this.toolStripEx1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveFamiliesButton}); - this.toolStripEx1.Location = new System.Drawing.Point(3, 3); - this.toolStripEx1.Name = "toolStripEx1"; - this.toolStripEx1.Size = new System.Drawing.Size(972, 25); - this.toolStripEx1.TabIndex = 0; - this.toolStripEx1.Text = "toolStripEx1"; - // - // saveFamiliesButton - // - this.saveFamiliesButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveFamiliesButton.Image = global::Nc_Demo_Application.Properties.Resources.saveButton; - this.saveFamiliesButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.saveFamiliesButton.Name = "saveFamiliesButton"; - this.saveFamiliesButton.Size = new System.Drawing.Size(23, 22); - this.saveFamiliesButton.Click += new System.EventHandler(this.SaveFamiliesButton_Click); - // // toolStrip7 // this.toolStrip7.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -2404,6 +2382,28 @@ namespace Nc_Demo_Application this.addTool.Text = "toolStripButton1"; this.addTool.Click += new System.EventHandler(this.AddTool_Click); // + // stopServer + // + this.stopServer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.stopServer.Location = new System.Drawing.Point(906, 687); + this.stopServer.Name = "stopServer"; + this.stopServer.Size = new System.Drawing.Size(91, 30); + this.stopServer.TabIndex = 8; + this.stopServer.Text = "Stop"; + this.stopServer.UseVisualStyleBackColor = true; + this.stopServer.Click += new System.EventHandler(this.StopServer_Click); + // + // versionLabel + // + this.versionLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.versionLabel.AutoSize = true; + this.versionLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.versionLabel.Location = new System.Drawing.Point(811, 691); + this.versionLabel.Name = "versionLabel"; + this.versionLabel.Size = new System.Drawing.Size(89, 20); + this.versionLabel.TabIndex = 11; + this.versionLabel.Text = "Version: 33"; + // // DemoApplicationForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -2422,47 +2422,47 @@ namespace Nc_Demo_Application this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.DemoApplicationForm_KeyDown); this.ncDataPage.ResumeLayout(false); this.ncDataPage.PerformLayout(); + this.toolStrip5.ResumeLayout(false); + this.toolStrip5.PerformLayout(); this.ncTabControl.ResumeLayout(false); this.processPage.ResumeLayout(false); this.processPage.PerformLayout(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.ncProcessGridView)).EndInit(); this.alarms.ResumeLayout(false); this.alarms.PerformLayout(); + this.toolStrip3.ResumeLayout(false); + this.toolStrip3.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.ncAlarmsGridView)).EndInit(); this.ncAxesPage.ResumeLayout(false); this.ncAxesPage.PerformLayout(); + this.toolStrip4.ResumeLayout(false); + this.toolStrip4.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.ncAxisGridView)).EndInit(); this.byteMemoryPage.ResumeLayout(false); this.byteMemoryPage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.binaryMemoryGridView)).EndInit(); + this.toolStrip2.ResumeLayout(false); + this.toolStrip2.PerformLayout(); this.partProgramPage.ResumeLayout(false); this.partProgramPage.PerformLayout(); + this.toolStrip6.ResumeLayout(false); + this.toolStrip6.PerformLayout(); this.magazinesTab.ResumeLayout(false); this.magazinesTab.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.magazinesGridView)).EndInit(); + this.toolStripEx2.ResumeLayout(false); + this.toolStripEx2.PerformLayout(); this.familiesTab.ResumeLayout(false); this.familiesTab.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.shanksDataGridView)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.familiesDataGridView)).EndInit(); + this.toolStripEx1.ResumeLayout(false); + this.toolStripEx1.PerformLayout(); this.toolsPage.ResumeLayout(false); this.toolsPage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.edgesDataGridView)).EndInit(); - this.toolStrip5.ResumeLayout(false); - this.toolStrip5.PerformLayout(); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - this.toolStrip3.ResumeLayout(false); - this.toolStrip3.PerformLayout(); - this.toolStrip4.ResumeLayout(false); - this.toolStrip4.PerformLayout(); - this.toolStrip2.ResumeLayout(false); - this.toolStrip2.PerformLayout(); - this.toolStrip6.ResumeLayout(false); - this.toolStrip6.PerformLayout(); - this.toolStripEx2.ResumeLayout(false); - this.toolStripEx2.PerformLayout(); - this.toolStripEx1.ResumeLayout(false); - this.toolStripEx1.PerformLayout(); this.toolStrip7.ResumeLayout(false); this.toolStrip7.PerformLayout(); this.ResumeLayout(false);