From 1439479989d3e64f53026691197dd6f5f2c202e7 Mon Sep 17 00:00:00 2001 From: RnD_Welder Date: Wed, 15 Apr 2026 16:31:22 +0900 Subject: [PATCH] =?UTF-8?q?FEAT:=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MilUI/Camera/CameraDisplay.xaml.cs | 2 +- AuroraVision/MilUI/Camera/GridGuideLine.cs | 4 +- AuroraVision/MilUI/Camera/RulerMode.cs | 3 +- .../Manual/SeqComponentTeachingRun.cs | 3 +- .../GUI/Dialog/WeldingParamDlg.Designer.cs | 1346 +++++++++-------- .../LASA/GUI/Dialog/WeldingParamDlg.cs | 50 +- .../WeldingCommon/CommonEquipmentSetup.cs | 1 + .../UCScannerCalibrationViewModel.cs | 24 +- ...cannerObjectTeachingControlBoxViewModel.cs | 51 +- 9 files changed, 782 insertions(+), 702 deletions(-) diff --git a/AuroraVision/MilUI/Camera/CameraDisplay.xaml.cs b/AuroraVision/MilUI/Camera/CameraDisplay.xaml.cs index 8e8fc23..a1c163f 100644 --- a/AuroraVision/MilUI/Camera/CameraDisplay.xaml.cs +++ b/AuroraVision/MilUI/Camera/CameraDisplay.xaml.cs @@ -172,7 +172,7 @@ namespace MilUI { public void DrawGuideLines() { var calFovRecipe = VisionRecipeManager.GetCalFovRecipe(_FovInfo); var centerPos = new ImagePoint(_ImageSize.Width / 2, _ImageSize.Height / 2); - var color = MIL.M_RGB888(255, 165, 0); // Orange + var color = MIL.M_COLOR_RED; // Orange _gridGuideLine.DrawGuideLines(_ImageSize, centerPos, 1, color, calFovRecipe.ErrRotationX); //_gridGuideLine.DrawRefLine(_ImageSize, calFovRecipe.ErrRotationX); diff --git a/AuroraVision/MilUI/Camera/GridGuideLine.cs b/AuroraVision/MilUI/Camera/GridGuideLine.cs index 55faffe..d2e3481 100644 --- a/AuroraVision/MilUI/Camera/GridGuideLine.cs +++ b/AuroraVision/MilUI/Camera/GridGuideLine.cs @@ -97,11 +97,11 @@ namespace MilUI { if (gridMode == eGridMode.Narrow) { DrawGuideLines(imageSize, centerPos, 11, MIL.M_COLOR_LIGHT_GRAY, errRotation); - DrawGuideLines(imageSize, centerPos, 1, COLOR_ORANGE, errRotation); + DrawGuideLines(imageSize, centerPos, 1, MIL.M_COLOR_RED, errRotation); } else { DrawGuideLines(imageSize, centerPos, 5, MIL.M_COLOR_LIGHT_GRAY, errRotation); - DrawGuideLines(imageSize, centerPos, 1, COLOR_ORANGE, errRotation); + DrawGuideLines(imageSize, centerPos, 1, MIL.M_COLOR_RED, errRotation); } } diff --git a/AuroraVision/MilUI/Camera/RulerMode.cs b/AuroraVision/MilUI/Camera/RulerMode.cs index 8edb235..ad579c7 100644 --- a/AuroraVision/MilUI/Camera/RulerMode.cs +++ b/AuroraVision/MilUI/Camera/RulerMode.cs @@ -36,7 +36,8 @@ namespace MilUI { _milGraphics = new MilGraphics(_displayId, _graphicListId); _tempMilGraphics = new MilGraphics(_displayId, _graphicListId); _colors = new List() { - MIL.M_COLOR_YELLOW, + //MIL.M_COLOR_YELLOW, + MIL.M_COLOR_GREEN, MIL.M_COLOR_MAGENTA }; } diff --git a/Machines/ILSOS_PrismaticScanner/Sequences/Manual/SeqComponentTeachingRun.cs b/Machines/ILSOS_PrismaticScanner/Sequences/Manual/SeqComponentTeachingRun.cs index fb43ec8..7ca34ca 100644 --- a/Machines/ILSOS_PrismaticScanner/Sequences/Manual/SeqComponentTeachingRun.cs +++ b/Machines/ILSOS_PrismaticScanner/Sequences/Manual/SeqComponentTeachingRun.cs @@ -305,7 +305,8 @@ namespace ILSOS_PrismaticScanner.Sequences } private bool CheckDeviceReady(SequenceContext context) { - List deviceListToCheck = new List() { CommonDeviceIds.Scanner, CommonDeviceIds.IODevice }; + //List deviceListToCheck = new List() { CommonDeviceIds.Scanner, CommonDeviceIds.IODevice }; // 26.04.15 주석처리 아래 로 테스트 + List deviceListToCheck = new List() { CommonDeviceIds.Scanner }; //List deviceListToCheck = new List() { CommonDeviceIds.Scanner, CommonDeviceIds.IODevice,DeviceIds.ACS }; 변수 맵 수신 후 ACS 주석 해제 위에 주석 처리 bool isAllDeviceActivated = true; foreach (string item in deviceListToCheck) diff --git a/WeldingComponents/LASA/GUI/Dialog/WeldingParamDlg.Designer.cs b/WeldingComponents/LASA/GUI/Dialog/WeldingParamDlg.Designer.cs index c77072e..463db8c 100644 --- a/WeldingComponents/LASA/GUI/Dialog/WeldingParamDlg.Designer.cs +++ b/WeldingComponents/LASA/GUI/Dialog/WeldingParamDlg.Designer.cs @@ -175,105 +175,105 @@ ((System.ComponentModel.ISupportInitialize)(this.nudRampingStartDist)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudRampingEndDist)).BeginInit(); this.SuspendLayout(); - // + // // btnCopyParam - // + // this.btnCopyParam.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCopyParam.Location = new System.Drawing.Point(34, 12); - this.btnCopyParam.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btnCopyParam.Location = new System.Drawing.Point(26, 10); + this.btnCopyParam.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.btnCopyParam.Name = "btnCopyParam"; - this.btnCopyParam.Size = new System.Drawing.Size(114, 40); + this.btnCopyParam.Size = new System.Drawing.Size(86, 35); this.btnCopyParam.TabIndex = 0; this.btnCopyParam.Text = "Copy"; this.btnCopyParam.UseVisualStyleBackColor = true; this.btnCopyParam.Click += new System.EventHandler(this.btnCopyParam_Click); - // + // // btnPasteParam - // + // this.btnPasteParam.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnPasteParam.Location = new System.Drawing.Point(160, 12); - this.btnPasteParam.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btnPasteParam.Location = new System.Drawing.Point(120, 10); + this.btnPasteParam.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.btnPasteParam.Name = "btnPasteParam"; - this.btnPasteParam.Size = new System.Drawing.Size(114, 40); + this.btnPasteParam.Size = new System.Drawing.Size(86, 35); this.btnPasteParam.TabIndex = 0; this.btnPasteParam.Text = "Paste"; this.btnPasteParam.UseVisualStyleBackColor = true; this.btnPasteParam.Click += new System.EventHandler(this.btnPasteParam_Click); - // + // // btnImport - // + // this.btnImport.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnImport.Location = new System.Drawing.Point(286, 12); - this.btnImport.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btnImport.Location = new System.Drawing.Point(214, 10); + this.btnImport.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.btnImport.Name = "btnImport"; - this.btnImport.Size = new System.Drawing.Size(114, 40); + this.btnImport.Size = new System.Drawing.Size(86, 35); this.btnImport.TabIndex = 1; this.btnImport.Text = "Import"; this.btnImport.UseVisualStyleBackColor = true; this.btnImport.Click += new System.EventHandler(this.btnImport_Click); - // + // // btnExport - // + // this.btnExport.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnExport.Location = new System.Drawing.Point(411, 12); - this.btnExport.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btnExport.Location = new System.Drawing.Point(308, 10); + this.btnExport.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.btnExport.Name = "btnExport"; - this.btnExport.Size = new System.Drawing.Size(114, 40); + this.btnExport.Size = new System.Drawing.Size(86, 35); this.btnExport.TabIndex = 1; this.btnExport.Text = "Export"; this.btnExport.UseVisualStyleBackColor = true; this.btnExport.Click += new System.EventHandler(this.btnExport_Click); - // + // // btnImportAll - // + // this.btnImportAll.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnImportAll.Location = new System.Drawing.Point(537, 12); - this.btnImportAll.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btnImportAll.Location = new System.Drawing.Point(403, 10); + this.btnImportAll.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.btnImportAll.Name = "btnImportAll"; - this.btnImportAll.Size = new System.Drawing.Size(114, 40); + this.btnImportAll.Size = new System.Drawing.Size(86, 35); this.btnImportAll.TabIndex = 1; this.btnImportAll.Text = "Import All"; this.btnImportAll.UseVisualStyleBackColor = true; this.btnImportAll.Click += new System.EventHandler(this.btnImportAll_Click); - // + // // btnExportAll - // + // this.btnExportAll.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnExportAll.Location = new System.Drawing.Point(663, 12); - this.btnExportAll.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btnExportAll.Location = new System.Drawing.Point(497, 10); + this.btnExportAll.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.btnExportAll.Name = "btnExportAll"; - this.btnExportAll.Size = new System.Drawing.Size(114, 40); + this.btnExportAll.Size = new System.Drawing.Size(86, 35); this.btnExportAll.TabIndex = 1; this.btnExportAll.Text = "Export All"; this.btnExportAll.UseVisualStyleBackColor = true; this.btnExportAll.Click += new System.EventHandler(this.btnExportAll_Click); - // + // // btnOk - // + // this.btnOk.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnOk.Location = new System.Drawing.Point(789, 12); - this.btnOk.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btnOk.Location = new System.Drawing.Point(592, 10); + this.btnOk.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.btnOk.Name = "btnOk"; - this.btnOk.Size = new System.Drawing.Size(114, 40); + this.btnOk.Size = new System.Drawing.Size(86, 35); this.btnOk.TabIndex = 1; this.btnOk.Text = "OK"; this.btnOk.UseVisualStyleBackColor = true; this.btnOk.Click += new System.EventHandler(this.btnOk_Click); - // + // // btnCancel - // + // this.btnCancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCancel.Location = new System.Drawing.Point(914, 12); - this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btnCancel.Location = new System.Drawing.Point(686, 10); + this.btnCancel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(114, 40); + this.btnCancel.Size = new System.Drawing.Size(86, 35); this.btnCancel.TabIndex = 1; this.btnCancel.Text = "Cancel"; this.btnCancel.UseVisualStyleBackColor = true; this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); - // + // // gbParameterSet - // + // this.gbParameterSet.Controls.Add(this.label1); this.gbParameterSet.Controls.Add(this.cbParamExt); this.gbParameterSet.Controls.Add(this.rbParamExt); @@ -294,260 +294,261 @@ this.gbParameterSet.Controls.Add(this.rbParam2); this.gbParameterSet.Controls.Add(this.rbParam1); this.gbParameterSet.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.gbParameterSet.Location = new System.Drawing.Point(14, 60); - this.gbParameterSet.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.gbParameterSet.Location = new System.Drawing.Point(10, 52); + this.gbParameterSet.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.gbParameterSet.Name = "gbParameterSet"; - this.gbParameterSet.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.gbParameterSet.Size = new System.Drawing.Size(150, 743); + this.gbParameterSet.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.gbParameterSet.Size = new System.Drawing.Size(112, 644); this.gbParameterSet.TabIndex = 2; this.gbParameterSet.TabStop = false; this.gbParameterSet.Text = "Paramter Set"; - // + // // label1 - // + // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(75, 621); + this.label1.Location = new System.Drawing.Point(56, 538); + this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(63, 18); + this.label1.Size = new System.Drawing.Size(54, 15); this.label1.TabIndex = 3; this.label1.Text = "(17-128)"; - // + // // cbParamExt - // + // this.cbParamExt.FormattingEnabled = true; - this.cbParamExt.Location = new System.Drawing.Point(71, 586); - this.cbParamExt.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.cbParamExt.Location = new System.Drawing.Point(53, 508); + this.cbParamExt.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cbParamExt.Name = "cbParamExt"; - this.cbParamExt.Size = new System.Drawing.Size(67, 26); + this.cbParamExt.Size = new System.Drawing.Size(51, 23); this.cbParamExt.TabIndex = 2; this.cbParamExt.SelectedIndexChanged += new System.EventHandler(this.cbParamExt_SelectedIndexChanged); - // + // // rbParamExt - // + // this.rbParamExt.AutoSize = true; this.rbParamExt.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rbParamExt.Location = new System.Drawing.Point(7, 585); - this.rbParamExt.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rbParamExt.Location = new System.Drawing.Point(5, 507); + this.rbParamExt.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rbParamExt.Name = "rbParamExt"; - this.rbParamExt.Size = new System.Drawing.Size(63, 28); + this.rbParamExt.Size = new System.Drawing.Size(51, 22); this.rbParamExt.TabIndex = 1; this.rbParamExt.Text = "Ext."; this.rbParamExt.UseVisualStyleBackColor = true; this.rbParamExt.CheckedChanged += new System.EventHandler(this.rbParamExt_CheckedChanged); - // + // // rbParam16 - // + // this.rbParam16.AutoSize = true; this.rbParam16.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rbParam16.Location = new System.Drawing.Point(7, 550); - this.rbParam16.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rbParam16.Location = new System.Drawing.Point(5, 477); + this.rbParam16.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rbParam16.Name = "rbParam16"; - this.rbParam16.Size = new System.Drawing.Size(142, 28); + this.rbParam16.Size = new System.Drawing.Size(115, 22); this.rbParam16.TabIndex = 1; this.rbParam16.Text = "Parameter 16"; this.rbParam16.UseVisualStyleBackColor = true; this.rbParam16.CheckedChanged += new System.EventHandler(this.rbParam_CheckedChanged); - // + // // rbParam15 - // + // this.rbParam15.AutoSize = true; this.rbParam15.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rbParam15.Location = new System.Drawing.Point(7, 515); - this.rbParam15.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rbParam15.Location = new System.Drawing.Point(5, 446); + this.rbParam15.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rbParam15.Name = "rbParam15"; - this.rbParam15.Size = new System.Drawing.Size(142, 28); + this.rbParam15.Size = new System.Drawing.Size(115, 22); this.rbParam15.TabIndex = 1; this.rbParam15.Text = "Parameter 15"; this.rbParam15.UseVisualStyleBackColor = true; this.rbParam15.CheckedChanged += new System.EventHandler(this.rbParam_CheckedChanged); - // + // // rbParam14 - // + // this.rbParam14.AutoSize = true; this.rbParam14.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rbParam14.Location = new System.Drawing.Point(7, 480); - this.rbParam14.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rbParam14.Location = new System.Drawing.Point(5, 416); + this.rbParam14.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rbParam14.Name = "rbParam14"; - this.rbParam14.Size = new System.Drawing.Size(142, 28); + this.rbParam14.Size = new System.Drawing.Size(115, 22); this.rbParam14.TabIndex = 1; this.rbParam14.Text = "Parameter 14"; this.rbParam14.UseVisualStyleBackColor = true; this.rbParam14.CheckedChanged += new System.EventHandler(this.rbParam_CheckedChanged); - // + // // rbParam13 - // + // this.rbParam13.AutoSize = true; this.rbParam13.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rbParam13.Location = new System.Drawing.Point(7, 445); - this.rbParam13.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rbParam13.Location = new System.Drawing.Point(5, 386); + this.rbParam13.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rbParam13.Name = "rbParam13"; - this.rbParam13.Size = new System.Drawing.Size(142, 28); + this.rbParam13.Size = new System.Drawing.Size(115, 22); this.rbParam13.TabIndex = 1; this.rbParam13.Text = "Parameter 13"; this.rbParam13.UseVisualStyleBackColor = true; this.rbParam13.CheckedChanged += new System.EventHandler(this.rbParam_CheckedChanged); - // + // // rbParam12 - // + // this.rbParam12.AutoSize = true; this.rbParam12.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rbParam12.Location = new System.Drawing.Point(7, 410); - this.rbParam12.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rbParam12.Location = new System.Drawing.Point(5, 355); + this.rbParam12.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rbParam12.Name = "rbParam12"; - this.rbParam12.Size = new System.Drawing.Size(142, 28); + this.rbParam12.Size = new System.Drawing.Size(115, 22); this.rbParam12.TabIndex = 1; this.rbParam12.Text = "Parameter 12"; this.rbParam12.UseVisualStyleBackColor = true; this.rbParam12.CheckedChanged += new System.EventHandler(this.rbParam_CheckedChanged); - // + // // rbParam11 - // + // this.rbParam11.AutoSize = true; this.rbParam11.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rbParam11.Location = new System.Drawing.Point(7, 375); - this.rbParam11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rbParam11.Location = new System.Drawing.Point(5, 325); + this.rbParam11.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rbParam11.Name = "rbParam11"; - this.rbParam11.Size = new System.Drawing.Size(142, 28); + this.rbParam11.Size = new System.Drawing.Size(115, 22); this.rbParam11.TabIndex = 1; this.rbParam11.Text = "Parameter 11"; this.rbParam11.UseVisualStyleBackColor = true; this.rbParam11.CheckedChanged += new System.EventHandler(this.rbParam_CheckedChanged); - // + // // rbParam10 - // + // this.rbParam10.AutoSize = true; this.rbParam10.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rbParam10.Location = new System.Drawing.Point(7, 340); - this.rbParam10.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rbParam10.Location = new System.Drawing.Point(5, 295); + this.rbParam10.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rbParam10.Name = "rbParam10"; - this.rbParam10.Size = new System.Drawing.Size(142, 28); + this.rbParam10.Size = new System.Drawing.Size(115, 22); this.rbParam10.TabIndex = 1; this.rbParam10.Text = "Parameter 10"; this.rbParam10.UseVisualStyleBackColor = true; this.rbParam10.CheckedChanged += new System.EventHandler(this.rbParam_CheckedChanged); - // + // // rbParam9 - // + // this.rbParam9.AutoSize = true; this.rbParam9.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rbParam9.Location = new System.Drawing.Point(7, 305); - this.rbParam9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rbParam9.Location = new System.Drawing.Point(5, 264); + this.rbParam9.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rbParam9.Name = "rbParam9"; - this.rbParam9.Size = new System.Drawing.Size(132, 28); + this.rbParam9.Size = new System.Drawing.Size(107, 22); this.rbParam9.TabIndex = 1; this.rbParam9.Text = "Parameter 9"; this.rbParam9.UseVisualStyleBackColor = true; this.rbParam9.CheckedChanged += new System.EventHandler(this.rbParam_CheckedChanged); - // + // // rbParam8 - // + // this.rbParam8.AutoSize = true; this.rbParam8.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rbParam8.Location = new System.Drawing.Point(7, 270); - this.rbParam8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rbParam8.Location = new System.Drawing.Point(5, 234); + this.rbParam8.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rbParam8.Name = "rbParam8"; - this.rbParam8.Size = new System.Drawing.Size(132, 28); + this.rbParam8.Size = new System.Drawing.Size(107, 22); this.rbParam8.TabIndex = 1; this.rbParam8.Text = "Parameter 8"; this.rbParam8.UseVisualStyleBackColor = true; this.rbParam8.CheckedChanged += new System.EventHandler(this.rbParam_CheckedChanged); - // + // // rbParam7 - // + // this.rbParam7.AutoSize = true; this.rbParam7.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rbParam7.Location = new System.Drawing.Point(7, 235); - this.rbParam7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rbParam7.Location = new System.Drawing.Point(5, 204); + this.rbParam7.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rbParam7.Name = "rbParam7"; - this.rbParam7.Size = new System.Drawing.Size(132, 28); + this.rbParam7.Size = new System.Drawing.Size(107, 22); this.rbParam7.TabIndex = 1; this.rbParam7.Text = "Parameter 7"; this.rbParam7.UseVisualStyleBackColor = true; this.rbParam7.CheckedChanged += new System.EventHandler(this.rbParam_CheckedChanged); - // + // // rbParam6 - // + // this.rbParam6.AutoSize = true; this.rbParam6.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rbParam6.Location = new System.Drawing.Point(7, 200); - this.rbParam6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rbParam6.Location = new System.Drawing.Point(5, 173); + this.rbParam6.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rbParam6.Name = "rbParam6"; - this.rbParam6.Size = new System.Drawing.Size(132, 28); + this.rbParam6.Size = new System.Drawing.Size(107, 22); this.rbParam6.TabIndex = 1; this.rbParam6.Text = "Parameter 6"; this.rbParam6.UseVisualStyleBackColor = true; this.rbParam6.CheckedChanged += new System.EventHandler(this.rbParam_CheckedChanged); - // + // // rbParam5 - // + // this.rbParam5.AutoSize = true; this.rbParam5.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rbParam5.Location = new System.Drawing.Point(7, 165); - this.rbParam5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rbParam5.Location = new System.Drawing.Point(5, 143); + this.rbParam5.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rbParam5.Name = "rbParam5"; - this.rbParam5.Size = new System.Drawing.Size(132, 28); + this.rbParam5.Size = new System.Drawing.Size(107, 22); this.rbParam5.TabIndex = 1; this.rbParam5.Text = "Parameter 5"; this.rbParam5.UseVisualStyleBackColor = true; this.rbParam5.CheckedChanged += new System.EventHandler(this.rbParam_CheckedChanged); - // + // // rbParam4 - // + // this.rbParam4.AutoSize = true; this.rbParam4.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rbParam4.Location = new System.Drawing.Point(7, 130); - this.rbParam4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rbParam4.Location = new System.Drawing.Point(5, 113); + this.rbParam4.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rbParam4.Name = "rbParam4"; - this.rbParam4.Size = new System.Drawing.Size(132, 28); + this.rbParam4.Size = new System.Drawing.Size(107, 22); this.rbParam4.TabIndex = 0; this.rbParam4.Text = "Parameter 4"; this.rbParam4.UseVisualStyleBackColor = true; this.rbParam4.CheckedChanged += new System.EventHandler(this.rbParam_CheckedChanged); - // + // // rbParam3 - // + // this.rbParam3.AutoSize = true; this.rbParam3.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rbParam3.Location = new System.Drawing.Point(7, 95); - this.rbParam3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rbParam3.Location = new System.Drawing.Point(5, 82); + this.rbParam3.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rbParam3.Name = "rbParam3"; - this.rbParam3.Size = new System.Drawing.Size(132, 28); + this.rbParam3.Size = new System.Drawing.Size(107, 22); this.rbParam3.TabIndex = 0; this.rbParam3.Text = "Parameter 3"; this.rbParam3.UseVisualStyleBackColor = true; this.rbParam3.CheckedChanged += new System.EventHandler(this.rbParam_CheckedChanged); - // + // // rbParam2 - // + // this.rbParam2.AutoSize = true; this.rbParam2.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rbParam2.Location = new System.Drawing.Point(7, 60); - this.rbParam2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rbParam2.Location = new System.Drawing.Point(5, 52); + this.rbParam2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rbParam2.Name = "rbParam2"; - this.rbParam2.Size = new System.Drawing.Size(132, 28); + this.rbParam2.Size = new System.Drawing.Size(107, 22); this.rbParam2.TabIndex = 0; this.rbParam2.Text = "Parameter 2"; this.rbParam2.UseVisualStyleBackColor = true; this.rbParam2.CheckedChanged += new System.EventHandler(this.rbParam_CheckedChanged); - // + // // rbParam1 - // + // this.rbParam1.AutoSize = true; this.rbParam1.Checked = true; this.rbParam1.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.rbParam1.ForeColor = System.Drawing.SystemColors.ControlText; - this.rbParam1.Location = new System.Drawing.Point(7, 25); - this.rbParam1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rbParam1.Location = new System.Drawing.Point(5, 22); + this.rbParam1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.rbParam1.Name = "rbParam1"; - this.rbParam1.Size = new System.Drawing.Size(132, 28); + this.rbParam1.Size = new System.Drawing.Size(107, 22); this.rbParam1.TabIndex = 0; this.rbParam1.TabStop = true; this.rbParam1.Text = "Parameter 1"; this.rbParam1.UseVisualStyleBackColor = true; this.rbParam1.CheckedChanged += new System.EventHandler(this.rbParam_CheckedChanged); - // + // // gbScanner - // + // this.gbScanner.Controls.Add(this.label62); this.gbScanner.Controls.Add(this.label63); this.gbScanner.Controls.Add(this.label64); @@ -585,359 +586,384 @@ this.gbScanner.Controls.Add(this.tbJumpSpeed); this.gbScanner.Controls.Add(this.tbDrawSpeed); this.gbScanner.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.gbScanner.Location = new System.Drawing.Point(171, 61); - this.gbScanner.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.gbScanner.Location = new System.Drawing.Point(128, 53); + this.gbScanner.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.gbScanner.Name = "gbScanner"; - this.gbScanner.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.gbScanner.Size = new System.Drawing.Size(877, 286); + this.gbScanner.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.gbScanner.Size = new System.Drawing.Size(658, 248); this.gbScanner.TabIndex = 3; this.gbScanner.TabStop = false; this.gbScanner.Text = "Scanner"; - // + // // label62 - // + // this.label62.AutoSize = true; - this.label62.Location = new System.Drawing.Point(542, 158); + this.label62.Location = new System.Drawing.Point(406, 137); + this.label62.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label62.Name = "label62"; - this.label62.Size = new System.Drawing.Size(67, 18); + this.label62.Size = new System.Drawing.Size(57, 15); this.label62.TabIndex = 15; this.label62.Text = "(0~1000)"; - // + // // label63 - // + // this.label63.AutoSize = true; - this.label63.Location = new System.Drawing.Point(418, 158); + this.label63.Location = new System.Drawing.Point(314, 137); + this.label63.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label63.Name = "label63"; - this.label63.Size = new System.Drawing.Size(87, 18); + this.label63.Size = new System.Drawing.Size(72, 15); this.label63.TabIndex = 16; this.label63.Text = "Mark Delay "; - // + // // label64 - // + // this.label64.AutoSize = true; - this.label64.Location = new System.Drawing.Point(701, 158); + this.label64.Location = new System.Drawing.Point(526, 137); + this.label64.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label64.Name = "label64"; - this.label64.Size = new System.Drawing.Size(24, 18); + this.label64.Size = new System.Drawing.Size(20, 15); this.label64.TabIndex = 14; this.label64.Text = "us"; - // + // // tbMarkDelay - // - this.tbMarkDelay.Location = new System.Drawing.Point(614, 154); - this.tbMarkDelay.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.tbMarkDelay.Location = new System.Drawing.Point(460, 133); + this.tbMarkDelay.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbMarkDelay.Name = "tbMarkDelay"; - this.tbMarkDelay.Size = new System.Drawing.Size(79, 24); + this.tbMarkDelay.Size = new System.Drawing.Size(60, 21); this.tbMarkDelay.TabIndex = 13; this.tbMarkDelay.Text = "400"; this.tbMarkDelay.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // label60 - // + // this.label60.AutoSize = true; - this.label60.Location = new System.Drawing.Point(183, 258); + this.label60.Location = new System.Drawing.Point(137, 224); + this.label60.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label60.Name = "label60"; - this.label60.Size = new System.Drawing.Size(75, 18); + this.label60.Size = new System.Drawing.Size(64, 15); this.label60.TabIndex = 12; this.label60.Text = "(0~10000)"; - // + // // label61 - // + // this.label61.AutoSize = true; - this.label61.Location = new System.Drawing.Point(351, 258); + this.label61.Location = new System.Drawing.Point(263, 224); + this.label61.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label61.Name = "label61"; - this.label61.Size = new System.Drawing.Size(45, 18); + this.label61.Size = new System.Drawing.Size(37, 15); this.label61.TabIndex = 11; this.label61.Text = "msec"; - // + // // tbSpotShotTime - // - this.tbSpotShotTime.Location = new System.Drawing.Point(264, 254); - this.tbSpotShotTime.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.tbSpotShotTime.Location = new System.Drawing.Point(198, 220); + this.tbSpotShotTime.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbSpotShotTime.Name = "tbSpotShotTime"; - this.tbSpotShotTime.Size = new System.Drawing.Size(79, 24); + this.tbSpotShotTime.Size = new System.Drawing.Size(60, 21); this.tbSpotShotTime.TabIndex = 10; this.tbSpotShotTime.Text = "0"; this.tbSpotShotTime.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // label59 - // + // this.label59.AutoSize = true; - this.label59.Location = new System.Drawing.Point(47, 258); + this.label59.Location = new System.Drawing.Point(35, 224); + this.label59.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label59.Name = "label59"; - this.label59.Size = new System.Drawing.Size(111, 18); + this.label59.Size = new System.Drawing.Size(91, 15); this.label59.TabIndex = 9; this.label59.Text = "Spot Shot Time"; - // + // // label30 - // + // this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(200, 225); + this.label30.Location = new System.Drawing.Point(150, 195); + this.label30.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(59, 18); + this.label30.Size = new System.Drawing.Size(50, 15); this.label30.TabIndex = 2; this.label30.Text = "(0~100)"; - // + // // label9 - // + // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(34, 225); + this.label9.Location = new System.Drawing.Point(26, 195); + this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(125, 18); + this.label9.Size = new System.Drawing.Size(102, 15); this.label9.TabIndex = 2; this.label9.Text = "Number Of Count"; - // + // // label25 - // + // this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(193, 191); + this.label25.Location = new System.Drawing.Point(145, 166); + this.label25.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(67, 18); + this.label25.Size = new System.Drawing.Size(57, 15); this.label25.TabIndex = 3; this.label25.Text = "(0~1000)"; - // + // // label10 - // + // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(54, 191); + this.label10.Location = new System.Drawing.Point(40, 166); + this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(103, 18); + this.label10.Size = new System.Drawing.Size(85, 15); this.label10.TabIndex = 3; this.label10.Text = "Polygon Delay"; - // + // // label24 - // + // this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(192, 158); + this.label24.Location = new System.Drawing.Point(144, 137); + this.label24.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(67, 18); + this.label24.Size = new System.Drawing.Size(57, 15); this.label24.TabIndex = 4; this.label24.Text = "(0~1000)"; - // + // // label11 - // + // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(69, 158); + this.label11.Location = new System.Drawing.Point(52, 137); + this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(90, 18); + this.label11.Size = new System.Drawing.Size(75, 15); this.label11.TabIndex = 4; this.label11.Text = "Jump Delay "; - // + // // label23 - // + // this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(193, 124); + this.label23.Location = new System.Drawing.Point(145, 107); + this.label23.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(67, 18); + this.label23.Size = new System.Drawing.Size(57, 15); this.label23.TabIndex = 5; this.label23.Text = "(0~1000)"; - // + // // label12 - // + // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(49, 124); + this.label12.Location = new System.Drawing.Point(37, 107); + this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(110, 18); + this.label12.Size = new System.Drawing.Size(90, 15); this.label12.TabIndex = 5; this.label12.Text = "Laser Off Delay"; - // + // // label18 - // + // this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(163, 90); + this.label18.Location = new System.Drawing.Point(122, 78); + this.label18.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(96, 18); + this.label18.Size = new System.Drawing.Size(82, 15); this.label18.TabIndex = 6; this.label18.Text = "(-1000~1000)"; - // + // // label13 - // + // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(48, 90); + this.label13.Location = new System.Drawing.Point(36, 78); + this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(110, 18); + this.label13.Size = new System.Drawing.Size(91, 15); this.label13.TabIndex = 6; this.label13.Text = "Laser On Delay"; - // + // // label17 - // + // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(193, 56); + this.label17.Location = new System.Drawing.Point(145, 49); + this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(67, 18); + this.label17.Size = new System.Drawing.Size(57, 15); this.label17.TabIndex = 7; this.label17.Text = "(1~2000)"; - // + // // label14 - // + // this.label14.AutoSize = true; this.label14.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.label14.Location = new System.Drawing.Point(63, 58); + this.label14.Location = new System.Drawing.Point(47, 50); + this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(91, 18); + this.label14.Size = new System.Drawing.Size(77, 15); this.label14.TabIndex = 7; this.label14.Text = "Jump Speed"; - // + // // label16 - // + // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(193, 22); + this.label16.Location = new System.Drawing.Point(145, 19); + this.label16.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(67, 18); + this.label16.Size = new System.Drawing.Size(57, 15); this.label16.TabIndex = 8; this.label16.Text = "(1~1000)"; - // + // // label15 - // + // this.label15.AutoSize = true; this.label15.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.label15.Location = new System.Drawing.Point(65, 22); + this.label15.Location = new System.Drawing.Point(49, 19); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(89, 18); + this.label15.Size = new System.Drawing.Size(75, 15); this.label15.TabIndex = 8; this.label15.Text = "Draw Speed"; - // + // // label8 - // + // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(351, 225); + this.label8.Location = new System.Drawing.Point(263, 195); + this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(48, 18); + this.label8.Size = new System.Drawing.Size(39, 15); this.label8.TabIndex = 1; this.label8.Text = "Count"; - // + // // label7 - // + // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(351, 191); + this.label7.Location = new System.Drawing.Point(263, 166); + this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(24, 18); + this.label7.Size = new System.Drawing.Size(20, 15); this.label7.TabIndex = 1; this.label7.Text = "us"; - // + // // label6 - // + // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(351, 158); + this.label6.Location = new System.Drawing.Point(263, 137); + this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(24, 18); + this.label6.Size = new System.Drawing.Size(20, 15); this.label6.TabIndex = 1; this.label6.Text = "us"; - // + // // label5 - // + // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(351, 124); + this.label5.Location = new System.Drawing.Point(263, 107); + this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(24, 18); + this.label5.Size = new System.Drawing.Size(20, 15); this.label5.TabIndex = 1; this.label5.Text = "us"; - // + // // label4 - // + // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(351, 90); + this.label4.Location = new System.Drawing.Point(263, 78); + this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(24, 18); + this.label4.Size = new System.Drawing.Size(20, 15); this.label4.TabIndex = 1; this.label4.Text = "us"; - // + // // label3 - // + // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(351, 56); + this.label3.Location = new System.Drawing.Point(263, 49); + this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(46, 18); + this.label3.Size = new System.Drawing.Size(38, 15); this.label3.TabIndex = 1; this.label3.Text = "mm/s"; - // + // // label2 - // + // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(351, 22); + this.label2.Location = new System.Drawing.Point(263, 19); + this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(46, 18); + this.label2.Size = new System.Drawing.Size(38, 15); this.label2.TabIndex = 1; this.label2.Text = "mm/s"; - // + // // tbNumberOfCount - // - this.tbNumberOfCount.Location = new System.Drawing.Point(264, 221); - this.tbNumberOfCount.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.tbNumberOfCount.Location = new System.Drawing.Point(198, 192); + this.tbNumberOfCount.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbNumberOfCount.Name = "tbNumberOfCount"; - this.tbNumberOfCount.Size = new System.Drawing.Size(79, 24); + this.tbNumberOfCount.Size = new System.Drawing.Size(60, 21); this.tbNumberOfCount.TabIndex = 0; this.tbNumberOfCount.Text = "1"; this.tbNumberOfCount.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // tbPolygonDelay - // - this.tbPolygonDelay.Location = new System.Drawing.Point(264, 188); - this.tbPolygonDelay.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.tbPolygonDelay.Location = new System.Drawing.Point(198, 163); + this.tbPolygonDelay.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbPolygonDelay.Name = "tbPolygonDelay"; - this.tbPolygonDelay.Size = new System.Drawing.Size(79, 24); + this.tbPolygonDelay.Size = new System.Drawing.Size(60, 21); this.tbPolygonDelay.TabIndex = 0; this.tbPolygonDelay.Text = "0"; this.tbPolygonDelay.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // tbJumpDelay - // - this.tbJumpDelay.Location = new System.Drawing.Point(264, 154); - this.tbJumpDelay.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.tbJumpDelay.Location = new System.Drawing.Point(198, 133); + this.tbJumpDelay.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbJumpDelay.Name = "tbJumpDelay"; - this.tbJumpDelay.Size = new System.Drawing.Size(79, 24); + this.tbJumpDelay.Size = new System.Drawing.Size(60, 21); this.tbJumpDelay.TabIndex = 0; this.tbJumpDelay.Text = "400"; this.tbJumpDelay.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // tbLaserOffDelay - // - this.tbLaserOffDelay.Location = new System.Drawing.Point(264, 120); - this.tbLaserOffDelay.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.tbLaserOffDelay.Location = new System.Drawing.Point(198, 104); + this.tbLaserOffDelay.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbLaserOffDelay.Name = "tbLaserOffDelay"; - this.tbLaserOffDelay.Size = new System.Drawing.Size(79, 24); + this.tbLaserOffDelay.Size = new System.Drawing.Size(60, 21); this.tbLaserOffDelay.TabIndex = 0; this.tbLaserOffDelay.Text = "200"; this.tbLaserOffDelay.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // tbLaserOnDelay - // - this.tbLaserOnDelay.Location = new System.Drawing.Point(264, 86); - this.tbLaserOnDelay.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.tbLaserOnDelay.Location = new System.Drawing.Point(198, 75); + this.tbLaserOnDelay.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbLaserOnDelay.Name = "tbLaserOnDelay"; - this.tbLaserOnDelay.Size = new System.Drawing.Size(79, 24); + this.tbLaserOnDelay.Size = new System.Drawing.Size(60, 21); this.tbLaserOnDelay.TabIndex = 0; this.tbLaserOnDelay.Text = "150"; this.tbLaserOnDelay.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // tbJumpSpeed - // - this.tbJumpSpeed.Enabled = false; - this.tbJumpSpeed.Location = new System.Drawing.Point(264, 52); - this.tbJumpSpeed.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.tbJumpSpeed.Enabled = true; + this.tbJumpSpeed.Location = new System.Drawing.Point(198, 45); + this.tbJumpSpeed.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbJumpSpeed.Name = "tbJumpSpeed"; - this.tbJumpSpeed.ReadOnly = true; - this.tbJumpSpeed.Size = new System.Drawing.Size(79, 24); + this.tbJumpSpeed.Size = new System.Drawing.Size(60, 21); this.tbJumpSpeed.TabIndex = 0; this.tbJumpSpeed.Text = "300"; this.tbJumpSpeed.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // tbDrawSpeed - // - this.tbDrawSpeed.Enabled = false; - this.tbDrawSpeed.Location = new System.Drawing.Point(264, 19); - this.tbDrawSpeed.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.tbDrawSpeed.Enabled = true; + this.tbDrawSpeed.Location = new System.Drawing.Point(198, 16); + this.tbDrawSpeed.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbDrawSpeed.Name = "tbDrawSpeed"; - this.tbDrawSpeed.ReadOnly = true; - this.tbDrawSpeed.Size = new System.Drawing.Size(79, 24); + this.tbDrawSpeed.Size = new System.Drawing.Size(60, 21); this.tbDrawSpeed.TabIndex = 0; this.tbDrawSpeed.Text = "100"; this.tbDrawSpeed.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // nudArcRampingInterval - // + // this.nudArcRampingInterval.DecimalPlaces = 3; - this.nudArcRampingInterval.Location = new System.Drawing.Point(219, 141); - this.nudArcRampingInterval.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.nudArcRampingInterval.Location = new System.Drawing.Point(164, 122); + this.nudArcRampingInterval.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.nudArcRampingInterval.Maximum = new decimal(new int[] { 2, 0, @@ -949,16 +975,16 @@ 0, 196608}); this.nudArcRampingInterval.Name = "nudArcRampingInterval"; - this.nudArcRampingInterval.Size = new System.Drawing.Size(89, 24); + this.nudArcRampingInterval.Size = new System.Drawing.Size(67, 21); this.nudArcRampingInterval.TabIndex = 17; this.nudArcRampingInterval.Value = new decimal(new int[] { 25, 0, 0, 196608}); - // + // // gbLaser - // + // this.gbLaser.Controls.Add(this.label68); this.gbLaser.Controls.Add(this.tbPRFmax); this.gbLaser.Controls.Add(this.label65); @@ -983,235 +1009,249 @@ this.gbLaser.Controls.Add(this.tbLaserPower1); this.gbLaser.Controls.Add(this.tbLaserPower2); this.gbLaser.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.gbLaser.Location = new System.Drawing.Point(170, 355); - this.gbLaser.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.gbLaser.Location = new System.Drawing.Point(128, 308); + this.gbLaser.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.gbLaser.Name = "gbLaser"; - this.gbLaser.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.gbLaser.Size = new System.Drawing.Size(416, 213); + this.gbLaser.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.gbLaser.Size = new System.Drawing.Size(312, 185); this.gbLaser.TabIndex = 9; this.gbLaser.TabStop = false; this.gbLaser.Text = "Laser"; - // + // // label68 - // + // this.label68.AutoSize = true; - this.label68.Location = new System.Drawing.Point(203, 141); + this.label68.Location = new System.Drawing.Point(152, 122); + this.label68.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label68.Name = "label68"; - this.label68.Size = new System.Drawing.Size(66, 18); + this.label68.Size = new System.Drawing.Size(55, 15); this.label68.TabIndex = 11; this.label68.Text = "PRFmax"; - // + // // tbPRFmax - // - this.tbPRFmax.Location = new System.Drawing.Point(275, 138); - this.tbPRFmax.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.tbPRFmax.Location = new System.Drawing.Point(206, 120); + this.tbPRFmax.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbPRFmax.Name = "tbPRFmax"; this.tbPRFmax.ReadOnly = true; - this.tbPRFmax.Size = new System.Drawing.Size(123, 24); + this.tbPRFmax.Size = new System.Drawing.Size(93, 21); this.tbPRFmax.TabIndex = 10; - // + // // label65 - // + // this.label65.AutoSize = true; - this.label65.Location = new System.Drawing.Point(22, 141); + this.label65.Location = new System.Drawing.Point(16, 122); + this.label65.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label65.Name = "label65"; - this.label65.Size = new System.Drawing.Size(46, 18); + this.label65.Size = new System.Drawing.Size(38, 15); this.label65.TabIndex = 9; this.label65.Text = "PRF0"; - // + // // label19 - // + // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(54, 173); + this.label19.Location = new System.Drawing.Point(40, 150); + this.label19.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(105, 18); + this.label19.Size = new System.Drawing.Size(88, 15); this.label19.TabIndex = 5; this.label19.Text = "Pulse Duration"; - // + // // label33 - // + // this.label33.AutoSize = true; - this.label33.Location = new System.Drawing.Point(201, 108); + this.label33.Location = new System.Drawing.Point(151, 94); + this.label33.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(0, 18); + this.label33.Size = new System.Drawing.Size(0, 15); this.label33.TabIndex = 6; - // + // // label20 - // + // this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(74, 108); + this.label20.Location = new System.Drawing.Point(56, 94); + this.label20.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(82, 18); + this.label20.Size = new System.Drawing.Size(66, 15); this.label20.TabIndex = 6; this.label20.Text = "WaveForm"; - // + // // label32 - // + // this.label32.AutoSize = true; - this.label32.Location = new System.Drawing.Point(177, 75); + this.label32.Location = new System.Drawing.Point(133, 65); + this.label32.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(83, 18); + this.label32.Size = new System.Drawing.Size(71, 15); this.label32.TabIndex = 7; this.label32.Text = "(100~5000)"; - // + // // label58 - // + // this.label58.AutoSize = true; - this.label58.Location = new System.Drawing.Point(184, 16); + this.label58.Location = new System.Drawing.Point(138, 14); + this.label58.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label58.Name = "label58"; - this.label58.Size = new System.Drawing.Size(75, 18); + this.label58.Size = new System.Drawing.Size(64, 15); this.label58.TabIndex = 8; this.label58.Text = "(0~10000)"; - // + // // label31 - // + // this.label31.AutoSize = true; - this.label31.Location = new System.Drawing.Point(184, 46); + this.label31.Location = new System.Drawing.Point(138, 40); + this.label31.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(75, 18); + this.label31.Size = new System.Drawing.Size(64, 15); this.label31.TabIndex = 8; this.label31.Text = "(0~10000)"; - // + // // label21 - // + // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(77, 75); + this.label21.Location = new System.Drawing.Point(58, 65); + this.label21.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(77, 18); + this.label21.Size = new System.Drawing.Size(64, 15); this.label21.TabIndex = 7; this.label21.Text = "Frequency"; - // + // // label57 - // + // this.label57.AutoSize = true; this.label57.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.label57.Location = new System.Drawing.Point(87, 16); + this.label57.Location = new System.Drawing.Point(65, 14); + this.label57.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label57.Name = "label57"; - this.label57.Size = new System.Drawing.Size(71, 18); + this.label57.Size = new System.Drawing.Size(59, 15); this.label57.TabIndex = 8; this.label57.Text = "Power #1"; - // + // // label22 - // + // this.label22.AutoSize = true; this.label22.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.label22.Location = new System.Drawing.Point(87, 42); + this.label22.Location = new System.Drawing.Point(65, 36); + this.label22.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(71, 18); + this.label22.Size = new System.Drawing.Size(59, 15); this.label22.TabIndex = 8; this.label22.Text = "Power #2"; - // + // // label26 - // + // this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(351, 173); + this.label26.Location = new System.Drawing.Point(263, 150); + this.label26.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(24, 18); + this.label26.Size = new System.Drawing.Size(20, 15); this.label26.TabIndex = 1; this.label26.Text = "us"; - // + // // label27 - // + // this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(351, 104); + this.label27.Location = new System.Drawing.Point(263, 90); + this.label27.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(0, 18); + this.label27.Size = new System.Drawing.Size(0, 15); this.label27.TabIndex = 1; - // + // // label28 - // + // this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(351, 75); + this.label28.Location = new System.Drawing.Point(263, 65); + this.label28.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(27, 18); + this.label28.Size = new System.Drawing.Size(22, 15); this.label28.TabIndex = 1; this.label28.Text = "Hz"; - // + // // label56 - // + // this.label56.AutoSize = true; - this.label56.Location = new System.Drawing.Point(351, 16); + this.label56.Location = new System.Drawing.Point(263, 14); + this.label56.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label56.Name = "label56"; - this.label56.Size = new System.Drawing.Size(23, 18); + this.label56.Size = new System.Drawing.Size(18, 15); this.label56.TabIndex = 1; this.label56.Text = "W"; - // + // // label29 - // + // this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(351, 46); + this.label29.Location = new System.Drawing.Point(263, 40); + this.label29.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(23, 18); + this.label29.Size = new System.Drawing.Size(18, 15); this.label29.TabIndex = 1; this.label29.Text = "W"; - // + // // tbLaserPulseDuration - // - this.tbLaserPulseDuration.Location = new System.Drawing.Point(264, 170); - this.tbLaserPulseDuration.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.tbLaserPulseDuration.Location = new System.Drawing.Point(198, 147); + this.tbLaserPulseDuration.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbLaserPulseDuration.Name = "tbLaserPulseDuration"; - this.tbLaserPulseDuration.Size = new System.Drawing.Size(79, 24); + this.tbLaserPulseDuration.Size = new System.Drawing.Size(60, 21); this.tbLaserPulseDuration.TabIndex = 0; this.tbLaserPulseDuration.Text = "1.00"; this.tbLaserPulseDuration.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // cbLaserProgramNo - // + // this.cbLaserProgramNo.FormattingEnabled = true; - this.cbLaserProgramNo.Location = new System.Drawing.Point(264, 101); - this.cbLaserProgramNo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.cbLaserProgramNo.Location = new System.Drawing.Point(198, 88); + this.cbLaserProgramNo.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cbLaserProgramNo.Name = "cbLaserProgramNo"; - this.cbLaserProgramNo.Size = new System.Drawing.Size(79, 26); + this.cbLaserProgramNo.Size = new System.Drawing.Size(60, 23); this.cbLaserProgramNo.TabIndex = 0; this.cbLaserProgramNo.SelectedIndexChanged += new System.EventHandler(this.cbLaserProgramNo_SelectedIndexChanged); this.cbLaserProgramNo.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // tbPRF0 - // - this.tbPRF0.Location = new System.Drawing.Point(74, 138); - this.tbPRF0.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.tbPRF0.Location = new System.Drawing.Point(56, 120); + this.tbPRF0.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbPRF0.Name = "tbPRF0"; this.tbPRF0.ReadOnly = true; - this.tbPRF0.Size = new System.Drawing.Size(123, 24); + this.tbPRF0.Size = new System.Drawing.Size(93, 21); this.tbPRF0.TabIndex = 0; this.tbPRF0.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // tbLaserFrequency - // - this.tbLaserFrequency.Location = new System.Drawing.Point(264, 71); - this.tbLaserFrequency.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.tbLaserFrequency.Location = new System.Drawing.Point(198, 62); + this.tbLaserFrequency.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbLaserFrequency.Name = "tbLaserFrequency"; - this.tbLaserFrequency.Size = new System.Drawing.Size(79, 24); + this.tbLaserFrequency.Size = new System.Drawing.Size(60, 21); this.tbLaserFrequency.TabIndex = 0; this.tbLaserFrequency.Text = "1"; this.tbLaserFrequency.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // tbLaserPower1 - // - this.tbLaserPower1.Enabled = false; - this.tbLaserPower1.Location = new System.Drawing.Point(264, 12); - this.tbLaserPower1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.tbLaserPower1.Enabled = true; + this.tbLaserPower1.Location = new System.Drawing.Point(198, 10); + this.tbLaserPower1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbLaserPower1.Name = "tbLaserPower1"; - this.tbLaserPower1.ReadOnly = true; - this.tbLaserPower1.Size = new System.Drawing.Size(79, 24); + this.tbLaserPower1.Size = new System.Drawing.Size(60, 21); this.tbLaserPower1.TabIndex = 0; this.tbLaserPower1.Text = "0"; this.tbLaserPower1.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // tbLaserPower2 - // - this.tbLaserPower2.Enabled = false; - this.tbLaserPower2.Location = new System.Drawing.Point(264, 42); - this.tbLaserPower2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.tbLaserPower2.Enabled = true; + this.tbLaserPower2.Location = new System.Drawing.Point(198, 36); + this.tbLaserPower2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbLaserPower2.Name = "tbLaserPower2"; - this.tbLaserPower2.ReadOnly = true; - this.tbLaserPower2.Size = new System.Drawing.Size(79, 24); + this.tbLaserPower2.Size = new System.Drawing.Size(60, 21); this.tbLaserPower2.TabIndex = 0; this.tbLaserPower2.Text = "0"; this.tbLaserPower2.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // gbWobbel - // + // this.gbWobbel.Controls.Add(this.btnOpenZigzagEditor); this.gbWobbel.Controls.Add(this.ckbZigZagEnabled); this.gbWobbel.Controls.Add(this.cbWobbelShape); @@ -1232,220 +1272,230 @@ this.gbWobbel.Controls.Add(this.tbWobbelFrequency); this.gbWobbel.Controls.Add(this.tbWobbelLongitudinal); this.gbWobbel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.gbWobbel.Location = new System.Drawing.Point(171, 575); - this.gbWobbel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.gbWobbel.Location = new System.Drawing.Point(128, 498); + this.gbWobbel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.gbWobbel.Name = "gbWobbel"; - this.gbWobbel.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.gbWobbel.Size = new System.Drawing.Size(416, 228); + this.gbWobbel.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.gbWobbel.Size = new System.Drawing.Size(312, 198); this.gbWobbel.TabIndex = 10; this.gbWobbel.TabStop = false; this.gbWobbel.Text = "Wobbel"; - // + // // btnOpenZigzagEditor - // - this.btnOpenZigzagEditor.Enabled = false; + // + this.btnOpenZigzagEditor.Enabled = true; this.btnOpenZigzagEditor.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnOpenZigzagEditor.ForeColor = System.Drawing.SystemColors.ControlText; - this.btnOpenZigzagEditor.Location = new System.Drawing.Point(169, 185); - this.btnOpenZigzagEditor.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btnOpenZigzagEditor.Location = new System.Drawing.Point(127, 160); + this.btnOpenZigzagEditor.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.btnOpenZigzagEditor.Name = "btnOpenZigzagEditor"; - this.btnOpenZigzagEditor.Size = new System.Drawing.Size(227, 29); + this.btnOpenZigzagEditor.Size = new System.Drawing.Size(170, 25); this.btnOpenZigzagEditor.TabIndex = 18; this.btnOpenZigzagEditor.Text = "Zigzag Editor"; this.btnOpenZigzagEditor.UseVisualStyleBackColor = true; this.btnOpenZigzagEditor.Click += new System.EventHandler(this.btnOpenZigzagEditor_Click); - // + // // ckbZigZagEnabled - // + // this.ckbZigZagEnabled.AutoSize = true; - this.ckbZigZagEnabled.Location = new System.Drawing.Point(8, 185); - this.ckbZigZagEnabled.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.ckbZigZagEnabled.Location = new System.Drawing.Point(6, 160); + this.ckbZigZagEnabled.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.ckbZigZagEnabled.Name = "ckbZigZagEnabled"; - this.ckbZigZagEnabled.Size = new System.Drawing.Size(105, 22); + this.ckbZigZagEnabled.Size = new System.Drawing.Size(88, 19); this.ckbZigZagEnabled.TabIndex = 17; this.ckbZigZagEnabled.Text = "Use Zigzag"; this.ckbZigZagEnabled.UseVisualStyleBackColor = true; this.ckbZigZagEnabled.CheckedChanged += new System.EventHandler(this.ckbZigZagEnabled_CheckedChanged); this.ckbZigZagEnabled.Click += new System.EventHandler(this.ckbZigZagEnabled_Click); - // + // // cbWobbelShape - // - this.cbWobbelShape.Enabled = false; + // + this.cbWobbelShape.Enabled = true; this.cbWobbelShape.FormattingEnabled = true; - this.cbWobbelShape.Location = new System.Drawing.Point(266, 25); - this.cbWobbelShape.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.cbWobbelShape.Location = new System.Drawing.Point(200, 22); + this.cbWobbelShape.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.cbWobbelShape.Name = "cbWobbelShape"; - this.cbWobbelShape.Size = new System.Drawing.Size(118, 26); + this.cbWobbelShape.Size = new System.Drawing.Size(90, 23); this.cbWobbelShape.TabIndex = 16; this.cbWobbelShape.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // label52 - // + // this.label52.AutoSize = true; - this.label52.Location = new System.Drawing.Point(191, 62); + this.label52.Location = new System.Drawing.Point(143, 54); + this.label52.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label52.Name = "label52"; - this.label52.Size = new System.Drawing.Size(71, 18); + this.label52.Size = new System.Drawing.Size(60, 15); this.label52.TabIndex = 14; this.label52.Text = "(0.01~10)"; - // + // // label55 - // + // this.label55.AutoSize = true; - this.label55.Location = new System.Drawing.Point(158, 25); + this.label55.Location = new System.Drawing.Point(118, 22); + this.label55.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label55.Name = "label55"; - this.label55.Size = new System.Drawing.Size(105, 18); + this.label55.Size = new System.Drawing.Size(88, 15); this.label55.TabIndex = 15; this.label55.Text = "Wobbel Shape"; - // + // // label53 - // + // this.label53.AutoSize = true; - this.label53.Location = new System.Drawing.Point(104, 62); + this.label53.Location = new System.Drawing.Point(78, 54); + this.label53.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label53.Name = "label53"; - this.label53.Size = new System.Drawing.Size(85, 18); + this.label53.Size = new System.Drawing.Size(70, 15); this.label53.TabIndex = 15; this.label53.Text = "Transversal"; - // + // // label54 - // + // this.label54.AutoSize = true; - this.label54.Location = new System.Drawing.Point(352, 62); + this.label54.Location = new System.Drawing.Point(264, 54); + this.label54.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label54.Name = "label54"; - this.label54.Size = new System.Drawing.Size(34, 18); + this.label54.Size = new System.Drawing.Size(29, 15); this.label54.TabIndex = 13; this.label54.Text = "mm"; - // + // // tbWobbelTransversal - // - this.tbWobbelTransversal.Enabled = false; - this.tbWobbelTransversal.Location = new System.Drawing.Point(265, 59); - this.tbWobbelTransversal.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.tbWobbelTransversal.Enabled = true; + this.tbWobbelTransversal.Location = new System.Drawing.Point(199, 51); + this.tbWobbelTransversal.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbWobbelTransversal.Name = "tbWobbelTransversal"; - this.tbWobbelTransversal.Size = new System.Drawing.Size(79, 24); + this.tbWobbelTransversal.Size = new System.Drawing.Size(60, 21); this.tbWobbelTransversal.TabIndex = 12; this.tbWobbelTransversal.Text = "1"; this.tbWobbelTransversal.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // btnOpenSnowManEditor - // - this.btnOpenSnowManEditor.Enabled = false; + // + this.btnOpenSnowManEditor.Enabled = true; this.btnOpenSnowManEditor.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnOpenSnowManEditor.ForeColor = System.Drawing.SystemColors.ControlText; - this.btnOpenSnowManEditor.Location = new System.Drawing.Point(169, 154); - this.btnOpenSnowManEditor.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btnOpenSnowManEditor.Location = new System.Drawing.Point(127, 133); + this.btnOpenSnowManEditor.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.btnOpenSnowManEditor.Name = "btnOpenSnowManEditor"; - this.btnOpenSnowManEditor.Size = new System.Drawing.Size(226, 29); + this.btnOpenSnowManEditor.Size = new System.Drawing.Size(170, 25); this.btnOpenSnowManEditor.TabIndex = 11; this.btnOpenSnowManEditor.Text = "SnowMan Editor"; this.btnOpenSnowManEditor.UseVisualStyleBackColor = true; this.btnOpenSnowManEditor.Click += new System.EventHandler(this.btnOpenSnowManEditor_Click); - // + // // ckbSnowManEnabled - // + // this.ckbSnowManEnabled.AutoSize = true; - this.ckbSnowManEnabled.Location = new System.Drawing.Point(8, 156); - this.ckbSnowManEnabled.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.ckbSnowManEnabled.Location = new System.Drawing.Point(6, 135); + this.ckbSnowManEnabled.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.ckbSnowManEnabled.Name = "ckbSnowManEnabled"; - this.ckbSnowManEnabled.Size = new System.Drawing.Size(128, 22); + this.ckbSnowManEnabled.Size = new System.Drawing.Size(107, 19); this.ckbSnowManEnabled.TabIndex = 9; this.ckbSnowManEnabled.Text = "Use SnowMan"; this.ckbSnowManEnabled.UseVisualStyleBackColor = true; this.ckbSnowManEnabled.CheckedChanged += new System.EventHandler(this.ckbSnowManEnabled_CheckedChanged); this.ckbSnowManEnabled.Click += new System.EventHandler(this.ckbSnowManEnabled_Click); this.ckbSnowManEnabled.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // ckbWobbelEnabled - // + // this.ckbWobbelEnabled.AutoSize = true; - this.ckbWobbelEnabled.Location = new System.Drawing.Point(8, 24); - this.ckbWobbelEnabled.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.ckbWobbelEnabled.Location = new System.Drawing.Point(6, 21); + this.ckbWobbelEnabled.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.ckbWobbelEnabled.Name = "ckbWobbelEnabled"; - this.ckbWobbelEnabled.Size = new System.Drawing.Size(112, 22); + this.ckbWobbelEnabled.Size = new System.Drawing.Size(93, 19); this.ckbWobbelEnabled.TabIndex = 9; this.ckbWobbelEnabled.Text = "Use Wobbel"; this.ckbWobbelEnabled.UseVisualStyleBackColor = true; this.ckbWobbelEnabled.CheckedChanged += new System.EventHandler(this.ckbWobbelEnabled_CheckedChanged); this.ckbWobbelEnabled.Click += new System.EventHandler(this.ckbWobbelEnabled_Click); this.ckbWobbelEnabled.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // label37 - // + // this.label37.AutoSize = true; - this.label37.Location = new System.Drawing.Point(201, 122); + this.label37.Location = new System.Drawing.Point(151, 106); + this.label37.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label37.Name = "label37"; - this.label37.Size = new System.Drawing.Size(59, 18); + this.label37.Size = new System.Drawing.Size(50, 15); this.label37.TabIndex = 7; this.label37.Text = "(0~300)"; - // + // // label38 - // + // this.label38.AutoSize = true; - this.label38.Location = new System.Drawing.Point(191, 92); + this.label38.Location = new System.Drawing.Point(143, 80); + this.label38.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(71, 18); + this.label38.Size = new System.Drawing.Size(60, 15); this.label38.TabIndex = 8; this.label38.Text = "(0.01~10)"; - // + // // label39 - // + // this.label39.AutoSize = true; - this.label39.Location = new System.Drawing.Point(111, 122); + this.label39.Location = new System.Drawing.Point(83, 106); + this.label39.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label39.Name = "label39"; - this.label39.Size = new System.Drawing.Size(77, 18); + this.label39.Size = new System.Drawing.Size(64, 15); this.label39.TabIndex = 7; this.label39.Text = "Frequency"; - // + // // label40 - // + // this.label40.AutoSize = true; - this.label40.Location = new System.Drawing.Point(98, 92); + this.label40.Location = new System.Drawing.Point(74, 80); + this.label40.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label40.Name = "label40"; - this.label40.Size = new System.Drawing.Size(86, 18); + this.label40.Size = new System.Drawing.Size(75, 15); this.label40.TabIndex = 8; this.label40.Text = "Longitudinal"; - // + // // label43 - // + // this.label43.AutoSize = true; - this.label43.Location = new System.Drawing.Point(352, 122); + this.label43.Location = new System.Drawing.Point(264, 106); + this.label43.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label43.Name = "label43"; - this.label43.Size = new System.Drawing.Size(27, 18); + this.label43.Size = new System.Drawing.Size(22, 15); this.label43.TabIndex = 1; this.label43.Text = "Hz"; - // + // // label44 - // + // this.label44.AutoSize = true; - this.label44.Location = new System.Drawing.Point(352, 92); + this.label44.Location = new System.Drawing.Point(264, 80); + this.label44.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label44.Name = "label44"; - this.label44.Size = new System.Drawing.Size(34, 18); + this.label44.Size = new System.Drawing.Size(29, 15); this.label44.TabIndex = 1; this.label44.Text = "mm"; - // + // // tbWobbelFrequency - // - this.tbWobbelFrequency.Enabled = false; - this.tbWobbelFrequency.Location = new System.Drawing.Point(265, 119); - this.tbWobbelFrequency.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.tbWobbelFrequency.Enabled = true; + this.tbWobbelFrequency.Location = new System.Drawing.Point(199, 103); + this.tbWobbelFrequency.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbWobbelFrequency.Name = "tbWobbelFrequency"; - this.tbWobbelFrequency.Size = new System.Drawing.Size(79, 24); + this.tbWobbelFrequency.Size = new System.Drawing.Size(60, 21); this.tbWobbelFrequency.TabIndex = 0; this.tbWobbelFrequency.Text = "100"; this.tbWobbelFrequency.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // tbWobbelLongitudinal - // - this.tbWobbelLongitudinal.Enabled = false; - this.tbWobbelLongitudinal.Location = new System.Drawing.Point(265, 89); - this.tbWobbelLongitudinal.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.tbWobbelLongitudinal.Enabled = true; + this.tbWobbelLongitudinal.Location = new System.Drawing.Point(199, 77); + this.tbWobbelLongitudinal.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbWobbelLongitudinal.Name = "tbWobbelLongitudinal"; - this.tbWobbelLongitudinal.Size = new System.Drawing.Size(79, 24); + this.tbWobbelLongitudinal.Size = new System.Drawing.Size(60, 21); this.tbWobbelLongitudinal.TabIndex = 0; this.tbWobbelLongitudinal.Text = "1"; this.tbWobbelLongitudinal.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // gbRamping - // + // this.gbRamping.Controls.Add(this.nudRampingEndPower); this.gbRamping.Controls.Add(this.nudRampingStartPower); this.gbRamping.Controls.Add(this.nudRampingStartDist); @@ -1471,282 +1521,294 @@ this.gbRamping.Controls.Add(this.label49); this.gbRamping.Controls.Add(this.label50); this.gbRamping.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.gbRamping.Location = new System.Drawing.Point(594, 355); - this.gbRamping.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.gbRamping.Location = new System.Drawing.Point(446, 308); + this.gbRamping.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.gbRamping.Name = "gbRamping"; - this.gbRamping.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.gbRamping.Size = new System.Drawing.Size(455, 282); + this.gbRamping.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.gbRamping.Size = new System.Drawing.Size(341, 244); this.gbRamping.TabIndex = 10; this.gbRamping.TabStop = false; this.gbRamping.Text = "Ramping"; this.gbRamping.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // nudRampingEndPower - // - this.nudRampingEndPower.Enabled = false; + // + this.nudRampingEndPower.Enabled = true; this.nudRampingEndPower.InterceptArrowKeys = false; - this.nudRampingEndPower.Location = new System.Drawing.Point(219, 84); - this.nudRampingEndPower.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.nudRampingEndPower.Location = new System.Drawing.Point(164, 73); + this.nudRampingEndPower.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.nudRampingEndPower.Name = "nudRampingEndPower"; - this.nudRampingEndPower.ReadOnly = true; - this.nudRampingEndPower.Size = new System.Drawing.Size(89, 24); + this.nudRampingEndPower.Size = new System.Drawing.Size(67, 21); this.nudRampingEndPower.TabIndex = 21; - // + // // nudRampingStartPower - // - this.nudRampingStartPower.Enabled = false; + // + this.nudRampingStartPower.Enabled = true; this.nudRampingStartPower.InterceptArrowKeys = false; - this.nudRampingStartPower.Location = new System.Drawing.Point(219, 26); - this.nudRampingStartPower.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.nudRampingStartPower.Location = new System.Drawing.Point(164, 23); + this.nudRampingStartPower.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.nudRampingStartPower.Name = "nudRampingStartPower"; - this.nudRampingStartPower.ReadOnly = true; - this.nudRampingStartPower.Size = new System.Drawing.Size(89, 24); + this.nudRampingStartPower.Size = new System.Drawing.Size(67, 21); this.nudRampingStartPower.TabIndex = 20; - // + // // nudRampingStartDist - // + // this.nudRampingStartDist.DecimalPlaces = 3; - this.nudRampingStartDist.Enabled = false; + this.nudRampingStartDist.Enabled = true; this.nudRampingStartDist.InterceptArrowKeys = false; - this.nudRampingStartDist.Location = new System.Drawing.Point(219, 55); - this.nudRampingStartDist.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.nudRampingStartDist.Location = new System.Drawing.Point(164, 48); + this.nudRampingStartDist.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.nudRampingStartDist.Maximum = new decimal(new int[] { 1000, 0, 0, 0}); this.nudRampingStartDist.Name = "nudRampingStartDist"; - this.nudRampingStartDist.ReadOnly = true; - this.nudRampingStartDist.Size = new System.Drawing.Size(89, 24); + this.nudRampingStartDist.Size = new System.Drawing.Size(67, 21); this.nudRampingStartDist.TabIndex = 19; - // + // // nudRampingEndDist - // + // this.nudRampingEndDist.DecimalPlaces = 3; - this.nudRampingEndDist.Enabled = false; + this.nudRampingEndDist.Enabled = true; this.nudRampingEndDist.InterceptArrowKeys = false; - this.nudRampingEndDist.Location = new System.Drawing.Point(219, 112); - this.nudRampingEndDist.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.nudRampingEndDist.Location = new System.Drawing.Point(164, 97); + this.nudRampingEndDist.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.nudRampingEndDist.Maximum = new decimal(new int[] { 1000, 0, 0, 0}); this.nudRampingEndDist.Name = "nudRampingEndDist"; - this.nudRampingEndDist.ReadOnly = true; - this.nudRampingEndDist.Size = new System.Drawing.Size(89, 24); + this.nudRampingEndDist.Size = new System.Drawing.Size(67, 21); this.nudRampingEndDist.TabIndex = 18; - // + // // textBoxPowerProfileID - // - this.textBoxPowerProfileID.Location = new System.Drawing.Point(219, 170); - this.textBoxPowerProfileID.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.textBoxPowerProfileID.Location = new System.Drawing.Point(164, 147); + this.textBoxPowerProfileID.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.textBoxPowerProfileID.Name = "textBoxPowerProfileID"; - this.textBoxPowerProfileID.Size = new System.Drawing.Size(79, 24); + this.textBoxPowerProfileID.Size = new System.Drawing.Size(60, 21); this.textBoxPowerProfileID.TabIndex = 15; this.textBoxPowerProfileID.Text = "0"; this.textBoxPowerProfileID.Leave += new System.EventHandler(this.textBoxPowerProfileID_Leave); - // + // // checkBoxUsePowerProfile - // + // this.checkBoxUsePowerProfile.AutoSize = true; - this.checkBoxUsePowerProfile.Location = new System.Drawing.Point(81, 172); - this.checkBoxUsePowerProfile.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.checkBoxUsePowerProfile.Location = new System.Drawing.Point(61, 149); + this.checkBoxUsePowerProfile.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.checkBoxUsePowerProfile.Name = "checkBoxUsePowerProfile"; - this.checkBoxUsePowerProfile.Size = new System.Drawing.Size(137, 22); + this.checkBoxUsePowerProfile.Size = new System.Drawing.Size(114, 19); this.checkBoxUsePowerProfile.TabIndex = 14; this.checkBoxUsePowerProfile.Text = "Power Profile ID"; this.checkBoxUsePowerProfile.UseVisualStyleBackColor = true; this.checkBoxUsePowerProfile.CheckedChanged += new System.EventHandler(this.checkBoxUsePowerProfile_CheckedChanged); this.checkBoxUsePowerProfile.Click += new System.EventHandler(this.checkBoxUsePowerProfile_Click); - // + // // checkBoxEndRampingSlopeMode - // + // this.checkBoxEndRampingSlopeMode.AutoSize = true; - this.checkBoxEndRampingSlopeMode.Location = new System.Drawing.Point(342, 88); - this.checkBoxEndRampingSlopeMode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.checkBoxEndRampingSlopeMode.Location = new System.Drawing.Point(256, 76); + this.checkBoxEndRampingSlopeMode.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.checkBoxEndRampingSlopeMode.Name = "checkBoxEndRampingSlopeMode"; - this.checkBoxEndRampingSlopeMode.Size = new System.Drawing.Size(110, 22); + this.checkBoxEndRampingSlopeMode.Size = new System.Drawing.Size(93, 19); this.checkBoxEndRampingSlopeMode.TabIndex = 13; this.checkBoxEndRampingSlopeMode.Text = "Slope Mode"; this.checkBoxEndRampingSlopeMode.UseVisualStyleBackColor = true; this.checkBoxEndRampingSlopeMode.Click += new System.EventHandler(this.checkBoxEndRampingSlopeMode_Click); - // + // // checkBoxStartRampingSlopeMode - // + // this.checkBoxStartRampingSlopeMode.AutoSize = true; - this.checkBoxStartRampingSlopeMode.Location = new System.Drawing.Point(342, 25); - this.checkBoxStartRampingSlopeMode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.checkBoxStartRampingSlopeMode.Location = new System.Drawing.Point(256, 22); + this.checkBoxStartRampingSlopeMode.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.checkBoxStartRampingSlopeMode.Name = "checkBoxStartRampingSlopeMode"; - this.checkBoxStartRampingSlopeMode.Size = new System.Drawing.Size(110, 22); + this.checkBoxStartRampingSlopeMode.Size = new System.Drawing.Size(93, 19); this.checkBoxStartRampingSlopeMode.TabIndex = 13; this.checkBoxStartRampingSlopeMode.Text = "Slope Mode"; this.checkBoxStartRampingSlopeMode.UseVisualStyleBackColor = true; this.checkBoxStartRampingSlopeMode.Click += new System.EventHandler(this.checkBoxStartRampingSlopeMode_Click); - // + // // lbArcRampingInterval - // + // this.lbArcRampingInterval.AutoSize = true; - this.lbArcRampingInterval.Location = new System.Drawing.Point(11, 146); + this.lbArcRampingInterval.Location = new System.Drawing.Point(8, 127); + this.lbArcRampingInterval.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lbArcRampingInterval.Name = "lbArcRampingInterval"; - this.lbArcRampingInterval.Size = new System.Drawing.Size(123, 18); + this.lbArcRampingInterval.Size = new System.Drawing.Size(102, 15); this.lbArcRampingInterval.TabIndex = 11; this.lbArcRampingInterval.Text = "Arc Ramp Inteval."; - // + // // label66 - // + // this.label66.AutoSize = true; - this.label66.Location = new System.Drawing.Point(131, 144); + this.label66.Location = new System.Drawing.Point(98, 125); + this.label66.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label66.Name = "label66"; - this.label66.Size = new System.Drawing.Size(83, 18); + this.label66.Size = new System.Drawing.Size(70, 15); this.label66.TabIndex = 12; this.label66.Text = "(0.025~0.2)"; - // + // // label67 - // + // this.label67.AutoSize = true; - this.label67.Location = new System.Drawing.Point(310, 144); + this.label67.Location = new System.Drawing.Point(232, 125); + this.label67.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label67.Name = "label67"; - this.label67.Size = new System.Drawing.Size(34, 18); + this.label67.Size = new System.Drawing.Size(29, 15); this.label67.TabIndex = 10; this.label67.Text = "mm"; - // + // // label34 - // + // this.label34.AutoSize = true; this.label34.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.label34.Location = new System.Drawing.Point(64, 114); + this.label34.Location = new System.Drawing.Point(48, 99); + this.label34.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(68, 18); + this.label34.Size = new System.Drawing.Size(56, 15); this.label34.TabIndex = 5; this.label34.Text = "End Dist."; - // + // // label35 - // + // this.label35.AutoSize = true; - this.label35.Location = new System.Drawing.Point(154, 86); + this.label35.Location = new System.Drawing.Point(116, 75); + this.label35.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(59, 18); + this.label35.Size = new System.Drawing.Size(50, 15); this.label35.TabIndex = 6; this.label35.Text = "(0~100)"; - // + // // label36 - // + // this.label36.AutoSize = true; this.label36.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.label36.Location = new System.Drawing.Point(51, 86); + this.label36.Location = new System.Drawing.Point(38, 75); + this.label36.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(81, 18); + this.label36.Size = new System.Drawing.Size(67, 15); this.label36.TabIndex = 6; this.label36.Text = "End Power"; - // + // // label51 - // + // this.label51.AutoSize = true; - this.label51.Location = new System.Drawing.Point(146, 115); + this.label51.Location = new System.Drawing.Point(110, 100); + this.label51.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label51.Name = "label51"; - this.label51.Size = new System.Drawing.Size(67, 18); + this.label51.Size = new System.Drawing.Size(57, 15); this.label51.TabIndex = 7; this.label51.Text = "(0~1000)"; - // + // // label41 - // + // this.label41.AutoSize = true; - this.label41.Location = new System.Drawing.Point(146, 58); + this.label41.Location = new System.Drawing.Point(110, 50); + this.label41.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label41.Name = "label41"; - this.label41.Size = new System.Drawing.Size(67, 18); + this.label41.Size = new System.Drawing.Size(57, 15); this.label41.TabIndex = 7; this.label41.Text = "(0~1000)"; - // + // // label42 - // + // this.label42.AutoSize = true; - this.label42.Location = new System.Drawing.Point(154, 29); + this.label42.Location = new System.Drawing.Point(116, 25); + this.label42.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label42.Name = "label42"; - this.label42.Size = new System.Drawing.Size(59, 18); + this.label42.Size = new System.Drawing.Size(50, 15); this.label42.TabIndex = 8; this.label42.Text = "(0~100)"; - // + // // label45 - // + // this.label45.AutoSize = true; this.label45.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.label45.Location = new System.Drawing.Point(61, 58); + this.label45.Location = new System.Drawing.Point(46, 50); + this.label45.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label45.Name = "label45"; - this.label45.Size = new System.Drawing.Size(73, 18); + this.label45.Size = new System.Drawing.Size(59, 15); this.label45.TabIndex = 7; this.label45.Text = "Start Dist."; - // + // // label46 - // + // this.label46.AutoSize = true; this.label46.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.label46.Location = new System.Drawing.Point(48, 29); + this.label46.Location = new System.Drawing.Point(36, 25); + this.label46.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label46.Name = "label46"; - this.label46.Size = new System.Drawing.Size(86, 18); + this.label46.Size = new System.Drawing.Size(70, 15); this.label46.TabIndex = 8; this.label46.Text = "Start Power"; - // + // // label47 - // + // this.label47.AutoSize = true; - this.label47.Location = new System.Drawing.Point(310, 115); + this.label47.Location = new System.Drawing.Point(232, 100); + this.label47.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label47.Name = "label47"; - this.label47.Size = new System.Drawing.Size(34, 18); + this.label47.Size = new System.Drawing.Size(29, 15); this.label47.TabIndex = 1; this.label47.Text = "mm"; - // + // // label48 - // + // this.label48.AutoSize = true; - this.label48.Location = new System.Drawing.Point(310, 86); + this.label48.Location = new System.Drawing.Point(232, 75); + this.label48.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label48.Name = "label48"; - this.label48.Size = new System.Drawing.Size(21, 18); + this.label48.Size = new System.Drawing.Size(18, 15); this.label48.TabIndex = 1; this.label48.Text = "%"; - // + // // label49 - // + // this.label49.AutoSize = true; - this.label49.Location = new System.Drawing.Point(310, 58); + this.label49.Location = new System.Drawing.Point(232, 50); + this.label49.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label49.Name = "label49"; - this.label49.Size = new System.Drawing.Size(34, 18); + this.label49.Size = new System.Drawing.Size(29, 15); this.label49.TabIndex = 1; this.label49.Text = "mm"; - // + // // label50 - // + // this.label50.AutoSize = true; - this.label50.Location = new System.Drawing.Point(310, 29); + this.label50.Location = new System.Drawing.Point(232, 25); + this.label50.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label50.Name = "label50"; - this.label50.Size = new System.Drawing.Size(21, 18); + this.label50.Size = new System.Drawing.Size(18, 15); this.label50.TabIndex = 1; this.label50.Text = "%"; - // + // // labelColor - // + // this.labelColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.labelColor.Location = new System.Drawing.Point(594, 725); + this.labelColor.Location = new System.Drawing.Point(446, 628); + this.labelColor.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.labelColor.Name = "labelColor"; - this.labelColor.Size = new System.Drawing.Size(114, 28); + this.labelColor.Size = new System.Drawing.Size(86, 25); this.labelColor.TabIndex = 11; - // + // // buttonSelectColor - // - this.buttonSelectColor.Location = new System.Drawing.Point(715, 725); - this.buttonSelectColor.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + // + this.buttonSelectColor.Location = new System.Drawing.Point(536, 628); + this.buttonSelectColor.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.buttonSelectColor.Name = "buttonSelectColor"; - this.buttonSelectColor.Size = new System.Drawing.Size(86, 29); + this.buttonSelectColor.Size = new System.Drawing.Size(64, 25); this.buttonSelectColor.TabIndex = 12; this.buttonSelectColor.Text = "Color"; this.buttonSelectColor.UseVisualStyleBackColor = true; this.buttonSelectColor.Click += new System.EventHandler(this.buttonSelectColor_Click); - // + // // WeldingParamDlg - // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1065, 816); + this.ClientSize = new System.Drawing.Size(799, 707); this.Controls.Add(this.buttonSelectColor); this.Controls.Add(this.labelColor); this.Controls.Add(this.gbRamping); @@ -1762,7 +1824,7 @@ this.Controls.Add(this.btnImport); this.Controls.Add(this.btnPasteParam); this.Controls.Add(this.btnCopyParam); - this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.Name = "WeldingParamDlg"; this.Text = "Scanner Parameter"; this.gbParameterSet.ResumeLayout(false); diff --git a/WeldingComponents/LASA/GUI/Dialog/WeldingParamDlg.cs b/WeldingComponents/LASA/GUI/Dialog/WeldingParamDlg.cs index 3170e51..53aa926 100644 --- a/WeldingComponents/LASA/GUI/Dialog/WeldingParamDlg.cs +++ b/WeldingComponents/LASA/GUI/Dialog/WeldingParamDlg.cs @@ -98,33 +98,33 @@ namespace CoreUnit.Scanner.UserControl.Canvas.Dialog cbParamExt.Items.Add(i); } - if (editMode) { - gbLaser.Enabled = true; - gbRamping.Enabled = true; - gbScanner.Enabled = true; - gbWobbel.Enabled = true; + //if (editMode) { + // gbLaser.Enabled = true; + // gbRamping.Enabled = true; + // gbScanner.Enabled = true; + // gbWobbel.Enabled = true; - btnCopyParam.Enabled = true; - btnImport.Enabled = true; - btnImportAll.Enabled = true; - btnExport.Enabled = true; - btnExportAll.Enabled = true; - btnOk.Enabled = true; - btnCancel.Enabled = true; - } else { - gbLaser.Enabled = false; - gbRamping.Enabled = false; - gbScanner.Enabled = false; - gbWobbel.Enabled = false; + // btnCopyParam.Enabled = true; + // btnImport.Enabled = true; + // btnImportAll.Enabled = true; + // btnExport.Enabled = true; + // btnExportAll.Enabled = true; + // btnOk.Enabled = true; + // btnCancel.Enabled = true; + //} else { + // gbLaser.Enabled = false; + // gbRamping.Enabled = false; + // gbScanner.Enabled = false; + // gbWobbel.Enabled = false; - btnCopyParam.Enabled = false; - btnImport.Enabled = false; - btnImportAll.Enabled = false; - btnExport.Enabled = false; - btnExportAll.Enabled = false; - btnOk.Enabled = false; - btnCancel.Enabled = true; - } + // btnCopyParam.Enabled = false; + // btnImport.Enabled = false; + // btnImportAll.Enabled = false; + // btnExport.Enabled = false; + // btnExportAll.Enabled = false; + // btnOk.Enabled = false; + // btnCancel.Enabled = true; + //} //Welding Paramter 색 지정 //rbParam1.ForeColor = Color.FromName(((WeldingParameterIDEditor.eWeldingColor)1).ToString()); diff --git a/WeldingComponents/WeldingCommon/CommonEquipmentSetup.cs b/WeldingComponents/WeldingCommon/CommonEquipmentSetup.cs index d740144..cb10e4f 100644 --- a/WeldingComponents/WeldingCommon/CommonEquipmentSetup.cs +++ b/WeldingComponents/WeldingCommon/CommonEquipmentSetup.cs @@ -227,6 +227,7 @@ namespace WeldingCommon registry.Register(CommonDeviceIds.Scanner, () => new Scanner(CommonDeviceIds.Scanner, isSimul), new ScannerConfig()); + registry.Register(CommonDeviceIds.Laser, () => new Laser(CommonDeviceIds.Laser, isSimul), new LaserConfig()); //registry.Register(CommonDeviceIds.SmcChiller, () => new SmcChiller(CommonDeviceIds.SmcChiller, 0, isSimul), new SmcChiller.Config(), // device => new UCSMCChillerDevice() { DataContext = new UCSMCChillerDeviceViewModel(AuroraEnv, CommonDeviceIds.SmcChiller) }); diff --git a/WeldingComponents/WeldingCommon/Views/Calibration/UCScannerCalibrationViewModel.cs b/WeldingComponents/WeldingCommon/Views/Calibration/UCScannerCalibrationViewModel.cs index 2cbd93e..6d36068 100644 --- a/WeldingComponents/WeldingCommon/Views/Calibration/UCScannerCalibrationViewModel.cs +++ b/WeldingComponents/WeldingCommon/Views/Calibration/UCScannerCalibrationViewModel.cs @@ -211,18 +211,18 @@ namespace WeldingCommon.Views CurrentY = yPos; } - //if(_Laser != null) - //{ - // if (_Laser.GetLaserReady()) - // { - // LaserStatus = true; - // } - // else - // { - // LaserStatus = false; - // } - //} - + if (_Laser != null) + { + if (_Laser.GetLaserReady()) + { + LaserStatus = true; + } + else + { + LaserStatus = false; + } + } + } private void OnUpdateCorrectionTable(EventMessage obj) diff --git a/WeldingComponents/WeldingCommon/Views/Recipes/UCScannerObjectTeachingControlBoxViewModel.cs b/WeldingComponents/WeldingCommon/Views/Recipes/UCScannerObjectTeachingControlBoxViewModel.cs index 178c2db..9061435 100644 --- a/WeldingComponents/WeldingCommon/Views/Recipes/UCScannerObjectTeachingControlBoxViewModel.cs +++ b/WeldingComponents/WeldingCommon/Views/Recipes/UCScannerObjectTeachingControlBoxViewModel.cs @@ -125,10 +125,11 @@ namespace WeldingCommon.Views //private readonly EquipmentInfo _EquipmentInfo; private readonly Scanner _Scanner; + #region To Do : 26.04.15 해당 _Laser와 _IODevice 와 _LaserConfig 전부 걷어내고 _Scanner로 동작하도록 수정해야한다. private readonly Laser _Laser; private readonly IODevice _IODevice; private readonly LaserConfig _LaserConfig; - + #endregion private ISequence _SeqScoutNormal; private bool _IsSequenceRunning_ScoutNormal; public bool IsSequenceRunning_ScoutNormal { get => _IsSequenceRunning_ScoutNormal; set => SetProperty(ref _IsSequenceRunning_ScoutNormal, value); } @@ -416,30 +417,44 @@ namespace WeldingCommon.Views private void OnMonitoring(object sender, EventArgs e) { // TODO: Laser Device 에 구현된 내용에 따르면, 일부 Laser Device 는 구현이 되어 있지 않은 상태. 항상 false - //if (_Laser.GetPilotLaserStatus()) { - // IsGuidBeam = true; - //} else { - // IsGuidBeam = false; - //} + if (_Laser.GetPilotLaserStatus()) + { + IsGuidBeam = true; + } + else + { + IsGuidBeam = false; + } - //if (_Laser.GetLaserReady()) { - // IsLaserReady = true; + if (_Laser.GetLaserReady()) + { + IsLaserReady = true; - // // TODO: PRIBAT_L1, PRIBAT_L2 는 IO에 LaserOnLamp 를 켜고 끄는게 필요함. - // // TODO: 우선 주석 처리 해 둠. 레이저 Type 별로 달라서 그런건지 확인하고, 어떻게 공통으로 구현할지를 생각해서 추가해 두자 - // //_iODevice._iOUnit.WriteDoBit(Convert.ToInt32(ePDOAddress.LaserOnLampOn), true); + // TODO: PRIBAT_L1, PRIBAT_L2 는 IO에 LaserOnLamp 를 켜고 끄는게 필요함. + // TODO: 우선 주석 처리 해 둠. 레이저 Type 별로 달라서 그런건지 확인하고, 어떻게 공통으로 구현할지를 생각해서 추가해 두자 + //_iODevice._iOUnit.WriteDoBit(Convert.ToInt32(ePDOAddress.LaserOnLampOn), true); - //} else { - // IsLaserReady = false; - // // TODO: PRIBAT_L1, PRIBAT_L2 는 IO에 LaserOnLamp 를 켜고 끄는게 필요함. - // // TODO: 우선 주석 처리 해 둠. 레이저 Type 별로 달라서 그런건지 확인하고, 어떻게 공통으로 구현할지를 생각해서 추가해 두자 - // //_iODevice._iOUnit.WriteDoBit(Convert.ToInt32(ePDOAddress.LaserOnLampOn), true); - //} + } + else + { + IsLaserReady = false; + // TODO: PRIBAT_L1, PRIBAT_L2 는 IO에 LaserOnLamp 를 켜고 끄는게 필요함. + // TODO: 우선 주석 처리 해 둠. 레이저 Type 별로 달라서 그런건지 확인하고, 어떻게 공통으로 구현할지를 생각해서 추가해 두자 + //_iODevice._iOUnit.WriteDoBit(Convert.ToInt32(ePDOAddress.LaserOnLampOn), true); + } // TODO: PRIBAT_L1, PRIBAT_L2 는 Blow 의 상태 check 가 들어 있음. 장비 한정이므로 이를 check 하는 것을 modelItem 이나 setting 으로 빼서 진행되도록 함. #region - // 26.04.09 NDY [Stage X Jog] OnMonitoring 내부 - X축 위치 갱신 + // 26.04.15 NDY Scanner ACS 변수로 IsLaserReady 모니터링 + // 26.04.15 NDY Gun → Scanner 변경: RTC5 ReadStatus 비트7로 레이저 상태 모니터링 + //if (_Scanner != null && _Scanner.IsActivated) + //{ + // uint status = _Scanner.ReadStatus(); + // IsLaserReady = (status & (1 << 7)) != 0; + //} + + // 26.04.09 NDY [Stage X Jog] X축 위치 갱신 if (_MotorX != null && _MotorX.IsActivated) { StageXPos = _MotorX.GetActualPos();