diff --git a/AUTS_Repair/AUTS_Repair.vbproj b/AUTS_Repair/AUTS_Repair.vbproj index 558a8de..fd59166 100644 --- a/AUTS_Repair/AUTS_Repair.vbproj +++ b/AUTS_Repair/AUTS_Repair.vbproj @@ -184,5 +184,11 @@ + + + {33C6456C-F00D-41AC-A6FB-DB0601495C6A} + UTS_Core + + \ No newline at end of file diff --git a/AUTS_Repair/obj/Debug/AUTS_Repair.vbproj.AssemblyReference.cache b/AUTS_Repair/obj/Debug/AUTS_Repair.vbproj.AssemblyReference.cache index 5184170..5f90d10 100644 Binary files a/AUTS_Repair/obj/Debug/AUTS_Repair.vbproj.AssemblyReference.cache and b/AUTS_Repair/obj/Debug/AUTS_Repair.vbproj.AssemblyReference.cache differ diff --git a/AUTS_Repair/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/AUTS_Repair/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index eb8d4e7..c806014 100644 Binary files a/AUTS_Repair/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/AUTS_Repair/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/AUTS_Win/My Project/AssemblyInfo.vb b/AUTS_Win/My Project/AssemblyInfo.vb index 6346124..f50c437 100644 --- a/AUTS_Win/My Project/AssemblyInfo.vb +++ b/AUTS_Win/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices '通过使用 "*"，如下所示: ' - - + + diff --git a/AUTS_Win/bin/Debug/AUTS_Win.exe b/AUTS_Win/bin/Debug/AUTS_Win.exe index 0339b81..a4fddb9 100644 Binary files a/AUTS_Win/bin/Debug/AUTS_Win.exe and b/AUTS_Win/bin/Debug/AUTS_Win.exe differ diff --git a/AUTS_Win/bin/Debug/AUTS_Win.pdb b/AUTS_Win/bin/Debug/AUTS_Win.pdb index 3f17e89..fe01cf3 100644 Binary files a/AUTS_Win/bin/Debug/AUTS_Win.pdb and b/AUTS_Win/bin/Debug/AUTS_Win.pdb differ diff --git a/AUTS_Win/bin/Debug/UTS_Core.dll b/AUTS_Win/bin/Debug/UTS_Core.dll index 553607e..a2dcdcd 100644 Binary files a/AUTS_Win/bin/Debug/UTS_Core.dll and b/AUTS_Win/bin/Debug/UTS_Core.dll differ diff --git a/AUTS_Win/bin/Debug/UTS_Core.pdb b/AUTS_Win/bin/Debug/UTS_Core.pdb index f25a1ee..e3827c3 100644 Binary files a/AUTS_Win/bin/Debug/UTS_Core.pdb and b/AUTS_Win/bin/Debug/UTS_Core.pdb differ diff --git a/AUTS_Win/obj/Debug/AUTS_Win.exe b/AUTS_Win/obj/Debug/AUTS_Win.exe index 0339b81..a4fddb9 100644 Binary files a/AUTS_Win/obj/Debug/AUTS_Win.exe and b/AUTS_Win/obj/Debug/AUTS_Win.exe differ diff --git a/AUTS_Win/obj/Debug/AUTS_Win.pdb b/AUTS_Win/obj/Debug/AUTS_Win.pdb index 3f17e89..fe01cf3 100644 Binary files a/AUTS_Win/obj/Debug/AUTS_Win.pdb and b/AUTS_Win/obj/Debug/AUTS_Win.pdb differ diff --git a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.AssemblyReference.cache b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.AssemblyReference.cache index 148ea3e..a700135 100644 Binary files a/AUTS_Win/obj/Debug/AUTS_Win.vbproj.AssemblyReference.cache and b/AUTS_Win/obj/Debug/AUTS_Win.vbproj.AssemblyReference.cache differ diff --git a/UTS_Core/UTSModule/Station/FrmStationPlan.Designer.vb b/UTS_Core/UTSModule/Station/FrmStationPlan.Designer.vb index 52ecc33..329e4fe 100644 --- a/UTS_Core/UTSModule/Station/FrmStationPlan.Designer.vb +++ b/UTS_Core/UTSModule/Station/FrmStationPlan.Designer.vb @@ -80,6 +80,8 @@ Namespace UTSModule.Station Me.TsmiDebugStart = New System.Windows.Forms.ToolStripMenuItem() Me.TsmiDebugEnd = New System.Windows.Forms.ToolStripMenuItem() Me.TsmiDebugContinue = New System.Windows.Forms.ToolStripMenuItem() + Me.执行1ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.执行2ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TsmiDebugStep = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator() Me.TsmiDebugSetup = New System.Windows.Forms.ToolStripMenuItem() @@ -90,6 +92,7 @@ Namespace UTSModule.Station Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator() Me.TsmiDebugNode = New System.Windows.Forms.ToolStripMenuItem() Me.TsmiDebugNodeBegin = New System.Windows.Forms.ToolStripMenuItem() + Me.TsmiJumpCall = New System.Windows.Forms.ToolStripMenuItem() Me.GrpSingleRowInfo = New System.Windows.Forms.GroupBox() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() Me.GrdRowNode = New FlexCell.Grid() @@ -98,7 +101,6 @@ Namespace UTSModule.Station Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TpOutputInfo = New System.Windows.Forms.TabPage() Me.RtxOutputInfo = New System.Windows.Forms.RichTextBox() - Me.TsmiJumpCall = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStrip1.SuspendLayout() Me.StuMain.SuspendLayout() CType(Me.SplStationPlan, System.ComponentModel.ISupportInitialize).BeginInit() @@ -123,10 +125,12 @@ Namespace UTSModule.Station ' 'ToolStrip1 ' + Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TsBtnOpen, Me.TsBtnSave, Me.ToolStripSeparator4, Me.TsBtnLoad, Me.TsBtnSaveAs, Me.ToolStripSeparator3, Me.TsBtnBackward, Me.TsBtnForward, Me.ToolStripSeparator1, Me.TsBtnUndo, Me.TsBtnRedo, Me.ToolStripSeparator13, Me.tsBtnInsertRow, Me.tsBtnRemoveRow, Me.ToolStripSeparator14, Me.TsBtnMoveUp, Me.TsBtnMoveDown, Me.TsBtnMoveLeft, Me.TsBtnMoveRight, Me.ToolStripSeparator2, Me.TsBtnDebugMode, Me.TsBtnDebugStart, Me.TsBtnFailMode, Me.ToolStripSeparator10, Me.tslBtn_ActionOnly, Me.TsBtn_Record, Me.TsBtn_ExpandNode}) Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) Me.ToolStrip1.Name = "ToolStrip1" - Me.ToolStrip1.Size = New System.Drawing.Size(977, 40) + Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0) + Me.ToolStrip1.Size = New System.Drawing.Size(1466, 58) Me.ToolStrip1.TabIndex = 0 Me.ToolStrip1.Text = "ToolStrip1" ' @@ -136,7 +140,7 @@ Namespace UTSModule.Station Me.TsBtnOpen.Image = CType(resources.GetObject("TsBtnOpen.Image"), System.Drawing.Image) Me.TsBtnOpen.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnOpen.Name = "TsBtnOpen" - Me.TsBtnOpen.Size = New System.Drawing.Size(35, 37) + Me.TsBtnOpen.Size = New System.Drawing.Size(47, 53) Me.TsBtnOpen.Text = "打开" Me.TsBtnOpen.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -146,14 +150,14 @@ Namespace UTSModule.Station Me.TsBtnSave.Image = CType(resources.GetObject("TsBtnSave.Image"), System.Drawing.Image) Me.TsBtnSave.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnSave.Name = "TsBtnSave" - Me.TsBtnSave.Size = New System.Drawing.Size(35, 37) + Me.TsBtnSave.Size = New System.Drawing.Size(47, 53) Me.TsBtnSave.Text = "保存" Me.TsBtnSave.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(6, 40) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(6, 58) ' 'TsBtnLoad ' @@ -161,7 +165,7 @@ Namespace UTSModule.Station Me.TsBtnLoad.Image = CType(resources.GetObject("TsBtnLoad.Image"), System.Drawing.Image) Me.TsBtnLoad.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnLoad.Name = "TsBtnLoad" - Me.TsBtnLoad.Size = New System.Drawing.Size(35, 37) + Me.TsBtnLoad.Size = New System.Drawing.Size(47, 53) Me.TsBtnLoad.Text = "重载" Me.TsBtnLoad.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -171,14 +175,14 @@ Namespace UTSModule.Station Me.TsBtnSaveAs.Image = CType(resources.GetObject("TsBtnSaveAs.Image"), System.Drawing.Image) Me.TsBtnSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnSaveAs.Name = "TsBtnSaveAs" - Me.TsBtnSaveAs.Size = New System.Drawing.Size(35, 37) + Me.TsBtnSaveAs.Size = New System.Drawing.Size(47, 53) Me.TsBtnSaveAs.Text = "导出" Me.TsBtnSaveAs.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 40) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 58) ' 'TsBtnBackward ' @@ -186,7 +190,7 @@ Namespace UTSModule.Station Me.TsBtnBackward.Image = CType(resources.GetObject("TsBtnBackward.Image"), System.Drawing.Image) Me.TsBtnBackward.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnBackward.Name = "TsBtnBackward" - Me.TsBtnBackward.Size = New System.Drawing.Size(47, 37) + Me.TsBtnBackward.Size = New System.Drawing.Size(64, 53) Me.TsBtnBackward.Text = "上一步" Me.TsBtnBackward.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -196,7 +200,7 @@ Namespace UTSModule.Station Me.TsBtnForward.Image = CType(resources.GetObject("TsBtnForward.Image"), System.Drawing.Image) Me.TsBtnForward.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnForward.Name = "TsBtnForward" - Me.TsBtnForward.Size = New System.Drawing.Size(47, 37) + Me.TsBtnForward.Size = New System.Drawing.Size(64, 53) Me.TsBtnForward.Text = "下一步" Me.TsBtnForward.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText Me.TsBtnForward.ToolTipText = "下一步" @@ -204,7 +208,7 @@ Namespace UTSModule.Station 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 40) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 58) ' 'TsBtnUndo ' @@ -212,7 +216,7 @@ Namespace UTSModule.Station Me.TsBtnUndo.Image = CType(resources.GetObject("TsBtnUndo.Image"), System.Drawing.Image) Me.TsBtnUndo.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnUndo.Name = "TsBtnUndo" - Me.TsBtnUndo.Size = New System.Drawing.Size(35, 37) + Me.TsBtnUndo.Size = New System.Drawing.Size(47, 53) Me.TsBtnUndo.Text = "撤销" Me.TsBtnUndo.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -222,7 +226,7 @@ Namespace UTSModule.Station Me.TsBtnRedo.Image = CType(resources.GetObject("TsBtnRedo.Image"), System.Drawing.Image) Me.TsBtnRedo.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnRedo.Name = "TsBtnRedo" - Me.TsBtnRedo.Size = New System.Drawing.Size(35, 37) + Me.TsBtnRedo.Size = New System.Drawing.Size(47, 53) Me.TsBtnRedo.Text = "重做" Me.TsBtnRedo.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText Me.TsBtnRedo.ToolTipText = "撤销" @@ -230,14 +234,14 @@ Namespace UTSModule.Station 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(6, 40) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(6, 58) ' 'tsBtnInsertRow ' Me.tsBtnInsertRow.Image = CType(resources.GetObject("tsBtnInsertRow.Image"), System.Drawing.Image) Me.tsBtnInsertRow.ImageTransparentColor = System.Drawing.Color.Magenta Me.tsBtnInsertRow.Name = "tsBtnInsertRow" - Me.tsBtnInsertRow.Size = New System.Drawing.Size(48, 37) + Me.tsBtnInsertRow.Size = New System.Drawing.Size(73, 53) Me.tsBtnInsertRow.Text = "插入行" Me.tsBtnInsertRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -246,14 +250,14 @@ Namespace UTSModule.Station Me.tsBtnRemoveRow.Image = CType(resources.GetObject("tsBtnRemoveRow.Image"), System.Drawing.Image) Me.tsBtnRemoveRow.ImageTransparentColor = System.Drawing.Color.Magenta Me.tsBtnRemoveRow.Name = "tsBtnRemoveRow" - Me.tsBtnRemoveRow.Size = New System.Drawing.Size(48, 37) + Me.tsBtnRemoveRow.Size = New System.Drawing.Size(73, 53) Me.tsBtnRemoveRow.Text = "移除行" Me.tsBtnRemoveRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(6, 40) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(6, 58) ' 'TsBtnMoveUp ' @@ -261,7 +265,7 @@ Namespace UTSModule.Station Me.TsBtnMoveUp.Image = CType(resources.GetObject("TsBtnMoveUp.Image"), System.Drawing.Image) Me.TsBtnMoveUp.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnMoveUp.Name = "TsBtnMoveUp" - Me.TsBtnMoveUp.Size = New System.Drawing.Size(35, 37) + Me.TsBtnMoveUp.Size = New System.Drawing.Size(47, 53) Me.TsBtnMoveUp.Text = "上移" Me.TsBtnMoveUp.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -271,7 +275,7 @@ Namespace UTSModule.Station Me.TsBtnMoveDown.Image = CType(resources.GetObject("TsBtnMoveDown.Image"), System.Drawing.Image) Me.TsBtnMoveDown.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnMoveDown.Name = "TsBtnMoveDown" - Me.TsBtnMoveDown.Size = New System.Drawing.Size(35, 37) + Me.TsBtnMoveDown.Size = New System.Drawing.Size(47, 53) Me.TsBtnMoveDown.Text = "下移" Me.TsBtnMoveDown.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -281,7 +285,7 @@ Namespace UTSModule.Station Me.TsBtnMoveLeft.Image = CType(resources.GetObject("TsBtnMoveLeft.Image"), System.Drawing.Image) Me.TsBtnMoveLeft.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnMoveLeft.Name = "TsBtnMoveLeft" - Me.TsBtnMoveLeft.Size = New System.Drawing.Size(35, 37) + Me.TsBtnMoveLeft.Size = New System.Drawing.Size(47, 53) Me.TsBtnMoveLeft.Text = "升级" Me.TsBtnMoveLeft.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -291,21 +295,21 @@ Namespace UTSModule.Station Me.TsBtnMoveRight.Image = CType(resources.GetObject("TsBtnMoveRight.Image"), System.Drawing.Image) Me.TsBtnMoveRight.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnMoveRight.Name = "TsBtnMoveRight" - Me.TsBtnMoveRight.Size = New System.Drawing.Size(35, 37) + Me.TsBtnMoveRight.Size = New System.Drawing.Size(47, 53) Me.TsBtnMoveRight.Text = "降级" Me.TsBtnMoveRight.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 40) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 58) ' 'TsBtnDebugMode ' Me.TsBtnDebugMode.Image = CType(resources.GetObject("TsBtnDebugMode.Image"), System.Drawing.Image) Me.TsBtnDebugMode.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnDebugMode.Name = "TsBtnDebugMode" - Me.TsBtnDebugMode.Size = New System.Drawing.Size(60, 37) + Me.TsBtnDebugMode.Size = New System.Drawing.Size(92, 53) Me.TsBtnDebugMode.Text = "调试模式" Me.TsBtnDebugMode.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -314,7 +318,7 @@ Namespace UTSModule.Station Me.TsBtnDebugStart.Image = CType(resources.GetObject("TsBtnDebugStart.Image"), System.Drawing.Image) Me.TsBtnDebugStart.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnDebugStart.Name = "TsBtnDebugStart" - Me.TsBtnDebugStart.Size = New System.Drawing.Size(60, 37) + Me.TsBtnDebugStart.Size = New System.Drawing.Size(92, 53) Me.TsBtnDebugStart.Text = "开始调试" Me.TsBtnDebugStart.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -323,21 +327,21 @@ Namespace UTSModule.Station Me.TsBtnFailMode.Image = CType(resources.GetObject("TsBtnFailMode.Image"), System.Drawing.Image) Me.TsBtnFailMode.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnFailMode.Name = "TsBtnFailMode" - Me.TsBtnFailMode.Size = New System.Drawing.Size(60, 37) + Me.TsBtnFailMode.Size = New System.Drawing.Size(92, 53) Me.TsBtnFailMode.Text = "单步退出" Me.TsBtnFailMode.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(6, 40) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(6, 58) ' 'tslBtn_ActionOnly ' Me.tslBtn_ActionOnly.Image = CType(resources.GetObject("tslBtn_ActionOnly.Image"), System.Drawing.Image) Me.tslBtn_ActionOnly.ImageTransparentColor = System.Drawing.Color.Magenta Me.tslBtn_ActionOnly.Name = "tslBtn_ActionOnly" - Me.tslBtn_ActionOnly.Size = New System.Drawing.Size(48, 37) + Me.tslBtn_ActionOnly.Size = New System.Drawing.Size(67, 53) Me.tslBtn_ActionOnly.Text = "Action" Me.tslBtn_ActionOnly.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -346,7 +350,7 @@ Namespace UTSModule.Station Me.TsBtn_Record.Image = CType(resources.GetObject("TsBtn_Record.Image"), System.Drawing.Image) Me.TsBtn_Record.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtn_Record.Name = "TsBtn_Record" - Me.TsBtn_Record.Size = New System.Drawing.Size(54, 37) + Me.TsBtn_Record.Size = New System.Drawing.Size(71, 53) Me.TsBtn_Record.Text = "Record" Me.TsBtn_Record.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -355,16 +359,18 @@ Namespace UTSModule.Station Me.TsBtn_ExpandNode.Image = CType(resources.GetObject("TsBtn_ExpandNode.Image"), System.Drawing.Image) Me.TsBtn_ExpandNode.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtn_ExpandNode.Name = "TsBtn_ExpandNode" - Me.TsBtn_ExpandNode.Size = New System.Drawing.Size(55, 37) + Me.TsBtn_ExpandNode.Size = New System.Drawing.Size(74, 53) Me.TsBtn_ExpandNode.Text = "Expand" Me.TsBtn_ExpandNode.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' 'StuMain ' + Me.StuMain.ImageScalingSize = New System.Drawing.Size(24, 24) Me.StuMain.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TssLblTestStatus, Me.TssLblTestTime, Me.TssBarTestProgress}) - Me.StuMain.Location = New System.Drawing.Point(0, 558) + Me.StuMain.Location = New System.Drawing.Point(0, 841) Me.StuMain.Name = "StuMain" - Me.StuMain.Size = New System.Drawing.Size(977, 22) + Me.StuMain.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0) + Me.StuMain.Size = New System.Drawing.Size(1466, 29) Me.StuMain.TabIndex = 1 Me.StuMain.Text = "StatusStrip1" ' @@ -372,7 +378,7 @@ Namespace UTSModule.Station ' Me.TssLblTestStatus.AutoSize = False Me.TssLblTestStatus.Name = "TssLblTestStatus" - Me.TssLblTestStatus.Size = New System.Drawing.Size(120, 17) + Me.TssLblTestStatus.Size = New System.Drawing.Size(120, 22) Me.TssLblTestStatus.Text = "测试状态" ' 'TssLblTestTime @@ -381,19 +387,20 @@ Namespace UTSModule.Station Me.TssLblTestTime.ForeColor = System.Drawing.Color.Green Me.TssLblTestTime.Name = "TssLblTestTime" Me.TssLblTestTime.Overflow = System.Windows.Forms.ToolStripItemOverflow.Always - Me.TssLblTestTime.Size = New System.Drawing.Size(160, 17) + Me.TssLblTestTime.Size = New System.Drawing.Size(160, 22) Me.TssLblTestTime.Text = "TimeExpend:00:00:00:000" ' 'TssBarTestProgress ' Me.TssBarTestProgress.AutoSize = False Me.TssBarTestProgress.Name = "TssBarTestProgress" - Me.TssBarTestProgress.Size = New System.Drawing.Size(200, 16) + Me.TssBarTestProgress.Size = New System.Drawing.Size(300, 21) ' 'SplStationPlan ' Me.SplStationPlan.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplStationPlan.Location = New System.Drawing.Point(0, 40) + Me.SplStationPlan.Location = New System.Drawing.Point(0, 58) + Me.SplStationPlan.Margin = New System.Windows.Forms.Padding(4) Me.SplStationPlan.Name = "SplStationPlan" Me.SplStationPlan.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -404,14 +411,16 @@ Namespace UTSModule.Station 'SplStationPlan.Panel2 ' Me.SplStationPlan.Panel2.Controls.Add(Me.GrpOutputInfo) - Me.SplStationPlan.Size = New System.Drawing.Size(977, 518) - Me.SplStationPlan.SplitterDistance = 348 + Me.SplStationPlan.Size = New System.Drawing.Size(1466, 783) + Me.SplStationPlan.SplitterDistance = 526 + Me.SplStationPlan.SplitterWidth = 6 Me.SplStationPlan.TabIndex = 10 ' 'SplPlanDesign ' Me.SplPlanDesign.Dock = System.Windows.Forms.DockStyle.Fill Me.SplPlanDesign.Location = New System.Drawing.Point(0, 0) + Me.SplPlanDesign.Margin = New System.Windows.Forms.Padding(4) Me.SplPlanDesign.Name = "SplPlanDesign" ' 'SplPlanDesign.Panel1 @@ -421,8 +430,9 @@ Namespace UTSModule.Station 'SplPlanDesign.Panel2 ' Me.SplPlanDesign.Panel2.Controls.Add(Me.GrpSingleRowInfo) - Me.SplPlanDesign.Size = New System.Drawing.Size(977, 348) - Me.SplPlanDesign.SplitterDistance = 671 + Me.SplPlanDesign.Size = New System.Drawing.Size(1466, 526) + Me.SplPlanDesign.SplitterDistance = 1006 + Me.SplPlanDesign.SplitterWidth = 6 Me.SplPlanDesign.TabIndex = 0 ' 'GrpStationPlan @@ -430,8 +440,10 @@ Namespace UTSModule.Station Me.GrpStationPlan.Controls.Add(Me.GrdStationPlan) Me.GrpStationPlan.Dock = System.Windows.Forms.DockStyle.Fill Me.GrpStationPlan.Location = New System.Drawing.Point(0, 0) + Me.GrpStationPlan.Margin = New System.Windows.Forms.Padding(4) Me.GrpStationPlan.Name = "GrpStationPlan" - Me.GrpStationPlan.Size = New System.Drawing.Size(671, 348) + Me.GrpStationPlan.Padding = New System.Windows.Forms.Padding(4) + Me.GrpStationPlan.Size = New System.Drawing.Size(1006, 526) Me.GrpStationPlan.TabIndex = 45 Me.GrpStationPlan.TabStop = False Me.GrpStationPlan.Text = "执行流程" @@ -441,19 +453,22 @@ Namespace UTSModule.Station Me.GrdStationPlan.BorderStyle = FlexCell.BorderStyleEnum.None Me.GrdStationPlan.ContextMenuStrip = Me.CmsPlanGrid Me.GrdStationPlan.DefaultFont = New System.Drawing.Font("宋体", 9.0!) + Me.GrdStationPlan.DefaultRowHeight = CType(28, Short) Me.GrdStationPlan.Dock = System.Windows.Forms.DockStyle.Fill Me.GrdStationPlan.GridColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer)) - Me.GrdStationPlan.Location = New System.Drawing.Point(3, 17) + Me.GrdStationPlan.Location = New System.Drawing.Point(4, 25) + Me.GrdStationPlan.Margin = New System.Windows.Forms.Padding(4) Me.GrdStationPlan.MouseWheelSpeed = CType(3, Short) Me.GrdStationPlan.Name = "GrdStationPlan" - Me.GrdStationPlan.Size = New System.Drawing.Size(665, 328) + Me.GrdStationPlan.Size = New System.Drawing.Size(998, 497) Me.GrdStationPlan.TabIndex = 0 ' 'CmsPlanGrid ' - Me.CmsPlanGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MsiGridRowBlockInsert, Me.MsiGridRowBlockDelete, Me.ToolStripSeparator7, Me.tsBtn_CheckAction, Me.tsBtn_UncheckAction, Me.ToolStripSeparator15, Me.MsiUndo, Me.MsiRedo, Me.ToolStripSeparator6, Me.MsiSaveNodeFile, Me.MsiLoadNodeFile, Me.ToolStripSeparator11, Me.TsmiDebugStart, Me.TsmiDebugEnd, Me.TsmiDebugContinue, Me.TsmiDebugStep, Me.ToolStripSeparator8, Me.TsmiDebugSetup, Me.TsmiDebugMain, Me.TsmiDebugPass, Me.TsmiDebugFail, Me.TsmiDebugCleanup, Me.ToolStripSeparator9, Me.TsmiDebugNode, Me.TsmiDebugNodeBegin, Me.TsmiJumpCall}) + Me.CmsPlanGrid.ImageScalingSize = New System.Drawing.Size(24, 24) + Me.CmsPlanGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MsiGridRowBlockInsert, Me.MsiGridRowBlockDelete, Me.ToolStripSeparator7, Me.tsBtn_CheckAction, Me.tsBtn_UncheckAction, Me.ToolStripSeparator15, Me.MsiUndo, Me.MsiRedo, Me.ToolStripSeparator6, Me.MsiSaveNodeFile, Me.MsiLoadNodeFile, Me.ToolStripSeparator11, Me.TsmiDebugStart, Me.TsmiDebugEnd, Me.TsmiDebugContinue, Me.执行1ToolStripMenuItem, Me.执行2ToolStripMenuItem, Me.TsmiDebugStep, Me.ToolStripSeparator8, Me.TsmiDebugSetup, Me.TsmiDebugMain, Me.TsmiDebugPass, Me.TsmiDebugFail, Me.TsmiDebugCleanup, Me.ToolStripSeparator9, Me.TsmiDebugNode, Me.TsmiDebugNodeBegin, Me.TsmiJumpCall}) Me.CmsPlanGrid.Name = "CmsMain" - Me.CmsPlanGrid.Size = New System.Drawing.Size(222, 502) + Me.CmsPlanGrid.Size = New System.Drawing.Size(303, 744) ' 'MsiGridRowBlockInsert ' @@ -461,7 +476,7 @@ Namespace UTSModule.Station Me.MsiGridRowBlockInsert.Name = "MsiGridRowBlockInsert" Me.MsiGridRowBlockInsert.ShortcutKeyDisplayString = "Ctr+I" Me.MsiGridRowBlockInsert.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.I), System.Windows.Forms.Keys) - Me.MsiGridRowBlockInsert.Size = New System.Drawing.Size(221, 22) + Me.MsiGridRowBlockInsert.Size = New System.Drawing.Size(302, 32) Me.MsiGridRowBlockInsert.Text = "插入" ' 'MsiGridRowBlockDelete @@ -470,75 +485,75 @@ Namespace UTSModule.Station Me.MsiGridRowBlockDelete.Name = "MsiGridRowBlockDelete" Me.MsiGridRowBlockDelete.ShortcutKeyDisplayString = "Ctr+D" Me.MsiGridRowBlockDelete.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.D), System.Windows.Forms.Keys) - Me.MsiGridRowBlockDelete.Size = New System.Drawing.Size(221, 22) + Me.MsiGridRowBlockDelete.Size = New System.Drawing.Size(302, 32) Me.MsiGridRowBlockDelete.Text = "删除" ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(218, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(299, 6) ' 'tsBtn_CheckAction ' Me.tsBtn_CheckAction.Image = CType(resources.GetObject("tsBtn_CheckAction.Image"), System.Drawing.Image) Me.tsBtn_CheckAction.Name = "tsBtn_CheckAction" - Me.tsBtn_CheckAction.Size = New System.Drawing.Size(221, 22) + Me.tsBtn_CheckAction.Size = New System.Drawing.Size(302, 32) Me.tsBtn_CheckAction.Text = "勾选测试" ' 'tsBtn_UncheckAction ' Me.tsBtn_UncheckAction.Image = CType(resources.GetObject("tsBtn_UncheckAction.Image"), System.Drawing.Image) Me.tsBtn_UncheckAction.Name = "tsBtn_UncheckAction" - Me.tsBtn_UncheckAction.Size = New System.Drawing.Size(221, 22) + Me.tsBtn_UncheckAction.Size = New System.Drawing.Size(302, 32) Me.tsBtn_UncheckAction.Text = "取消勾选测试" ' 'ToolStripSeparator15 ' Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(218, 6) + Me.ToolStripSeparator15.Size = New System.Drawing.Size(299, 6) ' 'MsiUndo ' Me.MsiUndo.Name = "MsiUndo" Me.MsiUndo.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Z), System.Windows.Forms.Keys) - Me.MsiUndo.Size = New System.Drawing.Size(221, 22) + Me.MsiUndo.Size = New System.Drawing.Size(302, 32) Me.MsiUndo.Text = "撤销" ' 'MsiRedo ' Me.MsiRedo.Name = "MsiRedo" Me.MsiRedo.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Y), System.Windows.Forms.Keys) - Me.MsiRedo.Size = New System.Drawing.Size(221, 22) + Me.MsiRedo.Size = New System.Drawing.Size(302, 32) Me.MsiRedo.Text = "重做" ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(218, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(299, 6) ' 'MsiSaveNodeFile ' Me.MsiSaveNodeFile.Name = "MsiSaveNodeFile" - Me.MsiSaveNodeFile.Size = New System.Drawing.Size(221, 22) + Me.MsiSaveNodeFile.Size = New System.Drawing.Size(302, 32) Me.MsiSaveNodeFile.Text = "另存为节点文件" ' 'MsiLoadNodeFile ' Me.MsiLoadNodeFile.Name = "MsiLoadNodeFile" - Me.MsiLoadNodeFile.Size = New System.Drawing.Size(221, 22) + Me.MsiLoadNodeFile.Size = New System.Drawing.Size(302, 32) Me.MsiLoadNodeFile.Text = "加载节点文件" ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(218, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(299, 6) ' 'TsmiDebugStart ' Me.TsmiDebugStart.Image = CType(resources.GetObject("TsmiDebugStart.Image"), System.Drawing.Image) Me.TsmiDebugStart.Name = "TsmiDebugStart" Me.TsmiDebugStart.ShortcutKeys = System.Windows.Forms.Keys.F5 - Me.TsmiDebugStart.Size = New System.Drawing.Size(221, 22) + Me.TsmiDebugStart.Size = New System.Drawing.Size(302, 32) Me.TsmiDebugStart.Text = "开始执行" ' 'TsmiDebugEnd @@ -546,7 +561,7 @@ Namespace UTSModule.Station Me.TsmiDebugEnd.Image = CType(resources.GetObject("TsmiDebugEnd.Image"), System.Drawing.Image) Me.TsmiDebugEnd.Name = "TsmiDebugEnd" Me.TsmiDebugEnd.ShortcutKeys = CType((System.Windows.Forms.Keys.Shift Or System.Windows.Forms.Keys.F5), System.Windows.Forms.Keys) - Me.TsmiDebugEnd.Size = New System.Drawing.Size(221, 22) + Me.TsmiDebugEnd.Size = New System.Drawing.Size(302, 32) Me.TsmiDebugEnd.Text = "退出执行" ' 'TsmiDebugContinue @@ -554,83 +569,107 @@ Namespace UTSModule.Station Me.TsmiDebugContinue.Image = CType(resources.GetObject("TsmiDebugContinue.Image"), System.Drawing.Image) Me.TsmiDebugContinue.Name = "TsmiDebugContinue" Me.TsmiDebugContinue.ShortcutKeys = CType((System.Windows.Forms.Keys.Alt Or System.Windows.Forms.Keys.F5), System.Windows.Forms.Keys) - Me.TsmiDebugContinue.Size = New System.Drawing.Size(221, 22) + Me.TsmiDebugContinue.Size = New System.Drawing.Size(302, 32) Me.TsmiDebugContinue.Text = "继续执行" ' + '执行1ToolStripMenuItem + ' + Me.执行1ToolStripMenuItem.Name = "执行1ToolStripMenuItem" + Me.执行1ToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F9 + Me.执行1ToolStripMenuItem.Size = New System.Drawing.Size(302, 32) + Me.执行1ToolStripMenuItem.Text = "单步重复" + ' + '执行2ToolStripMenuItem + ' + Me.执行2ToolStripMenuItem.Name = "执行2ToolStripMenuItem" + Me.执行2ToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F10 + Me.执行2ToolStripMenuItem.Size = New System.Drawing.Size(302, 32) + Me.执行2ToolStripMenuItem.Text = "单步调试" + ' 'TsmiDebugStep ' Me.TsmiDebugStep.Image = CType(resources.GetObject("TsmiDebugStep.Image"), System.Drawing.Image) Me.TsmiDebugStep.Name = "TsmiDebugStep" Me.TsmiDebugStep.ShortcutKeys = System.Windows.Forms.Keys.F11 - Me.TsmiDebugStep.Size = New System.Drawing.Size(221, 22) - Me.TsmiDebugStep.Text = "单步执行" + Me.TsmiDebugStep.Size = New System.Drawing.Size(302, 32) + Me.TsmiDebugStep.Text = "单步断点调试" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(218, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(299, 6) ' 'TsmiDebugSetup ' Me.TsmiDebugSetup.Name = "TsmiDebugSetup" Me.TsmiDebugSetup.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F1), System.Windows.Forms.Keys) - Me.TsmiDebugSetup.Size = New System.Drawing.Size(221, 22) + Me.TsmiDebugSetup.Size = New System.Drawing.Size(302, 32) Me.TsmiDebugSetup.Text = "Setup模块执行" ' 'TsmiDebugMain ' Me.TsmiDebugMain.Name = "TsmiDebugMain" Me.TsmiDebugMain.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F2), System.Windows.Forms.Keys) - Me.TsmiDebugMain.Size = New System.Drawing.Size(221, 22) + Me.TsmiDebugMain.Size = New System.Drawing.Size(302, 32) Me.TsmiDebugMain.Text = "Main模块执行" ' 'TsmiDebugPass ' Me.TsmiDebugPass.Name = "TsmiDebugPass" Me.TsmiDebugPass.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F3), System.Windows.Forms.Keys) - Me.TsmiDebugPass.Size = New System.Drawing.Size(221, 22) + Me.TsmiDebugPass.Size = New System.Drawing.Size(302, 32) Me.TsmiDebugPass.Text = "Pass模块执行" ' 'TsmiDebugFail ' Me.TsmiDebugFail.Name = "TsmiDebugFail" Me.TsmiDebugFail.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F4), System.Windows.Forms.Keys) - Me.TsmiDebugFail.Size = New System.Drawing.Size(221, 22) + Me.TsmiDebugFail.Size = New System.Drawing.Size(302, 32) Me.TsmiDebugFail.Text = "Fail模块执行" ' 'TsmiDebugCleanup ' Me.TsmiDebugCleanup.Name = "TsmiDebugCleanup" Me.TsmiDebugCleanup.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F5), System.Windows.Forms.Keys) - Me.TsmiDebugCleanup.Size = New System.Drawing.Size(221, 22) + Me.TsmiDebugCleanup.Size = New System.Drawing.Size(302, 32) Me.TsmiDebugCleanup.Text = "Cleanup模块执行" ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(218, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(299, 6) ' 'TsmiDebugNode ' Me.TsmiDebugNode.Name = "TsmiDebugNode" Me.TsmiDebugNode.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F10), System.Windows.Forms.Keys) - Me.TsmiDebugNode.Size = New System.Drawing.Size(221, 22) + Me.TsmiDebugNode.Size = New System.Drawing.Size(302, 32) Me.TsmiDebugNode.Text = "节点测试" ' 'TsmiDebugNodeBegin ' Me.TsmiDebugNodeBegin.Name = "TsmiDebugNodeBegin" Me.TsmiDebugNodeBegin.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F11), System.Windows.Forms.Keys) - Me.TsmiDebugNodeBegin.Size = New System.Drawing.Size(221, 22) + Me.TsmiDebugNodeBegin.Size = New System.Drawing.Size(302, 32) Me.TsmiDebugNodeBegin.Text = "节点开始测试" ' + 'TsmiJumpCall + ' + Me.TsmiJumpCall.Name = "TsmiJumpCall" + Me.TsmiJumpCall.ShortcutKeys = System.Windows.Forms.Keys.F12 + Me.TsmiJumpCall.Size = New System.Drawing.Size(302, 32) + Me.TsmiJumpCall.Text = "函数跳转" + Me.TsmiJumpCall.Visible = False + ' 'GrpSingleRowInfo ' Me.GrpSingleRowInfo.Controls.Add(Me.SplitContainer1) Me.GrpSingleRowInfo.Dock = System.Windows.Forms.DockStyle.Fill Me.GrpSingleRowInfo.Location = New System.Drawing.Point(0, 0) + Me.GrpSingleRowInfo.Margin = New System.Windows.Forms.Padding(4) Me.GrpSingleRowInfo.Name = "GrpSingleRowInfo" - Me.GrpSingleRowInfo.Size = New System.Drawing.Size(302, 348) + Me.GrpSingleRowInfo.Padding = New System.Windows.Forms.Padding(4) + Me.GrpSingleRowInfo.Size = New System.Drawing.Size(454, 526) Me.GrpSingleRowInfo.TabIndex = 1 Me.GrpSingleRowInfo.TabStop = False Me.GrpSingleRowInfo.Text = "属性" @@ -639,7 +678,8 @@ Namespace UTSModule.Station ' Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill Me.SplitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2 - Me.SplitContainer1.Location = New System.Drawing.Point(3, 17) + Me.SplitContainer1.Location = New System.Drawing.Point(4, 25) + Me.SplitContainer1.Margin = New System.Windows.Forms.Padding(4) Me.SplitContainer1.Name = "SplitContainer1" Me.SplitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -650,20 +690,23 @@ Namespace UTSModule.Station 'SplitContainer1.Panel2 ' Me.SplitContainer1.Panel2.Controls.Add(Me.RtxColTip) - Me.SplitContainer1.Size = New System.Drawing.Size(296, 328) - Me.SplitContainer1.SplitterDistance = 246 + Me.SplitContainer1.Size = New System.Drawing.Size(446, 497) + Me.SplitContainer1.SplitterDistance = 409 + Me.SplitContainer1.SplitterWidth = 6 Me.SplitContainer1.TabIndex = 1 ' 'GrdRowNode ' Me.GrdRowNode.BorderStyle = FlexCell.BorderStyleEnum.None Me.GrdRowNode.DefaultFont = New System.Drawing.Font("宋体", 9.0!) + Me.GrdRowNode.DefaultRowHeight = CType(28, Short) Me.GrdRowNode.Dock = System.Windows.Forms.DockStyle.Fill Me.GrdRowNode.GridColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer)) Me.GrdRowNode.Location = New System.Drawing.Point(0, 0) + Me.GrdRowNode.Margin = New System.Windows.Forms.Padding(4) Me.GrdRowNode.MouseWheelSpeed = CType(3, Short) Me.GrdRowNode.Name = "GrdRowNode" - Me.GrdRowNode.Size = New System.Drawing.Size(296, 246) + Me.GrdRowNode.Size = New System.Drawing.Size(446, 409) Me.GrdRowNode.TabIndex = 0 ' 'RtxColTip @@ -672,8 +715,9 @@ Namespace UTSModule.Station Me.RtxColTip.Dock = System.Windows.Forms.DockStyle.Fill Me.RtxColTip.Enabled = False Me.RtxColTip.Location = New System.Drawing.Point(0, 0) + Me.RtxColTip.Margin = New System.Windows.Forms.Padding(4) Me.RtxColTip.Name = "RtxColTip" - Me.RtxColTip.Size = New System.Drawing.Size(296, 78) + Me.RtxColTip.Size = New System.Drawing.Size(446, 82) Me.RtxColTip.TabIndex = 0 Me.RtxColTip.Text = "" ' @@ -682,8 +726,10 @@ Namespace UTSModule.Station Me.GrpOutputInfo.Controls.Add(Me.TabControl1) Me.GrpOutputInfo.Dock = System.Windows.Forms.DockStyle.Fill Me.GrpOutputInfo.Location = New System.Drawing.Point(0, 0) + Me.GrpOutputInfo.Margin = New System.Windows.Forms.Padding(4) Me.GrpOutputInfo.Name = "GrpOutputInfo" - Me.GrpOutputInfo.Size = New System.Drawing.Size(977, 166) + Me.GrpOutputInfo.Padding = New System.Windows.Forms.Padding(4) + Me.GrpOutputInfo.Size = New System.Drawing.Size(1466, 251) Me.GrpOutputInfo.TabIndex = 0 Me.GrpOutputInfo.TabStop = False Me.GrpOutputInfo.Text = "输出内容" @@ -692,19 +738,21 @@ Namespace UTSModule.Station ' Me.TabControl1.Controls.Add(Me.TpOutputInfo) Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.TabControl1.Location = New System.Drawing.Point(3, 17) + Me.TabControl1.Location = New System.Drawing.Point(4, 25) + Me.TabControl1.Margin = New System.Windows.Forms.Padding(4) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(971, 146) + Me.TabControl1.Size = New System.Drawing.Size(1458, 222) Me.TabControl1.TabIndex = 1 ' 'TpOutputInfo ' Me.TpOutputInfo.Controls.Add(Me.RtxOutputInfo) - Me.TpOutputInfo.Location = New System.Drawing.Point(4, 22) + Me.TpOutputInfo.Location = New System.Drawing.Point(4, 28) + Me.TpOutputInfo.Margin = New System.Windows.Forms.Padding(4) Me.TpOutputInfo.Name = "TpOutputInfo" - Me.TpOutputInfo.Padding = New System.Windows.Forms.Padding(3) - Me.TpOutputInfo.Size = New System.Drawing.Size(963, 120) + Me.TpOutputInfo.Padding = New System.Windows.Forms.Padding(4) + Me.TpOutputInfo.Size = New System.Drawing.Size(1450, 190) Me.TpOutputInfo.TabIndex = 0 Me.TpOutputInfo.Text = "输出信息" Me.TpOutputInfo.UseVisualStyleBackColor = True @@ -713,34 +761,28 @@ Namespace UTSModule.Station ' Me.RtxOutputInfo.BorderStyle = System.Windows.Forms.BorderStyle.None Me.RtxOutputInfo.Dock = System.Windows.Forms.DockStyle.Fill - Me.RtxOutputInfo.Location = New System.Drawing.Point(3, 3) + Me.RtxOutputInfo.Location = New System.Drawing.Point(4, 4) + Me.RtxOutputInfo.Margin = New System.Windows.Forms.Padding(4) Me.RtxOutputInfo.Name = "RtxOutputInfo" - Me.RtxOutputInfo.Size = New System.Drawing.Size(957, 114) + Me.RtxOutputInfo.Size = New System.Drawing.Size(1442, 182) Me.RtxOutputInfo.TabIndex = 0 Me.RtxOutputInfo.Text = "" ' - 'TsmiJumpCall - ' - Me.TsmiJumpCall.Name = "TsmiJumpCall" - Me.TsmiJumpCall.ShortcutKeys = System.Windows.Forms.Keys.F12 - Me.TsmiJumpCall.Size = New System.Drawing.Size(221, 22) - Me.TsmiJumpCall.Text = "函数跳转" - Me.TsmiJumpCall.Visible = False - ' 'FrmStationPlan ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 12.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 18.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(977, 580) + Me.ClientSize = New System.Drawing.Size(1466, 870) Me.Controls.Add(Me.SplStationPlan) Me.Controls.Add(Me.StuMain) Me.Controls.Add(Me.ToolStrip1) Me.KeyPreview = True + Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "FrmStationPlan" - Me.Text = "Form1" - Me.ToolStrip1.ResumeLayout(false) - Me.ToolStrip1.PerformLayout - Me.StuMain.ResumeLayout(false) + Me.Text = "Form1" + Me.ToolStrip1.ResumeLayout(False) + Me.ToolStrip1.PerformLayout() + Me.StuMain.ResumeLayout(false) Me.StuMain.PerformLayout Me.SplStationPlan.Panel1.ResumeLayout(false) Me.SplStationPlan.Panel2.ResumeLayout(false) @@ -836,5 +878,7 @@ End Sub Friend WithEvents TsBtnUndo As ToolStripButton Friend WithEvents TsBtnRedo As ToolStripButton Friend WithEvents TsmiJumpCall As ToolStripMenuItem + Friend WithEvents 执行1ToolStripMenuItem As ToolStripMenuItem + Friend WithEvents 执行2ToolStripMenuItem As ToolStripMenuItem End Class End Namespace \ No newline at end of file diff --git a/UTS_Core/UTSModule/Station/FrmStationPlan.resx b/UTS_Core/UTSModule/Station/FrmStationPlan.resx index 4670ff4..c37e24d 100644 --- a/UTS_Core/UTSModule/Station/FrmStationPlan.resx +++ b/UTS_Core/UTSModule/Station/FrmStationPlan.resx @@ -124,258 +124,255 @@ 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 - O4a4sTiBYfgGl13a4+npcwkAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHASURBVGhD1ZlLTgMxEERLAsEelsDd+Gwhp0NwA/4SnIXf + NqglR4paE9WUXXbIk7xJT/WzZyZejIF6DgEsADwB+AawNI/oGb1visvKCYCPCWmv8V6cFuJujJz8asQi + LE8iXpvcfNS4zpOp4Tk1vXU+3jVOAdwl12O+qIav1DREvThLrs98QQ35sfbG7rM3JFT79gBc5h9bGlZS + 5TsG8LYhUNWwAdm3vzb5qYDcsBHZd0UCcsNGZN8rCcgNG5F9vyQgN2xE9rEAq7uRfSzA6m5kHwuwuhvZ + xwKs7kb2sQCru5F9LMDqbmQfC7C6G9nHAqzuRvaxAKu7kX0swOpuZB8LsLob2ccCrO5G9rEAq7uRfSzA + 6m5kHwuwuhvZxwKs7kb2sQCru5F9LMDqbmQfC7C6G9nHAqzuRvaxwL//uMsWkD+vxyfwHouIyd8n16zP + 62wBcWaVrxk1Zh1w5FAmjnniuCdf13uE8yBPZoocnCJOZEYuQjrky+FNxN2IRxrvZf5jO0b0fCiOWXd+ + RW60c+z8AvLr0GOL7Mqofb4b29znL/JkatjWPv9SDhYtjN7nY/JHeRKt9N7nf8r/7bwcLFbxB5dd2uNo + 4MxjAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADQSURBVEhL5ZYxDgFBGEbnCE4gjuAcCnEER3AER9BpVWqV - QqcTlSOIUkVFx/fWSMYsyfx/FCu+5CX7ZWfmTbKT3Q1J+mLnYCmKMhQ3sRKLQg5iL4ryFHSqVpaZ+H3B - UQwy2qIWr4A5OaxVi0fATrsJPfFVQR7m/pGA42eBmARc8yrgpMxj38aewhjuEbNg/LgMLUEfVe01jGmu - 4CpO4hz7JfYUxrgFGzER09jXsacwxi34/WdggZgE7MwCMQk8aYbA8tHPYe5Hgfe35R2spYRwB61XwcSY - NxMjAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADWSURBVEhL5ZYxCsJAEEXfETyBeATPYSEewSN4BI9gZ2tl + bWVhZydWHkEsrbTSTvkywWU0wVkMBP3wYT87M28JSxJ4qg/sMrxMZlRqCNyAFbD40Adg7weVqQB0/EaF + Zj8BOAID57YvlHIB6vHWrBflAHTSbuLetwFe6v0jgK5fxFIIoLVeBbopc8tby6lVoz0pDBjbumV5lNQX + Uk1zAVfgBJwtXyynVk02YANMgKnlteXUqskG1P6IagdELIUAOlnEUgiQo2YAIh99b/WWAnJ/W95Zsx66 + A61XwcQ50MgGAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHJSURBVDhPvZHdK4NhGMb3pzAt4dgfIPmMosgBB8pHjnbA - kSMhijSa2pgJ89U23jEJExpmvhq2+ZoMxVZD78vYxjsue5+NMTVK+dV18jxdv7v7eXh/Rrt8BC7UkpVE - OWvCoHYdoeuf4cqRKCaNqGwY/p1Es2gN1YL4X14hGZmHzmBFcXX7zxLl3A4p6mwAtQuY7Qw6FTOgVhmo - l2mo9DT652iIJ25JQrUwg1ojEXA8PfvB3PvgcLmJIJKm0WskVxi+SuRqPbnsMzxDNMugnrpCzYAdIws3 - 5Pwz1TIXtBsMkoomwxJpYF9u70cPi2vag3PHHQ7sN5BPO0mplfKTmE/uUCpyIrFoCgkFY4jPGwpKuH29 - PvZjslBuQ5V0Hx2qcyJ4h3lgcXLphcFyDxm1DUFub1jAuH04PHNh59gBo/kCS1unaOgLfm/dqBtCqRMl - bTbkN+6RyKhNCLK7woLkrLJvqRHvEQEbWM9Fs7DYH7FoYqBZuUX3mBFxGeKvjxlJedMGEXye/J4u9Rr4 - aaLogsJaPTxPL5BPmNCj2YZsfJNM5spS5SpiU1uiCzKEusBrq0ji8xQQ5PQgLlMCfnp7oNyKmJTm6IJ/ - gsd7A8Wc0VfbPf1MAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHOSURBVDhPvZHfS5NRAIb3p6QyxLr2DwgpLQoMDC/qIqjE + q13oVVeRoaDEjAXO5sKaNdmm33QR6SRl6lyazJzr16RlUBtM5ft0Oaff5iM7onOftIKgF56rc97n5XB0 + un+NZ/IzOaSJsMAxEqTP8xbtvd8mV9bGNhygoeXF30nc4+GCcia7R5d9DK8/zLWmzj9LHKMLouiNgPQe + QlGFR7bXSNMKrkkZp0/m6aiMaWhdoO3r+jyBo/Wd3QzKZppYIikE2rT2r1J5218osbp84rDXv4txROGe + 9JPmZ1Hsb9a0fZosCTyzCmfqh/MSs31MvHsrpbIqp1iJbfAxuob1VVyUOqSMILS8wQ1jnNP1L6moG6C8 + 9vmBJPfe7bR6tGywRmg0f+Chc6VgXfmlsvxjG//SJhZpHv3lJ3mBkkzz6VuChS8xAqHvTLz7Skvvwffe + 7U9iMMe5/iDClfuLAos0h/5id15QeeHmCZpNi0KgZvdIyCpL0S3GgwruqXUeDwQoqzad/JHjudU6KwTH + lw/pds1Qes5YXHD1jo/UThbrUJAe9zyWwTmxnCubHdOUVLUXF1QbvFTUOQXltTb0l3ooq+mi9HwnJVUd + nDrbVlzw37IPxZzRV+2pq28AAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACMSURBVDhPtZDRDYAgDET7wazu5AIOY/x2BX/dAHO2KNQW - MMZLXiK1d5zSLwohxBwZ+9IGEBc6sd6JjYXBNO8XOOfG9Kx3xF4GJIOF3hP7M6BGM6CXrgCi0aUzYIiW - MOcgUa2BJcy3bb1DWg34RkafGwF2A+hlg/vnJThAGkAI0WDRU9HAV/6tHp9FdAB/QLi4qrG0hAAAAABJ - RU5ErkJggg== + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAACESURBVDhPtZDBDYAgDEV7YFZ3YgGHMZ5dgasbYEpFm08r + mOhP3sFKH1+J/kgIIWvwfRNcYPJKBZw3Qh7My35Rl7XIOmMK9M0InnMFT3QFowwJiKLLoGDKVnguoq4g + 4m4Jz1PabokvkAZyo4DPHYHdgPOyQfsTRXA2qBJkuIEf/a0eH+QAf0C4uBZ9A6wAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHJSURBVDhPvZHdK4NhGMb3pzAt4dgfIPmMosgBB8pHjnbA - kSMhijSa2pgJ89U23jEJExpmvhq2+ZoMxVZD78vYxjsue5+NMTVK+dV18jxdv7v7eXh/Rrt8BC7UkpVE - OWvCoHYdoeuf4cqRKCaNqGwY/p1Es2gN1YL4X14hGZmHzmBFcXX7zxLl3A4p6mwAtQuY7Qw6FTOgVhmo - l2mo9DT652iIJ25JQrUwg1ojEXA8PfvB3PvgcLmJIJKm0WskVxi+SuRqPbnsMzxDNMugnrpCzYAdIws3 - 5Pwz1TIXtBsMkoomwxJpYF9u70cPi2vag3PHHQ7sN5BPO0mplfKTmE/uUCpyIrFoCgkFY4jPGwpKuH29 - PvZjslBuQ5V0Hx2qcyJ4h3lgcXLphcFyDxm1DUFub1jAuH04PHNh59gBo/kCS1unaOgLfm/dqBtCqRMl - bTbkN+6RyKhNCLK7woLkrLJvqRHvEQEbWM9Fs7DYH7FoYqBZuUX3mBFxGeKvjxlJedMGEXye/J4u9Rr4 - aaLogsJaPTxPL5BPmNCj2YZsfJNM5spS5SpiU1uiCzKEusBrq0ji8xQQ5PQgLlMCfnp7oNyKmJTm6IJ/ - gsd7A8Wc0VfbPf1MAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHOSURBVDhPvZHfS5NRAIb3p6QyxLr2DwgpLQoMDC/qIqjE + q13oVVeRoaDEjAXO5sKaNdmm33QR6SRl6lyazJzr16RlUBtM5ft0Oaff5iM7onOftIKgF56rc97n5XB0 + un+NZ/IzOaSJsMAxEqTP8xbtvd8mV9bGNhygoeXF30nc4+GCcia7R5d9DK8/zLWmzj9LHKMLouiNgPQe + QlGFR7bXSNMKrkkZp0/m6aiMaWhdoO3r+jyBo/Wd3QzKZppYIikE2rT2r1J5218osbp84rDXv4txROGe + 9JPmZ1Hsb9a0fZosCTyzCmfqh/MSs31MvHsrpbIqp1iJbfAxuob1VVyUOqSMILS8wQ1jnNP1L6moG6C8 + 9vmBJPfe7bR6tGywRmg0f+Chc6VgXfmlsvxjG//SJhZpHv3lJ3mBkkzz6VuChS8xAqHvTLz7Skvvwffe + 7U9iMMe5/iDClfuLAos0h/5id15QeeHmCZpNi0KgZvdIyCpL0S3GgwruqXUeDwQoqzad/JHjudU6KwTH + lw/pds1Qes5YXHD1jo/UThbrUJAe9zyWwTmxnCubHdOUVLUXF1QbvFTUOQXltTb0l3ooq+mi9HwnJVUd + nDrbVlzw37IPxZzRV+2pq28AAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACMSURBVDhPtZDRDYAgDET7wazu5AIOY/x2BX/dAHO2KNQW - MMZLXiK1d5zSLwohxBwZ+9IGEBc6sd6JjYXBNO8XOOfG9Kx3xF4GJIOF3hP7M6BGM6CXrgCi0aUzYIiW - MOcgUa2BJcy3bb1DWg34RkafGwF2A+hlg/vnJThAGkAI0WDRU9HAV/6tHp9FdAB/QLi4qrG0hAAAAABJ - RU5ErkJggg== + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAACESURBVDhPtZDBDYAgDEV7YFZ3YgGHMZ5dgasbYEpFm08r + mOhP3sFKH1+J/kgIIWvwfRNcYPJKBZw3Qh7My35Rl7XIOmMK9M0InnMFT3QFowwJiKLLoGDKVnguoq4g + 4m4Jz1PabokvkAZyo4DPHYHdgPOyQfsTRXA2qBJkuIEf/a0eH+QAf0C4uBZ9A6wAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADTSURBVDhPvVKrDoNAEOSX+gt1tfxBg6psUNjmFJKcQjY5 - gyQ5gyXBVDbBVFYgKitWVEzZ43qpoDwC6SSjZmc2uxlvMXRRQ+UVVNZRnjVEomHlceAL9OooEjUzwBrp - CTQtw0hOD/hsZaPhA/APYnrAZhegj1ZeDzLVYPJ/RCwRHIWhlX/CDbCZz6vvQHUD9IWgChoMYNGRNxvj - FVAlQWSEIBkOYLiB8CSNUeaEMCX4MWEbNaMBDnxv77N1WUMXbQttG7smzi2SxWpNDBY3cf+3JnreG12r - GpgvtOAmAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADYSURBVDhPrVItD8IwFNxf4i/gsPsHpApJpmZJ1eRSNUlS + M7mkZnbJDJJkBomYmJx4AnHkddCQBvaRccmp3t3Le70gWAtTNtBFDZ0PVGcDmRr4up/AB+gxUKZ6YcDL + SD3Q9kAUq/kB76lstOyA8CDnB2x2At/o61ZDZQZMvo9MFMRRWvo6H07AZl6vuQP1DTAXgi5pNIAfHXmy + NV4BXRFkThDpeADDCaKTskZVEKKMECaEbdxOBjjwvv6h7bFN1cCUtWvj0MSlRfp3E8XqJu6n/9fBP8rS + Jj4BXasamGdFJGcAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADdSURBVDhPY6AK2Hbwwv+1O0/9X7zh0P+Zy3b9nzBv8//e - 2ev/Q6UJg3W7Tv8HgS/f//1//PbP/0uPfv039Uwm3oD5a/ajaD5+6+d/p7B84g2YMG8j2EYQBmmcsXA1 - HE+es/x/19SF/5t6ZqEYyMLEgtsCkMbDN/7833bu5/+lB7/9n7T5E9hwkCZ0DNWCCkA2rjvx43/7sgf/ - S2fe/Z/ScwcjTFA0o8dCZesUsFdg3oJhqHJMgC0WIrKbcGtAB9hiAa+N6ABkALpzSTKAJgmJJAOQExIy - hkoPasDAAACBjwD6rwhXUgAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADdSURBVDhPY2CgBth28ML/tTtP/V+84dD/mct2/Z8wb/P/ + 3tnr/6OrwwnW7Tr9HwS+fP/3//HbP/8vPfr139QzmXgD5q/Zj6L5+K2f/53C8ok3YMK8jWAbQRikccbC + 1XA8ec7y/11TF/5v6pmFYiALEwtuC0AaD9/483/buZ//lx789n/S5k9gw0Ga0DG6XjAA2bjuxI//7cse + /C+defd/Ss8djDBB0YweC5WtU8BegXkLhpENQAHYYiEiuwm3BnSALRbw2ogOQAagO5ckA7B5gSQDKPYC + ckIiywsDCgCBjwD6FcXgCwAAAABJRU5ErkJggg== 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 + hBBCCCHEEdkBVsTj8gS5a8wAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEUSURBVHhe7ZoxSkRBEAU/YrChmXgB77Hn8BSewHMIJoar - hzFRzMz1AKZaD3ayWU1cd+mugoKfDe/Bn4GmFxERERGRf+cU11vz3YoLfMKvrfk+wxYk/CuO8MMbLM+u - 8PEeS/NT+HiFZfkt/C2W5RxfcBY83uEJlsTwOAseDY8lMTzOgkfDY0kMj7Pg0fBYEsPjLHg0PJbkEj9w - Fjy+4SM+HMANZqiyt8nSCj9xFvyYzHhtLzPGa5wdeIxm0PrntC+g/S8Qcgm+4+zgWPoSHOQZfMZZAbH0 - MziwBLAEsASwBLAEsASwBLAEsASwBLAEsARovSAxaL0iM2i9JDXYVUKLNblBSmi7KDlovSorIiIiIodl - Wb4BwPHkArNQmuIAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEYSURBVHhe7ZoxigJBEEU/i4HhZuIF9h6ew1PsCTyHYGLo + ehgTxWzz9QCmStFTIE05Jjsq1e/Bhwm6Gd6H6YGmJAAAAACAZzOSNOtiz00xlbSTdOliz5/1oqyY/PFG + 3rOoF2bknrxlXS/ORp+8ZV5vyMQj+WW9IRMTSYdA2rOS9FFvygLygTTyyCOfE+QDaeSRRz4nyAfSTch/ + SToF0p5fSVtJPy/IprtUGexmaSzpHEi/W+x6bZA7xu/gZe8au2j9d5ovoPlPwLBD8C94qSf1IejYb3Af + yHtS/wYdSqCEAiVQQoESKKFACZRQoARKKFACJRSaHpBwHpWQekTG6Ssh/ZCUc6+EJsbknKYHJZ2mR2UB + AAAA4NVcAcDx5AIlrB0yAAAAAElFTkSuQmCC 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 - SUVORK5CYII= + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAV9SURBVHhe7ZtHqy1FFIWXKCIoDk0js76ROYAJAwbEgQFF + xJGioEMD6MTwF3RuHKgoZp0YwIhTsw7ViWFiAJ9ZvksVFOvu6qrTp/u8mz7Y8Li1anftOl3Vu3b3k3bY + YRVcLuk7Sf912reSLnMnmxkC8iBb9o072cx4cL22ZfDAem1Ds5+kSyQd7Q0BvYH16jLHpDEwlpVysKSP + 0yD/knSLC4zewHp1wDW5NjrGwphWwkGSPrWB/ivpdhcW9AbWq7tZ0j+m/VLSYS6cmij4nklwbY0eXRR8 + tlknYSj4bLVJcF2Nlm4o+GyzTALr6/PgYu9L2m1/YxJuTf3OkPRo0K+G6+iLD8Anvst2rs0YvB9jnWxP + qAX/sqR9U8YWTcJnQR/sb79AQe3XxVcUPNdmDIzF+0wyCa3gM9Ek1Oydop/zbqCPLAefmWUSeLbmR11p + HnymNQnfS3oo7SU1GOzDSev9s3nwmdokEMOoPIEEw52x3qLgMz4J3LYvSrpQ0t4uHgAtfV6yW78WfIax + RXvCxS7sgQwvJxq9A4Bz0sAfl3SyN47glOSLicT3EP4DYMTQk62GkG3VNp+NRhQ8Y29lqU1uCnbnPyRd + 4cIGe6Vf80FJb6fn9W/Jvkh/e2DkXcNy/T0I/jYXjmWZSSDwayV9Zf2HjMm5OvVtMXvwmVoicq4LC46S + 9FEQYK+xoR3uTgu4dnTb50RscqJJeNVFibMbj7Ne+0nS+e488bppZw0+4xkeO7TDgP8MgmHZPCXpeknH + Sdo/Gf/mb08nTdQvutOeMB1jm5Uzg8GdZhpue3411z0r6UjTRtD/uaD/D8FyOCm4I/PZYRYes4u9YO1s + Wr7myf3vMF0PdwYbL3uCb4zkHKWGA9QoFi1dYxeYj+sCzZjgM3cH/q4yDRmja4asWnJftHTNBlemt/wy + /qjjtl+W580nB5wSxrDoZhuW3F3UMg42JadaOxsX63lZjgg2xhNNwwHKx9eydbigZqxpjrR+zCTDK3Xs + 9lPxjPm+z9oPSUdpxubjrdk6moIGpLJlfx5rU3GD+X7DBR0042sKGnxt/anZl7T8D7WTJ5RtnB0WZcj/ + Gk1Bg1+t/wHW3vI/1I6vsu0Xa+9hyP8aTUEDBlX2n3ICDrS2n629hyH/azQFDfwReKy1t/wPte+ytg25 + BN6y/lNugjea7zdd0EEzPhfUjPT0veAxSDGj1HGwmQoSqtJ39BgkTfbUecjW4YKWeSJEJads5zQ4uhZX + wFLyk+UJppkkEZoiFaaSU2o41S0DPv2w46nwPlOlwhwQFp0EDiIl1wQaTnVjuTfwd6VpLgo0Q0bwl5qP + bvw9H6XqEn6xD03DurzLdC3wc0+wptl7/DjsL0MesfZJodjgM+oFEQ4vPwY6TnU9ewJr3m97LCqIsO94 + QeR000yOl8QoSznnBSc4jM2Mgw25/fEpWcJ4zvOoY7f3DQ/DV/RS5EnTzV4Si4qir7gocdaIzSmyDVMU + jYKnJB39MhmWwwdBUL3GmvfbvmRlZfHoy4xFXozwkoP01QOsGY86L33VqL0Yib5UGcUywTtUce9PqSwT + wgkS49/8jQzPqz09zDYJ2/rlKAWNMa/HWZevTfh6HB/4wmf0cqQkmoTRr8en+kCCZ/qYDyTI8PboBxJT + fyJDIsOhxU+RJZzq0KD1/tlqkzD5JzIwx0dSVG9r8NhzfWQ+CbXgl/pIKtOahCh4blvPGLNtqs/kMrVJ + 2BYfSmb4vO2T4GKlMcDoywzX1Wjpoi9V3KhJHOodp2JoEmrBg2tr9OiGJmHW4DPRJAwFDz7QGr26aBJW + EnyG9bVt/8NEZiP8lxmuvUf+y8yieGC9tmXwwHpty7BotRkLS9eblUVL7kuVrnfYoZ//AROOTSGrgwV9 + AAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEPSURBVGhD7ZfBCcJAFERzVOzCk81Ygr3Yk0dr8eTBDhRP - +j+ysAwTogayM7APHoQk8GfDZEmGTqfTkecUbj+HnrzCe3gMV3nCjVxA8RLuQyvqBRStasUWkNrUioWv - la8VC82UrRUGPYQ3OFd8hFmrdSgDhkw2YQZ9hng9laoVhqvZhecQ7ylK1ApDMfJpX0O8N22+W2GgMWRr - hUGmkKsVBvgWmVrh8F+QqBUO/YemtcJhc2hSKxw0l8VrhQPmYr0A2wrZvsTW22iTujBw+BS2nxLWH3My - dWFgoBrbHxrZujAwnP1P/ZgSdWGwsLVSdWGw0Gnz3eVbWHjZujDq4PJ1YWRwm7owrOrS6XQ6SzIMb9OV - UfyTpgr5AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEXSURBVGhD7ZfBCcJAFETnqNiFJ5uxBHuxJ4/W4smDHSie + lIUshGGWRAPZ+fAfzCW75M+Gl0CAJEkSdy4A9nwxEh8ATwBnABtejEA5QM0NwJE3uDM+QE0orbh8TRit + uDjHXisu3IqtVlz0BOAhrpe8Bq22fJOecMnCbij6FuslVlpxuTEHAFexp8ZCKy6lKE/7LvaWdP9acaEW + tlpxkSnstOICc7HRiof/goVWPPQfumrFw5bQRSsetJTVteIBSwl9gLAKhX2JV9dFwUPn0kUXBQ+foqsu + Ci7QwkIXBRdR2Oii4EJj7HRRcKmCrS4KLhf+p74VC10UXJRjpYuCC9d0/7rMhYuX2OqiCKWLIpQuilC6 + JEmSrMsX05VR/EVYTyAAAAAASUVORK5CYII= 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 + F7s46VfzAzFvgHyRmx3AAAAAAElFTkSuQmCC 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 @@ -387,75 +384,73 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAANNJREFUOE+9UqsOg0AQ5Jf6C3W1/EGDqmxQ2OYUkpxCNjmDJDmDJcFUNsFUViAq - K1ZUTNnjeqmgPALpJKNmZza7GW8xdFFD5RVU1lGeNUSiYeVx4Av06igSNTPAGukJNC3DSE4P+Gxlo+ED - 8A9iesBmF6CPVl4PMtVg8n9ELBEchaGVf8INsJnPq+9AdQP0haAKGgxg0ZE3G+MVUCVBZIQgGQ5guIHw - JI1R5oQwJfgxYRs1owEOfG/vs3VZQxdtC20buybOLZLFak0MFjdx/7cmet4bXasamC+04CYAAAAASUVO - RK5CYII= + vAAADrwBlbxySQAAANhJREFUOE+tUi0PwjAU3F/iL+Cw+wekCkmmZknV5FI1SVIzuaRmdskMkmQGiZiY + nHgCceR10JAG9pFxyane3ct7vSBYC1M20EUNnQ9UZwOZGvi6n8AH6DFQpnphwMtIPdD2QBSr+QHvqWy0 + 7IDwIOcHbHYC3+jrVkNlBky+j0wUxFFa+jofTsBmXq+5A/UNMBeCLmk0gB8debI1XgFdEWROEOl4AMMJ + opOyRlUQoowQJoRt3E4GOPC+/qHtsU3VwJS1a+PQxKVF+ncTxeom7qf/18E/ytImPgFdqxqYZ0UkZwAA + AABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAN1JREFUOE9joArYdvDC/7U7T/1fvOHQ/5nLdv2fMG/z/97Z6/9DpQmDdbtO/weB - L9///X/89s//S49+/Tf1TCbegPlr9qNoPn7r53+nsHziDZgwbyPYRhAGaZyxcDUcT56z/H/X1IX/m3pm - oRjIwsSC2wKQxsM3/vzfdu7n/6UHv/2ftPkT2HCQJnQM1YIKQDauO/Hjf/uyB/9LZ979n9JzByNMUDSj - x0Jl6xSwV2DegmGockyALRYisptwa0AH2GIBr43oAGQAunNJMoAmCYkkA5ATEjKGSg9qwMAAAIGPAPqv - CFdSAAAAAElFTkSuQmCC + vAAADrwBlbxySQAAAN1JREFUOE9jYKAG2Hbwwv+1O0/9X7zh0P+Zy3b9nzBv8//e2ev/o6vDCdbtOv0f + BL58//f/8ds//y89+vXf1DOZeAPmr9mPovn4rZ//ncLyiTdgwryNYBtBGKRxxsLVcDx5zvL/XVMX/m/q + mYViIAsTC24LQBoP3/jzf9u5n/+XHvz2f9LmT2DDQZrQMbpeMADZuO7Ej//tyx78L515939Kzx2MMEHR + jB4Lla1TwF6BeQuGkQ1AAdhiISK7CbcGdIAtFvDaiA5ABqA7lyQDsHmBJAMo9gJyQiLLCwMKAIGPAPoV + xeALAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAGRJREFUOE+lzcENgDAIhWFmchbHcRN3YwEW4GblgDGFV9r0T96hCV9K+53Xs7yv - 98HMYSISpqo1RrDEGTxuqjGCJfbDDA5xf4ygVWIELYhHP3oQ+zGCVor9+L+sgGehFfDy9iJq1K76qrTi - CkcAAAAASUVORK5CYII= + vAAADrwBlbxySQAAAGNJREFUOE+lzMEJADEIRFFr2lq2nO0kvdmADXjb4EEIY1RCBv7NJ9H13u8/bsXM + HBKRkKr2GJHDFiOynkE9RuSwxX64gyXG4wzaWpzBEuMDhCX24wym2I/XdgsYUQZtAR93uwnUrvqqK2la + WwAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAFdJREFUOE+ly7ENACEMQ9EMeeMwaxbIAukANyfdQRIjvuTCxZP7ntaP9zaPqoYz - s89o/IfuzuEdpHAES5zBFFcwxAxEC2YhSnEGUYgriLaYgWjBx7tLZADW/iIHX3Y7QQAAAABJRU5ErkJg - gg== + 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 - gg== + vAAADrwBlbxySQAAATxJREFUOE+tlLFugzAQhvMIfYQ+Qh+hYkfKytaBncxMnVgjdqSOjB3Y6czURygr + YvDC2aOrz8KR4wS1kbD0S9bd+buz7+CgtT4f9lhaaysiH7H94QWo73urtf5USj3F/n8vQEmS2K7rgH1v + wYwxbyLyFQrbJcCDUNM0DmaMeY4haBxHF4PYi8jxAgtBqKoqYGpZlhf8BBODjcM+jj02fC42BnnYNE0O + RiPqunY2DqdparMsc/uyLG3btgDPd0Eoz3M7z7PLykFsQEL5OBH52QT5yshcFIU7EPux4YOxCfIV0R2q + Yh/CAPiKibkLCh+c+1OVh/AuQKJkpxtQ3DXaG1YzDINTCHIjEILWDtzMESNAF5kfHpZE68wpY8zr1Rz9 + NdnrNXmPk4i8h1W79ci3RqXEeF05Ae319e/yP/oF9/8g1rKWugAAAAAASUVORK5CYII= diff --git a/UTS_Core/UTSModule/Station/FrmStationPlan.vb b/UTS_Core/UTSModule/Station/FrmStationPlan.vb index 3646427..4f9b34f 100644 --- a/UTS_Core/UTSModule/Station/FrmStationPlan.vb +++ b/UTS_Core/UTSModule/Station/FrmStationPlan.vb @@ -3,6 +3,7 @@ Imports System.Threading Imports System.Windows.Forms Imports UTS_Core.DebugLog Imports UTS_Core.UTSModule.Test +Imports UTS_Core.UTSModule.Test.Command Imports UTS_Core.UTSModule.Test.StatusMonitor Namespace UTSModule.Station @@ -631,6 +632,35 @@ Namespace UTSModule.Station _debugTest.Start() End Sub + Private Sub 执行1ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles 执行1ToolStripMenuItem.Click + If _debugTest IsNot Nothing AndAlso _debugTest.IsAlive Then + MsgBox($"请先退出当前调试后重试") + Return + End If + + '_planGrid.ClearDebug() + StartDebugThread(AddressOf _tester.TestNode, _planGrid.ActiveNode) + End Sub + + Private Async Sub 执行2ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles 执行2ToolStripMenuItem.Click + 'If _debugTest IsNot Nothing AndAlso _debugTest.IsAlive Then + ' MsgBox($"请先退出当前调试后重试") + ' Return + 'End If + + '_planGrid.ClearDebug() + 'StartDebugThread(AddressOf _tester.TestNode, _planGrid.ActiveNode) + + ' _planGrid.ClearDebug() + + Dim row As Integer = _planGrid.ActiveNode.RowListIndex + Dim result As TestCommandReturn = Await Task.Run(Function() + Return _tester.TestNode(_planGrid.ActiveNode) + End Function, _testerCancel) + + If result IsNot Nothing AndAlso result.ExecuteResult Then _planGrid.SetRowFocus(row + 1) + End Sub + Private Sub TsmiStepDebug_Click(sender As Object, e As EventArgs) Handles TsmiDebugStep.Click _tester.StepTest() End Sub @@ -709,13 +739,24 @@ Namespace UTSModule.Station _debugTest.Start() End Sub + Private _testerCancel As New CancellationToken + Private Sub TsmiDebugNode_Click(sender As Object, e As EventArgs) Handles TsmiDebugNode.Click - If _debugTest IsNot Nothing AndAlso _debugTest.IsAlive Then - MsgBox($"请先退出当前调试后重试") - Return - End If + 'If _debugTest IsNot Nothing AndAlso _debugTest.IsAlive Then + ' MsgBox($"请先退出当前调试后重试") + ' Return + 'End If _planGrid.ClearDebug() + + 'Dim row As Integer = _planGrid.ActiveNode.RowListIndex + 'Dim result As TestCommandReturn = Await Task.Run(Function() + ' Return _tester.TestNode(_planGrid.ActiveNode) + ' End Function, _testerCancel) + + 'If result IsNot Nothing AndAlso result.ExecuteResult Then _planGrid.SetFocus(row + 1, StationPlanGrid.ColNames.Description) + + StartDebugThread(AddressOf _tester.TestNode, _planGrid.ActiveNode) End Sub @@ -848,6 +889,8 @@ Namespace UTSModule.Station _planGrid.JumpCall() End Sub + + #End Region diff --git a/UTS_Core/UTSModule/Station/RowNode.vb b/UTS_Core/UTSModule/Station/RowNode.vb index f266ce6..edc377a 100644 --- a/UTS_Core/UTSModule/Station/RowNode.vb +++ b/UTS_Core/UTSModule/Station/RowNode.vb @@ -13,7 +13,7 @@ Namespace UTSModule.Station AuthByType(RowType) Pause = False - Action = False + Action = True RecordName = String.Empty Retry = 0 @@ -244,6 +244,12 @@ Namespace UTSModule.Station ''' Public Property CanChangeLever() As Boolean + ''' + ''' 允许移动节点移动 + ''' + ''' + Public Property CanMove() As Boolean + ''' ''' 当前节点是否处于重试状态 ''' @@ -257,21 +263,27 @@ Namespace UTSModule.Station CanChangeContent = False CanDelete = False CanChangeLever = False + CanMove = False Case RowTypeEnum.Module CanAddChildNode = True CanChangeContent = True CanDelete = True CanChangeLever = True + CanMove = True Case RowTypeEnum.Control CanAddChildNode = True CanChangeContent = True CanDelete = True CanChangeLever = True + CanMove = True + Case RowTypeEnum.Flow CanAddChildNode = True CanChangeContent = True CanDelete = True CanChangeLever = True + CanMove = True + End Select End Sub #End Region diff --git a/UTS_Core/UTSModule/Station/StationPlanGrid.vb b/UTS_Core/UTSModule/Station/StationPlanGrid.vb index f46f7eb..66df7ae 100644 --- a/UTS_Core/UTSModule/Station/StationPlanGrid.vb +++ b/UTS_Core/UTSModule/Station/StationPlanGrid.vb @@ -1,5 +1,6 @@ Imports System.Diagnostics.Eventing.Reader Imports System.Drawing +Imports System.Web.UI.WebControls Imports System.Windows.Forms Imports FlexCell Imports FluentFTP @@ -528,24 +529,28 @@ Namespace UTSModule.Station Select Case node.RowType Case RowNode.RowTypeEnum.Flow - Select Case node.CommandType - Case "System" - If node.Command = "Call" Then - Return Color.Blue - Else - Return Color.DarkSlateGray - End If - Case "ComPort" - Return Color.Olive - Case "UtsComPort" - Return Color.SeaGreen - Case "Converter" - Return Color.DarkOrange - Case "Process" - Return Color.DarkBlue - Case Else - Return Color.Black - End Select + If String.IsNullOrEmpty(node.CommandType) OrElse String.IsNullOrEmpty(node.Command) Then + Return Color.DarkGray + Else + Select Case node.CommandType + Case "System" + If node.Command = "Call" Then + Return Color.Blue + Else + Return Color.DarkSlateGray + End If + Case "ComPort" + Return Color.Olive + Case "UtsComPort" + Return Color.SeaGreen + Case "Converter" + Return Color.DarkOrange + Case "Process" + Return Color.DarkBlue + Case Else + Return Color.Black + End Select + End If Case RowNode.RowTypeEnum.Module Return Color.DeepPink Case RowNode.RowTypeEnum.FixedModule @@ -594,7 +599,7 @@ Namespace UTSModule.Station _grd.Range(row, ColNames.Result, row, ColNames.ErrorMessage).ForeColor = tmpRowColor '着色 If node.SaveToDb = False Then - _grd.Cell(row, ColNames.RecordName).ForeColor = Color.LightGray '着色 + _grd.Cell(row, ColNames.RecordName).ForeColor = Color.DarkGray '着色 End If If node.CommandType = "" And node.Description = "" Then '空白行字体与底色同色，避免对编辑产生干扰 @@ -624,7 +629,7 @@ Namespace UTSModule.Station _grd.Range(row, ColNames.Result, row, ColNames.ErrorMessage).ForeColor = tmpRowColor '着色 If node.SaveToDb = False Then - _grd.Cell(row, ColNames.RecordName).ForeColor = Color.LightGray '着色 + _grd.Cell(row, ColNames.RecordName).ForeColor = Color.DarkGray '着色 End If If node.CommandType = "" And node.Description = "" Then '空白行字体与底色同色，避免对编辑产生干扰 @@ -685,10 +690,10 @@ Namespace UTSModule.Station gMouseOldCol = tmpMouseCol Else If gRowType <> RowNode.RowTypeEnum.FixedModule Then '光标移动到flow节点 - _grd.Range(tmpMouseRow, ColNames.Result, tmpMouseRow, ColNames.ErrorMessage).BackColor = Color.LemonChiffon + _grd.Range(tmpMouseRow, ColNames.Result, tmpMouseRow, ColNames.ErrorMessage).BackColor = Color.FromArgb(40, Color.LemonChiffon) _grd.Cell(tmpMouseRow, tmpMouseCol).FontBold = True If gRowType = RowNode.RowTypeEnum.Module Then '光标移动到module节点 - Mouse_MoveOnNode_BackColorRepain(_grd, gRowType, tmpMouseRow, Color.LemonChiffon) + Mouse_MoveOnNode_BackColorRepain(_grd, gRowType, tmpMouseRow, Color.FromArgb(40, Color.LemonChiffon)) End If End If End If @@ -806,6 +811,7 @@ Namespace UTSModule.Station .FrozenCols = ColNames.Description '冻结列 .BorderStyle = BorderStyleEnum.None + .DefaultRowHeight = 22 '默认行高 .DefaultFont = New Font("微软雅黑", 8) '.DefaultFont = New Font("Consolas", 8) .Range(0, 0, 0, .Cols - 1).Font = New Font($"幼圆", 8) '首行样式 @@ -878,6 +884,9 @@ Namespace UTSModule.Station UnLockGridAutoRedraw() End With + + Dim s As Integer = _grd.DefaultRowHeight + Console.WriteLine(s) End Sub @@ -950,11 +959,18 @@ Namespace UTSModule.Station .Cell(row, ColNames.Parameters).Text = $"{ParamsToString(node.Parameters)}" .Cell(row, ColNames.SaveToDb).Text = $"{node.SaveToDb}" .Cell(row, ColNames.RecordName).Text = $"{node.RecordName}" - .Cell(row, ColNames.Retry).Text = $"{node.Retry}" - .Cell(row, ColNames.RetryInterval).Text = $"{node.RetryInterval}" .Cell(row, ColNames.ErrorCode).Text = $"{node.ErrorCode}" .Cell(row, ColNames.ErrorMessage).Text = $"{node.ErrorMessage}" + If node.RowType <> RowNode.RowTypeEnum.FixedModule Then + .Cell(row, ColNames.Retry).Text = $"{node.Retry}" + .Cell(row, ColNames.RetryInterval).Text = $"{node.RetryInterval}" + Else + .Cell(row, ColNames.Retry).Text = String.Empty + .Cell(row, ColNames.RetryInterval).Text = String.Empty + End If + + rowCmdType = .Cell(row, ColNames.CommandType).Text tmpIsAction = .Cell(row, ColNames.Action).BooleanValue 'tmpColor = setRowTextForeColor(rowCmdType, tmpIsAction, node.RowType) @@ -971,7 +987,7 @@ Namespace UTSModule.Station If .Cell(row, ColNames.Action).BooleanValue = True Then .Range(row, ColNames.Result, row, ColNames.ErrorMessage).ForeColor = Color.DeepPink Else - .Range(row, ColNames.Result, row, ColNames.ErrorMessage).ForeColor = Color.LightGray + .Range(row, ColNames.Result, row, ColNames.ErrorMessage).ForeColor = Color.DarkGray End If .Range(row, ColNames.Result, row, ColNames.ErrorMessage).FontSize = 8 .Range(row, ColNames.Result, row, ColNames.ErrorMessage).FontBold = False @@ -1123,7 +1139,7 @@ Namespace UTSModule.Station changeType = RowNodeChangedEventArgs.RowNodeChangeType.None Dim beforeNode As RowNode = node.Clone() - OnUserAction(beforeNode) + If e.Col = ColNames.Action OrElse e.Col >= ColNames.Label Then OnUserAction(beforeNode) Select Case e.Col Case ColNames.[Pause] @@ -1163,6 +1179,7 @@ Namespace UTSModule.Station Else node.RowType = RowNode.RowTypeEnum.Module AddLabelName(node.Label, e.Row) '记录新的标签名称 + NodeActionChanged(node) End If changeType = RowNodeChangedEventArgs.RowNodeChangeType.Label @@ -1182,7 +1199,7 @@ Namespace UTSModule.Station node.CommandType = _grd.Cell(e.Row, e.Col).Text node.Command = "" node.Parameters.Clear() - node.Action = Not String.IsNullOrWhiteSpace(node.Command) + 'node.Action = Not String.IsNullOrWhiteSpace(node.Command) CommandTypeChanged(node) changeType = RowNodeChangedEventArgs.RowNodeChangeType.CommandType @@ -1193,7 +1210,7 @@ Namespace UTSModule.Station If node.Command <> _grd.Cell(e.Row, e.Col).Text Then node.Command = _grd.Cell(e.Row, e.Col).Text node.Parameters.Clear() - node.Action = Not String.IsNullOrWhiteSpace(node.Command) + 'node.Action = Not String.IsNullOrWhiteSpace(node.Command) '拷贝所有参数到当前节点信息中 Dim planCommand As TestCmd = _testCmdManager.GetCommand(node.CommandType, node.Command) @@ -1205,6 +1222,8 @@ Namespace UTSModule.Station CommandChanged(node) changeType = RowNodeChangedEventArgs.RowNodeChangeType.Command End If + NodeActionChanged(node) + Case ColNames.Parameters Dim str() As String = _grd.Cell(e.Row, e.Col).Text.Split(New Char() {_paramChar}) @@ -1257,7 +1276,6 @@ Namespace UTSModule.Station changeType = RowNodeChangedEventArgs.RowNodeChangeType.ErrorMessage End Select - OnUserActionEnd(node) '触发事件 @@ -1265,6 +1283,8 @@ Namespace UTSModule.Station Select Case changeType Case RowNodeChangedEventArgs.RowNodeChangeType.None Return + Case Else + OnUserActionEnd(node) End Select StationEditStatusMonitor.StationEditStatus = StationEditStatusMonitor.StationEditStatusEnum.Changed @@ -1284,7 +1304,8 @@ Namespace UTSModule.Station Private Sub Grid_SelChange(sender As Object, e As Grid.SelChangeEventArgs) 'todo:更新详情表格 If _headNode Is Nothing Then Return - Dim node As RowNode = _headNode.RowList(_grd.ActiveCell.Row - _drawStartRow + 1) + Dim node As RowNode = _headNode.RowList(e.FirstRow - _drawStartRow + 1) + 'Dim node As RowNode = _headNode.RowList(_grd.ActiveCell.Row - _drawStartRow + 1) If node Is Nothing Then Return Console.WriteLine($"Grid_SelChange: row:{e.FirstRow} col:{e.FirstCol} end row{e.LastRow} {e.LastCol}") If Not GridNavigationManager.IsRunning Then @@ -1315,6 +1336,7 @@ Namespace UTSModule.Station ActiveNode = node + Dim LineNumber As Integer = e.FirstRow Dim LineActionEn As Boolean = node.Action @@ -1569,6 +1591,11 @@ Namespace UTSModule.Station Dim startNode As RowNode = _headNode.RowList(startMoveRow - _drawStartRow + 1) For i As Integer = 1 To rows node = _headNode.RowList(startMoveRow - _drawStartRow + i) + If Not node.CanDelete Then + MsgBox("当前级别节点不允许删除") '过滤非删除节点 + Return + End If + If startNode.RowLever <> node.RowLever Then MsgBox("请选择同一级别节点再尝试此操作") '非同级别节点不移动 Return @@ -1610,6 +1637,19 @@ Namespace UTSModule.Station UnLockGridAutoRedraw() End Sub + Public Sub SetFocus(row As Integer, col As Integer) + If row >= _grd.Rows Then row = 0 + If col >= _grd.Cols Then col = 0 + + _grd.Cell(row, col).SetFocus() + + End Sub + + Public Sub SetRowFocus(row As Integer) + If row >= _grd.Rows Then row = 0 + + _grd.Range(row, 0, row, _grd.Cols - 1).SelectCells() + End Sub Public Sub NodeClear() If _grd.ActiveCell Is Nothing OrElse _grd.Tree.SelectedNode Is Nothing Then Return @@ -1638,6 +1678,7 @@ Namespace UTSModule.Station Dim startNode As RowNode = _headNode.RowList(startMoveRow - _drawStartRow + 1) Dim prevNode As RowNode = startNode.PrevNode If prevNode Is Nothing Then Return + If Not startNode.CanMove Then Return Dim node As RowNode For i As Integer = 2 To moveRows @@ -1646,6 +1687,11 @@ Namespace UTSModule.Station MsgBox("请选择同一级别节点再尝试此操作") '非同级别节点不移动 Return End If + + If Not node.CanMove Then + MsgBox("当前选择节点不允许移动") + Return + End If Next @@ -1663,6 +1709,7 @@ Namespace UTSModule.Station Dim endNode As RowNode = _headNode.RowList(startMoveRow + moveRows - _drawStartRow) Dim nextNode As RowNode = endNode.NextNode If nextNode Is Nothing Then Return + If Not startNode.CanMove Then Return Dim node As RowNode For i As Integer = 2 To moveRows @@ -1671,6 +1718,11 @@ Namespace UTSModule.Station MsgBox("请选择同一级别节点再尝试此操作") '非同级别节点不移动 Return End If + + If Not node.CanMove Then + MsgBox("当前选择节点不允许移动") + Return + End If Next Dim moveEndRow As Integer = startMoveRow + nextNode.AllChildCount + 1 @@ -1775,6 +1827,7 @@ Namespace UTSModule.Station preNode = node Next + _grd.Range(downNode(0).RowListIndex, 0, downNode(0).RowListIndex + downNode.Count - 1, _grd.Cols - 1).SelectCells() '设置焦点 '节点修改 StationEditStatusMonitor.StationEditStatus = StationEditStatusMonitor.StationEditStatusEnum.Changed @@ -1808,6 +1861,8 @@ Namespace UTSModule.Station nextNode = node Next + _grd.Range(upNode(0).RowListIndex, 0, upNode(0).RowListIndex + upNode.Count - 1, _grd.Cols - 1).SelectCells() '设置焦点 + '节点修改 StationEditStatusMonitor.StationEditStatus = StationEditStatusMonitor.StationEditStatusEnum.Changed @@ -1844,6 +1899,11 @@ Namespace UTSModule.Station Return End If + If Not node.CanChangeLever Then + MsgBox("当前选择节点不允许修改级别") + Return + End If + moveEndRow -= (node.AllChildCount + 1) Next @@ -1906,6 +1966,11 @@ Namespace UTSModule.Station MsgBox("请选择同一级别节点再尝试此操作") '非同级别节点不移动 Return End If + + If Not node.CanChangeLever Then + MsgBox("当前选择节点不允许修改级别") + Return + End If Next Dim moveRightNodeIndex As Integer = startNode.PrevNode.Children.Count diff --git a/UTS_Core/UTSModule/Station/StationTestPlan.vb b/UTS_Core/UTSModule/Station/StationTestPlan.vb index 7ccb862..e1d0389 100644 --- a/UTS_Core/UTSModule/Station/StationTestPlan.vb +++ b/UTS_Core/UTSModule/Station/StationTestPlan.vb @@ -72,7 +72,7 @@ Namespace UTSModule.Station ''' ''' Private Function CreateFixedRowNode(text As String, desc As String) As RowNode - Dim node As New RowNode With {.RowType = RowNode.RowTypeEnum.FixedModule, .Label = text, .Description = desc} + Dim node As New RowNode With {.RowType = RowNode.RowTypeEnum.FixedModule, .Action = True, .Label = text, .Description = desc} node.AddNode(New RowNode()) '添加一个空的子节点 Return node End Function @@ -155,7 +155,7 @@ Namespace UTSModule.Station Throw New Exception($"LoadXml Unknown LocalName:{xe.LocalName}") End Select Next - + End Sub ''' diff --git a/UTS_Core/UTSModule/Test/Command/SystemCommand/CallExecutor.vb b/UTS_Core/UTSModule/Test/Command/SystemCommand/CallExecutor.vb index 9fa3cf5..9b7a6de 100644 --- a/UTS_Core/UTSModule/Test/Command/SystemCommand/CallExecutor.vb +++ b/UTS_Core/UTSModule/Test/Command/SystemCommand/CallExecutor.vb @@ -22,13 +22,14 @@ Namespace UTSModule.Test.Command.SystemCommand Public Overrides Function Execute() As TestCommandReturn Dim tester As UtsTester = UtsTester.CreateTester() Dim rowNode As RowNode = tester.GetModule(_moduleName) - rowNode.IsRetry = IsRetry If rowNode Is Nothing Then CommandReturn.ExecuteResult = False CommandReturn.RecordValue = String.Empty CommandReturn.ExecuteResultTipString = $"未查询到[{_moduleName}]模块存在" Else + rowNode.IsRetry = IsRetry + Dim moduleResult As TestCommandReturn = tester.ExecutePlan(rowNode, _localVariable) CommandReturn.ExecuteResult = moduleResult.ExecuteResult diff --git a/UTS_Core/UTSModule/Test/Controls/UtsInputBox.vb b/UTS_Core/UTSModule/Test/Controls/UtsInputBox.vb index 40be972..9f2d484 100644 --- a/UTS_Core/UTSModule/Test/Controls/UtsInputBox.vb +++ b/UTS_Core/UTSModule/Test/Controls/UtsInputBox.vb @@ -52,6 +52,7 @@ Namespace UTSModule.Test.Controls Public Overloads Shared Function ShowDialog(tip As String, Optional title As String = "", Optional text As String = "", Optional isPwd As Boolean = False) As String Using box As New UtsInputBox + box.TopLevel = True box.TipText = tip box.Title = title box.DefaultText = text diff --git a/UTS_Core/UTSModule/Test/Controls/UtsMsgBox.vb b/UTS_Core/UTSModule/Test/Controls/UtsMsgBox.vb index f648977..132448c 100644 --- a/UTS_Core/UTSModule/Test/Controls/UtsMsgBox.vb +++ b/UTS_Core/UTSModule/Test/Controls/UtsMsgBox.vb @@ -16,6 +16,7 @@ Namespace UTSModule.Test.Controls Public Overloads Shared Function ShowDialog(text As String, Optional type As UtsMsgBoxTypeEnum = UtsMsgBoxTypeEnum.OkOnly, Optional title As String = "") As System.Windows.Forms.DialogResult Using msg As New UtsMsgBox + msg.TopLevel = True msg.MsgText = text msg.MsgType = type msg.MsgTitle = title diff --git a/UTS_Core/UTSModule/Test/TestRecordGrid.vb b/UTS_Core/UTSModule/Test/TestRecordGrid.vb index 65a5257..f433cad 100644 --- a/UTS_Core/UTSModule/Test/TestRecordGrid.vb +++ b/UTS_Core/UTSModule/Test/TestRecordGrid.vb @@ -226,6 +226,10 @@ Namespace UTSModule.Test Next Dim moduleNode As RowNode = GetModule(moduleName) + If moduleNode Is Nothing Then + MsgBox($"行号:{node.RowListIndex} 未找到可调用模块：{moduleName}") + Continue For + End If SearchRecordName(moduleNode.RowNodes, True, variable) End If Next diff --git a/UTS_Core/UTSModule/Test/UtsTester.vb b/UTS_Core/UTSModule/Test/UtsTester.vb index 6bf4e76..7702d48 100644 --- a/UTS_Core/UTSModule/Test/UtsTester.vb +++ b/UTS_Core/UTSModule/Test/UtsTester.vb @@ -546,6 +546,9 @@ Namespace UTSModule.Test If _exitTest Then Return GetExitTestReturn() If node.Action = False Then Return GetNotActionNodeResult() + If node.RowType = RowNode.RowTypeEnum.Flow Then + If String.IsNullOrEmpty(node.CommandType) OrElse String.IsNullOrEmpty(node.Command) Then Return GetNotActionNodeResult() + End If If TestStatus = TestStatusEnum.Testing Then _testNode = node @@ -1025,7 +1028,7 @@ Namespace UTSModule.Test ''' 调试测试当前节点及其子节点 ''' ''' 节点对象 - Public Sub TestNode(obj As Object) + Public Function TestNode(obj As Object) As TestCommandReturn Dim node As RowNode = CType(obj, RowNode) DebugMode = True @@ -1071,8 +1074,8 @@ Namespace UTSModule.Test RaiseEvent TestEnd(Me, New TestEndEventArgs(_testResult)) - - End Sub + Return result + End Function ''' ''' 从当前节点调试测试,直到测试完当前顶级模块 diff --git a/UTS_Core/bin/Debug/UTS_Core.dll b/UTS_Core/bin/Debug/UTS_Core.dll index 553607e..a2dcdcd 100644 Binary files a/UTS_Core/bin/Debug/UTS_Core.dll and b/UTS_Core/bin/Debug/UTS_Core.dll differ diff --git a/UTS_Core/bin/Debug/UTS_Core.pdb b/UTS_Core/bin/Debug/UTS_Core.pdb index f25a1ee..e3827c3 100644 Binary files a/UTS_Core/bin/Debug/UTS_Core.pdb and b/UTS_Core/bin/Debug/UTS_Core.pdb differ diff --git a/UTS_Core/obj/Debug/UTS_Core.dll b/UTS_Core/obj/Debug/UTS_Core.dll index 553607e..a2dcdcd 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.dll and b/UTS_Core/obj/Debug/UTS_Core.dll differ diff --git a/UTS_Core/obj/Debug/UTS_Core.pdb b/UTS_Core/obj/Debug/UTS_Core.pdb index f25a1ee..e3827c3 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.pdb and b/UTS_Core/obj/Debug/UTS_Core.pdb differ diff --git a/UTS_Core/obj/Debug/UTS_Core.vbproj.GenerateResource.cache b/UTS_Core/obj/Debug/UTS_Core.vbproj.GenerateResource.cache index 2b18b42..5793a8f 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.vbproj.GenerateResource.cache and b/UTS_Core/obj/Debug/UTS_Core.vbproj.GenerateResource.cache differ