From 1ec5b0750fee5bbfc51a93798b2f11081f542967 Mon Sep 17 00:00:00 2001 From: choieigun Date: Fri, 27 Feb 2026 22:04:23 +0900 Subject: [PATCH] [Add Func] RMS Parameter - Ring Power >> SystemParameter OPTION [Bug Fix] RingPower Ramping - Delete Ramping Param3 --- .../Device/PLC/PLCController.Address.cs | 11 +- .../Recipes/RecipeEventHelper.cs | 140 +--- .../Sequences/SeqAutoRunCCWH52A.cs | 1 + .../GUI/Dialog/WeldingParamDlg.Designer.cs | 649 +++++++++--------- .../LASA/GUI/Dialog/WeldingParamDlg.cs | 57 +- .../LASA/GUI/Scanner/ScannerParam.cs | 30 - .../WeldingCommon/Data/ActualProcessData.cs | 11 +- .../WeldingCommon/Data/WeldingData.cs | 31 +- .../Sequences/Main/SeqUploadWeldingList.cs | 87 +-- .../WeldingCommon/Settings/SystemParameter.cs | 6 + 10 files changed, 455 insertions(+), 568 deletions(-) diff --git a/Machines/ILSOS_CCW_H52A/Device/PLC/PLCController.Address.cs b/Machines/ILSOS_CCW_H52A/Device/PLC/PLCController.Address.cs index c3d7c91..b25e684 100644 --- a/Machines/ILSOS_CCW_H52A/Device/PLC/PLCController.Address.cs +++ b/Machines/ILSOS_CCW_H52A/Device/PLC/PLCController.Address.cs @@ -274,6 +274,10 @@ namespace ILSOS_CCW_H52A.Device PLC_PARAM_3_WELDING_RAMPING_END_POWER_1 = 134, PLC_PARAM_3_WELDING_RAMPING_END_POWER_2 = 136, PLC_PARAM_3_WELDING_RAMPING_END_DISTANCE = 138, + + PLC_PARAM_1_WELDING_LASER_POWER_RING = 140, + PLC_PARAM_2_WELDING_LASER_POWER_RING = 142, + PLC_PARAM_3_WELDING_LASER_POWER_RING = 144, } public enum eWordOutput : int @@ -399,7 +403,12 @@ namespace ILSOS_CCW_H52A.Device PC_PARAM_3_WELDING_RAMPING_START_B_DISTANCE = 132, PC_PARAM_3_WELDING_RAMPING_END_POWER_1 = 134, PC_PARAM_3_WELDING_RAMPING_END_POWER_2 = 136, - PC_PARAM_3_WELDING_RAMPING_END_DISTANCE = 138 + PC_PARAM_3_WELDING_RAMPING_END_DISTANCE = 138, + + // 260227 Laser 개조 후 파라미터 추가 + PC_PARAM_1_WELDING_LASER_POWER_RING = 140, + PC_PARAM_2_WELDING_LASER_POWER_RING = 142, + PC_PARAM_3_WELDING_LASER_POWER_RING = 144, } } } diff --git a/Machines/ILSOS_CCW_H52A/Recipes/RecipeEventHelper.cs b/Machines/ILSOS_CCW_H52A/Recipes/RecipeEventHelper.cs index d2e2ab6..ab2c9ea 100644 --- a/Machines/ILSOS_CCW_H52A/Recipes/RecipeEventHelper.cs +++ b/Machines/ILSOS_CCW_H52A/Recipes/RecipeEventHelper.cs @@ -8,6 +8,7 @@ using static ILSOS_CCW_H52A.Device.PLCControllerCCWH52A; using Aurora.Api.Manager; using ILSOS_CCW_H52A.Device; using WeldingCommon.Recipes; +using WeldingCommon.Settings; namespace ILSOS_CCW_H52A.Recipes { @@ -15,62 +16,14 @@ namespace ILSOS_CCW_H52A.Recipes // 추가로 SYS_RECIPE_ACTIVATED 에서 처리가 다르게 이루어져야 할 수도 있음. 확장 가능하도록 사용성 열어둠 internal class RecipeEventHelper { + private static SystemParameter param; internal static void ExternalRecipeUpdate(Logger Log, IAuroraEnvironment aurora) { + if(param == null) + param = aurora.SettingEntry[CommonSettingIds.SystemParameter] as SystemParameter; var plc = aurora.DeviceManager[CommonDeviceIds.PLCDevice] as PLCController; var activatedRecipeId = aurora.RecipeManager.ActivatedRecipe().Id; - #region 기존 RMS 방식 - //Line _Line = null; - //var layerObjectList = WeldingRecipeManager.GetWeldingLayerObjects(0); - //if (layerObjectList.ElementAt(0) is Line) { - // _Line = (Line)layerObjectList.ElementAt(0); - //} - - //if (_Line != null) { - // #region 확인 필요 항목 - // //plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_LASER_OFF_DELAY, (int)(_LineParam.LaserOffDelay * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_WELDING_LASER_OFF_DELAY.ToString()))); - // //plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_MARK_DELAY, (int)(_LineParam.MarkDelay * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_WELDING_MARK_DELAY.ToString()))); - // //plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_POLYGON_DELAY, (int)(_LineParam.PolygonDelay * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_WELDING_POLYGON_DELAY.ToString()))); - // #endregion - - // plc.WriteDWord((int)eWordOutput.PC_RECIPE_NO, (int)(activatedRecipeId * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_RECIPE_NO.ToString()))); - // plc.WriteDWord((int)eWordOutput.PC_WELDING_RECIPE_NO, (int)(activatedRecipeId * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_RECIPE_NO.ToString()))); - - // plc.WriteDWord((int)eWordOutput.PC_WELDING_FOCAL_LENGTH, (int)(plc.ReadDWord((int)eWordInput.PLC_WELDING_FOCAL_LENGTH).data)); // PLC에서 받은 데이터를 그대로 넘겨주니 변환이 필요 없다 - // plc.WriteDWord((int)eWordOutput.PC_SCANNER_X_AXIS, (int)(plc.ReadDWord((int)eWordInput.PLC_SCANNER_X_AXIS).data)); // PLC에서 받은 데이터를 그대로 넘겨주니 변환이 필요 없다 - - // ScannerParam _LineParam = ScannerCanvasUserCtrl.ScannerParams[_Line.ScannerParamNo]; - // plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_LASER_POWER, (int)(_LineParam.LaserPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_LASER_POWER.ToString()))); - // plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_DRAW_SPEED, (int)(_LineParam.MarkSpeed * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_DRAW_SPEED.ToString()))); - // plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_JUMP_SPEED, (int)(_LineParam.JumpSpeed * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_JUMP_SPEED.ToString()))); - // plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_LASER_ON_DELAY, (int)(_LineParam.LaserOnDelay * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_LASER_ON_DELAY.ToString()))); - // plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_JUMP_DELAY, (int)(_LineParam.JumpDelay * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_JUMP_DELAY.ToString()))); - // plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_A_POWER_1, (int)(_LineParam.RampingStartAPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_A_POWER_1.ToString()))); - // plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_A_POWER_2, (int)(_LineParam.RampingStartAPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_A_POWER_2.ToString()))); - // plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_A_DISTANCE, (int)(_LineParam.RampingStartADist * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_A_DISTANCE.ToString()))); - // plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_B_POWER_1, (int)(_LineParam.RampingStartPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_B_POWER_1.ToString()))); - // plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_B_POWER_2, (int)(_LineParam.RampingStartPower3 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_B_POWER_2.ToString()))); - // plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_B_DISTANCE, (int)(_LineParam.RampingStartDist * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_B_DISTANCE.ToString()))); - // plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_POWER_1, (int)(_LineParam.RampingEndPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_POWER_1.ToString()))); - // plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_POWER_2, (int)(_LineParam.RampingEndPower3 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_POWER_2.ToString()))); - // plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_DISTANCE, (int)(_LineParam.RampingEndDist * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_DISTANCE.ToString()))); - - // plc.WriteDWord((int)eWordOutput.PC_EQUIPMENT_SPEED, (int)(plc.ReadDWord((int)eWordInput.PLC_EQUIPMENT_SPEED).data)); // PLC에서 받은 데이터를 그대로 넘겨주니 변환이 필요 없다. Equipment Speed는 Rotary Speed로 PC에서는 사용하지 않고 그냥 표기만 해준다. - - // Log.I(string.Format($"SET PC_RECIPE_PARAM_UPLOAD_COMPLETE True")); - // plc.WriteBit((int)eBitOutput.PC_RECIPE_PARAM_UPLOAD_COMPLETE, true); - - //} else { - // Log.W("Check Whether there is Line in the Activated Recipe Object!"); - //} - #endregion - #region 확인 필요 항목 - //plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_LASER_OFF_DELAY, (int)(_LineParam.LaserOffDelay * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_WELDING_LASER_OFF_DELAY.ToString()))); - //plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_MARK_DELAY, (int)(_LineParam.MarkDelay * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_WELDING_MARK_DELAY.ToString()))); - //plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_POLYGON_DELAY, (int)(_LineParam.PolygonDelay * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_WELDING_POLYGON_DELAY.ToString()))); - #endregion - plc.WriteDWord((int)eWordOutput.PC_RECIPE_NO, (int)(activatedRecipeId * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_RECIPE_NO.ToString()))); plc.WriteDWord((int)eWordOutput.PC_WELDING_RECIPE_NO, (int)(activatedRecipeId * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_RECIPE_NO.ToString()))); @@ -89,12 +42,16 @@ namespace ILSOS_CCW_H52A.Recipes plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_A_POWER_2, (int)(_LineParam_1.RampingStartAPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_A_POWER_2.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_A_DISTANCE, (int)(_LineParam_1.RampingStartADist * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_A_DISTANCE.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_B_POWER_1, (int)(_LineParam_1.RampingStartPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_B_POWER_1.ToString()))); - plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_B_POWER_2, (int)(_LineParam_1.RampingStartPower3 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_B_POWER_2.ToString()))); + plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_B_POWER_2, (int)(_LineParam_1.RampingStartPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_B_POWER_2.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_B_DISTANCE, (int)(_LineParam_1.RampingStartDist * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_START_B_DISTANCE.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_POWER_1, (int)(_LineParam_1.RampingEndPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_POWER_1.ToString()))); - plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_POWER_2, (int)(_LineParam_1.RampingEndPower3 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_POWER_2.ToString()))); + plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_POWER_2, (int)(_LineParam_1.RampingEndPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_POWER_2.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_DISTANCE, (int)(_LineParam_1.RampingEndDist * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_RAMPING_END_DISTANCE.ToString()))); + // 260227 Laser 개조 후 파라미터 추가 + if(param.UseRingPowerRMS) + plc.WriteDWord((int)eWordOutput.PC_PARAM_1_WELDING_LASER_POWER_RING, (int)(_LineParam_1.LaserPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_1_WELDING_LASER_POWER_RING.ToString()))); #endregion + #region PLC Upload Parameter 2 ScannerParam _LineParam_2 = ScannerCanvasUserCtrl.ScannerParams[1]; plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_LASER_POWER, (int)(_LineParam_2.LaserPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_LASER_POWER.ToString()))); @@ -106,12 +63,16 @@ namespace ILSOS_CCW_H52A.Recipes plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_RAMPING_START_A_POWER_2, (int)(_LineParam_2.RampingStartAPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_RAMPING_START_A_POWER_2.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_RAMPING_START_A_DISTANCE, (int)(_LineParam_2.RampingStartADist * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_RAMPING_START_A_DISTANCE.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_RAMPING_START_B_POWER_1, (int)(_LineParam_2.RampingStartPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_RAMPING_START_B_POWER_1.ToString()))); - plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_RAMPING_START_B_POWER_2, (int)(_LineParam_2.RampingStartPower3 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_RAMPING_START_B_POWER_2.ToString()))); + plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_RAMPING_START_B_POWER_2, (int)(_LineParam_2.RampingStartPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_RAMPING_START_B_POWER_2.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_RAMPING_START_B_DISTANCE, (int)(_LineParam_2.RampingStartDist * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_RAMPING_START_B_DISTANCE.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_RAMPING_END_POWER_1, (int)(_LineParam_2.RampingEndPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_RAMPING_END_POWER_1.ToString()))); - plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_RAMPING_END_POWER_2, (int)(_LineParam_2.RampingEndPower3 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_RAMPING_END_POWER_2.ToString()))); + plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_RAMPING_END_POWER_2, (int)(_LineParam_2.RampingEndPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_RAMPING_END_POWER_2.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_RAMPING_END_DISTANCE, (int)(_LineParam_2.RampingEndDist * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_RAMPING_END_DISTANCE.ToString()))); + // 260227 Laser 개조 후 파라미터 추가 + if (param.UseRingPowerRMS) + plc.WriteDWord((int)eWordOutput.PC_PARAM_2_WELDING_LASER_POWER_RING, (int)(_LineParam_2.LaserPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_2_WELDING_LASER_POWER_RING.ToString()))); #endregion + #region PLC Upload Parameter 3 ScannerParam _LineParam_3 = ScannerCanvasUserCtrl.ScannerParams[2]; plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_LASER_POWER, (int)(_LineParam_3.LaserPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_LASER_POWER.ToString()))); @@ -123,11 +84,14 @@ namespace ILSOS_CCW_H52A.Recipes plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_RAMPING_START_A_POWER_2, (int)(_LineParam_3.RampingStartAPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_RAMPING_START_A_POWER_2.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_RAMPING_START_A_DISTANCE, (int)(_LineParam_3.RampingStartADist * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_RAMPING_START_A_DISTANCE.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_RAMPING_START_B_POWER_1, (int)(_LineParam_3.RampingStartPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_RAMPING_START_B_POWER_1.ToString()))); - plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_RAMPING_START_B_POWER_2, (int)(_LineParam_3.RampingStartPower3 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_RAMPING_START_B_POWER_2.ToString()))); + plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_RAMPING_START_B_POWER_2, (int)(_LineParam_3.RampingStartPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_RAMPING_START_B_POWER_2.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_RAMPING_START_B_DISTANCE, (int)(_LineParam_3.RampingStartDist * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_RAMPING_START_B_DISTANCE.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_RAMPING_END_POWER_1, (int)(_LineParam_3.RampingEndPower1 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_RAMPING_END_POWER_1.ToString()))); - plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_RAMPING_END_POWER_2, (int)(_LineParam_3.RampingEndPower3 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_RAMPING_END_POWER_2.ToString()))); + plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_RAMPING_END_POWER_2, (int)(_LineParam_3.RampingEndPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_RAMPING_END_POWER_2.ToString()))); plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_RAMPING_END_DISTANCE, (int)(_LineParam_3.RampingEndDist * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_RAMPING_END_DISTANCE.ToString()))); + // 260227 Laser 개조 후 파라미터 추가 + if (param.UseRingPowerRMS) + plc.WriteDWord((int)eWordOutput.PC_PARAM_3_WELDING_LASER_POWER_RING, (int)(_LineParam_3.LaserPower2 * (plc as PLCControllerCCWH52A).ConvertTo2WordDivisionIndex(eWordOutput.PC_PARAM_3_WELDING_LASER_POWER_RING.ToString()))); #endregion Log.I(string.Format($"SET PC_RECIPE_PARAM_UPLOAD_COMPLETE True")); @@ -136,6 +100,8 @@ namespace ILSOS_CCW_H52A.Recipes internal static bool ExternalRecipeChangeRequest(Logger Log, IAuroraEnvironment aurora) { + if(param == null) + param = aurora.SettingEntry[CommonSettingIds.SystemParameter] as SystemParameter; var plc = aurora.DeviceManager[CommonDeviceIds.PLCDevice] as PLCController; int recipeRequestId = (int)plc.ReadDWord((int)eWordInput.PLC_WELDING_RECIPE_NO).data; @@ -149,47 +115,6 @@ namespace ILSOS_CCW_H52A.Recipes return false; } - #region 기존 RMS 방식 - //Line _Line = null; - //var layerObjectList = WeldingRecipeManager.GetWeldingLayerObjects(0); - //if (layerObjectList.ElementAt(0) is Line) { - // _Line = (Line)layerObjectList.ElementAt(0); - //} - - //if (_Line != null) { - // ScannerParam _LineParam = ScannerCanvasUserCtrl.ScannerParams[_Line.ScannerParamNo]; - // _LineParam.LaserPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_WELDING_LASER_POWER); - // _LineParam.MarkSpeed = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_WELDING_DRAW_SPEED); - // _LineParam.JumpSpeed = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_WELDING_JUMP_SPEED); - - // // 레이저 포커스 Z축 포지션영역, 해당 파라미터를 어떻게 받아 어떻게 전달할지에 대해서 논의 필요 - // //ZPosition?? = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_WELDING_FOCAL_LENGTH); - - // _LineParam.LaserOnDelay = (int)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_WELDING_LASER_ON_DELAY); - // _LineParam.LaserOffDelay = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_WELDING_LASER_OFF_DELAY); - // _LineParam.JumpDelay = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_WELDING_JUMP_DELAY); - // _LineParam.MarkDelay = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_WELDING_MARK_DELAY); - // _LineParam.PolygonDelay = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_WELDING_POLYGON_DELAY); - // _LineParam.RampingStartAPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_WELDING_RAMPING_START_A_POWER_1); - // _LineParam.RampingStartAPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_WELDING_RAMPING_START_A_POWER_2); - // _LineParam.RampingStartADist = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_WELDING_RAMPING_START_A_DISTANCE); - // _LineParam.RampingStartPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_WELDING_RAMPING_START_B_POWER_1); - // _LineParam.RampingStartPower3 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_WELDING_RAMPING_START_B_POWER_2); - // _LineParam.RampingStartDist = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_WELDING_RAMPING_START_B_DISTANCE); - // _LineParam.RampingEndPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_WELDING_RAMPING_END_POWER_1); - // _LineParam.RampingEndPower3 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_WELDING_RAMPING_END_POWER_2); - // _LineParam.RampingEndDist = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_WELDING_RAMPING_END_DISTANCE); - - //} else { - // Log.W("Check Whether there is Line in the Activated Recipe Object!"); - //} - #endregion - #region 확인 필요 항목 - //_LineParam.LaserOffDelay = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_LASER_OFF_DELAY); - //_LineParam.MarkDelay = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_MARK_DELAY); - //_LineParam.PolygonDelay = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_POLYGON_DELAY); - #endregion - #region Scanner Upload Parameter 1 ScannerParam _LineParam_1 = ScannerCanvasUserCtrl.ScannerParams[0]; _LineParam_1.LaserPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_LASER_POWER); @@ -201,11 +126,14 @@ namespace ILSOS_CCW_H52A.Recipes _LineParam_1.RampingStartAPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_RAMPING_START_A_POWER_2); _LineParam_1.RampingStartADist = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_RAMPING_START_A_DISTANCE); _LineParam_1.RampingStartPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_RAMPING_START_B_POWER_1); - _LineParam_1.RampingStartPower3 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_RAMPING_START_B_POWER_2); + _LineParam_1.RampingStartPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_RAMPING_START_B_POWER_2); _LineParam_1.RampingStartDist = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_RAMPING_START_B_DISTANCE); _LineParam_1.RampingEndPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_RAMPING_END_POWER_1); - _LineParam_1.RampingEndPower3 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_RAMPING_END_POWER_2); + _LineParam_1.RampingEndPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_RAMPING_END_POWER_2); _LineParam_1.RampingEndDist = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_RAMPING_END_DISTANCE); + // 260227 Laser 개조 후 파라미터 추가 + if (param.UseRingPowerRMS) + _LineParam_1.LaserPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_1_WELDING_LASER_POWER_RING); #endregion #region Scanner Upload Parameter 2 ScannerParam _LineParam_2 = ScannerCanvasUserCtrl.ScannerParams[1]; @@ -218,11 +146,13 @@ namespace ILSOS_CCW_H52A.Recipes _LineParam_2.RampingStartAPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_RAMPING_START_A_POWER_2); _LineParam_2.RampingStartADist = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_RAMPING_START_A_DISTANCE); _LineParam_2.RampingStartPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_RAMPING_START_B_POWER_1); - _LineParam_2.RampingStartPower3 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_RAMPING_START_B_POWER_2); + _LineParam_2.RampingStartPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_RAMPING_START_B_POWER_2); _LineParam_2.RampingStartDist = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_RAMPING_START_B_DISTANCE); _LineParam_2.RampingEndPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_RAMPING_END_POWER_1); - _LineParam_2.RampingEndPower3 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_RAMPING_END_POWER_2); + _LineParam_2.RampingEndPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_RAMPING_END_POWER_2); _LineParam_2.RampingEndDist = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_RAMPING_END_DISTANCE); + if (param.UseRingPowerRMS) + _LineParam_2.LaserPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_2_WELDING_LASER_POWER_RING); #endregion #region Scanner Upload Parameter 3 ScannerParam _LineParam_3 = ScannerCanvasUserCtrl.ScannerParams[2]; @@ -235,11 +165,13 @@ namespace ILSOS_CCW_H52A.Recipes _LineParam_3.RampingStartAPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_RAMPING_START_A_POWER_2); _LineParam_3.RampingStartADist = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_RAMPING_START_A_DISTANCE); _LineParam_3.RampingStartPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_RAMPING_START_B_POWER_1); - _LineParam_3.RampingStartPower3 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_RAMPING_START_B_POWER_2); + _LineParam_3.RampingStartPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_RAMPING_START_B_POWER_2); _LineParam_3.RampingStartDist = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_RAMPING_START_B_DISTANCE); _LineParam_3.RampingEndPower1 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_RAMPING_END_POWER_1); - _LineParam_3.RampingEndPower3 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_RAMPING_END_POWER_2); + _LineParam_3.RampingEndPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_RAMPING_END_POWER_2); _LineParam_3.RampingEndDist = (double)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_RAMPING_END_DISTANCE); + if (param.UseRingPowerRMS) + _LineParam_3.LaserPower2 = (uint)(plc as PLCControllerCCWH52A).ReadDWordByDivision(eWordInput.PLC_PARAM_3_WELDING_LASER_POWER_RING); #endregion //TODO: Recipe 저장 되어지면 안될꺼 같은데, 확인 필요함. diff --git a/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs b/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs index 2ce0451..9f6bbba 100644 --- a/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs +++ b/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs @@ -774,6 +774,7 @@ namespace ILSOS_CCW_H52A.Sequences if (laserParam != null) { // EDC 보내는 용도 Status.GetProcessingWeldingData().LaserPowerCore = laserParam.LaserPower1.ToString(); + Status.GetProcessingWeldingData().LaserPowerRing = laserParam.LaserPower2.ToString(); Status.GetProcessingWeldingData().MarkSpeed = laserParam.MarkSpeed.ToString(); Status.GetProcessingWeldingData().FocalLength = (_PLC.ReadDWord((int)eWordInput.PLC_WELDING_FOCAL_LENGTH).data / 1000f).ToString(); Status.GetProcessingWeldingData().WeldingJigNo = _WeldingJigNo.ToString(); diff --git a/WeldingComponents/LASA/GUI/Dialog/WeldingParamDlg.Designer.cs b/WeldingComponents/LASA/GUI/Dialog/WeldingParamDlg.Designer.cs index 29c2f3c..bbc8ac1 100644 --- a/WeldingComponents/LASA/GUI/Dialog/WeldingParamDlg.Designer.cs +++ b/WeldingComponents/LASA/GUI/Dialog/WeldingParamDlg.Designer.cs @@ -149,10 +149,8 @@ this.label81 = new System.Windows.Forms.Label(); this.nudRampingEndPower1 = new System.Windows.Forms.NumericUpDown(); this.nudRampingEndPower2 = new System.Windows.Forms.NumericUpDown(); - this.nudRampingEndPower3 = new System.Windows.Forms.NumericUpDown(); this.nudRampingStartPower1 = new System.Windows.Forms.NumericUpDown(); this.nudRampingStartPower2 = new System.Windows.Forms.NumericUpDown(); - this.nudRampingStartPower3 = new System.Windows.Forms.NumericUpDown(); this.nudRampingStartDist = new System.Windows.Forms.NumericUpDown(); this.nudRampingEndDist = new System.Windows.Forms.NumericUpDown(); this.lbRampingInterval = new System.Windows.Forms.Label(); @@ -193,16 +191,14 @@ ((System.ComponentModel.ISupportInitialize)(this.nudRampingStartADist)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudRampingEndPower1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudRampingEndPower2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudRampingEndPower3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudRampingStartPower1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudRampingStartPower2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudRampingStartPower3)).BeginInit(); ((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(30, 10); this.btnCopyParam.Name = "btnCopyParam"; @@ -211,9 +207,9 @@ 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(140, 10); this.btnPasteParam.Name = "btnPasteParam"; @@ -222,9 +218,9 @@ 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(250, 10); this.btnImport.Name = "btnImport"; @@ -233,9 +229,9 @@ 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(360, 10); this.btnExport.Name = "btnExport"; @@ -244,9 +240,9 @@ 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(470, 10); this.btnImportAll.Name = "btnImportAll"; @@ -255,9 +251,9 @@ 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(580, 10); this.btnExportAll.Name = "btnExportAll"; @@ -266,9 +262,9 @@ 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(690, 10); this.btnOk.Name = "btnOk"; @@ -277,9 +273,9 @@ 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(800, 10); this.btnCancel.Name = "btnCancel"; @@ -288,9 +284,9 @@ 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); @@ -317,27 +313,27 @@ 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(66, 497); this.label1.Name = "label1"; 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(62, 469); this.cbParamExt.Name = "cbParamExt"; this.cbParamExt.Size = new System.Drawing.Size(59, 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(6, 468); @@ -347,9 +343,9 @@ 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(6, 440); @@ -359,9 +355,9 @@ 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(6, 412); @@ -371,9 +367,9 @@ 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(6, 384); @@ -383,9 +379,9 @@ 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(6, 356); @@ -395,9 +391,9 @@ 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(6, 328); @@ -407,9 +403,9 @@ 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(6, 300); @@ -419,9 +415,9 @@ 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(6, 272); @@ -431,9 +427,9 @@ 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(6, 244); @@ -443,9 +439,9 @@ 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(6, 216); @@ -455,9 +451,9 @@ 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(6, 188); @@ -467,9 +463,9 @@ 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(6, 160); @@ -479,9 +475,9 @@ 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(6, 132); @@ -491,9 +487,9 @@ 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(6, 104); @@ -503,9 +499,9 @@ 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(6, 76); @@ -515,9 +511,9 @@ 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(6, 48); @@ -527,9 +523,9 @@ 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))); @@ -542,9 +538,9 @@ 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); @@ -588,333 +584,333 @@ this.gbScanner.TabIndex = 3; this.gbScanner.TabStop = false; this.gbScanner.Text = "Scanner"; - // + // // label62 - // + // this.label62.AutoSize = true; this.label62.Location = new System.Drawing.Point(474, 126); this.label62.Name = "label62"; 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(366, 126); this.label63.Name = "label63"; 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(613, 126); this.label64.Name = "label64"; 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(537, 123); this.tbMarkDelay.Name = "tbMarkDelay"; this.tbMarkDelay.Size = new System.Drawing.Size(70, 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(160, 206); this.label60.Name = "label60"; 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(307, 206); this.label61.Name = "label61"; 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(231, 203); this.tbSpotShotTime.Name = "tbSpotShotTime"; this.tbSpotShotTime.Size = new System.Drawing.Size(70, 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(41, 206); this.label59.Name = "label59"; 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(175, 180); this.label30.Name = "label30"; 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(30, 180); this.label9.Name = "label9"; 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(169, 153); this.label25.Name = "label25"; 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(47, 153); this.label10.Name = "label10"; 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(168, 126); this.label24.Name = "label24"; 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(60, 126); this.label11.Name = "label11"; 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(169, 99); this.label23.Name = "label23"; 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(43, 99); this.label12.Name = "label12"; 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(143, 72); this.label18.Name = "label18"; 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(42, 72); this.label13.Name = "label13"; 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(169, 45); this.label17.Name = "label17"; 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.Location = new System.Drawing.Point(55, 46); this.label14.Name = "label14"; 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(169, 18); this.label16.Name = "label16"; 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.Location = new System.Drawing.Point(57, 18); this.label15.Name = "label15"; 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(307, 180); this.label8.Name = "label8"; 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(307, 153); this.label7.Name = "label7"; 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(307, 126); this.label6.Name = "label6"; 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(307, 99); this.label5.Name = "label5"; 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(307, 72); this.label4.Name = "label4"; 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(307, 45); this.label3.Name = "label3"; 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(307, 18); this.label2.Name = "label2"; 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(231, 177); this.tbNumberOfCount.Name = "tbNumberOfCount"; this.tbNumberOfCount.Size = new System.Drawing.Size(70, 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(231, 150); this.tbPolygonDelay.Name = "tbPolygonDelay"; this.tbPolygonDelay.Size = new System.Drawing.Size(70, 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(231, 123); this.tbJumpDelay.Name = "tbJumpDelay"; this.tbJumpDelay.Size = new System.Drawing.Size(70, 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(231, 96); this.tbLaserOffDelay.Name = "tbLaserOffDelay"; this.tbLaserOffDelay.Size = new System.Drawing.Size(70, 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(231, 69); this.tbLaserOnDelay.Name = "tbLaserOnDelay"; this.tbLaserOnDelay.Size = new System.Drawing.Size(70, 21); this.tbLaserOnDelay.TabIndex = 0; this.tbLaserOnDelay.Text = "150"; this.tbLaserOnDelay.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // tbJumpSpeed - // + // this.tbJumpSpeed.Location = new System.Drawing.Point(231, 42); this.tbJumpSpeed.Name = "tbJumpSpeed"; this.tbJumpSpeed.Size = new System.Drawing.Size(70, 21); this.tbJumpSpeed.TabIndex = 0; this.tbJumpSpeed.Text = "300"; this.tbJumpSpeed.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // tbDrawSpeed - // + // this.tbDrawSpeed.Location = new System.Drawing.Point(231, 15); this.tbDrawSpeed.Name = "tbDrawSpeed"; this.tbDrawSpeed.Size = new System.Drawing.Size(70, 21); this.tbDrawSpeed.TabIndex = 0; this.tbDrawSpeed.Text = "100"; this.tbDrawSpeed.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // nudRampingInterval - // + // this.nudRampingInterval.DecimalPlaces = 3; this.nudRampingInterval.Location = new System.Drawing.Point(234, 252); this.nudRampingInterval.Maximum = new decimal(new int[] { @@ -936,9 +932,9 @@ 0, 196608}); this.nudRampingInterval.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // gbLaser - // + // this.gbLaser.Controls.Add(this.label19); this.gbLaser.Controls.Add(this.label33); this.gbLaser.Controls.Add(this.label32); @@ -965,18 +961,18 @@ this.gbLaser.TabIndex = 9; this.gbLaser.TabStop = false; this.gbLaser.Text = "Laser"; - // + // // label19 - // + // this.label19.AutoSize = true; this.label19.Location = new System.Drawing.Point(48, 83); this.label19.Name = "label19"; 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(175, 107); this.label33.Name = "label33"; @@ -984,27 +980,27 @@ this.label33.TabIndex = 6; this.label33.Text = "(0~100)"; this.label33.Visible = false; - // + // // label32 - // + // this.label32.AutoSize = true; this.label32.Location = new System.Drawing.Point(155, 60); this.label32.Name = "label32"; 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(161, 12); this.label58.Name = "label58"; this.label58.Size = new System.Drawing.Size(64, 15); this.label58.TabIndex = 8; this.label58.Text = "(0~10000)"; - // + // // label20 - // + // this.label20.AutoSize = true; this.label20.Location = new System.Drawing.Point(99, 107); this.label20.Name = "label20"; @@ -1012,72 +1008,72 @@ this.label20.TabIndex = 6; this.label20.Text = "Duty"; this.label20.Visible = false; - // + // // label31 - // + // this.label31.AutoSize = true; this.label31.Location = new System.Drawing.Point(161, 34); this.label31.Name = "label31"; 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(67, 60); this.label21.Name = "label21"; this.label21.Size = new System.Drawing.Size(64, 15); this.label21.TabIndex = 7; this.label21.Text = "Frequency"; - // + // // label57 - // + // this.label57.AutoSize = true; this.label57.Location = new System.Drawing.Point(76, 12); this.label57.Name = "label57"; 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.Location = new System.Drawing.Point(76, 34); this.label22.Name = "label22"; 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(308, 83); this.label26.Name = "label26"; this.label26.Size = new System.Drawing.Size(24, 15); this.label26.TabIndex = 1; this.label26.Text = "ms"; - // + // // label28 - // + // this.label28.AutoSize = true; this.label28.Location = new System.Drawing.Point(307, 60); this.label28.Name = "label28"; 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(307, 12); this.label56.Name = "label56"; this.label56.Size = new System.Drawing.Size(18, 15); this.label56.TabIndex = 1; this.label56.Text = "W"; - // + // // label27 - // + // this.label27.AutoSize = true; this.label27.Location = new System.Drawing.Point(306, 107); this.label27.Name = "label27"; @@ -1085,54 +1081,54 @@ this.label27.TabIndex = 1; this.label27.Text = "%"; this.label27.Visible = false; - // + // // label29 - // + // this.label29.AutoSize = true; this.label29.Location = new System.Drawing.Point(307, 34); this.label29.Name = "label29"; 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(232, 80); this.tbLaserPulseDuration.Name = "tbLaserPulseDuration"; this.tbLaserPulseDuration.Size = new System.Drawing.Size(70, 21); this.tbLaserPulseDuration.TabIndex = 0; this.tbLaserPulseDuration.Text = "1.00"; this.tbLaserPulseDuration.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // tbLaserFrequency - // + // this.tbLaserFrequency.Location = new System.Drawing.Point(231, 57); this.tbLaserFrequency.Name = "tbLaserFrequency"; this.tbLaserFrequency.Size = new System.Drawing.Size(70, 21); this.tbLaserFrequency.TabIndex = 0; this.tbLaserFrequency.Text = "1"; this.tbLaserFrequency.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // tbLaserPower1 - // + // this.tbLaserPower1.Location = new System.Drawing.Point(231, 11); this.tbLaserPower1.Name = "tbLaserPower1"; this.tbLaserPower1.Size = new System.Drawing.Size(70, 21); this.tbLaserPower1.TabIndex = 0; this.tbLaserPower1.Text = "0"; this.tbLaserPower1.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // tbLaserPower2 - // + // this.tbLaserPower2.Location = new System.Drawing.Point(231, 34); this.tbLaserPower2.Name = "tbLaserPower2"; this.tbLaserPower2.Size = new System.Drawing.Size(70, 21); this.tbLaserPower2.TabIndex = 0; this.tbLaserPower2.Text = "0"; this.tbLaserPower2.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // tbLaserDuty - // + // this.tbLaserDuty.Location = new System.Drawing.Point(231, 104); this.tbLaserDuty.Name = "tbLaserDuty"; this.tbLaserDuty.Size = new System.Drawing.Size(70, 21); @@ -1140,9 +1136,9 @@ this.tbLaserDuty.Text = "100"; this.tbLaserDuty.Visible = false; this.tbLaserDuty.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); @@ -1169,9 +1165,9 @@ this.gbWobbel.TabIndex = 10; this.gbWobbel.TabStop = false; this.gbWobbel.Text = "Wobbel"; - // + // // btnOpenZigzagEditor - // + // this.btnOpenZigzagEditor.Enabled = false; 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; @@ -1182,9 +1178,9 @@ 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(7, 148); this.ckbZigZagEnabled.Name = "ckbZigZagEnabled"; @@ -1195,9 +1191,9 @@ this.ckbZigZagEnabled.CheckedChanged += new System.EventHandler(this.ckbZigZagEnabled_CheckedChanged); this.ckbZigZagEnabled.Click += new System.EventHandler(this.ckbZigZagEnabled_Click); this.ckbZigZagEnabled.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // cbWobbelShape - // + // this.cbWobbelShape.Enabled = false; this.cbWobbelShape.FormattingEnabled = true; this.cbWobbelShape.Location = new System.Drawing.Point(233, 20); @@ -1205,45 +1201,45 @@ this.cbWobbelShape.Size = new System.Drawing.Size(104, 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(167, 50); this.label52.Name = "label52"; 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(138, 20); this.label55.Name = "label55"; 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(91, 50); this.label53.Name = "label53"; 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(308, 50); this.label54.Name = "label54"; 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(232, 47); this.tbWobbelTransversal.Name = "tbWobbelTransversal"; @@ -1251,9 +1247,9 @@ this.tbWobbelTransversal.TabIndex = 12; this.tbWobbelTransversal.Text = "1"; this.tbWobbelTransversal.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // btnOpenSnowManEditor - // + // this.btnOpenSnowManEditor.Enabled = false; 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; @@ -1264,9 +1260,9 @@ 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(7, 125); this.ckbSnowManEnabled.Name = "ckbSnowManEnabled"; @@ -1277,9 +1273,9 @@ 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(7, 19); this.ckbWobbelEnabled.Name = "ckbWobbelEnabled"; @@ -1290,63 +1286,63 @@ 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(176, 98); this.label37.Name = "label37"; 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(167, 74); this.label38.Name = "label38"; 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(97, 98); this.label39.Name = "label39"; 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(86, 74); this.label40.Name = "label40"; 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(308, 98); this.label43.Name = "label43"; 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(308, 74); this.label44.Name = "label44"; 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(232, 95); this.tbWobbelFrequency.Name = "tbWobbelFrequency"; @@ -1354,9 +1350,9 @@ 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(232, 71); this.tbWobbelLongitudinal.Name = "tbWobbelLongitudinal"; @@ -1364,9 +1360,9 @@ this.tbWobbelLongitudinal.TabIndex = 0; this.tbWobbelLongitudinal.Text = "1"; this.tbWobbelLongitudinal.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // gbRamping - // + // this.gbRamping.Controls.Add(this.nudRampingStartAPower1); this.gbRamping.Controls.Add(this.nudRampingStartAPower2); this.gbRamping.Controls.Add(this.nudRampingStartADist); @@ -1381,10 +1377,8 @@ this.gbRamping.Controls.Add(this.label81); this.gbRamping.Controls.Add(this.nudRampingEndPower1); this.gbRamping.Controls.Add(this.nudRampingEndPower2); - this.gbRamping.Controls.Add(this.nudRampingEndPower3); this.gbRamping.Controls.Add(this.nudRampingStartPower1); this.gbRamping.Controls.Add(this.nudRampingStartPower2); - this.gbRamping.Controls.Add(this.nudRampingStartPower3); this.gbRamping.Controls.Add(this.nudRampingStartDist); this.gbRamping.Controls.Add(this.nudRampingEndDist); this.gbRamping.Controls.Add(this.nudRampingInterval); @@ -1416,9 +1410,9 @@ this.gbRamping.TabIndex = 10; this.gbRamping.TabStop = false; this.gbRamping.Text = "Ramping"; - // + // // nudRampingStartAPower1 - // + // this.nudRampingStartAPower1.Location = new System.Drawing.Point(234, 34); this.nudRampingStartAPower1.Maximum = new decimal(new int[] { 200, @@ -1429,9 +1423,9 @@ this.nudRampingStartAPower1.Size = new System.Drawing.Size(78, 21); this.nudRampingStartAPower1.TabIndex = 36; this.nudRampingStartAPower1.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // nudRampingStartAPower2 - // + // this.nudRampingStartAPower2.Location = new System.Drawing.Point(234, 58); this.nudRampingStartAPower2.Maximum = new decimal(new int[] { 200, @@ -1442,9 +1436,9 @@ this.nudRampingStartAPower2.Size = new System.Drawing.Size(78, 21); this.nudRampingStartAPower2.TabIndex = 38; this.nudRampingStartAPower2.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // nudRampingStartADist - // + // this.nudRampingStartADist.DecimalPlaces = 3; this.nudRampingStartADist.Location = new System.Drawing.Point(234, 82); this.nudRampingStartADist.Maximum = new decimal(new int[] { @@ -1456,90 +1450,90 @@ this.nudRampingStartADist.Size = new System.Drawing.Size(78, 21); this.nudRampingStartADist.TabIndex = 35; this.nudRampingStartADist.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // label65 - // + // this.label65.AutoSize = true; this.label65.Location = new System.Drawing.Point(40, 58); this.label65.Name = "label65"; this.label65.Size = new System.Drawing.Size(117, 15); this.label65.TabIndex = 31; this.label65.Text = "Start_A Power (End)"; - // + // // label74 - // + // this.label74.AutoSize = true; this.label74.Location = new System.Drawing.Point(172, 58); this.label74.Name = "label74"; this.label74.Size = new System.Drawing.Size(50, 15); this.label74.TabIndex = 32; this.label74.Text = "(0~200)"; - // + // // label75 - // + // this.label75.AutoSize = true; this.label75.Location = new System.Drawing.Point(313, 58); this.label75.Name = "label75"; this.label75.Size = new System.Drawing.Size(18, 15); this.label75.TabIndex = 26; this.label75.Text = "%"; - // + // // label76 - // + // this.label76.AutoSize = true; this.label76.Location = new System.Drawing.Point(172, 82); this.label76.Name = "label76"; this.label76.Size = new System.Drawing.Size(50, 15); this.label76.TabIndex = 29; this.label76.Text = "(0~100)"; - // + // // label77 - // + // this.label77.AutoSize = true; this.label77.Location = new System.Drawing.Point(172, 34); this.label77.Name = "label77"; this.label77.Size = new System.Drawing.Size(50, 15); this.label77.TabIndex = 33; this.label77.Text = "(0~200)"; - // + // // label78 - // + // this.label78.AutoSize = true; this.label78.Location = new System.Drawing.Point(51, 82); this.label78.Name = "label78"; this.label78.Size = new System.Drawing.Size(73, 15); this.label78.TabIndex = 30; this.label78.Text = "Start_A Dist."; - // + // // label79 - // + // this.label79.AutoSize = true; this.label79.Location = new System.Drawing.Point(40, 34); this.label79.Name = "label79"; this.label79.Size = new System.Drawing.Size(120, 15); this.label79.TabIndex = 34; this.label79.Text = "Start_A Power (Start)"; - // + // // label80 - // + // this.label80.AutoSize = true; this.label80.Location = new System.Drawing.Point(313, 82); this.label80.Name = "label80"; this.label80.Size = new System.Drawing.Size(18, 15); this.label80.TabIndex = 27; this.label80.Text = "%"; - // + // // label81 - // + // this.label81.AutoSize = true; this.label81.Location = new System.Drawing.Point(313, 34); this.label81.Name = "label81"; this.label81.Size = new System.Drawing.Size(18, 15); this.label81.TabIndex = 28; this.label81.Text = "%"; - // + // // nudRampingEndPower1 - // + // this.nudRampingEndPower1.Location = new System.Drawing.Point(234, 180); this.nudRampingEndPower1.Maximum = new decimal(new int[] { 200, @@ -1550,9 +1544,9 @@ this.nudRampingEndPower1.Size = new System.Drawing.Size(78, 21); this.nudRampingEndPower1.TabIndex = 22; this.nudRampingEndPower1.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // nudRampingEndPower2 - // + // this.nudRampingEndPower2.Location = new System.Drawing.Point(234, 204); this.nudRampingEndPower2.Maximum = new decimal(new int[] { 200, @@ -1563,23 +1557,9 @@ this.nudRampingEndPower2.Size = new System.Drawing.Size(78, 21); this.nudRampingEndPower2.TabIndex = 23; this.nudRampingEndPower2.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // - // nudRampingEndPower3 - // - this.nudRampingEndPower3.Location = new System.Drawing.Point(234, 204); - this.nudRampingEndPower3.Maximum = new decimal(new int[] { - 200, - 0, - 0, - 0}); - this.nudRampingEndPower3.Name = "nudRampingEndPower3"; - this.nudRampingEndPower3.Size = new System.Drawing.Size(78, 21); - this.nudRampingEndPower3.TabIndex = 25; - this.nudRampingEndPower3.Visible = false; - this.nudRampingEndPower3.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // nudRampingStartPower1 - // + // this.nudRampingStartPower1.Location = new System.Drawing.Point(234, 108); this.nudRampingStartPower1.Maximum = new decimal(new int[] { 200, @@ -1590,9 +1570,9 @@ this.nudRampingStartPower1.Size = new System.Drawing.Size(78, 21); this.nudRampingStartPower1.TabIndex = 20; this.nudRampingStartPower1.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // nudRampingStartPower2 - // + // this.nudRampingStartPower2.Location = new System.Drawing.Point(234, 132); this.nudRampingStartPower2.Maximum = new decimal(new int[] { 200, @@ -1603,22 +1583,9 @@ this.nudRampingStartPower2.Size = new System.Drawing.Size(78, 21); this.nudRampingStartPower2.TabIndex = 21; this.nudRampingStartPower2.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // - // nudRampingStartPower3 - // - this.nudRampingStartPower3.Location = new System.Drawing.Point(234, 132); - this.nudRampingStartPower3.Maximum = new decimal(new int[] { - 200, - 0, - 0, - 0}); - this.nudRampingStartPower3.Name = "nudRampingStartPower3"; - this.nudRampingStartPower3.Size = new System.Drawing.Size(78, 21); - this.nudRampingStartPower3.TabIndex = 24; - this.nudRampingStartPower3.Visible = false; - // + // // nudRampingStartDist - // + // this.nudRampingStartDist.DecimalPlaces = 3; this.nudRampingStartDist.Location = new System.Drawing.Point(234, 156); this.nudRampingStartDist.Maximum = new decimal(new int[] { @@ -1630,9 +1597,9 @@ this.nudRampingStartDist.Size = new System.Drawing.Size(78, 21); this.nudRampingStartDist.TabIndex = 19; this.nudRampingStartDist.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // nudRampingEndDist - // + // this.nudRampingEndDist.DecimalPlaces = 3; this.nudRampingEndDist.Location = new System.Drawing.Point(234, 228); this.nudRampingEndDist.Maximum = new decimal(new int[] { @@ -1644,234 +1611,234 @@ this.nudRampingEndDist.Size = new System.Drawing.Size(78, 21); this.nudRampingEndDist.TabIndex = 18; this.nudRampingEndDist.Leave += new System.EventHandler(this.textBoxScannerParam_Leave); - // + // // lbRampingInterval - // + // this.lbRampingInterval.AutoSize = true; this.lbRampingInterval.Location = new System.Drawing.Point(57, 252); this.lbRampingInterval.Name = "lbRampingInterval"; this.lbRampingInterval.Size = new System.Drawing.Size(86, 15); this.lbRampingInterval.TabIndex = 11; this.lbRampingInterval.Text = "Ramp Interval."; - // + // // label66 - // + // this.label66.AutoSize = true; this.label66.Location = new System.Drawing.Point(152, 252); this.label66.Name = "label66"; 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(313, 252); this.label67.Name = "label67"; this.label67.Size = new System.Drawing.Size(29, 15); this.label67.TabIndex = 10; this.label67.Text = "mm"; - // + // // label68 - // + // this.label68.AutoSize = true; this.label68.Location = new System.Drawing.Point(40, 132); this.label68.Name = "label68"; this.label68.Size = new System.Drawing.Size(118, 15); this.label68.TabIndex = 8; this.label68.Text = "Start_B Power (End)"; - // + // // label69 - // + // this.label69.AutoSize = true; this.label69.Location = new System.Drawing.Point(172, 132); this.label69.Name = "label69"; this.label69.Size = new System.Drawing.Size(50, 15); this.label69.TabIndex = 8; this.label69.Text = "(0~200)"; - // + // // label70 - // + // this.label70.AutoSize = true; this.label70.Location = new System.Drawing.Point(313, 132); this.label70.Name = "label70"; this.label70.Size = new System.Drawing.Size(18, 15); this.label70.TabIndex = 1; this.label70.Text = "%"; - // + // // label71 - // + // this.label71.AutoSize = true; this.label71.Location = new System.Drawing.Point(57, 204); this.label71.Name = "label71"; this.label71.Size = new System.Drawing.Size(100, 15); this.label71.TabIndex = 6; this.label71.Text = "End Power (End)"; - // + // // label72 - // + // this.label72.AutoSize = true; this.label72.Location = new System.Drawing.Point(172, 204); this.label72.Name = "label72"; this.label72.Size = new System.Drawing.Size(50, 15); this.label72.TabIndex = 6; this.label72.Text = "(0~200)"; - // + // // label73 - // + // this.label73.AutoSize = true; this.label73.Location = new System.Drawing.Point(313, 204); this.label73.Name = "label73"; this.label73.Size = new System.Drawing.Size(18, 15); this.label73.TabIndex = 1; this.label73.Text = "%"; - // + // // label34 - // + // this.label34.AutoSize = true; this.label34.Location = new System.Drawing.Point(68, 228); this.label34.Name = "label34"; 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(172, 180); this.label35.Name = "label35"; this.label35.Size = new System.Drawing.Size(50, 15); this.label35.TabIndex = 6; this.label35.Text = "(0~200)"; - // + // // label36 - // + // this.label36.AutoSize = true; this.label36.Location = new System.Drawing.Point(57, 180); this.label36.Name = "label36"; this.label36.Size = new System.Drawing.Size(103, 15); this.label36.TabIndex = 6; this.label36.Text = "End Power (Start)"; - // + // // label51 - // + // this.label51.AutoSize = true; this.label51.Location = new System.Drawing.Point(172, 228); this.label51.Name = "label51"; this.label51.Size = new System.Drawing.Size(50, 15); this.label51.TabIndex = 7; this.label51.Text = "(0~100)"; - // + // // label41 - // + // this.label41.AutoSize = true; this.label41.Location = new System.Drawing.Point(172, 156); this.label41.Name = "label41"; this.label41.Size = new System.Drawing.Size(50, 15); this.label41.TabIndex = 7; this.label41.Text = "(0~100)"; - // + // // label42 - // + // this.label42.AutoSize = true; this.label42.Location = new System.Drawing.Point(172, 108); this.label42.Name = "label42"; this.label42.Size = new System.Drawing.Size(50, 15); this.label42.TabIndex = 8; this.label42.Text = "(0~200)"; - // + // // label45 - // + // this.label45.AutoSize = true; this.label45.Location = new System.Drawing.Point(51, 156); this.label45.Name = "label45"; this.label45.Size = new System.Drawing.Size(74, 15); this.label45.TabIndex = 7; this.label45.Text = "Start_B Dist."; - // + // // label46 - // + // this.label46.AutoSize = true; this.label46.Location = new System.Drawing.Point(40, 108); this.label46.Name = "label46"; this.label46.Size = new System.Drawing.Size(121, 15); this.label46.TabIndex = 8; this.label46.Text = "Start_B Power (Start)"; - // + // // label47 - // + // this.label47.AutoSize = true; this.label47.Location = new System.Drawing.Point(313, 228); this.label47.Name = "label47"; this.label47.Size = new System.Drawing.Size(18, 15); this.label47.TabIndex = 1; this.label47.Text = "%"; - // + // // label48 - // + // this.label48.AutoSize = true; this.label48.Location = new System.Drawing.Point(313, 180); this.label48.Name = "label48"; 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(313, 156); this.label49.Name = "label49"; this.label49.Size = new System.Drawing.Size(18, 15); this.label49.TabIndex = 1; this.label49.Text = "%"; - // + // // label50 - // + // this.label50.AutoSize = true; this.label50.Location = new System.Drawing.Point(313, 108); this.label50.Name = "label50"; this.label50.Size = new System.Drawing.Size(18, 15); this.label50.TabIndex = 1; this.label50.Text = "%"; - // + // // textBoxPowerProfileID - // + // this.textBoxPowerProfileID.Location = new System.Drawing.Point(0, 0); this.textBoxPowerProfileID.Name = "textBoxPowerProfileID"; this.textBoxPowerProfileID.Size = new System.Drawing.Size(100, 21); this.textBoxPowerProfileID.TabIndex = 0; - // + // // checkBoxUsePowerProfile - // + // this.checkBoxUsePowerProfile.Location = new System.Drawing.Point(0, 0); this.checkBoxUsePowerProfile.Name = "checkBoxUsePowerProfile"; this.checkBoxUsePowerProfile.Size = new System.Drawing.Size(104, 24); this.checkBoxUsePowerProfile.TabIndex = 0; - // + // // checkBoxEndRampingSlopeMode - // + // this.checkBoxEndRampingSlopeMode.Location = new System.Drawing.Point(0, 0); this.checkBoxEndRampingSlopeMode.Name = "checkBoxEndRampingSlopeMode"; this.checkBoxEndRampingSlopeMode.Size = new System.Drawing.Size(104, 24); this.checkBoxEndRampingSlopeMode.TabIndex = 0; - // + // // checkBoxStartRampingSlopeMode - // + // this.checkBoxStartRampingSlopeMode.Location = new System.Drawing.Point(0, 0); this.checkBoxStartRampingSlopeMode.Name = "checkBoxStartRampingSlopeMode"; this.checkBoxStartRampingSlopeMode.Size = new System.Drawing.Size(104, 24); this.checkBoxStartRampingSlopeMode.TabIndex = 0; - // + // // labelColor - // + // this.labelColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.labelColor.Location = new System.Drawing.Point(520, 580); this.labelColor.Name = "labelColor"; this.labelColor.Size = new System.Drawing.Size(100, 23); this.labelColor.TabIndex = 11; - // + // // buttonSelectColor - // + // this.buttonSelectColor.Location = new System.Drawing.Point(626, 580); this.buttonSelectColor.Name = "buttonSelectColor"; this.buttonSelectColor.Size = new System.Drawing.Size(75, 23); @@ -1879,9 +1846,9 @@ this.buttonSelectColor.Text = "Color"; this.buttonSelectColor.UseVisualStyleBackColor = true; this.buttonSelectColor.Click += new System.EventHandler(this.buttonSelectColor_Click); - // + // // WeldingParamDlg - // + // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(932, 615); @@ -1918,10 +1885,8 @@ ((System.ComponentModel.ISupportInitialize)(this.nudRampingStartADist)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudRampingEndPower1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudRampingEndPower2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudRampingEndPower3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudRampingStartPower1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudRampingStartPower2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudRampingStartPower3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudRampingStartDist)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudRampingEndDist)).EndInit(); this.ResumeLayout(false); @@ -2069,10 +2034,8 @@ private System.Windows.Forms.NumericUpDown nudRampingStartDist; private System.Windows.Forms.NumericUpDown nudRampingEndPower1; private System.Windows.Forms.NumericUpDown nudRampingEndPower2; - private System.Windows.Forms.NumericUpDown nudRampingEndPower3; private System.Windows.Forms.NumericUpDown nudRampingStartPower1; private System.Windows.Forms.NumericUpDown nudRampingStartPower2; - private System.Windows.Forms.NumericUpDown nudRampingStartPower3; private System.Windows.Forms.NumericUpDown nudRampingStartAPower1; private System.Windows.Forms.NumericUpDown nudRampingStartAPower2; private System.Windows.Forms.NumericUpDown nudRampingStartADist; diff --git a/WeldingComponents/LASA/GUI/Dialog/WeldingParamDlg.cs b/WeldingComponents/LASA/GUI/Dialog/WeldingParamDlg.cs index 7d78949..fcd6aab 100644 --- a/WeldingComponents/LASA/GUI/Dialog/WeldingParamDlg.cs +++ b/WeldingComponents/LASA/GUI/Dialog/WeldingParamDlg.cs @@ -98,10 +98,10 @@ namespace CoreUnit.Scanner.UserControl.Canvas.Dialog label31.Enabled = false; // Ramping Start, End 구분 후 사용한다. Power 2번은 여전히 막아둠 - //label68.Enabled = false; - //label69.Enabled = false; - //label71.Enabled = false; - //label72.Enabled = false; + //label68.Enabled = false; + //label69.Enabled = false; + //label71.Enabled = false; + //label72.Enabled = false; //label73.Enabled = false; //label70.Enabled = false; @@ -157,9 +157,6 @@ namespace CoreUnit.Scanner.UserControl.Canvas.Dialog nudRampingStartPower1.Enabled = PermissionCheck; nudRampingEndPower1.Enabled = PermissionCheck; - nudRampingStartPower3.Enabled = PermissionCheck; - nudRampingEndPower3.Enabled = PermissionCheck; - nudRampingStartAPower1.Enabled = PermissionCheck; nudRampingStartAPower2.Enabled = PermissionCheck; nudRampingStartADist.Enabled = PermissionCheck; @@ -184,8 +181,6 @@ namespace CoreUnit.Scanner.UserControl.Canvas.Dialog nudRampingStartPower2.Visible = false; nudRampingEndPower2.Visible = false; - nudRampingStartPower3.Visible = true; - nudRampingEndPower3.Visible = true; #endregion } @@ -329,13 +324,6 @@ namespace CoreUnit.Scanner.UserControl.Canvas.Dialog else nudRampingStartPower2.Value = Convert.ToDecimal(selectedParam.RampingStartPower2); - if (nudRampingStartPower3.Maximum < Convert.ToDecimal(selectedParam.RampingStartPower3)) - nudRampingStartPower3.Value = nudRampingStartPower3.Maximum; - else if (nudRampingStartPower3.Minimum > Convert.ToDecimal(selectedParam.RampingStartPower3)) - nudRampingStartPower3.Value = nudRampingStartPower3.Minimum; - else - nudRampingStartPower3.Value = Convert.ToDecimal(selectedParam.RampingStartPower3); - if (nudRampingStartDist.Maximum < Convert.ToDecimal(selectedParam.RampingStartDist)) nudRampingStartDist.Value = nudRampingStartDist.Maximum; else if (nudRampingStartDist.Minimum > Convert.ToDecimal(selectedParam.RampingStartDist)) @@ -357,15 +345,6 @@ namespace CoreUnit.Scanner.UserControl.Canvas.Dialog else nudRampingEndPower2.Value = Convert.ToDecimal(selectedParam.RampingEndPower2); - - if (nudRampingEndPower3.Maximum < Convert.ToDecimal(selectedParam.RampingEndPower3)) - nudRampingEndPower3.Value = nudRampingEndPower3.Maximum; - else if (nudRampingEndPower3.Minimum > Convert.ToDecimal(selectedParam.RampingEndPower3)) - nudRampingEndPower3.Value = nudRampingEndPower3.Minimum; - else - nudRampingEndPower3.Value = Convert.ToDecimal(selectedParam.RampingEndPower3); - - if (nudRampingEndDist.Maximum < Convert.ToDecimal(selectedParam.RampingEndDist)) nudRampingEndDist.Value = nudRampingEndDist.Maximum; else if (nudRampingEndDist.Minimum > Convert.ToDecimal(selectedParam.RampingEndDist)) @@ -425,11 +404,9 @@ namespace CoreUnit.Scanner.UserControl.Canvas.Dialog selectedParam.RampingStartPower1 = Convert.ToUInt32(nudRampingStartPower1.Value); selectedParam.RampingStartPower2 = Convert.ToUInt32(nudRampingStartPower2.Value); - selectedParam.RampingStartPower3 = Convert.ToUInt32(nudRampingStartPower3.Value); selectedParam.RampingStartDist = (double)nudRampingStartDist.Value; selectedParam.RampingEndPower1 = Convert.ToUInt32(nudRampingEndPower1.Value); selectedParam.RampingEndPower2 = Convert.ToUInt32(nudRampingEndPower2.Value); - selectedParam.RampingEndPower3 = Convert.ToUInt32(nudRampingEndPower3.Value); selectedParam.RampingEndDist = (double)nudRampingEndDist.Value; selectedParam.RampingInterval = (double)nudRampingInterval.Value; @@ -873,11 +850,9 @@ namespace CoreUnit.Scanner.UserControl.Canvas.Dialog nudRampingStartDist.Enabled = false; nudRampingStartPower1.Enabled = false; nudRampingStartPower2.Enabled = false; - nudRampingStartPower3.Enabled = false; nudRampingEndDist.Enabled = false; nudRampingEndPower1.Enabled = false; nudRampingEndPower2.Enabled = false; - nudRampingEndPower3.Enabled = false; nudRampingInterval.Enabled = false; checkBoxStartRampingSlopeMode.Enabled = false; checkBoxEndRampingSlopeMode.Enabled = false; @@ -886,11 +861,9 @@ namespace CoreUnit.Scanner.UserControl.Canvas.Dialog nudRampingStartDist.Enabled = true; nudRampingStartPower1.Enabled = true; nudRampingStartPower2.Enabled = true; - nudRampingStartPower3.Enabled = true; nudRampingEndDist.Enabled = true; nudRampingEndPower1.Enabled = true; nudRampingEndPower2.Enabled = true; - nudRampingEndPower3.Enabled = true; nudRampingInterval.Enabled = true; checkBoxStartRampingSlopeMode.Enabled = true; checkBoxEndRampingSlopeMode.Enabled = true; @@ -938,19 +911,17 @@ namespace CoreUnit.Scanner.UserControl.Canvas.Dialog tbWobbelLongitudinal.ImeMode = ImeMode.Disable; tbWobbelFrequency.ImeMode = ImeMode.Disable; - nudRampingStartAPower1.ImeMode = ImeMode.Disable;; - nudRampingStartAPower2.ImeMode = ImeMode.Disable;; - nudRampingStartADist.ImeMode = ImeMode.Disable;; + nudRampingStartAPower1.ImeMode = ImeMode.Disable; + nudRampingStartAPower2.ImeMode = ImeMode.Disable; + nudRampingStartADist.ImeMode = ImeMode.Disable; - nudRampingStartPower1.ImeMode = ImeMode.Disable;; - nudRampingStartPower2.ImeMode = ImeMode.Disable;; - nudRampingStartPower3.ImeMode = ImeMode.Disable;; - nudRampingStartDist.ImeMode = ImeMode.Disable;; - nudRampingEndPower1.ImeMode = ImeMode.Disable;; - nudRampingEndPower2.ImeMode = ImeMode.Disable;; - nudRampingEndPower3.ImeMode = ImeMode.Disable;; - nudRampingEndDist.ImeMode = ImeMode.Disable;; - nudRampingInterval.ImeMode = ImeMode.Disable;; + nudRampingStartPower1.ImeMode = ImeMode.Disable; + nudRampingStartPower2.ImeMode = ImeMode.Disable; + nudRampingStartDist.ImeMode = ImeMode.Disable; + nudRampingEndPower1.ImeMode = ImeMode.Disable; + nudRampingEndPower2.ImeMode = ImeMode.Disable; + nudRampingEndDist.ImeMode = ImeMode.Disable; + nudRampingInterval.ImeMode = ImeMode.Disable; } } } diff --git a/WeldingComponents/LASA/GUI/Scanner/ScannerParam.cs b/WeldingComponents/LASA/GUI/Scanner/ScannerParam.cs index a4575da..3890bdb 100644 --- a/WeldingComponents/LASA/GUI/Scanner/ScannerParam.cs +++ b/WeldingComponents/LASA/GUI/Scanner/ScannerParam.cs @@ -297,20 +297,6 @@ namespace CoreUnit.Scanner.UserControl.ScannerCanvas set { m_rampingStartPower2 = value; } } - - uint m_rampingStartPower3; - [Browsable(true)] - [ReadOnly(false)] - [Category("Ramping")] - [DisplayName("Start Power(%)")] - [Description("Start Power(Max:100, Min:0, Unit: %)")] - [XmlSerializable] - public uint RampingStartPower3 - { - get { return m_rampingStartPower3; } - set { m_rampingStartPower3 = value; } - } - //bool m_rampingStartSlopeMode; //[Browsable(true)] //[ReadOnly(false)] @@ -358,18 +344,6 @@ namespace CoreUnit.Scanner.UserControl.ScannerCanvas get { return m_rampingEndPower2; } set { m_rampingEndPower2 = value; } } - uint m_rampingEndPower3; - [Browsable(true)] - [ReadOnly(false)] - [Category("Ramping")] - [DisplayName("End Power(%)")] - [Description("End Power(Max:100, Min:0, Unit: %)")] - [XmlSerializable] - public uint RampingEndPower3 - { - get { return m_rampingEndPower3; } - set { m_rampingEndPower3 = value; } - } //bool m_rampingEndSlopeMode; //[Browsable(true)] @@ -1568,11 +1542,9 @@ namespace CoreUnit.Scanner.UserControl.ScannerCanvas m_rampingStartDist = 0; m_rampingStartPower1 = 0; m_rampingStartPower2 = 0; - m_rampingStartPower3 = 0; m_rampingEndPower1 = 0; m_rampingEndPower2 = 0; - m_rampingEndPower3 = 0; m_rampingEndDist = 0; m_RampingInterval = 0; //m_rampingStartSlopeMode = false; @@ -1633,11 +1605,9 @@ namespace CoreUnit.Scanner.UserControl.ScannerCanvas param.m_rampingStartPower1 = this.m_rampingStartPower1; param.m_rampingStartPower2 = this.m_rampingStartPower2; - param.m_rampingStartPower3 = this.m_rampingStartPower3; param.m_rampingStartDist = this.m_rampingStartDist; param.m_rampingEndPower1 = this.m_rampingEndPower1; param.m_rampingEndPower2 = this.m_rampingEndPower2; - param.m_rampingEndPower3 = this.m_rampingEndPower3; param.m_rampingEndDist = this.m_rampingEndDist; //param.m_rampingStartSlopeMode = this.m_rampingStartSlopeMode; //param.m_rampingEndSlopeMode = this.m_rampingEndSlopeMode; diff --git a/WeldingComponents/WeldingCommon/Data/ActualProcessData.cs b/WeldingComponents/WeldingCommon/Data/ActualProcessData.cs index 7d3add5..212307b 100644 --- a/WeldingComponents/WeldingCommon/Data/ActualProcessData.cs +++ b/WeldingComponents/WeldingCommon/Data/ActualProcessData.cs @@ -41,7 +41,8 @@ namespace WeldingCommon.Data table.Columns.Add(nameof(ActualProcessUnit.JumpDelay), typeof(double)); table.Columns.Add(nameof(ActualProcessUnit.MarkDelay), typeof(double)); table.Columns.Add(nameof(ActualProcessUnit.PolygonDelay), typeof(double)); - table.Columns.Add(nameof(ActualProcessUnit.Power), typeof(double)); + table.Columns.Add(nameof(ActualProcessUnit.PowerCore), typeof(double)); + table.Columns.Add(nameof(ActualProcessUnit.PowerRing), typeof(double)); table.Columns.Add(nameof(ActualProcessUnit.JumpSpeed), typeof(double)); table.Columns.Add(nameof(ActualProcessUnit.MarkSpeed), typeof(double)); table.Columns.Add(nameof(ActualProcessUnit.JumpX), typeof(double)); @@ -65,7 +66,7 @@ namespace WeldingCommon.Data table.Rows.Add(item.Date.ToString("yyyy-MM-dd"), item.Date.ToString("HH:mm:ss.fff"), item.LotID, item.CellID, item.HeadNo, item.WeldType, item.EncoderCheck, item.StartPointX, item.StartPointY, item.EndPointX, item.EndPointY, item.WeldCondition, item.LaserOnDelay, item.LaserOffDelay, item.JumpDelay, item.MarkDelay, - item.PolygonDelay, item.Power, item.JumpSpeed, item.MarkSpeed, item.JumpX, + item.PolygonDelay, item.PowerCore, item.PowerRing, item.JumpSpeed, item.MarkSpeed, item.JumpX, item.JumpY); } @@ -110,8 +111,10 @@ namespace WeldingCommon.Data private double _MarkDelay; public double PolygonDelay { get => _PolygonDelay; set => SetProperty(ref _PolygonDelay, value); } private double _PolygonDelay; - public double Power { get => _Power; set => SetProperty(ref _Power, value); } - private double _Power; + public double PowerCore { get => _PowerCore; set => SetProperty(ref _PowerCore, value); } + private double _PowerCore; + public double PowerRing { get => _PowerRing; set => SetProperty(ref _PowerRing, value); } + private double _PowerRing; public double JumpSpeed { get => _JumpSpeed; set => SetProperty(ref _JumpSpeed, value); } private double _JumpSpeed; public double MarkSpeed { get => _MarkSpeed; set => SetProperty(ref _MarkSpeed, value); } diff --git a/WeldingComponents/WeldingCommon/Data/WeldingData.cs b/WeldingComponents/WeldingCommon/Data/WeldingData.cs index 3c44d3a..81576d4 100644 --- a/WeldingComponents/WeldingCommon/Data/WeldingData.cs +++ b/WeldingComponents/WeldingCommon/Data/WeldingData.cs @@ -12,7 +12,7 @@ using System.Threading.Tasks; namespace WeldingCommon.Data { - public class WeldingData : NotifyPropertyChangedBase + public class WeldingData : NotifyPropertyChangedBase, ICloneable { protected readonly Logger Log = new Logger("WeldingData"); @@ -109,5 +109,34 @@ namespace WeldingCommon.Data { } + + public object Clone() + { + var clone = new WeldingData(); + clone._CellId = _CellId; + clone._LotId = _LotId; + clone._AutoRunStartTime = _AutoRunStartTime; + clone._WeldingStartTime = _WeldingStartTime; + clone._WeldingEndTime = _WeldingEndTime; + clone._WeldingSpanTimeMilliseconds = _WeldingSpanTimeMilliseconds; + clone._TodayProduct = _TodayProduct; + clone._TotalProduct = _TotalProduct; + clone._RecipeNo = _RecipeNo; + clone._WeldStartTime = _WeldStartTime; + clone._WeldTime = _WeldTime; + clone._WorkCellId = _WorkCellId; + clone._WorkLotId = _WorkLotId; + clone._LBAD_Judge = _LBAD_Judge; + clone._LDD_Judge = _LDD_Judge; + clone._LaserPowerCore = _LaserPowerCore; + clone._LaserPowerRing = _LaserPowerRing; + clone._MarkSpeed = _MarkSpeed; + clone._FocalLength = _FocalLength; + clone._WeldingJigNo = _WeldingJigNo; + clone._LaserPowerByLBAD = _LaserPowerByLBAD; + clone._CheckCanExist = _CheckCanExist; + clone._CheckScannerListEnd = _CheckScannerListEnd; + return clone; + } } } diff --git a/WeldingComponents/WeldingCommon/Sequences/Main/SeqUploadWeldingList.cs b/WeldingComponents/WeldingCommon/Sequences/Main/SeqUploadWeldingList.cs index 9e470ce..bcc78b8 100644 --- a/WeldingComponents/WeldingCommon/Sequences/Main/SeqUploadWeldingList.cs +++ b/WeldingComponents/WeldingCommon/Sequences/Main/SeqUploadWeldingList.cs @@ -405,7 +405,7 @@ namespace WeldingCommon.Sequences { float percentLaser1 = 0.0f; float percentLaser2 = 0.0f; SetScannerProcessCondition(param, out percentLaser1, out percentLaser2); - Log.I(string.Format($"[Line Weld] Weld Condition(No:{param.No + 1}) Setting(LaserOnDelay:{param.LaserOnDelay},LaserOffDelay:{param.LaserOffDelay},JumpDelay:{param.JumpDelay},MarkDelay:{param.MarkDelay},PolygonDelay:{param.PolygonDelay},Power:{param.LaserPower1},JumpSpeed:{param.JumpSpeed},MarkSpeed:{param.MarkSpeed})")); + Log.I(string.Format($"[Line Weld] Weld Condition(No:{param.No + 1}) Setting(LaserOnDelay:{param.LaserOnDelay},LaserOffDelay:{param.LaserOffDelay},JumpDelay:{param.JumpDelay},MarkDelay:{param.MarkDelay},PolygonDelay:{param.PolygonDelay},CorePower:{param.LaserPower1},RingPower:{param.LaserPower2},JumpSpeed:{param.JumpSpeed},MarkSpeed:{param.MarkSpeed})")); //CSV Laser Log 추가 laserLog.Date = DateTime.Now; @@ -416,7 +416,8 @@ namespace WeldingCommon.Sequences { laserLog.JumpDelay = param.JumpDelay; laserLog.MarkDelay = param.MarkDelay; laserLog.PolygonDelay = param.PolygonDelay; - laserLog.Power = param.LaserPower1; + laserLog.PowerCore = param.LaserPower1; + laserLog.PowerRing = param.LaserPower2; laserLog.JumpSpeed = param.JumpSpeed; laserLog.MarkSpeed = param.MarkSpeed; @@ -639,17 +640,17 @@ namespace WeldingCommon.Sequences { float firstPower_A1 = percentLaser1 * (float)param.RampingStartAPower1 / 100; // Ramping First Power 1 float firstPower_B1 = percentLaser1 * (float)param.RampingStartAPower2 / 100; // Ramping First Power 2 float startPower_A1 = percentLaser1 * (float)param.RampingStartPower1 / 100; // Ramping Start Power 1 - float startPower_B1 = percentLaser1 * (float)param.RampingStartPower3 / 100; // Ramping Start Power 3 + float startPower_B1 = percentLaser1 * (float)param.RampingStartPower2 / 100; // Ramping Start Power 3 float endPower_A1 = percentLaser1 * (float)param.RampingEndPower1 / 100; // Ramping End Power 1 - float endPower_B1 = percentLaser1 * (float)param.RampingEndPower3 / 100; // Ramping End Power 3 + float endPower_B1 = percentLaser1 * (float)param.RampingEndPower2 / 100; // Ramping End Power 3 // Power2 A -> Start Power, B -> End Power float firstPower_A2 = percentLaser2 * (float)param.RampingStartAPower1 / 100; // Ramping First Power 1 float firstPower_B2 = percentLaser2 * (float)param.RampingStartAPower2 / 100; // Ramping First Power 2 float startPower_A2 = percentLaser2 * (float)param.RampingStartPower1 / 100; // Ramping Start Power 1 - float startPower_B2 = percentLaser2 * (float)param.RampingStartPower3 / 100; // Ramping Start Power 3 + float startPower_B2 = percentLaser2 * (float)param.RampingStartPower2 / 100; // Ramping Start Power 3 float endPower_A2 = percentLaser2 * (float)param.RampingEndPower1 / 100; // Ramping End Power 1 - float endPower_B2 = percentLaser2 * (float)param.RampingEndPower3 / 100; // Ramping End Power 3 + float endPower_B2 = percentLaser2 * (float)param.RampingEndPower2 / 100; // Ramping End Power 3 double dx = (obj.P2.X - obj.P1.X) / obj.Distance * length; double dy = (obj.P2.Y - obj.P1.Y) / obj.Distance * length; @@ -659,8 +660,8 @@ namespace WeldingCommon.Sequences { Log.I($"[Line Weld] Ramping Condition No({obj.No + 1}), Line Length : {obj.Distance}" + $"(Start_A:{param.RampingStartADist}%, Dist {FirstDistance}mm {(float)param.RampingStartAPower1}% -> {(float)param.RampingStartAPower2}%) " + - $"(Start_B:{param.RampingStartDist}%, Dist {StartDistance}mm {(float)param.RampingStartPower1}% -> {(float)param.RampingStartPower3}%) " + - $"(End:{param.RampingEndDist}%, Dist {EndDistance}mm {(float)param.RampingEndPower1}% -> {(float)param.RampingEndPower3}%)"); + $"(Start_B:{param.RampingStartDist}%, Dist {StartDistance}mm {(float)param.RampingStartPower1}% -> {(float)param.RampingStartPower2}%) " + + $"(End:{param.RampingEndDist}%, Dist {EndDistance}mm {(float)param.RampingEndPower1}% -> {(float)param.RampingEndPower2}%)"); for (int iter = 0; iter < totalCount + 1; iter++) { @@ -742,7 +743,7 @@ namespace WeldingCommon.Sequences { float percentLaser2 = 0.0f; SetScannerProcessCondition(param, out percentLaser1, out percentLaser2); - Log.I(string.Format($"[Point Weld] Weld Condition(No:{param.No + 1}) Setting(LaserOnDelay:{param.LaserOnDelay},LaserOffDelay:{param.LaserOffDelay},JumpDelay:{param.JumpDelay},MarkDelay:{param.MarkDelay},PolygonDelay:{param.PolygonDelay},Power:{param.LaserPower1},JumpSpeed:{param.JumpSpeed},MarkSpeed:{param.MarkSpeed})")); + Log.I(string.Format($"[Point Weld] Weld Condition(No:{param.No + 1}) Setting(LaserOnDelay:{param.LaserOnDelay},LaserOffDelay:{param.LaserOffDelay},JumpDelay:{param.JumpDelay},MarkDelay:{param.MarkDelay},PolygonDelay:{param.PolygonDelay},CorePower:{param.LaserPower1},RingPower:{param.LaserPower2},JumpSpeed:{param.JumpSpeed},MarkSpeed:{param.MarkSpeed})")); // 2. 스캐너 가공 작업 // 2.1. Jump(Point Shot) @@ -791,7 +792,7 @@ namespace WeldingCommon.Sequences { // Spline 의 경우 Wobbel 해제 _Scanner.SetWobbelMode(false, 0, 0, 0, 0); - Log.I(string.Format($"[Spline Weld] Weld Condition(No:{param.No + 1}) Setting(LaserOnDelay:{param.LaserOnDelay},LaserOffDelay:{param.LaserOffDelay},JumpDelay:{param.JumpDelay},MarkDelay:{param.MarkDelay},PolygonDelay:{param.PolygonDelay},Power:{param.LaserPower1},JumpSpeed:{param.JumpSpeed},MarkSpeed:{param.MarkSpeed})")); + Log.I(string.Format($"[Spline Weld] Weld Condition(No:{param.No + 1}) Setting(LaserOnDelay:{param.LaserOnDelay},LaserOffDelay:{param.LaserOffDelay},JumpDelay:{param.JumpDelay},MarkDelay:{param.MarkDelay},PolygonDelay:{param.PolygonDelay},CorePower:{param.LaserPower1},RingPower:{param.LaserPower2},JumpSpeed:{param.JumpSpeed},MarkSpeed:{param.MarkSpeed})")); // 1. Ramping을 위한 변수 설정 // totalCount를 전체 Count에서 Mark가 시작하는 구간으로 2를 빼준다.. 아래수식에서 헷갈리지 않기 위해서.. @@ -839,8 +840,8 @@ namespace WeldingCommon.Sequences { float startingPercentLaser_A1 = percentLaser1 * (float)param.RampingStartPower1 / 100 <= 100 ? percentLaser1 * (float)param.RampingStartPower1 / 100 : 100; - float startingPercentLaser_B1 = percentLaser1 * (float)param.RampingStartPower3 / 100 <= 100 ? - percentLaser1 * (float)param.RampingStartPower3 / 100 : 100; + float startingPercentLaser_B1 = percentLaser1 * (float)param.RampingStartPower2 / 100 <= 100 ? + percentLaser1 * (float)param.RampingStartPower2 / 100 : 100; float risingEdgePercentLaser1 = 0; float startingPercentLaser2 = percentLaser2 * (float)param.RampingStartPower2 / 100 <= 100 ? @@ -851,8 +852,8 @@ namespace WeldingCommon.Sequences { // percentLaser1 * (float)param.RampingEndPower1 / 100 : 100; float endingPercentLaser_A1 = percentLaser1 * (float)param.RampingEndPower1 / 100 <= 100 ? percentLaser1 * (float)param.RampingEndPower1 / 100 : 100; - float endingPercentLaser_B1 = percentLaser1 * (float)param.RampingEndPower3 / 100 <= 100 ? - percentLaser1 * (float)param.RampingEndPower3 / 100 : 100; + float endingPercentLaser_B1 = percentLaser1 * (float)param.RampingEndPower2 / 100 <= 100 ? + percentLaser1 * (float)param.RampingEndPower2 / 100 : 100; float fallingEdgePercentLaser1 = 0; float endingPercentLaser2 = percentLaser2 * (float)param.RampingEndPower2 / 100 <= 100 ? @@ -1360,7 +1361,7 @@ namespace WeldingCommon.Sequences { float percentLaser2 = 0; SetScannerProcessCondition(param, out percentLaser1, out percentLaser2); - Log.I(string.Format($"[SnowMan Weld] Weld Condition(No:{param.No + 1}) Setting(LaserOnDelay:{param.LaserOnDelay},LaserOffDelay:{param.LaserOffDelay},JumpDelay:{param.JumpDelay},MarkDelay:{param.MarkDelay},PolygonDelay:{param.PolygonDelay},Power:{param.LaserPower1},JumpSpeed:{param.JumpSpeed},MarkSpeed:{param.MarkSpeed})")); + Log.I(string.Format($"[SnowMan Weld] Weld Condition(No:{param.No + 1}) Setting(LaserOnDelay:{param.LaserOnDelay},LaserOffDelay:{param.LaserOffDelay},JumpDelay:{param.JumpDelay},MarkDelay:{param.MarkDelay},PolygonDelay:{param.PolygonDelay},CorePower:{param.LaserPower1},RingPower:{param.LaserPower2},JumpSpeed:{param.JumpSpeed},MarkSpeed:{param.MarkSpeed})")); // 2. 스캐너 가공 작업 // SnowMan 로드 시작 @@ -1417,7 +1418,7 @@ namespace WeldingCommon.Sequences { float percentLaser2 = 0; SetScannerProcessCondition(param, out percentLaser1, out percentLaser2); - Log.I(string.Format($"[Arc Weld] Weld Condition(No:{param.No + 1}) Setting(LaserOnDelay:{param.LaserOnDelay},LaserOffDelay:{param.LaserOffDelay},JumpDelay:{param.JumpDelay},MarkDelay:{param.MarkDelay},PolygonDelay:{param.PolygonDelay},Power:{param.LaserPower1},JumpSpeed:{param.JumpSpeed},MarkSpeed:{param.MarkSpeed})")); + Log.I(string.Format($"[Arc Weld] Weld Condition(No:{param.No + 1}) Setting(LaserOnDelay:{param.LaserOnDelay},LaserOffDelay:{param.LaserOffDelay},JumpDelay:{param.JumpDelay},MarkDelay:{param.MarkDelay},PolygonDelay:{param.PolygonDelay},CorePower:{param.LaserPower1},RingPower:{param.LaserPower2},JumpSpeed:{param.JumpSpeed},MarkSpeed:{param.MarkSpeed})")); //CSV Laser Log 추가 laserLog.Date = DateTime.Now; @@ -1428,7 +1429,8 @@ namespace WeldingCommon.Sequences { laserLog.JumpDelay = param.JumpDelay; laserLog.MarkDelay = param.MarkDelay; laserLog.PolygonDelay = param.PolygonDelay; - laserLog.Power = param.LaserPower1; + laserLog.PowerCore = param.LaserPower1; + laserLog.PowerRing = param.LaserPower2; laserLog.JumpSpeed = param.JumpSpeed; laserLog.MarkSpeed = param.MarkSpeed; @@ -1570,13 +1572,13 @@ namespace WeldingCommon.Sequences { float startingPercentLaser_A1 = percentLaser1 * (float)param.RampingStartPower1 / 100 <= 100 ? percentLaser1 * (float)param.RampingStartPower1 / 100 : 100; - float startingPercentLaser_B1 = percentLaser1 * (float)param.RampingStartPower3 / 100 <= 100 ? - percentLaser1 * (float)param.RampingStartPower3 / 100 : 100; + float startingPercentLaser_B1 = percentLaser1 * (float)param.RampingStartPower2 / 100 <= 100 ? + percentLaser1 * (float)param.RampingStartPower2 / 100 : 100; float startingPercentLaser_A2 = percentLaser2 * (float)param.RampingStartPower1 / 100 <= 100 ? percentLaser2 * (float)param.RampingStartPower1 / 100 : 100; - float startingPercentLaser_B2 = percentLaser2 * (float)param.RampingStartPower3 / 100 <= 100 ? - percentLaser2 * (float)param.RampingStartPower3 / 100 : 100; + float startingPercentLaser_B2 = percentLaser2 * (float)param.RampingStartPower2 / 100 <= 100 ? + percentLaser2 * (float)param.RampingStartPower2 / 100 : 100; float risingEdgePercentLaser1 = 0; @@ -1585,8 +1587,8 @@ namespace WeldingCommon.Sequences { Log.I($"[Arc Weld] Ramping Condition No({obj.No + 1}), Arc Length : {obj.Length}, Arc Angle : {obj.SweepAngle} " + $"(Start_A:{param.RampingStartADist}%, Dist {FirstAngle}mm {(float)param.RampingStartAPower1}% -> {(float)param.RampingStartAPower2}%) " + - $"(Start_B:{param.RampingStartDist}%, Dist {StartAngle}mm {(float)param.RampingStartPower1}% -> {(float)param.RampingStartPower3}%) " + - $"(End:{param.RampingEndDist}%, Dist {EndAngle}mm {(float)param.RampingEndPower1}% -> {(float)param.RampingEndPower3}%)"); + $"(Start_B:{param.RampingStartDist}%, Dist {StartAngle}mm {(float)param.RampingStartPower1}% -> {(float)param.RampingStartPower2}%) " + + $"(End:{param.RampingEndDist}%, Dist {EndAngle}mm {(float)param.RampingEndPower1}% -> {(float)param.RampingEndPower2}%)"); // 2.2.2.2. Rising Edge 구간 파워 및 위치 변경 @@ -1617,16 +1619,16 @@ namespace WeldingCommon.Sequences { // 2.2.4.1. Falling Edge 마지막 파워 설정 float endingPercentLaser_A1 = percentLaser1 * (float)param.RampingEndPower1 / 100 <= 100 ? percentLaser1 * (float)param.RampingEndPower1 / 100 : 100; - float endingPercentLaser_B1 = percentLaser1 * (float)param.RampingEndPower3 / 100 <= 100 ? - percentLaser1 * (float)param.RampingEndPower3 / 100 : 100; + float endingPercentLaser_B1 = percentLaser1 * (float)param.RampingEndPower2 / 100 <= 100 ? + percentLaser1 * (float)param.RampingEndPower2 / 100 : 100; float fallingEdgePercentLaser1 = 0; float endingPercentLaser_A2 = percentLaser2 * (float)param.RampingEndPower1 / 100 <= 100 ? percentLaser2 * (float)param.RampingEndPower1 / 100 : 100; - float endingPercentLaser_B2 = percentLaser2 * (float)param.RampingEndPower3 / 100 <= 100 ? - percentLaser2 * (float)param.RampingEndPower3 / 100 : 100; + float endingPercentLaser_B2 = percentLaser2 * (float)param.RampingEndPower2 / 100 <= 100 ? + percentLaser2 * (float)param.RampingEndPower2 / 100 : 100; float fallingEdgePercentLaser2 = 0; @@ -1686,7 +1688,7 @@ namespace WeldingCommon.Sequences { float percentLaser2 = 0; SetScannerProcessCondition(param, out percentLaser1, out percentLaser2); - Log.I(string.Format($"[Arc3P Weld] Weld Condition(No:{param.No + 1}) Setting(LaserOnDelay:{param.LaserOnDelay},LaserOffDelay:{param.LaserOffDelay},JumpDelay:{param.JumpDelay},MarkDelay:{param.MarkDelay},PolygonDelay:{param.PolygonDelay},Power:{param.LaserPower1},JumpSpeed:{param.JumpSpeed},MarkSpeed:{param.MarkSpeed})")); + Log.I(string.Format($"[Arc3P Weld] Weld Condition(No:{param.No + 1}) Setting(LaserOnDelay:{param.LaserOnDelay},LaserOffDelay:{param.LaserOffDelay},JumpDelay:{param.JumpDelay},MarkDelay:{param.MarkDelay},PolygonDelay:{param.PolygonDelay},CorePower:{param.LaserPower1},RingPower:{param.LaserPower2},JumpSpeed:{param.JumpSpeed},MarkSpeed:{param.MarkSpeed})")); //CSV Laser Log 추가 laserLog.Date = DateTime.Now; @@ -1697,7 +1699,8 @@ namespace WeldingCommon.Sequences { laserLog.JumpDelay = param.JumpDelay; laserLog.MarkDelay = param.MarkDelay; laserLog.PolygonDelay = param.PolygonDelay; - laserLog.Power = param.LaserPower1; + laserLog.PowerCore = param.LaserPower1; + laserLog.PowerRing = param.LaserPower2; laserLog.JumpSpeed = param.JumpSpeed; laserLog.MarkSpeed = param.MarkSpeed; @@ -1844,13 +1847,13 @@ namespace WeldingCommon.Sequences { float startingPercentLaser_A1 = percentLaser1 * (float)param.RampingStartPower1 / 100 <= 100 ? percentLaser1 * (float)param.RampingStartPower1 / 100 : 100; - float startingPercentLaser_B1 = percentLaser1 * (float)param.RampingStartPower3 / 100 <= 100 ? - percentLaser1 * (float)param.RampingStartPower3 / 100 : 100; + float startingPercentLaser_B1 = percentLaser1 * (float)param.RampingStartPower2 / 100 <= 100 ? + percentLaser1 * (float)param.RampingStartPower2 / 100 : 100; float startingPercentLaser_A2 = percentLaser2 * (float)param.RampingStartPower1 / 100 <= 100 ? percentLaser2 * (float)param.RampingStartPower1 / 100 : 100; - float startingPercentLaser_B2 = percentLaser2 * (float)param.RampingStartPower3 / 100 <= 100 ? - percentLaser2 * (float)param.RampingStartPower3 / 100 : 100; + float startingPercentLaser_B2 = percentLaser2 * (float)param.RampingStartPower2 / 100 <= 100 ? + percentLaser2 * (float)param.RampingStartPower2 / 100 : 100; float risingEdgePercentLaser1 = 0; @@ -1858,8 +1861,8 @@ namespace WeldingCommon.Sequences { Log.I($"[Arc3P Weld] Ramping Condition No({obj.No + 1}), Arc Angle : {obj.SweepAngle} " + $"(Start_A:{param.RampingStartADist}%, Dist {FirstAngle}mm {(float)param.RampingStartAPower1}% -> {(float)param.RampingStartAPower2}%) " + - $"(Start_B:{param.RampingStartDist}%, Dist {StartAngle}mm {(float)param.RampingStartPower1}% -> {(float)param.RampingStartPower3}%) " + - $"(End:{param.RampingEndDist}%, Dist {EndAngle}mm {(float)param.RampingEndPower1}% -> {(float)param.RampingEndPower3}%)"); + $"(Start_B:{param.RampingStartDist}%, Dist {StartAngle}mm {(float)param.RampingStartPower1}% -> {(float)param.RampingStartPower2}%) " + + $"(End:{param.RampingEndDist}%, Dist {EndAngle}mm {(float)param.RampingEndPower1}% -> {(float)param.RampingEndPower2}%)"); // 2.2.2.2. Rising Edge 구간 파워 및 위치 변경 @@ -1889,15 +1892,15 @@ namespace WeldingCommon.Sequences { // 2.2.4.1. Falling Edge 마지막 파워 설정 float endingPercentLaser_A1 = percentLaser1 * (float)param.RampingEndPower1 / 100 <= 100 ? percentLaser1 * (float)param.RampingEndPower1 / 100 : 100; - float endingPercentLaser_B1 = percentLaser1 * (float)param.RampingEndPower3 / 100 <= 100 ? - percentLaser1 * (float)param.RampingEndPower3 / 100 : 100; + float endingPercentLaser_B1 = percentLaser1 * (float)param.RampingEndPower2 / 100 <= 100 ? + percentLaser1 * (float)param.RampingEndPower2 / 100 : 100; float fallingEdgePercentLaser1 = 0; float endingPercentLaser_A2 = percentLaser2 * (float)param.RampingEndPower1 / 100 <= 100 ? percentLaser2 * (float)param.RampingEndPower1 / 100 : 100; - float endingPercentLaser_B2 = percentLaser2 * (float)param.RampingEndPower3 / 100 <= 100 ? - percentLaser2 * (float)param.RampingEndPower3 / 100 : 100; + float endingPercentLaser_B2 = percentLaser2 * (float)param.RampingEndPower2 / 100 <= 100 ? + percentLaser2 * (float)param.RampingEndPower2 / 100 : 100; float fallingEdgePercentLaser2 = 0; @@ -1955,7 +1958,7 @@ namespace WeldingCommon.Sequences { float percentLaser2 = 0; SetScannerProcessCondition(param, out percentLaser1, out percentLaser2); - Log.I(string.Format($"[Zigzag Weld] Weld Condition(No:{param.No + 1}) Setting(LaserOnDelay:{param.LaserOnDelay},LaserOffDelay:{param.LaserOffDelay},JumpDelay:{param.JumpDelay},MarkDelay:{param.MarkDelay},PolygonDelay:{param.PolygonDelay},Power:{param.LaserPower1},JumpSpeed:{param.JumpSpeed},MarkSpeed:{param.MarkSpeed})")); + Log.I(string.Format($"[Zigzag Weld] Weld Condition(No:{param.No + 1}) Setting(LaserOnDelay:{param.LaserOnDelay},LaserOffDelay:{param.LaserOffDelay},JumpDelay:{param.JumpDelay},MarkDelay:{param.MarkDelay},PolygonDelay:{param.PolygonDelay},CorePower:{param.LaserPower1},RingPower:{param.LaserPower2},JumpSpeed:{param.JumpSpeed},MarkSpeed:{param.MarkSpeed})")); // 1. 시작 위치로 점프 if (Math.Abs(_LastX - obj.PF1.X - xOffset) < 0.01 && Math.Abs(_LastY - obj.PF1.Y - yOffset) < 0.01) { @@ -2105,7 +2108,7 @@ namespace WeldingCommon.Sequences { // A -> Start Power, B -> End Power float startingPercentLaser_A1 = Math.Min(percentLaser1 * (float)param.RampingStartPower1 / 100, 100); - float startingPercentLaser_B1 = Math.Min(percentLaser1 * (float)param.RampingStartPower3 / 100, 100); + float startingPercentLaser_B1 = Math.Min(percentLaser1 * (float)param.RampingStartPower2 / 100, 100); // 2170은 Power를 사용하지 않는다. float startingPercentLaser2 = 0; // Math.Min(percentLaser2 * (float)param.RampingStartPower2 / 100, 100); @@ -2247,7 +2250,7 @@ namespace WeldingCommon.Sequences { int endRampStep = 0; // A -> Start Power, B -> End Power float endingPercentLaser_A1 = Math.Min(percentLaser1 * (float)param.RampingEndPower1 / 100, 100); - float endingPercentLaser_B1 = Math.Min(percentLaser1 * (float)param.RampingEndPower3 / 100, 100); + float endingPercentLaser_B1 = Math.Min(percentLaser1 * (float)param.RampingEndPower2 / 100, 100); // 2170은 Power를 사용하지 않는다. float endingPercentLaser2 = 0; // Math.Min(percentLaser2 * (float)param.RampingEndPower2 / 100, 100); diff --git a/WeldingComponents/WeldingCommon/Settings/SystemParameter.cs b/WeldingComponents/WeldingCommon/Settings/SystemParameter.cs index f05522b..5c83403 100644 --- a/WeldingComponents/WeldingCommon/Settings/SystemParameter.cs +++ b/WeldingComponents/WeldingCommon/Settings/SystemParameter.cs @@ -479,6 +479,12 @@ namespace WeldingCommon.Settings [DisplayName("CellCenterOffsetY")] public double CellPosMeasureCenterOffsetY { get; set; } = 0; + // 260227 Laser 개조 후 파라미터 추가 + [Browsable(true)] + [ReadOnly(false)] + [Category("RMS")] + [DisplayName("Use RingPower RMS")] + public bool UseRingPowerRMS { get; set; } = false; } public class ILSOSSizeF {