테스트중

INT_LKD_PTB6_DW/Controls/ControlMainDisplay.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     partial class ControlMainDisplay
     {

INT_LKD_PTB6_DW/Controls/ControlMainDisplay.cs

@@ -8,10 +8,10 @@ using System.Data;
 using System.Text;
 using System.Windows.Forms;
 
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
 
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     public partial class ControlMainDisplay : UserControl
     {
@@ -101,43 +101,43 @@ namespace INT_LKD_PTB.Controls
         }
         
         // Judgment
-        public void UpdateStartLeakDataDisplay1(LeakData1 data)
+        public void UpdateStartLeakDataDisplay1(LeakData data)
         {
             this.CollectionChildControl[0].UpdateStartLeakDataDisplay(data.DiffData, data.DispData, data.Judgment);        
         }
-        public void UpdateStartLeakDataDisplay2(LeakData1 data)
+        public void UpdateStartLeakDataDisplay2(LeakData data)
         {
             this.CollectionChildControl[1].UpdateStartLeakDataDisplay(data.DiffData, data.DispData, data.Judgment);
         }
-        public void UpdateStartLeakDataDisplay3(LeakData1 data)
+        public void UpdateStartLeakDataDisplay3(LeakData data)
         {
             this.CollectionChildControl[2].UpdateStartLeakDataDisplay(data.DiffData, data.DispData, data.Judgment);
         }
-        public void UpdateStartLeakDataDisplay4(LeakData1 data)
+        public void UpdateStartLeakDataDisplay4(LeakData data)
         {
             this.CollectionChildControl[3].UpdateStartLeakDataDisplay(data.DiffData, data.DispData, data.Judgment);
         }
-        public void UpdateStartLeakDataDisplay5(LeakData1 data)
+        public void UpdateStartLeakDataDisplay5(LeakData data)
         {
             this.CollectionChildControl[4].UpdateStartLeakDataDisplay(data.DiffData, data.DispData, data.Judgment);
         }
-        public void UpdateStartLeakDataDisplay6(LeakData1 data)
+        public void UpdateStartLeakDataDisplay6(LeakData data)
         {
             this.CollectionChildControl[5].UpdateStartLeakDataDisplay(data.DiffData, data.DispData, data.Judgment);
         }
-        public void UpdateStartLeakDataDisplay7(LeakData1 data)
+        public void UpdateStartLeakDataDisplay7(LeakData data)
         {
             this.CollectionChildControl[6].UpdateStartLeakDataDisplay(data.DiffData, data.DispData, data.Judgment);
         }
-        public void UpdateStartLeakDataDisplay8(LeakData1 data)
+        public void UpdateStartLeakDataDisplay8(LeakData data)
         {
             this.CollectionChildControl[7].UpdateStartLeakDataDisplay(data.DiffData, data.DispData, data.Judgment);
         }
-        public void UpdateStartLeakDataDisplay9(LeakData1 data)
+        public void UpdateStartLeakDataDisplay9(LeakData data)
         {
             this.CollectionChildControl[8].UpdateStartLeakDataDisplay(data.DiffData, data.DispData, data.Judgment);
         }
-        public void UpdateStartLeakDataDisplay10(LeakData1 data)
+        public void UpdateStartLeakDataDisplay10(LeakData data)
         {
             this.CollectionChildControl[9].UpdateStartLeakDataDisplay(data.DiffData, data.DispData, data.Judgment);
         }

INT_LKD_PTB6_DW/Controls/ControlMainDisplayDotGraph.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     partial class ControlMainDisplayDotGraph
     {

INT_LKD_PTB6_DW/Controls/ControlMainDisplayDotGraph.cs

@@ -8,10 +8,10 @@ using System.Text;
 using System.Windows.Forms;
 
 using SmartX;
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
 
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     public partial class ControlMainDisplayDotGraph : UserControl
     {

INT_LKD_PTB6_DW/Controls/Log/ControlMenuLogAlarm.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     partial class ControlMenuLogAlarm
     {

INT_LKD_PTB6_DW/Controls/Log/ControlMenuLogAlarm.cs

@@ -9,11 +9,11 @@ using System.Windows.Forms;
 using System.IO;
 using System.Collections.ObjectModel;
 
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
-using INT_LKD_PTB.DialogForms;
+using INT_LKD_PTB6_DW.DialogForms;
 
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     public partial class ControlMenuLogAlarm : UserControl
     {

INT_LKD_PTB6_DW/Controls/Log/ControlMenuLogHistory.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     partial class ControlMenuLogHistory
     {

INT_LKD_PTB6_DW/Controls/Log/ControlMenuLogHistory.cs

@@ -10,11 +10,11 @@ using System.Collections.ObjectModel;
 using System.IO;
 
 using SmartX;
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
-using INT_LKD_PTB.DialogForms;
+using INT_LKD_PTB6_DW.DialogForms;
 
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     public partial class ControlMenuLogHistory : UserControl
     {

INT_LKD_PTB6_DW/Controls/Log/ControlMenuLogInspection.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     partial class ControlMenuLogInspection
     {

INT_LKD_PTB6_DW/Controls/Log/ControlMenuLogInspection.cs

@@ -10,11 +10,11 @@ using System.Windows.Forms;
 using System.IO;
 
 using SmartX;
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
-using INT_LKD_PTB.DialogForms;
+using INT_LKD_PTB6_DW.DialogForms;
 
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     public partial class ControlMenuLogInspection : UserControl
     {

INT_LKD_PTB6_DW/Controls/MainDisplay/ControlMainDisplay_1.cs

@@ -9,10 +9,10 @@ using System.Text;
 using System.Windows.Forms;
 
 using SmartX;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
 
-namespace INT_LKD_PTB.Controls.MainDisplay
+namespace INT_LKD_PTB6_DW.Controls.MainDisplay
 {
     public partial class ControlMainDisplay_1 : UserControl
     {
@@ -74,6 +74,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             this.ColorResultNG = Color.FromArgb(255, 128, 128);
             this.ColorResultNone = Color.FromArgb(224, 224, 224);
 
+            this.labelInspectionReady.BackGroundColor = this.ColorResultNG;
         }
         private void Initialize()
         {
@@ -187,7 +188,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
                     value = "PASS";
                     c = this.ColorResultPass;
                     break;
-                case Define.E_JudgmentStatus.Ng:
+                case Define.E_JudgmentStatus.Leak:
                     value = "LEAK";
                     c = this.ColorResultNG;
                     break;
@@ -220,7 +221,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
                 case Define.E_JudgmentStatus.Pass:
                     c = this.ColorResultPass;
                     break;
-                case Define.E_JudgmentStatus.Ng:
+                case Define.E_JudgmentStatus.Leak:
                     c = this.ColorResultNG;
                     break;
                 case Define.E_JudgmentStatus.Empty:
@@ -248,7 +249,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
                 case Define.E_JudgmentStatus.Pass:
                     c = this.ColorResultPass;
                     break;
-                case Define.E_JudgmentStatus.Ng:
+                case Define.E_JudgmentStatus.Leak:
                     c = this.ColorResultNG;
                     break;
                 case Define.E_JudgmentStatus.Empty:
@@ -286,6 +287,15 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             }
         }
 
+        // Inspection Ready 상태
+        public void UpdateDisplayInspectionReadStatus(SystemStatus status)
+        {
+            if (status.InspectionReady == false)
+                this.labelInspectionReady.BackGroundColor = this.ColorResultNG;
+            else
+                this.labelInspectionReady.BackGroundColor = this.ColorResultPass;
+        }
+
         // 진행상태 데이터
         private void ProcessStatusStep1(Define.E_ProcessStatus status)
         {
@@ -503,6 +513,10 @@ namespace INT_LKD_PTB.Controls.MainDisplay
                 case Define.E_ProcessStatus._3_MoveToLeak:
                     break;
                 case Define.E_ProcessStatus._4_MoveToCheck:
+                    break;
+                case Define.E_ProcessStatus._5_ChamberMerge:
+                    break;
+                case Define.E_ProcessStatus._6_VacuumStart:
                     this.InitializeData();
                     this.SetLabelResultDiff(this.labelResultDiff1, Define.E_JudgmentStatus.None);
                     this.SetLabelResultDiff(this.labelResultDiff2, Define.E_JudgmentStatus.None);
@@ -517,10 +531,6 @@ namespace INT_LKD_PTB.Controls.MainDisplay
                     this.SetLabelResultDisp(this.labelResultDisp5, Define.E_JudgmentStatus.None);
                     this.SetLabelResultDisp(this.labelResultDisp6, Define.E_JudgmentStatus.None);
                     break;
-                case Define.E_ProcessStatus._5_ChamberMerge:
-                    break;
-                case Define.E_ProcessStatus._6_VacuumStart:
-                    break;
                 case Define.E_ProcessStatus._7_VacuumHold:
                     break;
                 case Define.E_ProcessStatus._8_Judgment:
@@ -544,7 +554,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
         }
 
         // 차압센서 데이터
-        private void UpdateDisplayDiffdata(SmartLabel labelSec, SmartLabel labelJudg, LeakData1 data)
+        private void UpdateDisplayDiffdata(SmartLabel labelSec, SmartLabel labelJudg, LeakData data)
         {
             string value = "";
 
@@ -556,7 +566,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             if (labelJudg.Text != value)
                 labelJudg.Text = value;
         }
-        public void UpdateDisplayDiffData(Collection<LeakData1> datas)
+        public void UpdateDisplayDiffData(Collection<LeakData> datas)
         {
             this.UpdateDisplayDiffData1(datas[0]);
             this.UpdateDisplayDiffData2(datas[1]);
@@ -565,33 +575,33 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             this.UpdateDisplayDiffData5(datas[4]);
             this.UpdateDisplayDiffData6(datas[5]);
         }
-        private void UpdateDisplayDiffData1(LeakData1 data)
+        private void UpdateDisplayDiffData1(LeakData data)
         {
             this.UpdateDisplayDiffdata(this.CollLabelLrSec[0], this.CollLabelLrJudg[0], data);
         }
-        private void UpdateDisplayDiffData2(LeakData1 data)
+        private void UpdateDisplayDiffData2(LeakData data)
         {
             this.UpdateDisplayDiffdata(this.CollLabelLrSec[1], this.CollLabelLrJudg[1], data);
         }
-        private void UpdateDisplayDiffData3(LeakData1 data)
+        private void UpdateDisplayDiffData3(LeakData data)
         {
             this.UpdateDisplayDiffdata(this.CollLabelLrSec[2], this.CollLabelLrJudg[2], data);
         }
-        private void UpdateDisplayDiffData4(LeakData1 data)
+        private void UpdateDisplayDiffData4(LeakData data)
         {
             this.UpdateDisplayDiffdata(this.CollLabelLrSec[3], this.CollLabelLrJudg[3], data);
         }
-        private void UpdateDisplayDiffData5(LeakData1 data)
+        private void UpdateDisplayDiffData5(LeakData data)
         {
             this.UpdateDisplayDiffdata(this.CollLabelLrSec[4], this.CollLabelLrJudg[4], data);
         }
-        private void UpdateDisplayDiffData6(LeakData1 data)
+        private void UpdateDisplayDiffData6(LeakData data)
         {
             this.UpdateDisplayDiffdata(this.CollLabelLrSec[5], this.CollLabelLrJudg[5], data);
         }
 
         // 변위센서 데이터
-        private void UpdateDisplayDispData(SmartLabel labelHeight, SmartLabel labelDiff, LeakData1 data)
+        private void UpdateDisplayDispData(SmartLabel labelHeight, SmartLabel labelDiff, LeakData data)
         {
             string value = "";
 
@@ -603,7 +613,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             if (labelDiff.Text != value)
                 labelDiff.Text = value;
         }
-        public void UpdateDisplayDispData(Collection<LeakData1> datas)
+        public void UpdateDisplayDispData(Collection<LeakData> datas)
         {
             this.UpdateDisplayDispData1(datas[0]);
             this.UpdateDisplayDispData2(datas[1]);
@@ -612,33 +622,33 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             this.UpdateDisplayDispData5(datas[4]);
             this.UpdateDisplayDispData6(datas[5]);
         }
-        private void UpdateDisplayDispData1(LeakData1 data)
+        private void UpdateDisplayDispData1(LeakData data)
         {
             this.UpdateDisplayDispData(this.CollLabelDispHeight[0], this.CollLabelDispDiff[0], data);
         }
-        private void UpdateDisplayDispData2(LeakData1 data)
+        private void UpdateDisplayDispData2(LeakData data)
         {
             this.UpdateDisplayDispData(this.CollLabelDispHeight[1], this.CollLabelDispDiff[1], data);
         }
-        private void UpdateDisplayDispData3(LeakData1 data)
+        private void UpdateDisplayDispData3(LeakData data)
         {
             this.UpdateDisplayDispData(this.CollLabelDispHeight[2], this.CollLabelDispDiff[2], data);
         }
-        private void UpdateDisplayDispData4(LeakData1 data)
+        private void UpdateDisplayDispData4(LeakData data)
         {
             this.UpdateDisplayDispData(this.CollLabelDispHeight[3], this.CollLabelDispDiff[3], data);
         }
-        private void UpdateDisplayDispData5(LeakData1 data)
+        private void UpdateDisplayDispData5(LeakData data)
         {
             this.UpdateDisplayDispData(this.CollLabelDispHeight[4], this.CollLabelDispDiff[4], data);
         }
-        private void UpdateDisplayDispData6(LeakData1 data)
+        private void UpdateDisplayDispData6(LeakData data)
         {
             this.UpdateDisplayDispData(this.CollLabelDispHeight[5], this.CollLabelDispDiff[5], data);
         }
 
         // 압력센서 데이터
-        private void UpdateDisplayPresData(SmartLabel labelMaster, SmartLabel labelWork, LeakData1 data)
+        private void UpdateDisplayPresData(SmartLabel labelMaster, SmartLabel labelWork, LeakData data)
         {
             string value = "";
 
@@ -650,7 +660,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             if (labelWork.Text != value)
                 labelWork.Text = value;
         }
-        public void UpdateDisplayPresData(Collection<LeakData1> datas)
+        public void UpdateDisplayPresData(Collection<LeakData> datas)
         {
             this.UpdateDisplayPresData1(datas[0]);
             this.UpdateDisplayPresData2(datas[1]);
@@ -659,33 +669,33 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             this.UpdateDisplayPresData5(datas[4]);
             this.UpdateDisplayPresData6(datas[5]);
         }
-        private void UpdateDisplayPresData1(LeakData1 data)
+        private void UpdateDisplayPresData1(LeakData data)
         {
             this.UpdateDisplayPresData(this.CollLabelMaster[0], this.CollLabelWork[0], data);
         }
-        private void UpdateDisplayPresData2(LeakData1 data)
+        private void UpdateDisplayPresData2(LeakData data)
         {
             this.UpdateDisplayPresData(this.CollLabelMaster[1], this.CollLabelWork[1], data);
         }
-        private void UpdateDisplayPresData3(LeakData1 data)
+        private void UpdateDisplayPresData3(LeakData data)
         {
             this.UpdateDisplayPresData(this.CollLabelMaster[2], this.CollLabelWork[2], data);
         }
-        private void UpdateDisplayPresData4(LeakData1 data)
+        private void UpdateDisplayPresData4(LeakData data)
         {
             this.UpdateDisplayPresData(this.CollLabelMaster[3], this.CollLabelWork[3], data);
         }
-        private void UpdateDisplayPresData5(LeakData1 data)
+        private void UpdateDisplayPresData5(LeakData data)
         {
             this.UpdateDisplayPresData(this.CollLabelMaster[4], this.CollLabelWork[4], data);
         }
-        private void UpdateDisplayPresData6(LeakData1 data)
+        private void UpdateDisplayPresData6(LeakData data)
         {
             this.UpdateDisplayPresData(this.CollLabelMaster[5], this.CollLabelWork[5], data);
         }
 
         // 판정결과
-        public void UpdateDisplayJudgmentData(Collection<LeakData1> datas)
+        public void UpdateDisplayJudgmentData(Collection<LeakData> datas)
         {
             this.UpdateDisplayJudgmentData1(datas[0]);
             this.UpdateDisplayJudgmentData2(datas[1]);
@@ -697,37 +707,37 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             // TrackingInspectionData
             this.ParentForm.ParentForm.TrackingInspectionData(datas);
         }
-        private void UpdateDisplayJudgmentData1(LeakData1 data)
+        private void UpdateDisplayJudgmentData1(LeakData data)
         {
             this.SetLabelResult(this.labelResultProcess1, data.Judgment.Result);
             this.SetLabelResultDiff(this.labelResultDiff1, data.Judgment.DIFF_Result);
             this.SetLabelResultDisp(this.labelResultDisp1, data.Judgment.DISP_Result);
         }
-        private void UpdateDisplayJudgmentData2(LeakData1 data)
+        private void UpdateDisplayJudgmentData2(LeakData data)
         {
             this.SetLabelResult(this.labelResultProcess2, data.Judgment.Result);
             this.SetLabelResultDiff(this.labelResultDiff2, data.Judgment.DIFF_Result);
             this.SetLabelResultDisp(this.labelResultDisp2, data.Judgment.DISP_Result);
         }
-        private void UpdateDisplayJudgmentData3(LeakData1 data)
+        private void UpdateDisplayJudgmentData3(LeakData data)
         {
             this.SetLabelResult(this.labelResultProcess3, data.Judgment.Result);
             this.SetLabelResultDiff(this.labelResultDiff3, data.Judgment.DIFF_Result);
             this.SetLabelResultDisp(this.labelResultDisp3, data.Judgment.DISP_Result);
         }
-        private void UpdateDisplayJudgmentData4(LeakData1 data)
+        private void UpdateDisplayJudgmentData4(LeakData data)
         {
             this.SetLabelResult(this.labelResultProcess4, data.Judgment.Result);
             this.SetLabelResultDiff(this.labelResultDiff4, data.Judgment.DIFF_Result);
             this.SetLabelResultDisp(this.labelResultDisp4, data.Judgment.DISP_Result);
         }
-        private void UpdateDisplayJudgmentData5(LeakData1 data)
+        private void UpdateDisplayJudgmentData5(LeakData data)
         {
             this.SetLabelResult(this.labelResultProcess5, data.Judgment.Result);
             this.SetLabelResultDiff(this.labelResultDiff5, data.Judgment.DIFF_Result);
             this.SetLabelResultDisp(this.labelResultDisp5, data.Judgment.DISP_Result);
         }
-        private void UpdateDisplayJudgmentData6(LeakData1 data)
+        private void UpdateDisplayJudgmentData6(LeakData data)
         {
             this.SetLabelResult(this.labelResultProcess6, data.Judgment.Result);
             this.SetLabelResultDiff(this.labelResultDiff6, data.Judgment.DIFF_Result);

INT_LKD_PTB6_DW/Controls/MainDisplay/ControlMainDisplay_2.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Controls.MainDisplay
+namespace INT_LKD_PTB6_DW.Controls.MainDisplay
 {
     partial class ControlMainDisplay_2
     {

INT_LKD_PTB6_DW/Controls/MainDisplay/ControlMainDisplay_2.cs

@@ -9,10 +9,10 @@ using System.Text;
 using System.Windows.Forms;
 
 using SmartX;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
 
-namespace INT_LKD_PTB.Controls.MainDisplay
+namespace INT_LKD_PTB6_DW.Controls.MainDisplay
 {
     public partial class ControlMainDisplay_2 : UserControl
     {
@@ -203,7 +203,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
                     label2.TextColor = Define.ColorTextResultPass;
                     label2.Font = new Font("New Gulim", 20, FontStyle.Bold);
                     break;
-                case Define.E_JudgmentStatus.Ng:
+                case Define.E_JudgmentStatus.Leak:
                     switch (this.ParentForm.ParentForm.SystemConfig.LANGUAGE)
                     {
                         case Define.E_LanguageID.Chinese:
@@ -259,7 +259,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
                 case Define.E_JudgmentStatus.Pass:
                     label.TextColor = Define.ColorTextResultPass;
                     break;
-                case Define.E_JudgmentStatus.Ng:
+                case Define.E_JudgmentStatus.Leak:
                     label.TextColor = Define.ColorTextResultNG;
                     break;
                 case Define.E_JudgmentStatus.Empty:
@@ -282,7 +282,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
                 case Define.E_JudgmentStatus.Pass:
                     label.TextColor = Define.ColorTextResultPass;
                     break;
-                case Define.E_JudgmentStatus.Ng:
+                case Define.E_JudgmentStatus.Leak:
                     label.TextColor = Define.ColorTextResultNG;
                     break;
                 case Define.E_JudgmentStatus.Empty:
@@ -395,7 +395,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
         }
 
         // 차압센서 데이터
-        public void UpdateDisplayDiffData(Collection<LeakData1> datas)
+        public void UpdateDisplayDiffData(Collection<LeakData> datas)
         {
             this.UpdateDisplayDiffData1(datas[0]);
             this.UpdateDisplayDiffData2(datas[1]);
@@ -404,7 +404,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             this.UpdateDisplayDiffData5(datas[4]);
             this.UpdateDisplayDiffData6(datas[5]);
         }
-        private void UpdateDisplayDiffData1(LeakData1 data)
+        private void UpdateDisplayDiffData1(LeakData data)
         {
             string value = "";
 
@@ -420,7 +420,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             if (this.CollectionLabelLRMax[0].Text != value)
                 this.CollectionLabelLRMax[0].Text = value;
         }
-        private void UpdateDisplayDiffData2(LeakData1 data)
+        private void UpdateDisplayDiffData2(LeakData data)
         {
             string value = "";
 
@@ -436,7 +436,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             if (this.CollectionLabelLRMax[1].Text != value)
                 this.CollectionLabelLRMax[1].Text = value;
         }
-        private void UpdateDisplayDiffData3(LeakData1 data)
+        private void UpdateDisplayDiffData3(LeakData data)
         {
             string value = "";
 
@@ -452,7 +452,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             if (this.CollectionLabelLRMax[2].Text != value)
                 this.CollectionLabelLRMax[2].Text = value;
         }
-        private void UpdateDisplayDiffData4(LeakData1 data)
+        private void UpdateDisplayDiffData4(LeakData data)
         {
             string value = "";
 
@@ -468,7 +468,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             if (this.CollectionLabelLRMax[3].Text != value)
                 this.CollectionLabelLRMax[3].Text = value;
         }
-        private void UpdateDisplayDiffData5(LeakData1 data)
+        private void UpdateDisplayDiffData5(LeakData data)
         {
             string value = "";
 
@@ -484,7 +484,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             if (this.CollectionLabelLRMax[4].Text != value)
                 this.CollectionLabelLRMax[4].Text = value;
         }
-        private void UpdateDisplayDiffData6(LeakData1 data)
+        private void UpdateDisplayDiffData6(LeakData data)
         {
             string value = "";
 
@@ -502,7 +502,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
         }
 
         // 변위센서 데이터
-        public void UpdateDisplayDispData(Collection<LeakData1> datas)
+        public void UpdateDisplayDispData(Collection<LeakData> datas)
         {
             this.UpdateDisplayDispData1(datas[0]);
             this.UpdateDisplayDispData2(datas[1]);
@@ -511,7 +511,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             this.UpdateDisplayDispData5(datas[4]);
             this.UpdateDisplayDispData6(datas[5]);
         }
-        private void UpdateDisplayDispData1(LeakData1 data)
+        private void UpdateDisplayDispData1(LeakData data)
         {
             string value = "";
 
@@ -531,7 +531,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             if (this.CollectionLabelMaxHeight[0].Text != value)
                 this.CollectionLabelMaxHeight[0].Text = value;
         }
-        private void UpdateDisplayDispData2(LeakData1 data)
+        private void UpdateDisplayDispData2(LeakData data)
         {
             string value = "";
 
@@ -551,7 +551,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             if (this.CollectionLabelMaxHeight[1].Text != value)
                 this.CollectionLabelMaxHeight[1].Text = value;
         }
-        private void UpdateDisplayDispData3(LeakData1 data)
+        private void UpdateDisplayDispData3(LeakData data)
         {
             string value = "";
 
@@ -571,7 +571,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             if (this.CollectionLabelMaxHeight[2].Text != value)
                 this.CollectionLabelMaxHeight[2].Text = value;
         }
-        private void UpdateDisplayDispData4(LeakData1 data)
+        private void UpdateDisplayDispData4(LeakData data)
         {
             string value = "";
 
@@ -591,7 +591,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             if (this.CollectionLabelMaxHeight[3].Text != value)
                 this.CollectionLabelMaxHeight[3].Text = value;
         }
-        private void UpdateDisplayDispData5(LeakData1 data)
+        private void UpdateDisplayDispData5(LeakData data)
         {
             string value = "";
 
@@ -611,7 +611,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             if (this.CollectionLabelMaxHeight[4].Text != value)
                 this.CollectionLabelMaxHeight[4].Text = value;
         }
-        private void UpdateDisplayDispData6(LeakData1 data)
+        private void UpdateDisplayDispData6(LeakData data)
         {
             string value = "";
 
@@ -633,7 +633,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
         }
 
         // 압력센서 데이터
-        public void UpdateDisplayPresData(Collection<LeakData1> datas)
+        public void UpdateDisplayPresData(Collection<LeakData> datas)
         {
             this.UpdateDisplayPresData1(datas[0]);
             this.UpdateDisplayPresData2(datas[1]);
@@ -642,7 +642,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             this.UpdateDisplayPresData5(datas[4]);
             this.UpdateDisplayPresData6(datas[5]);
         }
-        private void UpdateDisplayPresData1(LeakData1 data)
+        private void UpdateDisplayPresData1(LeakData data)
         {
             string value = "";
 
@@ -654,7 +654,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             if (this.CollectionPressureMaster[0].Text != value)
                 this.CollectionPressureMaster[0].Text = value;
         }
-        private void UpdateDisplayPresData2(LeakData1 data)
+        private void UpdateDisplayPresData2(LeakData data)
         {
             string value = "";
 
@@ -666,7 +666,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             if (this.CollectionPressureMaster[1].Text != value)
                 this.CollectionPressureMaster[1].Text = value;
         }
-        private void UpdateDisplayPresData3(LeakData1 data)
+        private void UpdateDisplayPresData3(LeakData data)
         {
             string value = "";
 
@@ -678,7 +678,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             if (this.CollectionPressureMaster[2].Text != value)
                 this.CollectionPressureMaster[2].Text = value;
         }
-        private void UpdateDisplayPresData4(LeakData1 data)
+        private void UpdateDisplayPresData4(LeakData data)
         {
             string value = "";
 
@@ -690,7 +690,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             if (this.CollectionPressureMaster[3].Text != value)
                 this.CollectionPressureMaster[3].Text = value;
         }
-        private void UpdateDisplayPresData5(LeakData1 data)
+        private void UpdateDisplayPresData5(LeakData data)
         {
             string value = "";
 
@@ -702,7 +702,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             if (this.CollectionPressureMaster[4].Text != value)
                 this.CollectionPressureMaster[4].Text = value;
         }
-        private void UpdateDisplayPresData6(LeakData1 data)
+        private void UpdateDisplayPresData6(LeakData data)
         {
             string value = "";
 
@@ -716,7 +716,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
         }
 
         // 판정결과
-        public void UpdateDisplayJudgmentData(Collection<LeakData1> datas)
+        public void UpdateDisplayJudgmentData(Collection<LeakData> datas)
         {
             this.UpdateDisplayJudgmentData1(datas[0]);
             this.UpdateDisplayJudgmentData2(datas[1]);
@@ -725,7 +725,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
             this.UpdateDisplayJudgmentData5(datas[4]);
             this.UpdateDisplayJudgmentData6(datas[5]);
         }
-        private void UpdateDisplayJudgmentData1(LeakData1 data)
+        private void UpdateDisplayJudgmentData1(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.CollectionLabelResult[0]);
 
@@ -740,7 +740,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
                 this.GetJudgmentResultDisp(data.Judgment.DISP_Result, this.CollectionLabelResultDisp[0]);
             }
         }
-        private void UpdateDisplayJudgmentData2(LeakData1 data)
+        private void UpdateDisplayJudgmentData2(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.CollectionLabelResult[1]);
 
@@ -755,7 +755,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
                 this.GetJudgmentResultDisp(data.Judgment.DISP_Result, this.CollectionLabelResultDisp[1]);
             }
         }
-        private void UpdateDisplayJudgmentData3(LeakData1 data)
+        private void UpdateDisplayJudgmentData3(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.CollectionLabelResult[2]);
 
@@ -770,7 +770,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
                 this.GetJudgmentResultDisp(data.Judgment.DISP_Result, this.CollectionLabelResultDisp[2]);
             }
         }
-        private void UpdateDisplayJudgmentData4(LeakData1 data)
+        private void UpdateDisplayJudgmentData4(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.CollectionLabelResult[3]);
 
@@ -785,7 +785,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
                 this.GetJudgmentResultDisp(data.Judgment.DISP_Result, this.CollectionLabelResultDisp[3]);
             }
         }
-        private void UpdateDisplayJudgmentData5(LeakData1 data)
+        private void UpdateDisplayJudgmentData5(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.CollectionLabelResult[4]);
 
@@ -800,7 +800,7 @@ namespace INT_LKD_PTB.Controls.MainDisplay
                 this.GetJudgmentResultDisp(data.Judgment.DISP_Result, this.CollectionLabelResultDisp[4]);
             }
         }
-        private void UpdateDisplayJudgmentData6(LeakData1 data)
+        private void UpdateDisplayJudgmentData6(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.CollectionLabelResult[5]);
 

INT_LKD_PTB6_DW/Controls/MainDisplay/ControlMainDisplay_3.cs

@@ -0,0 +1,421 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+
+using SmartX;
+using INT_LKD_PTB6_DW.DataStore;
+using INT_LKD_PTB6_DW.Forms;
+
+namespace INT_LKD_PTB6_DW.Controls.MainDisplay
+{
+    public partial class ControlMainDisplay_3 : UserControl
+    {
+        #region Field
+        private FormMainDisplay m_ParentForm;
+
+        private Collection<SmartListBox> m_ColListBox;
+        private Collection<SmartLabel> m_ColPassCNT;
+        private Collection<SmartLabel> m_ColLeakCNT;
+        #endregion
+
+        #region Constructor
+        public ControlMainDisplay_3(FormMainDisplay parent)
+        {
+            InitializeComponent();
+
+            this.ParentForm = parent;
+
+            this.Initialize();
+            this.InitializeListBox();
+        } 
+        #endregion
+
+        #region Property
+        public FormMainDisplay ParentForm
+        {
+            get { return this.m_ParentForm; }
+            set { this.m_ParentForm = value; }
+        }
+
+        public Collection<SmartListBox> ColListBox
+        {
+            get { return this.m_ColListBox; }
+            set { this.m_ColListBox = value; }
+        }
+        public Collection<SmartLabel> ColPassCNT
+        {
+            get { return this.m_ColPassCNT; }
+            set { this.m_ColPassCNT = value; }
+        }
+        public Collection<SmartLabel> ColLeakCNT
+        {
+            get { return this.m_ColLeakCNT; }
+            set { this.m_ColLeakCNT = value; }
+        }
+        #endregion
+
+        #region Method
+        private void Initialize()
+        {
+            this.ColListBox = new Collection<SmartListBox>();
+            this.ColListBox.Add(this.listBoxTime);
+            this.ColListBox.Add(this.listBoxLane1);
+            this.ColListBox.Add(this.listBoxLane2);
+            this.ColListBox.Add(this.listBoxLane3);
+            this.ColListBox.Add(this.listBoxLane4);
+            this.ColListBox.Add(this.listBoxLane5);
+            this.ColListBox.Add(this.listBoxLane6);
+
+            this.ColPassCNT = new Collection<SmartLabel>();
+            this.ColPassCNT.Add(this.labelPassCNT1);
+            this.ColPassCNT.Add(this.labelPassCNT2);
+            this.ColPassCNT.Add(this.labelPassCNT3);
+            this.ColPassCNT.Add(this.labelPassCNT4);
+            this.ColPassCNT.Add(this.labelPassCNT5);
+            this.ColPassCNT.Add(this.labelPassCNT6);
+
+            this.ColLeakCNT = new Collection<SmartLabel>();
+            this.ColLeakCNT.Add(this.labelLeakCNT1);
+            this.ColLeakCNT.Add(this.labelLeakCNT2);
+            this.ColLeakCNT.Add(this.labelLeakCNT3);
+            this.ColLeakCNT.Add(this.labelLeakCNT4);
+            this.ColLeakCNT.Add(this.labelLeakCNT5);
+            this.ColLeakCNT.Add(this.labelLeakCNT6);
+
+            this.Clear();
+        }
+        private void InitializeListBox()
+        {
+            // ListBox Time
+            // Columns Style
+            SmartListBox.COLUMNSTYLE[] timeStyle = new SmartListBox.COLUMNSTYLE[2];
+            timeStyle[0].iColumnWidth = 136;
+            timeStyle[0].eColumnAlign = SmartListBox.COLUMNALIGNS.CENTER;
+            timeStyle[0].iOffsetColumn = 0;
+            timeStyle[1].iColumnWidth = 1;
+            timeStyle[1].eColumnAlign = SmartListBox.COLUMNALIGNS.CENTER;
+            timeStyle[1].iOffsetColumn = 0;
+            this.listBoxTime.ColumnStyles = timeStyle;
+            // Set Color
+            this.listBoxTime.TextColor = Color.White;
+            this.listBoxTime.SetRowsColorAdd(Color.Red);
+            this.listBoxTime.SetRowsColorAdd(Color.Green);
+            this.listBoxTime.SetRowsColorAdd(Color.White);
+
+            // Columns Style
+            SmartListBox.COLUMNSTYLE[] laneStyle = new SmartListBox.COLUMNSTYLE[2];
+            laneStyle[0].iColumnWidth = 120;
+            laneStyle[0].eColumnAlign = SmartListBox.COLUMNALIGNS.CENTER;
+            laneStyle[0].iOffsetColumn = 0;
+            laneStyle[1].iColumnWidth = 1;
+            laneStyle[1].eColumnAlign = SmartListBox.COLUMNALIGNS.CENTER;
+            laneStyle[1].iOffsetColumn = 0;
+            // Set Style
+            this.listBoxLane1.ColumnStyles = laneStyle;
+            this.listBoxLane2.ColumnStyles = laneStyle;
+            this.listBoxLane3.ColumnStyles = laneStyle;
+            this.listBoxLane4.ColumnStyles = laneStyle;
+            this.listBoxLane5.ColumnStyles = laneStyle;
+            this.listBoxLane6.ColumnStyles = laneStyle;
+            
+            // Set Color
+            // Lane 1
+            this.listBoxLane1.TextColor = Color.White;
+            this.listBoxLane1.SetRowsColorAdd(Color.Red);
+            this.listBoxLane1.SetRowsColorAdd(Color.Green);
+            this.listBoxLane1.SetRowsColorAdd(Color.White);
+            // Lane 2
+            this.listBoxLane2.TextColor = Color.White;
+            this.listBoxLane2.SetRowsColorAdd(Color.Red);
+            this.listBoxLane2.SetRowsColorAdd(Color.Green);
+            this.listBoxLane2.SetRowsColorAdd(Color.White);
+            // Lane 3
+            this.listBoxLane3.TextColor = Color.White;
+            this.listBoxLane3.SetRowsColorAdd(Color.Red);
+            this.listBoxLane3.SetRowsColorAdd(Color.Green);
+            this.listBoxLane3.SetRowsColorAdd(Color.White);
+            // Lane 4
+            this.listBoxLane4.TextColor = Color.White;
+            this.listBoxLane4.SetRowsColorAdd(Color.Red);
+            this.listBoxLane4.SetRowsColorAdd(Color.Green);
+            this.listBoxLane4.SetRowsColorAdd(Color.White);
+            // Lane 5
+            this.listBoxLane5.TextColor = Color.White;
+            this.listBoxLane5.SetRowsColorAdd(Color.Red);
+            this.listBoxLane5.SetRowsColorAdd(Color.Green);
+            this.listBoxLane5.SetRowsColorAdd(Color.White);
+            // Lane 6
+            this.listBoxLane6.TextColor = Color.White;
+            this.listBoxLane6.SetRowsColorAdd(Color.Red);
+            this.listBoxLane6.SetRowsColorAdd(Color.Green);
+            this.listBoxLane6.SetRowsColorAdd(Color.White);
+        }
+
+        private void UpdateDisplayJudgmentDataListBox(SmartListBox listBox, LeakData leakData)
+        {
+            int colorIndex = 0;
+            string[] items = new string[3];
+
+            switch (leakData.Judgment.Result)
+            {
+                case Define.E_JudgmentStatus.None:
+                    break;
+                case Define.E_JudgmentStatus.Pass:
+                    colorIndex = 2;
+                    break;
+                case Define.E_JudgmentStatus.Leak:
+                    colorIndex = 1;
+                    break;
+                case Define.E_JudgmentStatus.Empty:
+                    colorIndex = 3;
+                    break;
+                case Define.E_JudgmentStatus.Error:
+                    colorIndex = 3;
+                    break;
+                default:
+                    break;
+            }
+
+            items[0] = leakData.Judgment.Result.ToString();
+            items[1] = "";
+            items[2] = colorIndex.ToString();
+
+            listBox.AddItem(items); 
+        }
+        public void UpdateDisplayJudgmentData(Collection<LeakData> datas)
+        {
+            string[] items = new string[3];
+
+            items[0] = string.Format("{0:HH:mm:ss}", DateTime.Now);
+            items[1] = "";
+            items[2] = "0";
+            
+
+            if (this.listBoxTime.ItemCount >= 10)
+            {
+                this.listBoxTime.RemoveItem(0);
+                this.listBoxLane1.RemoveItem(0);
+                this.listBoxLane2.RemoveItem(0);
+                this.listBoxLane3.RemoveItem(0);
+                this.listBoxLane4.RemoveItem(0);
+                this.listBoxLane5.RemoveItem(0);
+                this.listBoxLane6.RemoveItem(0);
+            }
+
+            this.listBoxTime.AddItem(items);
+            this.UpdateDisplayJudgmentDataListBox(this.listBoxLane1, datas[0]);
+            this.UpdateDisplayJudgmentDataListBox(this.listBoxLane2, datas[1]);
+            this.UpdateDisplayJudgmentDataListBox(this.listBoxLane3, datas[2]);
+            this.UpdateDisplayJudgmentDataListBox(this.listBoxLane4, datas[3]);
+            this.UpdateDisplayJudgmentDataListBox(this.listBoxLane5, datas[4]);
+            this.UpdateDisplayJudgmentDataListBox(this.listBoxLane6, datas[5]);
+        }
+        public void UpdateDisplayCounterData(Collection<LeakData> datas)
+        {
+            string value = "";
+
+            for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE; i++)
+            {
+                // Pass Count
+                value = datas[i].CounterData.PassCNT.ToString();
+                if (this.ColPassCNT[i].Text != value)
+                    this.ColPassCNT[i].Text = value;
+
+                // Leak Count
+                value = datas[i].CounterData.LeakCNT.ToString();
+                if (this.ColLeakCNT[i].Text != value)
+                    this.ColLeakCNT[i].Text = value;
+            }
+        }
+
+        public void Clear()
+        {
+            foreach (SmartListBox list in this.ColListBox)
+                list.ClearAll();
+
+            for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE; i++)
+            {
+                this.ColPassCNT[i].Text = "0";
+                this.ColLeakCNT[i].Text = "0";
+            }
+        }
+
+        public void DisplayRefresh()
+        { 
+               
+        }
+        #endregion
+
+        #region Event Handler
+        private void listBox_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.listBoxTime.SelectItemIndex = -1;
+            this.listBoxLane1.SelectItemIndex = -1;
+            this.listBoxLane2.SelectItemIndex = -1;
+            this.listBoxLane3.SelectItemIndex = -1;
+            this.listBoxLane4.SelectItemIndex = -1;
+            this.listBoxLane5.SelectItemIndex = -1;
+            this.listBoxLane6.SelectItemIndex = -1;
+        } 
+        #endregion
+
+        private void smartButton1_Click(object sender, EventArgs e)
+        {
+            string[] items = new string[3];
+
+            items[0] = string.Format("{0:HH:mm:ss}", DateTime.Now);
+            items[1] = string.Format("{0:HH:mm:ss}", DateTime.Now);
+            items[2] = "0";
+
+            //Collection<LeakData> datas = new Collection<LeakData>();
+            //for (int i = 0; i < 6; i++)
+            //    datas.Add(new LeakData());
+
+            //datas[0].Judgment.Result = Define.E_JudgmentStatus.Pass;
+            //datas[1].Judgment.Result = Define.E_JudgmentStatus.Leak;
+            //datas[2].Judgment.Result = Define.E_JudgmentStatus.Pass;
+            //datas[3].Judgment.Result = Define.E_JudgmentStatus.Pass;
+            //datas[4].Judgment.Result = Define.E_JudgmentStatus.Leak;
+            //datas[5].Judgment.Result = Define.E_JudgmentStatus.Pass;
+
+            //if (this.listBoxTime.ItemCount >= 10)
+            //{
+            //    this.listBoxTime.RemoveItem(0);
+            //    this.listBoxLane1.RemoveItem(0);
+            //    this.listBoxLane2.RemoveItem(0);
+            //    this.listBoxLane3.RemoveItem(0);
+            //    this.listBoxLane4.RemoveItem(0);
+            //    this.listBoxLane5.RemoveItem(0);
+            //    this.listBoxLane6.RemoveItem(0);
+            //}
+
+            this.listBoxTime.AddItem(items);
+            //this.UpdateDisplayJudgmentDataListBox(this.listBoxLane1, datas[0]);
+            //this.UpdateDisplayJudgmentDataListBox(this.listBoxLane2, datas[1]);
+            //this.UpdateDisplayJudgmentDataListBox(this.listBoxLane3, datas[2]);
+            //this.UpdateDisplayJudgmentDataListBox(this.listBoxLane4, datas[3]);
+            //this.UpdateDisplayJudgmentDataListBox(this.listBoxLane5, datas[4]);
+            //this.UpdateDisplayJudgmentDataListBox(this.listBoxLane6, datas[5]);
+        }
+        private void smartButton2_Click(object sender, EventArgs e)
+        {
+            string[] items = new string[3];
+
+            items[0] = string.Format("{0:HH:mm:ss}", DateTime.Now);
+            items[1] = "";
+            items[2] = "0";
+
+            Collection<LeakData> datas = new Collection<LeakData>();
+            for (int i = 0; i < 6; i++)
+                datas.Add(new LeakData());
+
+            datas[0].Judgment.Result = Define.E_JudgmentStatus.Leak;
+            datas[1].Judgment.Result = Define.E_JudgmentStatus.Pass;
+            datas[2].Judgment.Result = Define.E_JudgmentStatus.Error;
+            datas[3].Judgment.Result = Define.E_JudgmentStatus.Pass;
+            datas[4].Judgment.Result = Define.E_JudgmentStatus.Pass;
+            datas[5].Judgment.Result = Define.E_JudgmentStatus.Empty;
+
+            if (this.listBoxTime.ItemCount >= 10)
+            {
+                this.listBoxTime.RemoveItem(0);
+                this.listBoxLane1.RemoveItem(0);
+                this.listBoxLane2.RemoveItem(0);
+                this.listBoxLane3.RemoveItem(0);
+                this.listBoxLane4.RemoveItem(0);
+                this.listBoxLane5.RemoveItem(0);
+                this.listBoxLane6.RemoveItem(0);
+            }
+
+            this.listBoxTime.AddItem(items);
+            this.UpdateDisplayJudgmentDataListBox(this.listBoxLane1, datas[0]);
+            this.UpdateDisplayJudgmentDataListBox(this.listBoxLane2, datas[1]);
+            this.UpdateDisplayJudgmentDataListBox(this.listBoxLane3, datas[2]);
+            this.UpdateDisplayJudgmentDataListBox(this.listBoxLane4, datas[3]);
+            this.UpdateDisplayJudgmentDataListBox(this.listBoxLane5, datas[4]);
+            this.UpdateDisplayJudgmentDataListBox(this.listBoxLane6, datas[5]);
+        }
+        private void smartButton3_Click(object sender, EventArgs e)
+        {
+            string[] items = new string[3];
+
+            items[0] = string.Format("{0:HH:mm:ss}", DateTime.Now);
+            items[1] = "";
+            items[2] = "0";
+
+            Collection<LeakData> datas = new Collection<LeakData>();
+            for (int i = 0; i < 6; i++)
+                datas.Add(new LeakData());
+
+            datas[0].Judgment.Result = Define.E_JudgmentStatus.Pass;
+            datas[1].Judgment.Result = Define.E_JudgmentStatus.Leak;
+            datas[2].Judgment.Result = Define.E_JudgmentStatus.Pass;
+            datas[3].Judgment.Result = Define.E_JudgmentStatus.Error;
+            datas[4].Judgment.Result = Define.E_JudgmentStatus.Empty;
+            datas[5].Judgment.Result = Define.E_JudgmentStatus.Pass;
+
+            if (this.listBoxTime.ItemCount >= 10)
+            {
+                this.listBoxTime.RemoveItem(0);
+                this.listBoxLane1.RemoveItem(0);
+                this.listBoxLane2.RemoveItem(0);
+                this.listBoxLane3.RemoveItem(0);
+                this.listBoxLane4.RemoveItem(0);
+                this.listBoxLane5.RemoveItem(0);
+                this.listBoxLane6.RemoveItem(0);
+            }
+
+            this.listBoxTime.AddItem(items);
+            this.UpdateDisplayJudgmentDataListBox(this.listBoxLane1, datas[0]);
+            this.UpdateDisplayJudgmentDataListBox(this.listBoxLane2, datas[1]);
+            this.UpdateDisplayJudgmentDataListBox(this.listBoxLane3, datas[2]);
+            this.UpdateDisplayJudgmentDataListBox(this.listBoxLane4, datas[3]);
+            this.UpdateDisplayJudgmentDataListBox(this.listBoxLane5, datas[4]);
+            this.UpdateDisplayJudgmentDataListBox(this.listBoxLane6, datas[5]);
+        }
+        private void smartButton4_Click(object sender, EventArgs e)
+        {
+            SmartListBox.COLUMNSTYLE[] timeStyle = new SmartListBox.COLUMNSTYLE[2];
+            timeStyle[0].iColumnWidth = 136;
+            timeStyle[0].eColumnAlign = SmartListBox.COLUMNALIGNS.CENTER;
+            timeStyle[0].iOffsetColumn = 0;
+            timeStyle[1].iColumnWidth = 1;
+            timeStyle[1].eColumnAlign = SmartListBox.COLUMNALIGNS.CENTER;
+            timeStyle[1].iOffsetColumn = 0;
+            this.listBoxTime.ColumnStyles = timeStyle;
+            // Set Color
+            this.listBoxTime.TextColor = Color.White;
+            this.listBoxTime.SetRowsColorAdd(Color.Red);
+            this.listBoxTime.SetRowsColorAdd(Color.Green);
+            this.listBoxTime.SetRowsColorAdd(Color.White);
+        }
+        private void smartButton5_Click(object sender, EventArgs e)
+        {
+
+            string[] items = new string[3];
+
+            items[0] = string.Format("{0:HH:mm:ss}", DateTime.Now);
+            items[1] = "";
+            items[2] = "1";
+
+            this.listBoxTime.AddItem(items);
+        }
+
+        private void smartButton6_Click(object sender, EventArgs e)
+        {
+            string[] items = new string[3];
+
+            items[0] = string.Format("{0:HH:mm:ss}", DateTime.Now);
+            items[1] = "";
+            items[2] = "2";
+
+            this.listBoxTime.AddItem(items);
+        }
+    }
+}

INT_LKD_PTB6_DW/Controls/MainDisplay/ControlMainDisplay_3.resx

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="$this.FormFactorShadowProperty" xml:space="preserve">
+    <value>WEBPAD</value>
+  </metadata>
+</root>

INT_LKD_PTB6_DW/Controls/MainDisplay/ControlMainDisplay_4.cs

@@ -0,0 +1,367 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+
+using SmartX;
+using INT_LKD_PTB6_DW.DataStore;
+using INT_LKD_PTB6_DW.Forms;
+
+namespace INT_LKD_PTB6_DW.Controls.MainDisplay
+{
+    public partial class ControlMainDisplay_4 : UserControl
+    {
+        #region Field
+        private FormMainDisplay m_ParentForm;
+
+        private Collection<SmartLabel> m_ColPassCNT;
+        private Collection<SmartLabel> m_ColLeakCNT;
+        #endregion
+
+        #region Constructor
+        public ControlMainDisplay_4(FormMainDisplay parent)
+        {
+            InitializeComponent();
+
+            this.ParentForm = parent;
+
+            this.Initialize();
+            this.InitializeListBox();
+        } 
+        #endregion
+
+        #region Property
+        public FormMainDisplay ParentForm
+        {
+            get { return this.m_ParentForm; }
+            set { this.m_ParentForm = value; }
+        }
+
+        public Collection<SmartLabel> ColPassCNT
+        {
+            get { return this.m_ColPassCNT; }
+            set { this.m_ColPassCNT = value; }
+        }
+        public Collection<SmartLabel> ColLeakCNT
+        {
+            get { return this.m_ColLeakCNT; }
+            set { this.m_ColLeakCNT = value; }
+        }
+        #endregion
+
+        #region Method
+        private void Initialize()
+        {
+            this.ColPassCNT = new Collection<SmartLabel>();
+            this.ColPassCNT.Add(this.labelPassCNT1);
+            this.ColPassCNT.Add(this.labelPassCNT2);
+            this.ColPassCNT.Add(this.labelPassCNT3);
+            this.ColPassCNT.Add(this.labelPassCNT4);
+            this.ColPassCNT.Add(this.labelPassCNT5);
+            this.ColPassCNT.Add(this.labelPassCNT6);
+
+            this.ColLeakCNT = new Collection<SmartLabel>();
+            this.ColLeakCNT.Add(this.labelLeakCNT1);
+            this.ColLeakCNT.Add(this.labelLeakCNT2);
+            this.ColLeakCNT.Add(this.labelLeakCNT3);
+            this.ColLeakCNT.Add(this.labelLeakCNT4);
+            this.ColLeakCNT.Add(this.labelLeakCNT5);
+            this.ColLeakCNT.Add(this.labelLeakCNT6);
+
+            this.Clear();
+        }
+        private void InitializeListBox()
+        {
+            // ListBox Time
+            // Columns Style
+            SmartListBox.COLUMNSTYLE[] timeStyle = new SmartListBox.COLUMNSTYLE[7];
+            timeStyle[0].iColumnWidth = 136;
+            timeStyle[0].eColumnAlign = SmartListBox.COLUMNALIGNS.CENTER;
+            timeStyle[0].iOffsetColumn = 0;
+            timeStyle[1].iColumnWidth = 120;
+            timeStyle[1].eColumnAlign = SmartListBox.COLUMNALIGNS.CENTER;
+            timeStyle[1].iOffsetColumn = 0;
+            timeStyle[2].iColumnWidth = 120;
+            timeStyle[2].eColumnAlign = SmartListBox.COLUMNALIGNS.CENTER;
+            timeStyle[2].iOffsetColumn = 0;
+            timeStyle[3].iColumnWidth = 120;
+            timeStyle[3].eColumnAlign = SmartListBox.COLUMNALIGNS.CENTER;
+            timeStyle[3].iOffsetColumn = 0;
+            timeStyle[4].iColumnWidth = 120;
+            timeStyle[4].eColumnAlign = SmartListBox.COLUMNALIGNS.CENTER;
+            timeStyle[4].iOffsetColumn = 0;
+            timeStyle[5].iColumnWidth = 120;
+            timeStyle[5].eColumnAlign = SmartListBox.COLUMNALIGNS.CENTER;
+            timeStyle[5].iOffsetColumn = 0;
+            timeStyle[6].iColumnWidth = 120;
+            timeStyle[6].eColumnAlign = SmartListBox.COLUMNALIGNS.CENTER;
+            timeStyle[6].iOffsetColumn = 0;
+            this.listBoxTime.ColumnStyles = timeStyle;
+            // Set Color
+            this.listBoxTime.TextColor = Color.White;
+            this.listBoxTime.SetRowsColorAdd(Color.Red);
+            this.listBoxTime.SetRowsColorAdd(Color.Green);
+            this.listBoxTime.SetRowsColorAdd(Color.White);
+        }
+
+        public void UpdateDisplayJudgmentData(Collection<LeakData> datas)
+        {
+            string[] items = new string[8];
+
+            items[0] = string.Format("{0:HH:mm:ss}", DateTime.Now);
+            items[1] = datas[0].Judgment.Result.ToString();
+            items[2] = datas[1].Judgment.Result.ToString();
+            items[3] = datas[2].Judgment.Result.ToString();
+            items[4] = datas[3].Judgment.Result.ToString();
+            items[5] = datas[4].Judgment.Result.ToString();
+            items[6] = datas[5].Judgment.Result.ToString();
+
+            int passCNT = 0, leakCNT = 0;
+            for (int i = 0; i < datas.Count; i++)
+            {
+                if (datas[i].Judgment.Result == Define.E_JudgmentStatus.Pass)
+                    passCNT++;
+                else if (datas[i].Judgment.Result == Define.E_JudgmentStatus.Leak)
+                    leakCNT++;
+            }
+
+            if (passCNT == 6)
+                items[7] = "2";
+            else if (leakCNT >= 1)
+                items[7] = "1";
+            else
+                items[7] = "0";
+
+            if (this.listBoxTime.ItemCount >= 10)
+                this.listBoxTime.RemoveItem(0);
+
+            this.listBoxTime.AddItem(items);
+        }
+        public void UpdateDisplayCounterData(Collection<LeakData> datas)
+        {
+            string value = "";
+            int totalPass = 0, totalLeak = 0;
+            for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE; i++)
+            {
+                // Pass Count
+                value = datas[i].CounterData.PassCNT.ToString();
+                if (this.ColPassCNT[i].Text != value)
+                    this.ColPassCNT[i].Text = value;
+
+                // Leak Count
+                value = datas[i].CounterData.LeakCNT.ToString();
+                if (this.ColLeakCNT[i].Text != value)
+                    this.ColLeakCNT[i].Text = value;
+
+                totalPass += datas[i].CounterData.PassCNT;
+                totalLeak += datas[i].CounterData.LeakCNT;
+            }
+
+            value = totalPass.ToString();
+            if (this.labelPassTotalCNT.Text != value)
+                this.labelPassTotalCNT.Text = value;
+
+            value = totalLeak.ToString();
+            if (this.labelLeakTotalCNT.Text != value)
+                this.labelLeakTotalCNT.Text = value;
+        }
+
+        public void Clear()
+        {
+            this.listBoxTime.ClearAll();
+
+            for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE; i++)
+                this.ParentForm.ParentForm.CurrentLeakDatas[i].CounterData.Clear();
+
+            this.ParentForm.ParentForm.SaveCounterFile(this.ParentForm.ParentForm.CurrentLeakDatas, this.ParentForm.ParentForm.SystemConfig.RECIPE_NUMBER - 1);
+            this.UpdateDisplayCounterData(this.ParentForm.ParentForm.CurrentLeakDatas);
+        }
+
+        public void DisplayRefresh()
+        { 
+               
+        }
+        #endregion
+
+        #region Event Handler
+        private void listBox_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.listBoxTime.SelectItemIndex = -1;
+        } 
+        #endregion
+
+        private void smartButton1_Click(object sender, EventArgs e)
+        {
+            Collection<LeakData> datas = new Collection<LeakData>();
+            for (int i = 0; i < 6; i++)
+                datas.Add(new LeakData());
+
+            datas[0].Judgment.Result = Define.E_JudgmentStatus.Pass;
+            datas[1].Judgment.Result = Define.E_JudgmentStatus.Pass;
+            datas[2].Judgment.Result = Define.E_JudgmentStatus.Pass;
+            datas[3].Judgment.Result = Define.E_JudgmentStatus.Pass;
+            datas[4].Judgment.Result = Define.E_JudgmentStatus.Pass;
+            datas[5].Judgment.Result = Define.E_JudgmentStatus.Pass;
+
+            string[] items = new string[8];
+            items[0] = string.Format("{0:HH:mm:ss}", DateTime.Now);
+            items[1] = datas[0].Judgment.Result.ToString();
+            items[2] = datas[1].Judgment.Result.ToString();
+            items[3] = datas[2].Judgment.Result.ToString();
+            items[4] = datas[3].Judgment.Result.ToString();
+            items[5] = datas[4].Judgment.Result.ToString();
+            items[6] = datas[5].Judgment.Result.ToString();
+
+            int passCNT = 0, leakCNT = 0;
+            for (int i = 0; i < datas.Count; i++)
+            {
+                if (datas[i].Judgment.Result == Define.E_JudgmentStatus.Pass)
+                    passCNT++;
+                else if (datas[i].Judgment.Result == Define.E_JudgmentStatus.Leak)
+                    leakCNT++;
+            }
+
+            if (passCNT == 6)
+                items[7] = "2";
+            else if (leakCNT > 1)
+                items[7] = "1";
+            else
+                items[7] = "0";
+
+            if (this.listBoxTime.ItemCount >= 10)
+                this.listBoxTime.RemoveItem(0);
+
+            this.listBoxTime.AddItem(items);
+        }
+        private void smartButton2_Click(object sender, EventArgs e)
+        {
+            Collection<LeakData> datas = new Collection<LeakData>();
+            for (int i = 0; i < 6; i++)
+                datas.Add(new LeakData());
+
+            datas[0].Judgment.Result = Define.E_JudgmentStatus.Leak;
+            datas[1].Judgment.Result = Define.E_JudgmentStatus.Pass;
+            datas[2].Judgment.Result = Define.E_JudgmentStatus.Error;
+            datas[3].Judgment.Result = Define.E_JudgmentStatus.Pass;
+            datas[4].Judgment.Result = Define.E_JudgmentStatus.Pass;
+            datas[5].Judgment.Result = Define.E_JudgmentStatus.Empty;
+
+            string[] items = new string[8];
+            items[0] = string.Format("{0:HH:mm:ss}", DateTime.Now);
+            items[1] = datas[0].Judgment.Result.ToString();
+            items[2] = datas[1].Judgment.Result.ToString();
+            items[3] = datas[2].Judgment.Result.ToString();
+            items[4] = datas[3].Judgment.Result.ToString();
+            items[5] = datas[4].Judgment.Result.ToString();
+            items[6] = datas[5].Judgment.Result.ToString();
+
+            int passCNT = 0, leakCNT = 0;
+            for (int i = 0; i < datas.Count; i++)
+            {
+                if (datas[i].Judgment.Result == Define.E_JudgmentStatus.Pass)
+                    passCNT++;
+                else if (datas[i].Judgment.Result == Define.E_JudgmentStatus.Leak)
+                    leakCNT++;
+            }
+
+            if (passCNT == 6)
+                items[7] = "2";
+            else if (leakCNT >= 1)
+                items[7] = "1";
+            else
+                items[7] = "0";
+
+            if (this.listBoxTime.ItemCount >= 10)
+                this.listBoxTime.RemoveItem(0);
+
+            this.listBoxTime.AddItem(items);
+        }
+        private void smartButton3_Click(object sender, EventArgs e)
+        {
+            Collection<LeakData> datas = new Collection<LeakData>();
+            for (int i = 0; i < 6; i++)
+                datas.Add(new LeakData());
+
+            datas[0].Judgment.Result = Define.E_JudgmentStatus.Pass;
+            datas[1].Judgment.Result = Define.E_JudgmentStatus.Empty;
+            datas[2].Judgment.Result = Define.E_JudgmentStatus.Pass;
+            datas[3].Judgment.Result = Define.E_JudgmentStatus.Error;
+            datas[4].Judgment.Result = Define.E_JudgmentStatus.Empty;
+            datas[5].Judgment.Result = Define.E_JudgmentStatus.Pass;
+
+            string[] items = new string[8];
+            items[0] = string.Format("{0:HH:mm:ss}", DateTime.Now);
+            items[1] = datas[0].Judgment.Result.ToString();
+            items[2] = datas[1].Judgment.Result.ToString();
+            items[3] = datas[2].Judgment.Result.ToString();
+            items[4] = datas[3].Judgment.Result.ToString();
+            items[5] = datas[4].Judgment.Result.ToString();
+            items[6] = datas[5].Judgment.Result.ToString();
+
+            int passCNT = 0, leakCNT = 0;
+            for (int i = 0; i < datas.Count; i++)
+            {
+                if (datas[i].Judgment.Result == Define.E_JudgmentStatus.Pass)
+                    passCNT++;
+                else if (datas[i].Judgment.Result == Define.E_JudgmentStatus.Leak)
+                    leakCNT++;
+            }
+
+            if (passCNT == 6)
+                items[7] = "2";
+            else if (leakCNT >= 1)
+                items[7] = "1";
+            else
+                items[7] = "0";
+
+
+            if (this.listBoxTime.ItemCount >= 10)
+                this.listBoxTime.RemoveItem(0);
+
+            this.listBoxTime.AddItem(items);
+        }
+        private void smartButton4_Click(object sender, EventArgs e)
+        {
+            SmartListBox.COLUMNSTYLE[] timeStyle = new SmartListBox.COLUMNSTYLE[2];
+            timeStyle[0].iColumnWidth = 136;
+            timeStyle[0].eColumnAlign = SmartListBox.COLUMNALIGNS.CENTER;
+            timeStyle[0].iOffsetColumn = 0;
+            timeStyle[1].iColumnWidth = 1;
+            timeStyle[1].eColumnAlign = SmartListBox.COLUMNALIGNS.CENTER;
+            timeStyle[1].iOffsetColumn = 0;
+            this.listBoxTime.ColumnStyles = timeStyle;
+            // Set Color
+            this.listBoxTime.TextColor = Color.White;
+            this.listBoxTime.SetRowsColorAdd(Color.Red);
+            this.listBoxTime.SetRowsColorAdd(Color.Green);
+            this.listBoxTime.SetRowsColorAdd(Color.White);
+        }
+        private void smartButton5_Click(object sender, EventArgs e)
+        {
+
+            string[] items = new string[3];
+
+            items[0] = string.Format("{0:HH:mm:ss}", DateTime.Now);
+            items[1] = "";
+            items[2] = "1";
+
+            this.listBoxTime.AddItem(items);
+        }
+
+        private void smartButton6_Click(object sender, EventArgs e)
+        {
+            string[] items = new string[3];
+
+            items[0] = string.Format("{0:HH:mm:ss}", DateTime.Now);
+            items[1] = "";
+            items[2] = "2";
+
+            this.listBoxTime.AddItem(items);
+        }
+    }
+}

INT_LKD_PTB6_DW/Controls/MainDisplay/ControlMainDisplay_4.resx

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="$this.FormFactorShadowProperty" xml:space="preserve">
+    <value>WEBPAD</value>
+  </metadata>
+</root>

INT_LKD_PTB6_DW/Controls/MainDisplay/ControlMainModbus.cs

@@ -8,11 +8,11 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
 using SmartX;
 
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     public partial class ControlMainModbus : UserControl
     {

INT_LKD_PTB6_DW/Controls/MainDisplay/ControlMainModbus.designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     partial class ControlMainModbus
     {

INT_LKD_PTB6_DW/Controls/Manual/ControlMenuManualIoTest.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     partial class ControlMenuManualIoTest
     {
@@ -30,6 +30,7 @@
         {
             this.smartGroupBox1 = new SmartX.SmartGroupBox();
             this.smartGroupBox2 = new SmartX.SmartGroupBox();
+            this.buttonServoStep = new SmartX.SmartButton();
             this.buttonServoAlarmClear = new SmartX.SmartButton();
             this.labelServoOrigin = new SmartX.SmartLabel();
             this.buttonServoOrigin = new SmartX.SmartButton();
@@ -107,7 +108,6 @@
             this.labelInput1 = new SmartX.SmartLabel();
             this.smartTimer = new SmartX.SmartTimer();
             this.smartTimerJog = new SmartX.SmartTimer();
-            this.buttonServoStep = new SmartX.SmartButton();
             this.smartGroupBox1.SuspendLayout();
             this.smartGroupBox2.SuspendLayout();
             this.groupBoxOutput.SuspendLayout();
@@ -162,6 +162,42 @@
             this.smartGroupBox2.Text = "SERVO";
             this.smartGroupBox2.TextColor = System.Drawing.Color.White;
             // 
+            // buttonServoStep
+            // 
+            this.buttonServoStep.BackGround = this.smartGroupBox2;
+            this.buttonServoStep.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32)))));
+            this.buttonServoStep.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
+            this.buttonServoStep.ButtonDownColor = System.Drawing.Color.DarkGray;
+            this.buttonServoStep.ButtonImageAutoSize = true;
+            this.buttonServoStep.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
+            this.buttonServoStep.ButtonText = "Step";
+            this.buttonServoStep.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+            this.buttonServoStep.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
+            this.buttonServoStep.GroupID = 0;
+            this.buttonServoStep.ImageDisable = null;
+            this.buttonServoStep.ImageDown = null;
+            this.buttonServoStep.ImageUp = null;
+            this.buttonServoStep.Location = new System.Drawing.Point(165, 118);
+            this.buttonServoStep.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
+            this.buttonServoStep.Name = "buttonServoStep";
+            this.buttonServoStep.NestedClickEventPrevent = false;
+            this.buttonServoStep.OutlinePixel = 2;
+            this.buttonServoStep.OverlapOptimize = true;
+            this.buttonServoStep.RepeatInterval = 200;
+            this.buttonServoStep.RepeatIntervalAccelerate = null;
+            this.buttonServoStep.RoundSize = 10;
+            this.buttonServoStep.SafeInterval = 200;
+            this.buttonServoStep.Size = new System.Drawing.Size(100, 50);
+            this.buttonServoStep.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+            this.buttonServoStep.TabIndex = 109;
+            this.buttonServoStep.Text = null;
+            this.buttonServoStep.TextColor = System.Drawing.Color.White;
+            this.buttonServoStep.TextColorDisable = System.Drawing.Color.Gray;
+            this.buttonServoStep.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255)))));
+            this.buttonServoStep.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+            this.buttonServoStep.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+            this.buttonServoStep.Click += new System.EventHandler(this.buttonServoStep_Click);
+            // 
             // buttonServoAlarmClear
             // 
             this.buttonServoAlarmClear.BackGround = this.smartGroupBox2;
@@ -2276,42 +2312,6 @@
             this.smartTimerJog.TimeFormStringSeparator = ":";
             this.smartTimerJog.Tick += new System.EventHandler(this.smartTimerJog_Tick);
             // 
-            // buttonServoStep
-            // 
-            this.buttonServoStep.BackGround = this.smartGroupBox2;
-            this.buttonServoStep.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32)))));
-            this.buttonServoStep.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
-            this.buttonServoStep.ButtonDownColor = System.Drawing.Color.DarkGray;
-            this.buttonServoStep.ButtonImageAutoSize = true;
-            this.buttonServoStep.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
-            this.buttonServoStep.ButtonText = "Step";
-            this.buttonServoStep.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
-            this.buttonServoStep.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
-            this.buttonServoStep.GroupID = 0;
-            this.buttonServoStep.ImageDisable = null;
-            this.buttonServoStep.ImageDown = null;
-            this.buttonServoStep.ImageUp = null;
-            this.buttonServoStep.Location = new System.Drawing.Point(165, 118);
-            this.buttonServoStep.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
-            this.buttonServoStep.Name = "buttonServoStep";
-            this.buttonServoStep.NestedClickEventPrevent = false;
-            this.buttonServoStep.OutlinePixel = 2;
-            this.buttonServoStep.OverlapOptimize = true;
-            this.buttonServoStep.RepeatInterval = 200;
-            this.buttonServoStep.RepeatIntervalAccelerate = null;
-            this.buttonServoStep.RoundSize = 10;
-            this.buttonServoStep.SafeInterval = 200;
-            this.buttonServoStep.Size = new System.Drawing.Size(100, 50);
-            this.buttonServoStep.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
-            this.buttonServoStep.TabIndex = 109;
-            this.buttonServoStep.Text = null;
-            this.buttonServoStep.TextColor = System.Drawing.Color.White;
-            this.buttonServoStep.TextColorDisable = System.Drawing.Color.Gray;
-            this.buttonServoStep.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255)))));
-            this.buttonServoStep.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
-            this.buttonServoStep.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
-            this.buttonServoStep.Click += new System.EventHandler(this.buttonServoStep_Click);
-            // 
             // ControlMenuManualIoTest
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);

INT_LKD_PTB6_DW/Controls/Manual/ControlMenuManualIoTest.cs

@@ -9,11 +9,11 @@ using System.Text;
 using System.Windows.Forms;
 
 using SmartX;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
-using INT_LKD_PTB.DialogForms;
+using INT_LKD_PTB6_DW.DialogForms;
 
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     public partial class ControlMenuManualIoTest : UserControl
     {
@@ -149,7 +149,7 @@ namespace INT_LKD_PTB.Controls
         }
 
         // 변위센서 데이터
-        public void UpdateDisplayDispData(Collection<LeakData1> datas)
+        public void UpdateDisplayDispData(Collection<LeakData> datas)
         {
             this.CollLabelDisplacement[0].Text = datas[0].DispData.RData;
             this.CollLabelDisplacement[1].Text = datas[1].DispData.RData;
@@ -159,7 +159,7 @@ namespace INT_LKD_PTB.Controls
             this.CollLabelDisplacement[5].Text = datas[5].DispData.RData;
         }
         // 차압센서 데이터
-        public void UpdateDisplayDiffData(Collection<LeakData1> datas)
+        public void UpdateDisplayDiffData(Collection<LeakData> datas)
         {
             this.CollLabelDiffPressure[0].Text = datas[0].DiffData.MAdc;
             this.CollLabelDiffPressure[1].Text = datas[1].DiffData.MAdc;
@@ -169,7 +169,7 @@ namespace INT_LKD_PTB.Controls
             this.CollLabelDiffPressure[5].Text = datas[5].DiffData.MAdc;
         }
         // 압력센서 데이터
-        public void UpdateDisplayPresData(Collection<LeakData1> datas)
+        public void UpdateDisplayPresData(Collection<LeakData> datas)
         {
             this.CollLabelPressureWork[0].Text = datas[0].PresData.WorkingChamber;
             this.CollLabelPressureWork[1].Text = datas[1].PresData.WorkingChamber;

INT_LKD_PTB6_DW/Controls/Recipe/ControlMenuRecipeData.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     partial class ControlMenuRecipeData
     {

INT_LKD_PTB6_DW/Controls/Recipe/ControlMenuRecipeData.cs

@@ -8,10 +8,10 @@ using System.Text;
 using System.Windows.Forms;
 
 using SmartX;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
 
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     public partial class ControlMenuRecipeData : UserControl
     {
@@ -273,7 +273,7 @@ namespace INT_LKD_PTB.Controls
                     value = "Pass";
                     label2.TextColor = Define.ColorTextResultPass;
                     break;
-                case Define.E_JudgmentStatus.Ng:
+                case Define.E_JudgmentStatus.Leak:
                     value = "Leak";
                     label2.TextColor = Define.ColorTextResultNG;
                     break;
@@ -302,7 +302,7 @@ namespace INT_LKD_PTB.Controls
                 case Define.E_JudgmentStatus.Pass:
                     label.TextColor = Define.ColorTextResultPass;
                     break;
-                case Define.E_JudgmentStatus.Ng:
+                case Define.E_JudgmentStatus.Leak:
                     label.TextColor = Define.ColorTextResultNG;
                     break;
                 case Define.E_JudgmentStatus.Empty:
@@ -325,7 +325,7 @@ namespace INT_LKD_PTB.Controls
                 case Define.E_JudgmentStatus.Pass:
                     label.TextColor = Define.ColorTextResultPass;
                     break;
-                case Define.E_JudgmentStatus.Ng:
+                case Define.E_JudgmentStatus.Leak:
                     label.TextColor = Define.ColorTextResultNG;
                     break;
                 case Define.E_JudgmentStatus.Empty:
@@ -400,7 +400,7 @@ namespace INT_LKD_PTB.Controls
             if (this.labelMesPressureMaster.Text != value)
                 this.labelMesPressureMaster.Text = value;
         }
-        public void UpdateDisplayMeasuringLeadDataResult(LeakData1 data)
+        public void UpdateDisplayMeasuringLeadDataResult(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.labelMesResult);
 

INT_LKD_PTB6_DW/Controls/Recipe/ControlMenuRecipeSetting.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     partial class ControlMenuRecipeSetting
     {

INT_LKD_PTB6_DW/Controls/Recipe/ControlMenuRecipeSetting.cs

@@ -9,11 +9,11 @@ using System.Text;
 using System.Windows.Forms;
 
 using SmartX;
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
-using INT_LKD_PTB.DialogForms;
+using INT_LKD_PTB6_DW.DialogForms;
 
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     public partial class ControlMenuRecipeSetting : UserControl
     {
@@ -66,6 +66,10 @@ namespace INT_LKD_PTB.Controls
             this.CollControls.Add(this.labelVacuumBreak);
             this.CollControls.Add(this.radioButton1);
             this.CollControls.Add(this.radioButton2);
+            this.CollControls.Add(this.radioButton3);
+            this.CollControls.Add(this.radioButton4);
+            this.CollControls.Add(this.radioButton5);
+            this.CollControls.Add(this.radioButton6);
             this.CollControls.Add(this.buttonInspection);
 
             this.ChildControlRecipeData = new ControlMenuRecipeData(this.ParentForm);
@@ -446,7 +450,7 @@ namespace INT_LKD_PTB.Controls
             }
         }
         // 차압센서 데이터
-        public void UpdateDisplayDiffPressureData(Collection<LeakData1> datas)
+        public void UpdateDisplayDiffPressureData(Collection<LeakData> datas)
         {
             if (this.radioButton1.Checked == true)
                 this.ChildControlRecipeData.UpdateDisplayMeasuringLeakDataDiffPressure(datas[0].DiffData);
@@ -462,7 +466,7 @@ namespace INT_LKD_PTB.Controls
                 this.ChildControlRecipeData.UpdateDisplayMeasuringLeakDataDiffPressure(datas[5].DiffData);
         }
         // 변위센서 데이터
-        public void UpdateDisplayDisplacementData(Collection<LeakData1> datas)
+        public void UpdateDisplayDisplacementData(Collection<LeakData> datas)
         {
             if (this.radioButton1.Checked == true)
                 this.ChildControlRecipeData.UpdateDisplayMeasuringLeakDataDisplacement(datas[0].DispData);
@@ -478,7 +482,7 @@ namespace INT_LKD_PTB.Controls
                 this.ChildControlRecipeData.UpdateDisplayMeasuringLeakDataDisplacement(datas[5].DispData);
         }
         // 압력센서 데이터
-        public void UpdateDisplayPressureData(Collection<LeakData1> datas)
+        public void UpdateDisplayPressureData(Collection<LeakData> datas)
         {
             if (this.radioButton1.Checked == true)
                 this.ChildControlRecipeData.UpdateDisplayMeasuringLeakDataPressure(datas[0].PresData);
@@ -494,7 +498,7 @@ namespace INT_LKD_PTB.Controls
                 this.ChildControlRecipeData.UpdateDisplayMeasuringLeakDataPressure(datas[5].PresData);
         }
         // 판정결과
-        public void UpdateDisplayJudgmentData(Collection<LeakData1> datas)
+        public void UpdateDisplayJudgmentData(Collection<LeakData> datas)
         {
             if (this.radioButton1.Checked == true)
                 this.ChildControlRecipeData.UpdateDisplayMeasuringLeadDataResult(datas[0]);
@@ -787,6 +791,8 @@ namespace INT_LKD_PTB.Controls
                 this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingParameter.Disp_MinHight, "", before, after);
 
                 this.ChildControlRecipeData.DrawDisplacementReferenceLine(myKeypad.StringValue);
+
+                this.ParentForm.Child_System_Equipment6_1.DrawDisplacementReferenceLine(myKeypad.StringValue);
             }
         }
         private void buttonDispEnable1_Click(object sender, EventArgs e)
@@ -915,15 +921,10 @@ namespace INT_LKD_PTB.Controls
         // Inspection
         private void buttonInspection_Click(object sender, EventArgs e)
         {
-            string id = "";
+            string id = "0";
 
             this.ChildControlRecipeData.InitializeData();
 
-            if (this.radioButton1.Checked == true)
-                id = CommunicationID.SubBoard1;
-            else if (this.radioButton2.Checked == true)
-                id = CommunicationID.SubBoard2;
-
             this.ParentForm.ParentForm.TransferData(CommunicationCommand.CutInpupt, id);
         }
         private void radioButton1_Click(object sender, EventArgs e)

INT_LKD_PTB6_DW/Controls/System/ControlMenuSystemEthernet.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     partial class ControlMenuSystemEthernet
     {

INT_LKD_PTB6_DW/Controls/System/ControlMenuSystemEthernet.cs

@@ -7,12 +7,12 @@ using System.Data;
 using System.Text;
 using System.Windows.Forms;
 
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
-using INT_LKD_PTB.DialogForms;
+using INT_LKD_PTB6_DW.DialogForms;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
 using SmartX;
 
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     public partial class ControlMenuSystemEthernet : UserControl
     {

INT_LKD_PTB6_DW/Controls/System/ControlMenuSystemInformation.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     partial class ControlMenuSystemInformation
     {

INT_LKD_PTB6_DW/Controls/System/ControlMenuSystemInformation.cs

@@ -8,11 +8,11 @@ using System.Text;
 using System.Windows.Forms;
 using System.IO;
 
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
-using INT_LKD_PTB.DialogForms;
+using INT_LKD_PTB6_DW.DialogForms;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
 
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     public partial class ControlMenuSystemInformation : UserControl
     {

INT_LKD_PTB6_DW/Controls/System/ControlMenuSystemSetting.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     partial class ControlMenuSystemSetting
     {

INT_LKD_PTB6_DW/Controls/System/ControlMenuSystemSetting.cs

@@ -9,12 +9,12 @@ using System.Text;
 using System.Windows.Forms;
 
 using SmartX;
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
-using INT_LKD_PTB.DialogForms;
+using INT_LKD_PTB6_DW.DialogForms;
 using System.Threading;
 
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     public partial class ControlMenuSystemSetting : UserControl
     {

INT_LKD_PTB6_DW/Controls/System/ControlMenuSystemStatus6_1.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     partial class ControlMenuSystemStatus6_1
     {
@@ -28,12 +28,12 @@
         /// </summary>
         private void InitializeComponent()
         {
-            SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle chartPenStyle19 = new SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle();
+            SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle chartPenStyle1 = new SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle();
-            SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle chartPenStyle20 = new SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle();
+            SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle chartPenStyle2 = new SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle();
-            SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle chartPenStyle21 = new SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle();
+            SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle chartPenStyle3 = new SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle();
-            SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle chartPenStyle22 = new SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle();
+            SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle chartPenStyle4 = new SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle();
-            SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle chartPenStyle23 = new SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle();
+            SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle chartPenStyle5 = new SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle();
-            SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle chartPenStyle24 = new SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle();
+            SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle chartPenStyle6 = new SmartX.SmartDraw_ChartChannelPenStyle.ChartPenStyle();
             this.smartGroupBox1 = new SmartX.SmartGroupBox();
             this.buttonDisplay = new SmartX.SmartButton();
             this.buttonStart = new SmartX.SmartButton();
@@ -125,6 +125,16 @@
             this.labelProgress4 = new SmartX.SmartLabel();
             this.labelProgress2 = new SmartX.SmartLabel();
             this.labelProgress1 = new SmartX.SmartLabel();
+            this.smartLabel1 = new SmartX.SmartLabel();
+            this.smartLabel2 = new SmartX.SmartLabel();
+            this.smartLabel3 = new SmartX.SmartLabel();
+            this.smartLabel6 = new SmartX.SmartLabel();
+            this.smartLabel8 = new SmartX.SmartLabel();
+            this.smartLabel9 = new SmartX.SmartLabel();
+            this.smartLabel10 = new SmartX.SmartLabel();
+            this.smartLabel13 = new SmartX.SmartLabel();
+            this.smartLabel15 = new SmartX.SmartLabel();
+            this.smartLabel16 = new SmartX.SmartLabel();
             this.smartGroupBox1.SuspendLayout();
             this.smartGroupBox8.SuspendLayout();
             this.smartGroupBox2.SuspendLayout();
@@ -323,6 +333,8 @@
             this.smartGroupBox8.BackGround = null;
             this.smartGroupBox8.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32)))));
             this.smartGroupBox8.BackImage = null;
+            this.smartGroupBox8.Controls.Add(this.smartLabel15);
+            this.smartGroupBox8.Controls.Add(this.smartLabel16);
             this.smartGroupBox8.Controls.Add(this.smartSeparatorLine12);
             this.smartGroupBox8.Controls.Add(this.labelResultDisp6);
             this.smartGroupBox8.Controls.Add(this.labelResultDiff6);
@@ -429,30 +441,30 @@
             // 
             // smartDraw_ChartChannelPenStyle1
             // 
-            chartPenStyle19.ChannelColor = System.Drawing.Color.White;
+            chartPenStyle1.ChannelColor = System.Drawing.Color.White;
-            chartPenStyle19.PenStyle = SmartX.SmartDraw_ChartChannelPenStyle.PenStyles.SOLID;
+            chartPenStyle1.PenStyle = SmartX.SmartDraw_ChartChannelPenStyle.PenStyles.SOLID;
-            chartPenStyle19.PenWidth = 3;
+            chartPenStyle1.PenWidth = 2;
-            chartPenStyle20.ChannelColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
+            chartPenStyle2.ChannelColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
-            chartPenStyle20.PenStyle = SmartX.SmartDraw_ChartChannelPenStyle.PenStyles.SOLID;
+            chartPenStyle2.PenStyle = SmartX.SmartDraw_ChartChannelPenStyle.PenStyles.SOLID;
-            chartPenStyle20.PenWidth = 3;
+            chartPenStyle2.PenWidth = 2;
-            chartPenStyle21.ChannelColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            chartPenStyle3.ChannelColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            chartPenStyle21.PenStyle = SmartX.SmartDraw_ChartChannelPenStyle.PenStyles.SOLID;
+            chartPenStyle3.PenStyle = SmartX.SmartDraw_ChartChannelPenStyle.PenStyles.SOLID;
-            chartPenStyle21.PenWidth = 3;
+            chartPenStyle3.PenWidth = 2;
-            chartPenStyle22.ChannelColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            chartPenStyle4.ChannelColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            chartPenStyle22.PenStyle = SmartX.SmartDraw_ChartChannelPenStyle.PenStyles.SOLID;
+            chartPenStyle4.PenStyle = SmartX.SmartDraw_ChartChannelPenStyle.PenStyles.SOLID;
-            chartPenStyle22.PenWidth = 3;
+            chartPenStyle4.PenWidth = 2;
-            chartPenStyle23.ChannelColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
+            chartPenStyle5.ChannelColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
-            chartPenStyle23.PenStyle = SmartX.SmartDraw_ChartChannelPenStyle.PenStyles.SOLID;
+            chartPenStyle5.PenStyle = SmartX.SmartDraw_ChartChannelPenStyle.PenStyles.SOLID;
-            chartPenStyle23.PenWidth = 3;
+            chartPenStyle5.PenWidth = 2;
-            chartPenStyle24.ChannelColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
+            chartPenStyle6.ChannelColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
-            chartPenStyle24.PenStyle = SmartX.SmartDraw_ChartChannelPenStyle.PenStyles.SOLID;
+            chartPenStyle6.PenStyle = SmartX.SmartDraw_ChartChannelPenStyle.PenStyles.SOLID;
-            chartPenStyle24.PenWidth = 3;
+            chartPenStyle6.PenWidth = 2;
-            this.smartDraw_ChartChannelPenStyle1.ChartChannelPenStyle.Add(chartPenStyle19);
+            this.smartDraw_ChartChannelPenStyle1.ChartChannelPenStyle.Add(chartPenStyle1);
-            this.smartDraw_ChartChannelPenStyle1.ChartChannelPenStyle.Add(chartPenStyle20);
+            this.smartDraw_ChartChannelPenStyle1.ChartChannelPenStyle.Add(chartPenStyle2);
-            this.smartDraw_ChartChannelPenStyle1.ChartChannelPenStyle.Add(chartPenStyle21);
+            this.smartDraw_ChartChannelPenStyle1.ChartChannelPenStyle.Add(chartPenStyle3);
-            this.smartDraw_ChartChannelPenStyle1.ChartChannelPenStyle.Add(chartPenStyle22);
+            this.smartDraw_ChartChannelPenStyle1.ChartChannelPenStyle.Add(chartPenStyle4);
-            this.smartDraw_ChartChannelPenStyle1.ChartChannelPenStyle.Add(chartPenStyle23);
+            this.smartDraw_ChartChannelPenStyle1.ChartChannelPenStyle.Add(chartPenStyle5);
-            this.smartDraw_ChartChannelPenStyle1.ChartChannelPenStyle.Add(chartPenStyle24);
+            this.smartDraw_ChartChannelPenStyle1.ChartChannelPenStyle.Add(chartPenStyle6);
             // 
             // smartLabel61
             // 
@@ -679,6 +691,8 @@
             this.smartGroupBox6.BackGround = null;
             this.smartGroupBox6.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32)))));
             this.smartGroupBox6.BackImage = null;
+            this.smartGroupBox6.Controls.Add(this.smartLabel8);
+            this.smartGroupBox6.Controls.Add(this.smartLabel9);
             this.smartGroupBox6.Controls.Add(this.smartSeparatorLine10);
             this.smartGroupBox6.Controls.Add(this.labelResultDisp4);
             this.smartGroupBox6.Controls.Add(this.labelResultDiff4);
@@ -942,6 +956,8 @@
             this.smartGroupBox10.BackGround = null;
             this.smartGroupBox10.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32)))));
             this.smartGroupBox10.BackImage = null;
+            this.smartGroupBox10.Controls.Add(this.smartLabel10);
+            this.smartGroupBox10.Controls.Add(this.smartLabel13);
             this.smartGroupBox10.Controls.Add(this.smartSeparatorLine11);
             this.smartGroupBox10.Controls.Add(this.labelResult5);
             this.smartGroupBox10.Controls.Add(this.labelResultDisp5);
@@ -1205,6 +1221,7 @@
             this.smartGroupBox5.BackGround = null;
             this.smartGroupBox5.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32)))));
             this.smartGroupBox5.BackImage = null;
+            this.smartGroupBox5.Controls.Add(this.smartLabel2);
             this.smartGroupBox5.Controls.Add(this.smartSeparatorLine8);
             this.smartGroupBox5.Controls.Add(this.labelResultDisp2);
             this.smartGroupBox5.Controls.Add(this.labelResultDiff2);
@@ -1468,6 +1485,8 @@
             this.smartGroupBox7.BackGround = null;
             this.smartGroupBox7.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32)))));
             this.smartGroupBox7.BackImage = null;
+            this.smartGroupBox7.Controls.Add(this.smartLabel3);
+            this.smartGroupBox7.Controls.Add(this.smartLabel6);
             this.smartGroupBox7.Controls.Add(this.smartSeparatorLine9);
             this.smartGroupBox7.Controls.Add(this.labelResult3);
             this.smartGroupBox7.Controls.Add(this.labelResultDiff3);
@@ -1731,6 +1750,7 @@
             this.smartGroupBox3.BackGround = null;
             this.smartGroupBox3.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32)))));
             this.smartGroupBox3.BackImage = null;
+            this.smartGroupBox3.Controls.Add(this.smartLabel1);
             this.smartGroupBox3.Controls.Add(this.smartSeparatorLine3);
             this.smartGroupBox3.Controls.Add(this.labelResultDisp1);
             this.smartGroupBox3.Controls.Add(this.smartSeparatorLine1);
@@ -2192,6 +2212,216 @@
             this.labelProgress1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
             this.labelProgress1.Wordwrap = false;
             // 
+            // smartLabel1
+            // 
+            this.smartLabel1.BackGround = null;
+            this.smartLabel1.BackGroundColor = System.Drawing.Color.White;
+            this.smartLabel1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel1.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
+            this.smartLabel1.LineSpacing = 0F;
+            this.smartLabel1.Location = new System.Drawing.Point(100, 2);
+            this.smartLabel1.Name = "smartLabel1";
+            this.smartLabel1.OverlapOptimize = true;
+            this.smartLabel1.PasswordChar = '\0';
+            this.smartLabel1.Radius = 3;
+            this.smartLabel1.RoundRectFillColor = System.Drawing.Color.LightBlue;
+            this.smartLabel1.Size = new System.Drawing.Size(30, 16);
+            this.smartLabel1.TabIndex = 4;
+            this.smartLabel1.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel1.TextColorDisable = System.Drawing.Color.Gray;
+            this.smartLabel1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+            this.smartLabel1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top;
+            this.smartLabel1.Wordwrap = false;
+            // 
+            // smartLabel2
+            // 
+            this.smartLabel2.BackGround = null;
+            this.smartLabel2.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
+            this.smartLabel2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel2.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
+            this.smartLabel2.LineSpacing = 0F;
+            this.smartLabel2.Location = new System.Drawing.Point(100, 2);
+            this.smartLabel2.Name = "smartLabel2";
+            this.smartLabel2.OverlapOptimize = true;
+            this.smartLabel2.PasswordChar = '\0';
+            this.smartLabel2.Radius = 3;
+            this.smartLabel2.RoundRectFillColor = System.Drawing.Color.LightBlue;
+            this.smartLabel2.Size = new System.Drawing.Size(30, 16);
+            this.smartLabel2.TabIndex = 45;
+            this.smartLabel2.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel2.TextColorDisable = System.Drawing.Color.Gray;
+            this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+            this.smartLabel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top;
+            this.smartLabel2.Wordwrap = false;
+            // 
+            // smartLabel3
+            // 
+            this.smartLabel3.BackGround = null;
+            this.smartLabel3.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
+            this.smartLabel3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel3.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
+            this.smartLabel3.LineSpacing = 0F;
+            this.smartLabel3.Location = new System.Drawing.Point(100, 2);
+            this.smartLabel3.Name = "smartLabel3";
+            this.smartLabel3.OverlapOptimize = true;
+            this.smartLabel3.PasswordChar = '\0';
+            this.smartLabel3.Radius = 3;
+            this.smartLabel3.RoundRectFillColor = System.Drawing.Color.LightBlue;
+            this.smartLabel3.Size = new System.Drawing.Size(30, 16);
+            this.smartLabel3.TabIndex = 47;
+            this.smartLabel3.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel3.TextColorDisable = System.Drawing.Color.Gray;
+            this.smartLabel3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+            this.smartLabel3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top;
+            this.smartLabel3.Wordwrap = false;
+            // 
+            // smartLabel6
+            // 
+            this.smartLabel6.BackGround = null;
+            this.smartLabel6.BackGroundColor = System.Drawing.Color.White;
+            this.smartLabel6.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel6.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
+            this.smartLabel6.LineSpacing = 0F;
+            this.smartLabel6.Location = new System.Drawing.Point(100, 2);
+            this.smartLabel6.Name = "smartLabel6";
+            this.smartLabel6.OverlapOptimize = true;
+            this.smartLabel6.PasswordChar = '\0';
+            this.smartLabel6.Radius = 3;
+            this.smartLabel6.RoundRectFillColor = System.Drawing.Color.LightBlue;
+            this.smartLabel6.Size = new System.Drawing.Size(30, 16);
+            this.smartLabel6.TabIndex = 48;
+            this.smartLabel6.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel6.TextColorDisable = System.Drawing.Color.Gray;
+            this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+            this.smartLabel6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top;
+            this.smartLabel6.Wordwrap = false;
+            // 
+            // smartLabel8
+            // 
+            this.smartLabel8.BackGround = null;
+            this.smartLabel8.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.smartLabel8.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel8.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
+            this.smartLabel8.LineSpacing = 0F;
+            this.smartLabel8.Location = new System.Drawing.Point(100, 2);
+            this.smartLabel8.Name = "smartLabel8";
+            this.smartLabel8.OverlapOptimize = true;
+            this.smartLabel8.PasswordChar = '\0';
+            this.smartLabel8.Radius = 3;
+            this.smartLabel8.RoundRectFillColor = System.Drawing.Color.LightBlue;
+            this.smartLabel8.Size = new System.Drawing.Size(30, 16);
+            this.smartLabel8.TabIndex = 48;
+            this.smartLabel8.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel8.TextColorDisable = System.Drawing.Color.Gray;
+            this.smartLabel8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+            this.smartLabel8.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top;
+            this.smartLabel8.Wordwrap = false;
+            // 
+            // smartLabel9
+            // 
+            this.smartLabel9.BackGround = null;
+            this.smartLabel9.BackGroundColor = System.Drawing.Color.White;
+            this.smartLabel9.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel9.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
+            this.smartLabel9.LineSpacing = 0F;
+            this.smartLabel9.Location = new System.Drawing.Point(100, 2);
+            this.smartLabel9.Name = "smartLabel9";
+            this.smartLabel9.OverlapOptimize = true;
+            this.smartLabel9.PasswordChar = '\0';
+            this.smartLabel9.Radius = 3;
+            this.smartLabel9.RoundRectFillColor = System.Drawing.Color.LightBlue;
+            this.smartLabel9.Size = new System.Drawing.Size(30, 16);
+            this.smartLabel9.TabIndex = 49;
+            this.smartLabel9.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel9.TextColorDisable = System.Drawing.Color.Gray;
+            this.smartLabel9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+            this.smartLabel9.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top;
+            this.smartLabel9.Wordwrap = false;
+            // 
+            // smartLabel10
+            // 
+            this.smartLabel10.BackGround = null;
+            this.smartLabel10.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
+            this.smartLabel10.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel10.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
+            this.smartLabel10.LineSpacing = 0F;
+            this.smartLabel10.Location = new System.Drawing.Point(100, 2);
+            this.smartLabel10.Name = "smartLabel10";
+            this.smartLabel10.OverlapOptimize = true;
+            this.smartLabel10.PasswordChar = '\0';
+            this.smartLabel10.Radius = 3;
+            this.smartLabel10.RoundRectFillColor = System.Drawing.Color.LightBlue;
+            this.smartLabel10.Size = new System.Drawing.Size(30, 16);
+            this.smartLabel10.TabIndex = 48;
+            this.smartLabel10.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel10.TextColorDisable = System.Drawing.Color.Gray;
+            this.smartLabel10.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+            this.smartLabel10.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top;
+            this.smartLabel10.Wordwrap = false;
+            // 
+            // smartLabel13
+            // 
+            this.smartLabel13.BackGround = null;
+            this.smartLabel13.BackGroundColor = System.Drawing.Color.White;
+            this.smartLabel13.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel13.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
+            this.smartLabel13.LineSpacing = 0F;
+            this.smartLabel13.Location = new System.Drawing.Point(100, 2);
+            this.smartLabel13.Name = "smartLabel13";
+            this.smartLabel13.OverlapOptimize = true;
+            this.smartLabel13.PasswordChar = '\0';
+            this.smartLabel13.Radius = 3;
+            this.smartLabel13.RoundRectFillColor = System.Drawing.Color.LightBlue;
+            this.smartLabel13.Size = new System.Drawing.Size(30, 16);
+            this.smartLabel13.TabIndex = 49;
+            this.smartLabel13.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel13.TextColorDisable = System.Drawing.Color.Gray;
+            this.smartLabel13.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+            this.smartLabel13.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top;
+            this.smartLabel13.Wordwrap = false;
+            // 
+            // smartLabel15
+            // 
+            this.smartLabel15.BackGround = null;
+            this.smartLabel15.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
+            this.smartLabel15.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel15.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
+            this.smartLabel15.LineSpacing = 0F;
+            this.smartLabel15.Location = new System.Drawing.Point(100, 2);
+            this.smartLabel15.Name = "smartLabel15";
+            this.smartLabel15.OverlapOptimize = true;
+            this.smartLabel15.PasswordChar = '\0';
+            this.smartLabel15.Radius = 3;
+            this.smartLabel15.RoundRectFillColor = System.Drawing.Color.LightBlue;
+            this.smartLabel15.Size = new System.Drawing.Size(30, 16);
+            this.smartLabel15.TabIndex = 48;
+            this.smartLabel15.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel15.TextColorDisable = System.Drawing.Color.Gray;
+            this.smartLabel15.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+            this.smartLabel15.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top;
+            this.smartLabel15.Wordwrap = false;
+            // 
+            // smartLabel16
+            // 
+            this.smartLabel16.BackGround = null;
+            this.smartLabel16.BackGroundColor = System.Drawing.Color.White;
+            this.smartLabel16.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel16.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
+            this.smartLabel16.LineSpacing = 0F;
+            this.smartLabel16.Location = new System.Drawing.Point(100, 2);
+            this.smartLabel16.Name = "smartLabel16";
+            this.smartLabel16.OverlapOptimize = true;
+            this.smartLabel16.PasswordChar = '\0';
+            this.smartLabel16.Radius = 3;
+            this.smartLabel16.RoundRectFillColor = System.Drawing.Color.LightBlue;
+            this.smartLabel16.Size = new System.Drawing.Size(30, 16);
+            this.smartLabel16.TabIndex = 49;
+            this.smartLabel16.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
+            this.smartLabel16.TextColorDisable = System.Drawing.Color.Gray;
+            this.smartLabel16.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+            this.smartLabel16.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top;
+            this.smartLabel16.Wordwrap = false;
+            // 
             // ControlMenuSystemStatus6_1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -2307,5 +2537,15 @@
         private SmartX.SmartSeparatorLine smartSeparatorLine8;
         private SmartX.SmartSeparatorLine smartSeparatorLine9;
         private SmartX.SmartDraw smartDraw2;
+        private SmartX.SmartLabel smartLabel15;
+        private SmartX.SmartLabel smartLabel16;
+        private SmartX.SmartLabel smartLabel8;
+        private SmartX.SmartLabel smartLabel9;
+        private SmartX.SmartLabel smartLabel10;
+        private SmartX.SmartLabel smartLabel13;
+        private SmartX.SmartLabel smartLabel2;
+        private SmartX.SmartLabel smartLabel3;
+        private SmartX.SmartLabel smartLabel6;
+        private SmartX.SmartLabel smartLabel1;
     }
 }

INT_LKD_PTB6_DW/Controls/System/ControlMenuSystemStatus6_1.cs

@@ -9,10 +9,10 @@ using System.Text;
 using System.Windows.Forms;
 
 using SmartX;
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
 
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     public partial class ControlMenuSystemStatus6_1 : UserControl
     {
@@ -187,7 +187,7 @@ namespace INT_LKD_PTB.Controls
                     value = "Pass";
                     label.TextColor = Define.ColorTextResultPass;
                     break;
-                case Define.E_JudgmentStatus.Ng:
+                case Define.E_JudgmentStatus.Leak:
                     value = "Leak";
                     label.TextColor = Define.ColorTextResultNG;
                     break;
@@ -216,7 +216,7 @@ namespace INT_LKD_PTB.Controls
                 case Define.E_JudgmentStatus.Pass:
                     label.TextColor = Define.ColorTextResultPass;
                     break;
-                case Define.E_JudgmentStatus.Ng:
+                case Define.E_JudgmentStatus.Leak:
                     label.TextColor = Define.ColorTextResultNG;
                     break;
                 case Define.E_JudgmentStatus.Empty:
@@ -239,7 +239,7 @@ namespace INT_LKD_PTB.Controls
                 case Define.E_JudgmentStatus.Pass:
                     label.TextColor = Define.ColorTextResultPass;
                     break;
-                case Define.E_JudgmentStatus.Ng:
+                case Define.E_JudgmentStatus.Leak:
                     label.TextColor = Define.ColorTextResultNG;
                     break;
                 case Define.E_JudgmentStatus.Empty:
@@ -322,7 +322,7 @@ namespace INT_LKD_PTB.Controls
             this.smartDraw2.BackLayer.SetPenStyle(Color.Blue, 2);
             this.smartDraw2.BackLayer.Line(10, 242 - iValue, 600, 242 - iValue);
         }
-        private void UpdateDisplayDotGraphDiffPressure(Collection<LeakData1> datas)
+        private void UpdateDisplayDotGraphDiffPressure(Collection<LeakData> datas)
         {
             string value = "";
             double dValue = 0.0;
@@ -343,7 +343,7 @@ namespace INT_LKD_PTB.Controls
 
             this.smartDraw1.Chart.PutData(iValues);
         }
-        private void UpdateDisplayDotGraphDisplacement(Collection<LeakData1> datas)
+        private void UpdateDisplayDotGraphDisplacement(Collection<LeakData> datas)
         {
             string value = "";
             double dValue = 0.0;
@@ -353,11 +353,12 @@ namespace INT_LKD_PTB.Controls
             // 0.00 ~ 15.00
             // 그래프 영역 높이 230
             // 1500 / 230 = 6.521739130434783
+            // 2500 / 230 = 10.8695652173913
 
             for (int i = 0; i < datas.Count; i++)
             {
                 value = datas[i].DispData.MData.Replace(".", "");
-                dValue = int.Parse(value) / 6.521739130434783;
+                dValue = int.Parse(value) / 10.8695652173913;
 
                 if (dValue > 230)
                     dValue = 230;
@@ -548,7 +549,7 @@ namespace INT_LKD_PTB.Controls
         }
         
         // 차압센서 데이터
-        public void UpdateDisplayDiffPressureData(Collection<LeakData1> datas)
+        public void UpdateDisplayDiffPressureData(Collection<LeakData> datas)
         {
             this.UpdateDisplayDiffPressureData1(datas[0]);
             this.UpdateDisplayDiffPressureData2(datas[1]);
@@ -559,7 +560,7 @@ namespace INT_LKD_PTB.Controls
 
             this.UpdateDisplayDotGraphDiffPressure(datas);
         }
-        private void UpdateDisplayDiffPressureData1(LeakData1 data)
+        private void UpdateDisplayDiffPressureData1(LeakData data)
         {
             string value = "";
 
@@ -567,7 +568,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionDiffSecDiff[0].Text != value)
                 this.CollectionDiffSecDiff[0].Text = value;
         }
-        private void UpdateDisplayDiffPressureData2(LeakData1 data)
+        private void UpdateDisplayDiffPressureData2(LeakData data)
         {
             string value = "";
 
@@ -575,7 +576,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionDiffSecDiff[1].Text != value)
                 this.CollectionDiffSecDiff[1].Text = value;
         }
-        private void UpdateDisplayDiffPressureData3(LeakData1 data)
+        private void UpdateDisplayDiffPressureData3(LeakData data)
         {
             string value = "";
 
@@ -583,7 +584,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionDiffSecDiff[2].Text != value)
                 this.CollectionDiffSecDiff[2].Text = value;
         }
-        private void UpdateDisplayDiffPressureData4(LeakData1 data)
+        private void UpdateDisplayDiffPressureData4(LeakData data)
         {
             string value = "";
 
@@ -591,7 +592,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionDiffSecDiff[3].Text != value)
                 this.CollectionDiffSecDiff[3].Text = value;
         }
-        private void UpdateDisplayDiffPressureData5(LeakData1 data)
+        private void UpdateDisplayDiffPressureData5(LeakData data)
         {
             string value = "";
 
@@ -599,7 +600,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionDiffSecDiff[4].Text != value)
                 this.CollectionDiffSecDiff[4].Text = value;
         }
-        private void UpdateDisplayDiffPressureData6(LeakData1 data)
+        private void UpdateDisplayDiffPressureData6(LeakData data)
         {
             string value = "";
 
@@ -608,7 +609,7 @@ namespace INT_LKD_PTB.Controls
                 this.CollectionDiffSecDiff[5].Text = value;
         }
         // 변위센서 데이터
-        public void UpdateDisplayDisplacementData(Collection<LeakData1> datas)
+        public void UpdateDisplayDisplacementData(Collection<LeakData> datas)
         {
             this.UpdateDisplayDisplacementData1(datas[0]);
             this.UpdateDisplayDisplacementData2(datas[1]);
@@ -619,26 +620,26 @@ namespace INT_LKD_PTB.Controls
 
             this.UpdateDisplayDotGraphDisplacement(datas);
         }
-        private void UpdateDisplayDisplacementData1(LeakData1 data)
+        private void UpdateDisplayDisplacementData1(LeakData data)
         {
         }
-        private void UpdateDisplayDisplacementData2(LeakData1 data)
+        private void UpdateDisplayDisplacementData2(LeakData data)
         {
         }
-        private void UpdateDisplayDisplacementData3(LeakData1 data)
+        private void UpdateDisplayDisplacementData3(LeakData data)
         {
         }
-        private void UpdateDisplayDisplacementData4(LeakData1 data)
+        private void UpdateDisplayDisplacementData4(LeakData data)
         {
         }
-        private void UpdateDisplayDisplacementData5(LeakData1 data)
+        private void UpdateDisplayDisplacementData5(LeakData data)
         {
         }
-        private void UpdateDisplayDisplacementData6(LeakData1 data)
+        private void UpdateDisplayDisplacementData6(LeakData data)
         {
         }
         // 압력센서 데이터
-        public void UpdateDisplayPressureData(Collection<LeakData1> datas)
+        public void UpdateDisplayPressureData(Collection<LeakData> datas)
         {
             this.UpdateDisplayPressureData1(datas[0]);
             this.UpdateDisplayPressureData2(datas[1]);
@@ -647,7 +648,7 @@ namespace INT_LKD_PTB.Controls
             this.UpdateDisplayPressureData5(datas[4]);
             this.UpdateDisplayPressureData6(datas[5]);
         }
-        private void UpdateDisplayPressureData1(LeakData1 data)
+        private void UpdateDisplayPressureData1(LeakData data)
         {
             string value = "";
 
@@ -659,7 +660,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionPressureMaster[0].Text != value)
                 this.CollectionPressureMaster[0].Text = value;
         }
-        private void UpdateDisplayPressureData2(LeakData1 data)
+        private void UpdateDisplayPressureData2(LeakData data)
         {
             string value = "";
 
@@ -671,7 +672,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionPressureMaster[1].Text != value)
                 this.CollectionPressureMaster[1].Text = value;
         }
-        private void UpdateDisplayPressureData3(LeakData1 data)
+        private void UpdateDisplayPressureData3(LeakData data)
         {
             string value = "";
 
@@ -683,7 +684,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionPressureMaster[2].Text != value)
                 this.CollectionPressureMaster[2].Text = value;
         }
-        private void UpdateDisplayPressureData4(LeakData1 data)
+        private void UpdateDisplayPressureData4(LeakData data)
         {
             string value = "";
 
@@ -695,7 +696,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionPressureMaster[3].Text != value)
                 this.CollectionPressureMaster[3].Text = value;
         }
-        private void UpdateDisplayPressureData5(LeakData1 data)
+        private void UpdateDisplayPressureData5(LeakData data)
         {
             string value = "";
 
@@ -707,7 +708,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionPressureMaster[4].Text != value)
                 this.CollectionPressureMaster[4].Text = value;
         }
-        private void UpdateDisplayPressureData6(LeakData1 data)
+        private void UpdateDisplayPressureData6(LeakData data)
         {
             string value = "";
 
@@ -720,7 +721,7 @@ namespace INT_LKD_PTB.Controls
                 this.CollectionPressureMaster[5].Text = value;
         }
         // 판정결과
-        public void UpdateDisplayJudgmentData(Collection<LeakData1> datas)
+        public void UpdateDisplayJudgmentData(Collection<LeakData> datas)
         {
             this.UpdateDisplayJudgmentData1(datas[0]);
             this.UpdateDisplayJudgmentData2(datas[1]);
@@ -729,7 +730,7 @@ namespace INT_LKD_PTB.Controls
             this.UpdateDisplayJudgmentData5(datas[4]);
             this.UpdateDisplayJudgmentData6(datas[5]);
         }
-        private void UpdateDisplayJudgmentData1(LeakData1 data)
+        private void UpdateDisplayJudgmentData1(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.CollectionLabelResult[0]);
 
@@ -744,7 +745,7 @@ namespace INT_LKD_PTB.Controls
                 this.GetJudgmentResultDisplacement(data.Judgment.DISP_Result, this.CollectionLabelResultDisp[0]);
             }
         }
-        private void UpdateDisplayJudgmentData2(LeakData1 data)
+        private void UpdateDisplayJudgmentData2(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.CollectionLabelResult[1]);
 
@@ -759,7 +760,7 @@ namespace INT_LKD_PTB.Controls
                 this.GetJudgmentResultDisplacement(data.Judgment.DISP_Result, this.CollectionLabelResultDisp[1]);
             }
         }
-        private void UpdateDisplayJudgmentData3(LeakData1 data)
+        private void UpdateDisplayJudgmentData3(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.CollectionLabelResult[2]);
 
@@ -774,7 +775,7 @@ namespace INT_LKD_PTB.Controls
                 this.GetJudgmentResultDisplacement(data.Judgment.DISP_Result, this.CollectionLabelResultDisp[2]);
             }
         }
-        private void UpdateDisplayJudgmentData4(LeakData1 data)
+        private void UpdateDisplayJudgmentData4(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.CollectionLabelResult[3]);
 
@@ -789,7 +790,7 @@ namespace INT_LKD_PTB.Controls
                 this.GetJudgmentResultDisplacement(data.Judgment.DISP_Result, this.CollectionLabelResultDisp[3]);
             }
         }
-        private void UpdateDisplayJudgmentData5(LeakData1 data)
+        private void UpdateDisplayJudgmentData5(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.CollectionLabelResult[4]);
 
@@ -804,7 +805,7 @@ namespace INT_LKD_PTB.Controls
                 this.GetJudgmentResultDisplacement(data.Judgment.DISP_Result, this.CollectionLabelResultDisp[4]);
             }
         }
-        private void UpdateDisplayJudgmentData6(LeakData1 data)
+        private void UpdateDisplayJudgmentData6(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.CollectionLabelResult[5]);
 
@@ -829,7 +830,8 @@ namespace INT_LKD_PTB.Controls
             {
                 this.CalScaleDiffPressure(this.ParentForm.ParentForm.CurrentRecipe.DIFF_LR_LIMIT);
                 this.DrawDiffPressureReferenceLine(this.ParentForm.ParentForm.CurrentRecipe.DIFF_LR_LIMIT);
-                
+                this.DrawDisplacementReferenceLine(this.ParentForm.ParentForm.CurrentRecipe.DISP_JUDG_MIN_HEIGHT);
+
                 // 화면 데이터 초기화
                 this.InitializeData();
                 this.ParentForm.Child_System_Equipment6_2.InitializeData();

INT_LKD_PTB6_DW/Controls/System/ControlMenuSystemStatus6_1.resx

@@ -120,9 +120,6 @@
   <metadata name="smartDraw_ChartChannelPenStyle1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="smartDraw_ChartChannelPenStyle1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>47</value>
   </metadata>

INT_LKD_PTB6_DW/Controls/System/ControlMenuSystemStatus6_2.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     partial class ControlMenuSystemStatus6_2
     {
@@ -602,13 +602,13 @@
             this.labelDispMDataMax3.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDispMDataMax3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDispMDataMax3.LineSpacing = 0F;
-            this.labelDispMDataMax3.Location = new System.Drawing.Point(90, 241);
+            this.labelDispMDataMax3.Location = new System.Drawing.Point(149, 241);
             this.labelDispMDataMax3.Name = "labelDispMDataMax3";
             this.labelDispMDataMax3.OverlapOptimize = true;
             this.labelDispMDataMax3.PasswordChar = '\0';
             this.labelDispMDataMax3.Radius = 3;
             this.labelDispMDataMax3.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDispMDataMax3.Size = new System.Drawing.Size(80, 20);
+            this.labelDispMDataMax3.Size = new System.Drawing.Size(142, 20);
             this.labelDispMDataMax3.TabIndex = 45;
             this.labelDispMDataMax3.Text = "9.2354";
             this.labelDispMDataMax3.TextColor = System.Drawing.Color.White;
@@ -631,7 +631,7 @@
             this.labelTitleDispMDataM3.PasswordChar = '\0';
             this.labelTitleDispMDataM3.Radius = 3;
             this.labelTitleDispMDataM3.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelTitleDispMDataM3.Size = new System.Drawing.Size(80, 20);
+            this.labelTitleDispMDataM3.Size = new System.Drawing.Size(142, 20);
             this.labelTitleDispMDataM3.TabIndex = 44;
             this.labelTitleDispMDataM3.Text = "Max.H";
             this.labelTitleDispMDataM3.TextColor = System.Drawing.Color.White;
@@ -693,13 +693,13 @@
             this.labelDispMDataMax1.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDispMDataMax1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDispMDataMax1.LineSpacing = 0F;
-            this.labelDispMDataMax1.Location = new System.Drawing.Point(90, 241);
+            this.labelDispMDataMax1.Location = new System.Drawing.Point(149, 241);
             this.labelDispMDataMax1.Name = "labelDispMDataMax1";
             this.labelDispMDataMax1.OverlapOptimize = true;
             this.labelDispMDataMax1.PasswordChar = '\0';
             this.labelDispMDataMax1.Radius = 3;
             this.labelDispMDataMax1.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDispMDataMax1.Size = new System.Drawing.Size(80, 20);
+            this.labelDispMDataMax1.Size = new System.Drawing.Size(142, 20);
             this.labelDispMDataMax1.TabIndex = 31;
             this.labelDispMDataMax1.Text = "9.2354";
             this.labelDispMDataMax1.TextColor = System.Drawing.Color.White;
@@ -722,7 +722,7 @@
             this.labelTitleDispMDataM1.PasswordChar = '\0';
             this.labelTitleDispMDataM1.Radius = 3;
             this.labelTitleDispMDataM1.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelTitleDispMDataM1.Size = new System.Drawing.Size(80, 20);
+            this.labelTitleDispMDataM1.Size = new System.Drawing.Size(142, 20);
             this.labelTitleDispMDataM1.TabIndex = 30;
             this.labelTitleDispMDataM1.Text = "Max.H";
             this.labelTitleDispMDataM1.TextColor = System.Drawing.Color.White;
@@ -827,7 +827,7 @@
             this.labelTitleDispRData1.PasswordChar = '\0';
             this.labelTitleDispRData1.Radius = 3;
             this.labelTitleDispRData1.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelTitleDispRData1.Size = new System.Drawing.Size(80, 20);
+            this.labelTitleDispRData1.Size = new System.Drawing.Size(142, 20);
             this.labelTitleDispRData1.TabIndex = 12;
             this.labelTitleDispRData1.Text = "Level";
             this.labelTitleDispRData1.TextColor = System.Drawing.Color.White;
@@ -913,13 +913,13 @@
             this.labelDispRData1.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDispRData1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDispRData1.LineSpacing = 0F;
-            this.labelDispRData1.Location = new System.Drawing.Point(90, 197);
+            this.labelDispRData1.Location = new System.Drawing.Point(149, 197);
             this.labelDispRData1.Name = "labelDispRData1";
             this.labelDispRData1.OverlapOptimize = true;
             this.labelDispRData1.PasswordChar = '\0';
             this.labelDispRData1.Radius = 3;
             this.labelDispRData1.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDispRData1.Size = new System.Drawing.Size(80, 20);
+            this.labelDispRData1.Size = new System.Drawing.Size(142, 20);
             this.labelDispRData1.TabIndex = 12;
             this.labelDispRData1.Text = "0.00";
             this.labelDispRData1.TextColor = System.Drawing.Color.White;
@@ -1001,7 +1001,7 @@
             this.labelTitleDispMData1.PasswordChar = '\0';
             this.labelTitleDispMData1.Radius = 3;
             this.labelTitleDispMData1.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelTitleDispMData1.Size = new System.Drawing.Size(80, 20);
+            this.labelTitleDispMData1.Size = new System.Drawing.Size(142, 20);
             this.labelTitleDispMData1.TabIndex = 13;
             this.labelTitleDispMData1.Text = "Height";
             this.labelTitleDispMData1.TextColor = System.Drawing.Color.White;
@@ -1077,13 +1077,13 @@
             this.labelDispMData1.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDispMData1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDispMData1.LineSpacing = 0F;
-            this.labelDispMData1.Location = new System.Drawing.Point(90, 219);
+            this.labelDispMData1.Location = new System.Drawing.Point(149, 219);
             this.labelDispMData1.Name = "labelDispMData1";
             this.labelDispMData1.OverlapOptimize = true;
             this.labelDispMData1.PasswordChar = '\0';
             this.labelDispMData1.Radius = 3;
             this.labelDispMData1.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDispMData1.Size = new System.Drawing.Size(80, 20);
+            this.labelDispMData1.Size = new System.Drawing.Size(142, 20);
             this.labelDispMData1.TabIndex = 14;
             this.labelDispMData1.Text = "9.2354";
             this.labelDispMData1.TextColor = System.Drawing.Color.White;
@@ -1152,7 +1152,7 @@
             this.labelTitleDispMDataD1.PasswordChar = '\0';
             this.labelTitleDispMDataD1.Radius = 3;
             this.labelTitleDispMDataD1.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelTitleDispMDataD1.Size = new System.Drawing.Size(80, 20);
+            this.labelTitleDispMDataD1.Size = new System.Drawing.Size(142, 20);
             this.labelTitleDispMDataD1.TabIndex = 28;
             this.labelTitleDispMDataD1.Text = "Diff";
             this.labelTitleDispMDataD1.TextColor = System.Drawing.Color.White;
@@ -1215,13 +1215,13 @@
             this.labelDispMDataDiff1.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDispMDataDiff1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDispMDataDiff1.LineSpacing = 0F;
-            this.labelDispMDataDiff1.Location = new System.Drawing.Point(90, 263);
+            this.labelDispMDataDiff1.Location = new System.Drawing.Point(149, 263);
             this.labelDispMDataDiff1.Name = "labelDispMDataDiff1";
             this.labelDispMDataDiff1.OverlapOptimize = true;
             this.labelDispMDataDiff1.PasswordChar = '\0';
             this.labelDispMDataDiff1.Radius = 3;
             this.labelDispMDataDiff1.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDispMDataDiff1.Size = new System.Drawing.Size(80, 20);
+            this.labelDispMDataDiff1.Size = new System.Drawing.Size(142, 20);
             this.labelDispMDataDiff1.TabIndex = 29;
             this.labelDispMDataDiff1.Text = "9.2354";
             this.labelDispMDataDiff1.TextColor = System.Drawing.Color.White;
@@ -1290,7 +1290,7 @@
             this.labelTitleDispMDataD3.PasswordChar = '\0';
             this.labelTitleDispMDataD3.Radius = 3;
             this.labelTitleDispMDataD3.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelTitleDispMDataD3.Size = new System.Drawing.Size(80, 20);
+            this.labelTitleDispMDataD3.Size = new System.Drawing.Size(142, 20);
             this.labelTitleDispMDataD3.TabIndex = 42;
             this.labelTitleDispMDataD3.Text = "Diff";
             this.labelTitleDispMDataD3.TextColor = System.Drawing.Color.White;
@@ -1307,13 +1307,13 @@
             this.labelDispMDataDiff3.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDispMDataDiff3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDispMDataDiff3.LineSpacing = 0F;
-            this.labelDispMDataDiff3.Location = new System.Drawing.Point(90, 263);
+            this.labelDispMDataDiff3.Location = new System.Drawing.Point(149, 263);
             this.labelDispMDataDiff3.Name = "labelDispMDataDiff3";
             this.labelDispMDataDiff3.OverlapOptimize = true;
             this.labelDispMDataDiff3.PasswordChar = '\0';
             this.labelDispMDataDiff3.Radius = 3;
             this.labelDispMDataDiff3.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDispMDataDiff3.Size = new System.Drawing.Size(80, 20);
+            this.labelDispMDataDiff3.Size = new System.Drawing.Size(142, 20);
             this.labelDispMDataDiff3.TabIndex = 43;
             this.labelDispMDataDiff3.Text = "9.2354";
             this.labelDispMDataDiff3.TextColor = System.Drawing.Color.White;
@@ -1376,13 +1376,13 @@
             this.labelDiffSecMax3.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDiffSecMax3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDiffSecMax3.LineSpacing = 0F;
-            this.labelDiffSecMax3.Location = new System.Drawing.Point(90, 173);
+            this.labelDiffSecMax3.Location = new System.Drawing.Point(149, 173);
             this.labelDiffSecMax3.Name = "labelDiffSecMax3";
             this.labelDiffSecMax3.OverlapOptimize = true;
             this.labelDiffSecMax3.PasswordChar = '\0';
             this.labelDiffSecMax3.Radius = 3;
             this.labelDiffSecMax3.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDiffSecMax3.Size = new System.Drawing.Size(80, 20);
+            this.labelDiffSecMax3.Size = new System.Drawing.Size(142, 20);
             this.labelDiffSecMax3.TabIndex = 49;
             this.labelDiffSecMax3.Text = "0.0023";
             this.labelDiffSecMax3.TextColor = System.Drawing.Color.White;
@@ -1428,7 +1428,7 @@
             this.labelTitleDispRData3.PasswordChar = '\0';
             this.labelTitleDispRData3.Radius = 3;
             this.labelTitleDispRData3.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelTitleDispRData3.Size = new System.Drawing.Size(80, 20);
+            this.labelTitleDispRData3.Size = new System.Drawing.Size(142, 20);
             this.labelTitleDispRData3.TabIndex = 29;
             this.labelTitleDispRData3.Text = "Level";
             this.labelTitleDispRData3.TextColor = System.Drawing.Color.White;
@@ -1474,7 +1474,7 @@
             this.smartLabel41.PasswordChar = '\0';
             this.smartLabel41.Radius = 3;
             this.smartLabel41.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.smartLabel41.Size = new System.Drawing.Size(80, 20);
+            this.smartLabel41.Size = new System.Drawing.Size(142, 20);
             this.smartLabel41.TabIndex = 48;
             this.smartLabel41.Text = "LR.Max";
             this.smartLabel41.TextColor = System.Drawing.Color.White;
@@ -1497,7 +1497,7 @@
             this.smartLabel23.PasswordChar = '\0';
             this.smartLabel23.Radius = 3;
             this.smartLabel23.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.smartLabel23.Size = new System.Drawing.Size(80, 20);
+            this.smartLabel23.Size = new System.Drawing.Size(142, 20);
             this.smartLabel23.TabIndex = 39;
             this.smartLabel23.Text = "ADC";
             this.smartLabel23.TextColor = System.Drawing.Color.White;
@@ -1540,13 +1540,13 @@
             this.labelDiffSecSum3.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDiffSecSum3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDiffSecSum3.LineSpacing = 0F;
-            this.labelDiffSecSum3.Location = new System.Drawing.Point(90, 151);
+            this.labelDiffSecSum3.Location = new System.Drawing.Point(149, 151);
             this.labelDiffSecSum3.Name = "labelDiffSecSum3";
             this.labelDiffSecSum3.OverlapOptimize = true;
             this.labelDiffSecSum3.PasswordChar = '\0';
             this.labelDiffSecSum3.Radius = 3;
             this.labelDiffSecSum3.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDiffSecSum3.Size = new System.Drawing.Size(80, 20);
+            this.labelDiffSecSum3.Size = new System.Drawing.Size(142, 20);
             this.labelDiffSecSum3.TabIndex = 47;
             this.labelDiffSecSum3.Text = "0.0023";
             this.labelDiffSecSum3.TextColor = System.Drawing.Color.White;
@@ -1563,13 +1563,13 @@
             this.labelDiffMadc3.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDiffMadc3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDiffMadc3.LineSpacing = 0F;
-            this.labelDiffMadc3.Location = new System.Drawing.Point(90, 107);
+            this.labelDiffMadc3.Location = new System.Drawing.Point(149, 107);
             this.labelDiffMadc3.Name = "labelDiffMadc3";
             this.labelDiffMadc3.OverlapOptimize = true;
             this.labelDiffMadc3.PasswordChar = '\0';
             this.labelDiffMadc3.Radius = 3;
             this.labelDiffMadc3.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDiffMadc3.Size = new System.Drawing.Size(80, 20);
+            this.labelDiffMadc3.Size = new System.Drawing.Size(142, 20);
             this.labelDiffMadc3.TabIndex = 40;
             this.labelDiffMadc3.Text = "0.0023";
             this.labelDiffMadc3.TextColor = System.Drawing.Color.White;
@@ -1586,13 +1586,13 @@
             this.labelDispRData3.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDispRData3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDispRData3.LineSpacing = 0F;
-            this.labelDispRData3.Location = new System.Drawing.Point(90, 197);
+            this.labelDispRData3.Location = new System.Drawing.Point(149, 197);
             this.labelDispRData3.Name = "labelDispRData3";
             this.labelDispRData3.OverlapOptimize = true;
             this.labelDispRData3.PasswordChar = '\0';
             this.labelDispRData3.Radius = 3;
             this.labelDispRData3.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDispRData3.Size = new System.Drawing.Size(80, 20);
+            this.labelDispRData3.Size = new System.Drawing.Size(142, 20);
             this.labelDispRData3.TabIndex = 28;
             this.labelDispRData3.Text = "0.00";
             this.labelDispRData3.TextColor = System.Drawing.Color.White;
@@ -1638,7 +1638,7 @@
             this.smartLabel45.PasswordChar = '\0';
             this.smartLabel45.Radius = 3;
             this.smartLabel45.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.smartLabel45.Size = new System.Drawing.Size(80, 20);
+            this.smartLabel45.Size = new System.Drawing.Size(142, 20);
             this.smartLabel45.TabIndex = 46;
             this.smartLabel45.Text = "LR.Judg";
             this.smartLabel45.TextColor = System.Drawing.Color.White;
@@ -1684,7 +1684,7 @@
             this.labelTitleDispMData3.PasswordChar = '\0';
             this.labelTitleDispMData3.Radius = 3;
             this.labelTitleDispMData3.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelTitleDispMData3.Size = new System.Drawing.Size(80, 20);
+            this.labelTitleDispMData3.Size = new System.Drawing.Size(142, 20);
             this.labelTitleDispMData3.TabIndex = 30;
             this.labelTitleDispMData3.Text = "Height";
             this.labelTitleDispMData3.TextColor = System.Drawing.Color.White;
@@ -1737,13 +1737,13 @@
             this.labelDispMData3.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDispMData3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDispMData3.LineSpacing = 0F;
-            this.labelDispMData3.Location = new System.Drawing.Point(90, 219);
+            this.labelDispMData3.Location = new System.Drawing.Point(149, 219);
             this.labelDispMData3.Name = "labelDispMData3";
             this.labelDispMData3.OverlapOptimize = true;
             this.labelDispMData3.PasswordChar = '\0';
             this.labelDispMData3.Radius = 3;
             this.labelDispMData3.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDispMData3.Size = new System.Drawing.Size(80, 20);
+            this.labelDispMData3.Size = new System.Drawing.Size(142, 20);
             this.labelDispMData3.TabIndex = 31;
             this.labelDispMData3.Text = "9.2354";
             this.labelDispMData3.TextColor = System.Drawing.Color.White;
@@ -1760,13 +1760,13 @@
             this.labelDiffSecDiff3.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDiffSecDiff3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDiffSecDiff3.LineSpacing = 0F;
-            this.labelDiffSecDiff3.Location = new System.Drawing.Point(90, 129);
+            this.labelDiffSecDiff3.Location = new System.Drawing.Point(149, 129);
             this.labelDiffSecDiff3.Name = "labelDiffSecDiff3";
             this.labelDiffSecDiff3.OverlapOptimize = true;
             this.labelDiffSecDiff3.PasswordChar = '\0';
             this.labelDiffSecDiff3.Radius = 3;
             this.labelDiffSecDiff3.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDiffSecDiff3.Size = new System.Drawing.Size(80, 20);
+            this.labelDiffSecDiff3.Size = new System.Drawing.Size(142, 20);
             this.labelDiffSecDiff3.TabIndex = 33;
             this.labelDiffSecDiff3.Text = "0.0023";
             this.labelDiffSecDiff3.TextColor = System.Drawing.Color.White;
@@ -1789,7 +1789,7 @@
             this.smartLabel28.PasswordChar = '\0';
             this.smartLabel28.Radius = 3;
             this.smartLabel28.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.smartLabel28.Size = new System.Drawing.Size(80, 20);
+            this.smartLabel28.Size = new System.Drawing.Size(142, 20);
             this.smartLabel28.TabIndex = 32;
             this.smartLabel28.Text = "LR.Sec";
             this.smartLabel28.TextColor = System.Drawing.Color.White;
@@ -2462,13 +2462,13 @@
             this.labelDispMDataDiff2.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDispMDataDiff2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDispMDataDiff2.LineSpacing = 0F;
-            this.labelDispMDataDiff2.Location = new System.Drawing.Point(90, 263);
+            this.labelDispMDataDiff2.Location = new System.Drawing.Point(149, 263);
             this.labelDispMDataDiff2.Name = "labelDispMDataDiff2";
             this.labelDispMDataDiff2.OverlapOptimize = true;
             this.labelDispMDataDiff2.PasswordChar = '\0';
             this.labelDispMDataDiff2.Radius = 3;
             this.labelDispMDataDiff2.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDispMDataDiff2.Size = new System.Drawing.Size(80, 20);
+            this.labelDispMDataDiff2.Size = new System.Drawing.Size(142, 20);
             this.labelDispMDataDiff2.TabIndex = 37;
             this.labelDispMDataDiff2.Text = "9.2354";
             this.labelDispMDataDiff2.TextColor = System.Drawing.Color.White;
@@ -2491,7 +2491,7 @@
             this.labelTitleDispMDataD2.PasswordChar = '\0';
             this.labelTitleDispMDataD2.Radius = 3;
             this.labelTitleDispMDataD2.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelTitleDispMDataD2.Size = new System.Drawing.Size(80, 20);
+            this.labelTitleDispMDataD2.Size = new System.Drawing.Size(142, 20);
             this.labelTitleDispMDataD2.TabIndex = 36;
             this.labelTitleDispMDataD2.Text = "Diff";
             this.labelTitleDispMDataD2.TextColor = System.Drawing.Color.White;
@@ -2554,13 +2554,13 @@
             this.labelDiffSecMax2.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDiffSecMax2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDiffSecMax2.LineSpacing = 0F;
-            this.labelDiffSecMax2.Location = new System.Drawing.Point(90, 173);
+            this.labelDiffSecMax2.Location = new System.Drawing.Point(149, 173);
             this.labelDiffSecMax2.Name = "labelDiffSecMax2";
             this.labelDiffSecMax2.OverlapOptimize = true;
             this.labelDiffSecMax2.PasswordChar = '\0';
             this.labelDiffSecMax2.Radius = 3;
             this.labelDiffSecMax2.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDiffSecMax2.Size = new System.Drawing.Size(80, 20);
+            this.labelDiffSecMax2.Size = new System.Drawing.Size(142, 20);
             this.labelDiffSecMax2.TabIndex = 43;
             this.labelDiffSecMax2.Text = "0.0023";
             this.labelDiffSecMax2.TextColor = System.Drawing.Color.White;
@@ -2606,7 +2606,7 @@
             this.labelTitleDispRData2.PasswordChar = '\0';
             this.labelTitleDispRData2.Radius = 3;
             this.labelTitleDispRData2.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelTitleDispRData2.Size = new System.Drawing.Size(80, 20);
+            this.labelTitleDispRData2.Size = new System.Drawing.Size(142, 20);
             this.labelTitleDispRData2.TabIndex = 29;
             this.labelTitleDispRData2.Text = "Level";
             this.labelTitleDispRData2.TextColor = System.Drawing.Color.White;
@@ -2701,7 +2701,7 @@
             this.smartLabel24.PasswordChar = '\0';
             this.smartLabel24.Radius = 3;
             this.smartLabel24.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.smartLabel24.Size = new System.Drawing.Size(80, 20);
+            this.smartLabel24.Size = new System.Drawing.Size(142, 20);
             this.smartLabel24.TabIndex = 42;
             this.smartLabel24.Text = "LR.Max";
             this.smartLabel24.TextColor = System.Drawing.Color.White;
@@ -2724,7 +2724,7 @@
             this.labelTitleDispMDataM2.PasswordChar = '\0';
             this.labelTitleDispMDataM2.Radius = 3;
             this.labelTitleDispMDataM2.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelTitleDispMDataM2.Size = new System.Drawing.Size(80, 20);
+            this.labelTitleDispMDataM2.Size = new System.Drawing.Size(142, 20);
             this.labelTitleDispMDataM2.TabIndex = 38;
             this.labelTitleDispMDataM2.Text = "Max.H";
             this.labelTitleDispMDataM2.TextColor = System.Drawing.Color.White;
@@ -2741,13 +2741,13 @@
             this.labelDispRData2.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDispRData2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDispRData2.LineSpacing = 0F;
-            this.labelDispRData2.Location = new System.Drawing.Point(90, 197);
+            this.labelDispRData2.Location = new System.Drawing.Point(149, 197);
             this.labelDispRData2.Name = "labelDispRData2";
             this.labelDispRData2.OverlapOptimize = true;
             this.labelDispRData2.PasswordChar = '\0';
             this.labelDispRData2.Radius = 3;
             this.labelDispRData2.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDispRData2.Size = new System.Drawing.Size(80, 20);
+            this.labelDispRData2.Size = new System.Drawing.Size(142, 20);
             this.labelDispRData2.TabIndex = 28;
             this.labelDispRData2.Text = "0.00";
             this.labelDispRData2.TextColor = System.Drawing.Color.White;
@@ -2829,7 +2829,7 @@
             this.labelTitleDispMData2.PasswordChar = '\0';
             this.labelTitleDispMData2.Radius = 3;
             this.labelTitleDispMData2.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelTitleDispMData2.Size = new System.Drawing.Size(80, 20);
+            this.labelTitleDispMData2.Size = new System.Drawing.Size(142, 20);
             this.labelTitleDispMData2.TabIndex = 30;
             this.labelTitleDispMData2.Text = "Height";
             this.labelTitleDispMData2.TextColor = System.Drawing.Color.White;
@@ -2846,13 +2846,13 @@
             this.labelDiffSecSum2.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDiffSecSum2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDiffSecSum2.LineSpacing = 0F;
-            this.labelDiffSecSum2.Location = new System.Drawing.Point(90, 151);
+            this.labelDiffSecSum2.Location = new System.Drawing.Point(149, 151);
             this.labelDiffSecSum2.Name = "labelDiffSecSum2";
             this.labelDiffSecSum2.OverlapOptimize = true;
             this.labelDiffSecSum2.PasswordChar = '\0';
             this.labelDiffSecSum2.Radius = 3;
             this.labelDiffSecSum2.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDiffSecSum2.Size = new System.Drawing.Size(80, 20);
+            this.labelDiffSecSum2.Size = new System.Drawing.Size(142, 20);
             this.labelDiffSecSum2.TabIndex = 41;
             this.labelDiffSecSum2.Text = "0.0023";
             this.labelDiffSecSum2.TextColor = System.Drawing.Color.White;
@@ -2869,13 +2869,13 @@
             this.labelDispMDataMax2.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDispMDataMax2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDispMDataMax2.LineSpacing = 0F;
-            this.labelDispMDataMax2.Location = new System.Drawing.Point(90, 241);
+            this.labelDispMDataMax2.Location = new System.Drawing.Point(149, 241);
             this.labelDispMDataMax2.Name = "labelDispMDataMax2";
             this.labelDispMDataMax2.OverlapOptimize = true;
             this.labelDispMDataMax2.PasswordChar = '\0';
             this.labelDispMDataMax2.Radius = 3;
             this.labelDispMDataMax2.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDispMDataMax2.Size = new System.Drawing.Size(80, 20);
+            this.labelDispMDataMax2.Size = new System.Drawing.Size(142, 20);
             this.labelDispMDataMax2.TabIndex = 39;
             this.labelDispMDataMax2.Text = "9.2354";
             this.labelDispMDataMax2.TextColor = System.Drawing.Color.White;
@@ -2892,13 +2892,13 @@
             this.labelDispMData2.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDispMData2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDispMData2.LineSpacing = 0F;
-            this.labelDispMData2.Location = new System.Drawing.Point(90, 219);
+            this.labelDispMData2.Location = new System.Drawing.Point(149, 219);
             this.labelDispMData2.Name = "labelDispMData2";
             this.labelDispMData2.OverlapOptimize = true;
             this.labelDispMData2.PasswordChar = '\0';
             this.labelDispMData2.Radius = 3;
             this.labelDispMData2.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDispMData2.Size = new System.Drawing.Size(80, 20);
+            this.labelDispMData2.Size = new System.Drawing.Size(142, 20);
             this.labelDispMData2.TabIndex = 31;
             this.labelDispMData2.Text = "9.2354";
             this.labelDispMData2.TextColor = System.Drawing.Color.White;
@@ -2921,7 +2921,7 @@
             this.smartLabel9.PasswordChar = '\0';
             this.smartLabel9.Radius = 3;
             this.smartLabel9.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.smartLabel9.Size = new System.Drawing.Size(80, 20);
+            this.smartLabel9.Size = new System.Drawing.Size(142, 20);
             this.smartLabel9.TabIndex = 39;
             this.smartLabel9.Text = "ADC";
             this.smartLabel9.TextColor = System.Drawing.Color.White;
@@ -2938,13 +2938,13 @@
             this.labelDiffMadc2.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDiffMadc2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDiffMadc2.LineSpacing = 0F;
-            this.labelDiffMadc2.Location = new System.Drawing.Point(90, 107);
+            this.labelDiffMadc2.Location = new System.Drawing.Point(149, 107);
             this.labelDiffMadc2.Name = "labelDiffMadc2";
             this.labelDiffMadc2.OverlapOptimize = true;
             this.labelDiffMadc2.PasswordChar = '\0';
             this.labelDiffMadc2.Radius = 3;
             this.labelDiffMadc2.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDiffMadc2.Size = new System.Drawing.Size(80, 20);
+            this.labelDiffMadc2.Size = new System.Drawing.Size(142, 20);
             this.labelDiffMadc2.TabIndex = 40;
             this.labelDiffMadc2.Text = "0.0023";
             this.labelDiffMadc2.TextColor = System.Drawing.Color.White;
@@ -2961,13 +2961,13 @@
             this.labelDiffSecDiff2.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelDiffSecDiff2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular);
             this.labelDiffSecDiff2.LineSpacing = 0F;
-            this.labelDiffSecDiff2.Location = new System.Drawing.Point(90, 129);
+            this.labelDiffSecDiff2.Location = new System.Drawing.Point(149, 129);
             this.labelDiffSecDiff2.Name = "labelDiffSecDiff2";
             this.labelDiffSecDiff2.OverlapOptimize = true;
             this.labelDiffSecDiff2.PasswordChar = '\0';
             this.labelDiffSecDiff2.Radius = 3;
             this.labelDiffSecDiff2.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.labelDiffSecDiff2.Size = new System.Drawing.Size(80, 20);
+            this.labelDiffSecDiff2.Size = new System.Drawing.Size(142, 20);
             this.labelDiffSecDiff2.TabIndex = 33;
             this.labelDiffSecDiff2.Text = "0.0023";
             this.labelDiffSecDiff2.TextColor = System.Drawing.Color.White;
@@ -2990,7 +2990,7 @@
             this.smartLabel16.PasswordChar = '\0';
             this.smartLabel16.Radius = 3;
             this.smartLabel16.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.smartLabel16.Size = new System.Drawing.Size(80, 20);
+            this.smartLabel16.Size = new System.Drawing.Size(142, 20);
             this.smartLabel16.TabIndex = 32;
             this.smartLabel16.Text = "LR.Sec";
             this.smartLabel16.TextColor = System.Drawing.Color.White;
@@ -3013,7 +3013,7 @@
             this.smartLabel29.PasswordChar = '\0';
             this.smartLabel29.Radius = 3;
             this.smartLabel29.RoundRectFillColor = System.Drawing.Color.LightBlue;
-            this.smartLabel29.Size = new System.Drawing.Size(80, 20);
+            this.smartLabel29.Size = new System.Drawing.Size(142, 20);
             this.smartLabel29.TabIndex = 40;
             this.smartLabel29.Text = "LR.Judg";
             this.smartLabel29.TextColor = System.Drawing.Color.White;
@@ -4246,12 +4246,12 @@
             this.labelDispMDataDiff6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
             this.labelDispMDataDiff6.Wordwrap = false;
             // 
-            // ControlMenuSystemStatus10_2
+            // ControlMenuSystemStatus6_2
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.Controls.Add(this.smartGroupBox1);
-            this.Name = "ControlMenuSystemStatus10_2";
+            this.Name = "ControlMenuSystemStatus6_2";
             this.Size = new System.Drawing.Size(909, 664);
             this.smartGroupBox1.ResumeLayout(false);
             this.smartGroupBox4.ResumeLayout(false);

INT_LKD_PTB6_DW/Controls/System/ControlMenuSystemStatus6_2.cs

@@ -9,10 +9,10 @@ using System.Text;
 using System.Windows.Forms;
 
 using SmartX;
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
 
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     public partial class ControlMenuSystemStatus6_2 : UserControl
     {
@@ -145,7 +145,7 @@ namespace INT_LKD_PTB.Controls
                     label2.TextColor = Define.ColorTextResultPass;
                     label2.Font = new Font("New Gulim", 20, FontStyle.Bold);
                     break;
-                case Define.E_JudgmentStatus.Ng:
+                case Define.E_JudgmentStatus.Leak:
                     value = "Leak";
                     label2.TextColor = Define.ColorTextResultNG;
                     label2.Font = new Font("New Gulim", 20, FontStyle.Bold);
@@ -177,7 +177,7 @@ namespace INT_LKD_PTB.Controls
                 case Define.E_JudgmentStatus.Pass:
                     label.TextColor = Define.ColorTextResultPass;
                     break;
-                case Define.E_JudgmentStatus.Ng:
+                case Define.E_JudgmentStatus.Leak:
                     label.TextColor = Define.ColorTextResultNG;
                     break;
                 case Define.E_JudgmentStatus.Empty:
@@ -202,7 +202,7 @@ namespace INT_LKD_PTB.Controls
                 case Define.E_JudgmentStatus.Pass:
                     label.TextColor = Define.ColorTextResultPass;
                     break;
-                case Define.E_JudgmentStatus.Ng:
+                case Define.E_JudgmentStatus.Leak:
                     label.TextColor = Define.ColorTextResultNG;
                     break;
                 case Define.E_JudgmentStatus.Empty:
@@ -436,7 +436,7 @@ namespace INT_LKD_PTB.Controls
         }
 
         // 차압센서 데이터
-        public void UpdateDisplayDiffPressureData(Collection<LeakData1> datas)
+        public void UpdateDisplayDiffPressureData(Collection<LeakData> datas)
         {
             this.UpdateDisplayDiffPressureData1(datas[0]);
             this.UpdateDisplayDiffPressureData2(datas[1]);
@@ -445,7 +445,7 @@ namespace INT_LKD_PTB.Controls
             this.UpdateDisplayDiffPressureData5(datas[4]);
             this.UpdateDisplayDiffPressureData6(datas[5]);
         }
-        private void UpdateDisplayDiffPressureData1(LeakData1 data)
+        private void UpdateDisplayDiffPressureData1(LeakData data)
         {
             string value = "";
 
@@ -465,7 +465,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionDiffSecMax[0].Text != value)
                 this.CollectionDiffSecMax[0].Text = value;
         }
-        private void UpdateDisplayDiffPressureData2(LeakData1 data)
+        private void UpdateDisplayDiffPressureData2(LeakData data)
         {
             string value = "";
 
@@ -485,7 +485,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionDiffSecMax[1].Text != value)
                 this.CollectionDiffSecMax[1].Text = value;
         }
-        private void UpdateDisplayDiffPressureData3(LeakData1 data)
+        private void UpdateDisplayDiffPressureData3(LeakData data)
         {
             string value = "";
 
@@ -505,7 +505,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionDiffSecMax[2].Text != value)
                 this.CollectionDiffSecMax[2].Text = value;
         }
-        private void UpdateDisplayDiffPressureData4(LeakData1 data)
+        private void UpdateDisplayDiffPressureData4(LeakData data)
         {
             string value = "";
 
@@ -525,7 +525,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionDiffSecMax[3].Text != value)
                 this.CollectionDiffSecMax[3].Text = value;
         }
-        private void UpdateDisplayDiffPressureData5(LeakData1 data)
+        private void UpdateDisplayDiffPressureData5(LeakData data)
         {
             string value = "";
 
@@ -545,7 +545,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionDiffSecMax[4].Text != value)
                 this.CollectionDiffSecMax[4].Text = value;
         }
-        private void UpdateDisplayDiffPressureData6(LeakData1 data)
+        private void UpdateDisplayDiffPressureData6(LeakData data)
         {
             string value = "";
 
@@ -567,7 +567,7 @@ namespace INT_LKD_PTB.Controls
         }
 
         // 변위센서 데이터
-        public void UpdateDisplayDisplacementData(Collection<LeakData1> datas)
+        public void UpdateDisplayDisplacementData(Collection<LeakData> datas)
         {
             this.UpdateDisplayDisplacementData1(datas[0]);
             this.UpdateDisplayDisplacementData2(datas[1]);
@@ -576,7 +576,7 @@ namespace INT_LKD_PTB.Controls
             this.UpdateDisplayDisplacementData5(datas[4]);
             this.UpdateDisplayDisplacementData6(datas[5]);
         }
-        private void UpdateDisplayDisplacementData1(LeakData1 data)
+        private void UpdateDisplayDisplacementData1(LeakData data)
         {
             string value = "";
 
@@ -596,7 +596,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionDispMDataMax[0].Text != value)
                 this.CollectionDispMDataMax[0].Text = value;
         }
-        private void UpdateDisplayDisplacementData2(LeakData1 data)
+        private void UpdateDisplayDisplacementData2(LeakData data)
         {
             string value = "";
 
@@ -616,7 +616,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionDispMDataMax[1].Text != value)
                 this.CollectionDispMDataMax[1].Text = value;
         }
-        private void UpdateDisplayDisplacementData3(LeakData1 data)
+        private void UpdateDisplayDisplacementData3(LeakData data)
         {
             string value = "";
 
@@ -636,7 +636,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionDispMDataMax[2].Text != value)
                 this.CollectionDispMDataMax[2].Text = value;
         }
-        private void UpdateDisplayDisplacementData4(LeakData1 data)
+        private void UpdateDisplayDisplacementData4(LeakData data)
         {
             string value = "";
 
@@ -656,7 +656,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionDispMDataMax[3].Text != value)
                 this.CollectionDispMDataMax[3].Text = value;
         }
-        private void UpdateDisplayDisplacementData5(LeakData1 data)
+        private void UpdateDisplayDisplacementData5(LeakData data)
         {
             string value = "";
 
@@ -676,7 +676,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionDispMDataMax[4].Text != value)
                 this.CollectionDispMDataMax[4].Text = value;
         }
-        private void UpdateDisplayDisplacementData6(LeakData1 data)
+        private void UpdateDisplayDisplacementData6(LeakData data)
         {
             string value = "";
 
@@ -698,7 +698,7 @@ namespace INT_LKD_PTB.Controls
         }
 
         // 압력센서 데이터
-        public void UpdateDisplayPressureData(Collection<LeakData1> datas)
+        public void UpdateDisplayPressureData(Collection<LeakData> datas)
         {
             this.UpdateDisplayPressureData1(datas[0]);
             this.UpdateDisplayPressureData2(datas[1]);
@@ -707,7 +707,7 @@ namespace INT_LKD_PTB.Controls
             this.UpdateDisplayPressureData5(datas[4]);
             this.UpdateDisplayPressureData6(datas[5]);
         }
-        private void UpdateDisplayPressureData1(LeakData1 data)
+        private void UpdateDisplayPressureData1(LeakData data)
         {
             string value = "";
 
@@ -719,7 +719,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionPressureMaster[0].Text != value)
                 this.CollectionPressureMaster[0].Text = value;
         }
-        private void UpdateDisplayPressureData2(LeakData1 data)
+        private void UpdateDisplayPressureData2(LeakData data)
         {
             string value = "";
 
@@ -731,7 +731,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionPressureMaster[1].Text != value)
                 this.CollectionPressureMaster[1].Text = value;
         }
-        private void UpdateDisplayPressureData3(LeakData1 data)
+        private void UpdateDisplayPressureData3(LeakData data)
         {
             string value = "";
 
@@ -743,7 +743,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionPressureMaster[2].Text != value)
                 this.CollectionPressureMaster[2].Text = value;
         }
-        private void UpdateDisplayPressureData4(LeakData1 data)
+        private void UpdateDisplayPressureData4(LeakData data)
         {
             string value = "";
 
@@ -755,7 +755,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionPressureMaster[3].Text != value)
                 this.CollectionPressureMaster[3].Text = value;
         }
-        private void UpdateDisplayPressureData5(LeakData1 data)
+        private void UpdateDisplayPressureData5(LeakData data)
         {
             string value = "";
 
@@ -767,7 +767,7 @@ namespace INT_LKD_PTB.Controls
             if (this.CollectionPressureMaster[4].Text != value)
                 this.CollectionPressureMaster[4].Text = value;
         }
-        private void UpdateDisplayPressureData6(LeakData1 data)
+        private void UpdateDisplayPressureData6(LeakData data)
         {
             string value = "";
 
@@ -781,7 +781,7 @@ namespace INT_LKD_PTB.Controls
         }
 
         // 판정결과
-        public void UpdateDisplayJudgmentData(Collection<LeakData1> datas)
+        public void UpdateDisplayJudgmentData(Collection<LeakData> datas)
         {
             this.UpdateDisplayJudgmentData1(datas[0]);
             this.UpdateDisplayJudgmentData2(datas[1]);
@@ -790,7 +790,7 @@ namespace INT_LKD_PTB.Controls
             this.UpdateDisplayJudgmentData5(datas[4]);
             this.UpdateDisplayJudgmentData6(datas[5]);
         }
-        private void UpdateDisplayJudgmentData1(LeakData1 data)
+        private void UpdateDisplayJudgmentData1(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.CollectionLabelResult[0]);
 
@@ -805,7 +805,7 @@ namespace INT_LKD_PTB.Controls
                 this.GetJudgmentResultDisp(data.Judgment.DISP_Result, this.CollectionLabelResultDisp[0]);
             }
         }
-        private void UpdateDisplayJudgmentData2(LeakData1 data)
+        private void UpdateDisplayJudgmentData2(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.CollectionLabelResult[1]);
 
@@ -820,7 +820,7 @@ namespace INT_LKD_PTB.Controls
                 this.GetJudgmentResultDisp(data.Judgment.DISP_Result, this.CollectionLabelResultDisp[1]);
             }
         }
-        private void UpdateDisplayJudgmentData3(LeakData1 data)
+        private void UpdateDisplayJudgmentData3(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.CollectionLabelResult[2]);
 
@@ -835,7 +835,7 @@ namespace INT_LKD_PTB.Controls
                 this.GetJudgmentResultDisp(data.Judgment.DISP_Result, this.CollectionLabelResultDisp[2]);
             }
         }
-        private void UpdateDisplayJudgmentData4(LeakData1 data)
+        private void UpdateDisplayJudgmentData4(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.CollectionLabelResult[3]);
 
@@ -850,7 +850,7 @@ namespace INT_LKD_PTB.Controls
                 this.GetJudgmentResultDisp(data.Judgment.DISP_Result, this.CollectionLabelResultDisp[3]);
             }
         }
-        private void UpdateDisplayJudgmentData5(LeakData1 data)
+        private void UpdateDisplayJudgmentData5(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.CollectionLabelResult[4]);
 
@@ -865,7 +865,7 @@ namespace INT_LKD_PTB.Controls
                 this.GetJudgmentResultDisp(data.Judgment.DISP_Result, this.CollectionLabelResultDisp[4]);
             }
         }
-        private void UpdateDisplayJudgmentData6(LeakData1 data)
+        private void UpdateDisplayJudgmentData6(LeakData data)
         {
             this.GetJudgmentResult(data.Judgment.Result, this.CollectionLabelResult[5]);
 

INT_LKD_PTB6_DW/Controls/User/ControlMenuUserGroupEditor.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     partial class ControlMenuUserGroupEditor
     {

INT_LKD_PTB6_DW/Controls/User/ControlMenuUserGroupEditor.cs

@@ -7,10 +7,10 @@ using System.Data;
 using System.Text;
 using System.Windows.Forms;
 
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
 
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     public partial class ControlMenuUserGroupEditor : UserControl
     {

INT_LKD_PTB6_DW/Controls/User/ControlMenuUserMyPage.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     partial class ControlMenuUserMyPage
     {

INT_LKD_PTB6_DW/Controls/User/ControlMenuUserMyPage.cs

@@ -6,12 +6,12 @@ using System.Drawing;
 using System.Data;
 using System.Text;
 using System.Windows.Forms;
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
-using INT_LKD_PTB.Part11_UserManager;
+using INT_LKD_PTB6_DW.Part11_UserManager;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
-using INT_LKD_PTB.DialogForms;
+using INT_LKD_PTB6_DW.DialogForms;
 
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     public partial class ControlMenuUserMyPage : UserControl
     {

INT_LKD_PTB6_DW/Controls/User/ControlMenuUserUserEditor.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     partial class ControlMenuUserUserEditor
     {

INT_LKD_PTB6_DW/Controls/User/ControlMenuUserUserEditor.cs

@@ -8,12 +8,12 @@ using System.Text;
 using System.Windows.Forms;
 using System.Threading;
 
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
-using INT_LKD_PTB.DialogForms;
+using INT_LKD_PTB6_DW.DialogForms;
-using INT_LKD_PTB.Part11_UserManager;
+using INT_LKD_PTB6_DW.Part11_UserManager;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
 
-namespace INT_LKD_PTB.Controls
+namespace INT_LKD_PTB6_DW.Controls
 {
     public partial class ControlMenuUserUserEditor : UserControl
     {

INT_LKD_PTB6_DW/DataStore/AlarmList.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Text;
 
-namespace INT_LKD_PTB.DataStore
+namespace INT_LKD_PTB6_DW.DataStore
 {
     public class AlarmList
     {

INT_LKD_PTB6_DW/DataStore/Communication.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Collections.Generic;
 using System.Text;
 
-namespace INT_LKD_PTB.DataStore
+namespace INT_LKD_PTB6_DW.DataStore
 {
     public class CommunicationCommand
     {

INT_LKD_PTB6_DW/DataStore/DataBackup.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Collections.Generic;
 using System.Text;
 
-namespace INT_LKD_PTB.DataStore
+namespace INT_LKD_PTB6_DW.DataStore
 {
     #region DataBackupYear
     public class DataBackupYear

INT_LKD_PTB6_DW/DataStore/Define.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Collections.Generic;
 using System.Text;
 
-namespace INT_LKD_PTB.DataStore
+namespace INT_LKD_PTB6_DW.DataStore
 {
     public class Define
     {
@@ -143,7 +143,7 @@ namespace INT_LKD_PTB.DataStore
         {
             None,
             Pass,
-            Ng,
+            Leak,
             Empty,
             Error,
         }

INT_LKD_PTB6_DW/DataStore/LeakData/Counter.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+
+namespace INT_LKD_PTB6_DW.DataStore
+{
+    public class Counter
+    {
+        #region Field
+        private int m_PassCNT;
+        private int m_LeakCNT; 
+        #endregion
+
+        #region Constructor
+        public Counter()
+        {
+        } 
+        #endregion
+
+        #region Property
+        public int PassCNT
+        {
+            get { return this.m_PassCNT; }
+            set { this.m_PassCNT = value; }
+        }
+        public int LeakCNT
+        {
+            get { return this.m_LeakCNT; }
+            set { this.m_LeakCNT = value; }
+        } 
+        #endregion
+
+        #region Method
+        public void Clear()
+        {
+            this.PassCNT = 0;
+            this.LeakCNT = 0;
+        }
+        #endregion
+    }
+
+    #region StructCount
+    [StructLayout(LayoutKind.Sequential)]
+    public struct StructCounter
+    {
+        public int PassCount1;
+        public int LeakCount1;
+
+        public int PassCount2;
+        public int LeakCount2;
+
+        public int PassCount3;
+        public int LeakCount3;
+
+        public int PassCount4;
+        public int LeakCount4;
+
+        public int PassCount5;
+        public int LeakCount5;
+
+        public int PassCount6;
+        public int LeakCount6;
+
+        public int DummyInt1;
+        public int DummyInt2;
+        public int DummyInt3;
+        public int DummyInt4;
+        public int DummyInt5;
+        public int DummyInt6;
+        public int DummyInt7;
+        public int DummyInt8;
+        public int DummyInt9;
+        public int DummyInt10;
+        public int DummyInt11;
+        public int DummyInt12;
+    }
+    #endregion
+}

INT_LKD_PTB6_DW/DataStore/LeakData/DiffData.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Collections.Generic;
 using System.Text;
 
-namespace INT_LKD_PTB.DataStore
+namespace INT_LKD_PTB6_DW.DataStore
 {
     /// <summary>
     /// 차압센서

INT_LKD_PTB6_DW/DataStore/LeakData/DispData.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Collections.Generic;
 using System.Text;
 
-namespace INT_LKD_PTB.DataStore
+namespace INT_LKD_PTB6_DW.DataStore
 {
     /// <summary>
     /// 변위센서 데이터

INT_LKD_PTB6_DW/DataStore/LeakData/LeakData.cs

@@ -4,9 +4,9 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Text;
 
-namespace INT_LKD_PTB.DataStore
+namespace INT_LKD_PTB6_DW.DataStore
 {
-    public class LeakData1
+    public class LeakData
     {
         #region Field
         private Define.E_ProcessStatus m_ProcessStatus;
@@ -14,10 +14,11 @@ namespace INT_LKD_PTB.DataStore
         private DispData m_DispData;
         private DiffData m_DiffData;
         private PressureData m_PresData;
+        private Counter m_CounterData;
         #endregion
 
         #region Constructor
-           public LeakData1()
+           public LeakData()
         {
             this.Initialize();
         }
@@ -64,6 +65,14 @@ namespace INT_LKD_PTB.DataStore
             get { return this.m_PresData; }
             set { this.m_PresData = value; }
         }
+        /// <summary>
+        /// 수량 데이터
+        /// </summary>
+        public Counter CounterData
+        {
+            get { return this.m_CounterData; }
+            set { this.m_CounterData = value; }
+        }
         #endregion
 
         #region Method
@@ -74,6 +83,7 @@ namespace INT_LKD_PTB.DataStore
             this.DispData = new DispData();
             this.DiffData = new DiffData();
             this.PresData = new PressureData();
+            this.CounterData = new Counter();
         }
         public void Clear()
         {
@@ -81,97 +91,7 @@ namespace INT_LKD_PTB.DataStore
             this.DispData = new DispData();
             this.DiffData = new DiffData();
             this.PresData = new PressureData();
-        }
+            this.CounterData = new Counter();
-        #endregion
-    }
-
-    public class LeakResult
-    {
-        #region Field
-        private Define.E_JudgmentStatus m_Result;
-
-        private Define.E_JudgmentStatus m_DIFF_Result;
-        private string m_DIFF_SecBufMax;
-        private string m_DIFF_SecBufSum;
-
-        private Define.E_JudgmentStatus m_DISP_Result;
-        private string m_DISP_Min;
-        private string m_DISP_MDataMax;
-        private string m_DISP_MDataDiff;
-        #endregion
-
-        #region Constructor
-        public LeakResult()
-        {
-            this.Initialize();
-        } 
-        #endregion
-
-        #region Property
-        /// <summary>
-        /// 리크 판정 결과
-        /// </summary>
-        public Define.E_JudgmentStatus Result
-        {
-            get { return this.m_Result; }
-            set { this.m_Result = value; }
-        }
-        /// <summary>
-        /// 차압센서 판정 결과
-        /// </summary>
-        public Define.E_JudgmentStatus DIFF_Result
-        {
-            get { return this.m_DIFF_Result; }
-            set { this.m_DIFF_Result = value; }
-        }
-        public string DIFF_SecBufMax
-        {
-            get { return this.m_DIFF_SecBufMax; }
-            set { this.m_DIFF_SecBufMax = value; }
-        }
-        public string DIFF_SecBufSum
-        {
-            get { return this.m_DIFF_SecBufSum; }
-            set { this.m_DIFF_SecBufSum = value; }
-        }
-        /// <summary>
-        /// 변위센서 판정 결과
-        /// </summary>
-        public Define.E_JudgmentStatus DISP_Result
-        {
-            get { return this.m_DISP_Result; }
-            set { this.m_DISP_Result = value; }
-        }
-        public string DISP_Min
-        {
-            get { return this.m_DISP_Min; }
-            set { this.m_DISP_Min = value; }
-        }
-        public string DISP_MDataMax
-        {
-            get { return this.m_DISP_MDataMax; }
-            set { this.m_DISP_MDataMax = value; }
-        }
-        public string DISP_MDataDiff
-        {
-            get { return this.m_DISP_MDataDiff; }
-            set { this.m_DISP_MDataDiff = value; }
-        }
-        #endregion
-
-        #region Method
-        public void Initialize()
-        {
-            this.Result = Define.E_JudgmentStatus.None;
-
-            this.DIFF_Result = Define.E_JudgmentStatus.None;
-            this.DIFF_SecBufMax = "0.00";
-            this.DIFF_SecBufSum = "0.00";
-
-            this.DISP_Result = Define.E_JudgmentStatus.None;
-            this.DISP_Min = "0.00";
-            this.DISP_MDataMax = "0.00";
-            this.DISP_MDataDiff = "0.00";
         }
         #endregion
     }

INT_LKD_PTB6_DW/DataStore/LeakData/LeakResult.cs

@@ -0,0 +1,98 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Text;
+
+namespace INT_LKD_PTB6_DW.DataStore
+{
+    public class LeakResult
+    {
+        #region Field
+        private Define.E_JudgmentStatus m_Result;
+
+        private Define.E_JudgmentStatus m_DIFF_Result;
+        private string m_DIFF_SecBufMax;
+        private string m_DIFF_SecBufSum;
+
+        private Define.E_JudgmentStatus m_DISP_Result;
+        private string m_DISP_Min;
+        private string m_DISP_MDataMax;
+        private string m_DISP_MDataDiff;
+        #endregion
+
+        #region Constructor
+        public LeakResult()
+        {
+            this.Initialize();
+        }
+        #endregion
+
+        #region Property
+        /// <summary>
+        /// 리크 판정 결과
+        /// </summary>
+        public Define.E_JudgmentStatus Result
+        {
+            get { return this.m_Result; }
+            set { this.m_Result = value; }
+        }
+        /// <summary>
+        /// 차압센서 판정 결과
+        /// </summary>
+        public Define.E_JudgmentStatus DIFF_Result
+        {
+            get { return this.m_DIFF_Result; }
+            set { this.m_DIFF_Result = value; }
+        }
+        public string DIFF_SecBufMax
+        {
+            get { return this.m_DIFF_SecBufMax; }
+            set { this.m_DIFF_SecBufMax = value; }
+        }
+        public string DIFF_SecBufSum
+        {
+            get { return this.m_DIFF_SecBufSum; }
+            set { this.m_DIFF_SecBufSum = value; }
+        }
+        /// <summary>
+        /// 변위센서 판정 결과
+        /// </summary>
+        public Define.E_JudgmentStatus DISP_Result
+        {
+            get { return this.m_DISP_Result; }
+            set { this.m_DISP_Result = value; }
+        }
+        public string DISP_Min
+        {
+            get { return this.m_DISP_Min; }
+            set { this.m_DISP_Min = value; }
+        }
+        public string DISP_MDataMax
+        {
+            get { return this.m_DISP_MDataMax; }
+            set { this.m_DISP_MDataMax = value; }
+        }
+        public string DISP_MDataDiff
+        {
+            get { return this.m_DISP_MDataDiff; }
+            set { this.m_DISP_MDataDiff = value; }
+        }
+        #endregion
+
+        #region Method
+        public void Initialize()
+        {
+            this.Result = Define.E_JudgmentStatus.None;
+
+            this.DIFF_Result = Define.E_JudgmentStatus.None;
+            this.DIFF_SecBufMax = "0.00";
+            this.DIFF_SecBufSum = "0.00";
+
+            this.DISP_Result = Define.E_JudgmentStatus.None;
+            this.DISP_Min = "0.00";
+            this.DISP_MDataMax = "0.00";
+            this.DISP_MDataDiff = "0.00";
+        }
+        #endregion
+    }
+}

INT_LKD_PTB6_DW/DataStore/Log.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Collections.Generic;
 using System.Text;
 
-namespace INT_LKD_PTB.DataStore
+namespace INT_LKD_PTB6_DW.DataStore
 {
     public class HistoryData
     {

INT_LKD_PTB6_DW/DataStore/ModbusData.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Collections.ObjectModel;
 
-namespace INT_LKD_PTB
+namespace INT_LKD_PTB6_DW
 {
     public class ModbusData
     {

INT_LKD_PTB6_DW/DataStore/PressureData.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Collections.Generic;
 using System.Text;
 
-namespace INT_LKD_PTB.DataStore
+namespace INT_LKD_PTB6_DW.DataStore
 {
     public class PressureData
     {

INT_LKD_PTB6_DW/DataStore/Recipe.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace INT_LKD_PTB.DataStore
+namespace INT_LKD_PTB6_DW.DataStore
 {
     #region Recipe
     public class Recipe

INT_LKD_PTB6_DW/DataStore/ServoMotor.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Collections.Generic;
 using System.Text;
 
-namespace INT_LKD_PTB.DataStore
+namespace INT_LKD_PTB6_DW.DataStore
 {
     public class ServoMotorAddress
     {

INT_LKD_PTB6_DW/DataStore/SystemConfiguration.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Runtime.InteropServices;
 using System.Collections.ObjectModel;
 
-namespace INT_LKD_PTB.DataStore
+namespace INT_LKD_PTB6_DW.DataStore
 {
     #region SystemConfiguration
     public class SystemConfiguration

INT_LKD_PTB6_DW/DataStore/SystemStatus.cs

@@ -3,11 +3,13 @@ using System.Linq;
 using System.Collections.Generic;
 using System.Text;
 
-namespace INT_LKD_PTB.DataStore
+namespace INT_LKD_PTB6_DW.DataStore
 {
     public class SystemStatus
     {
         #region Field
+        private bool m_InspectionReady;
+
         private UserItem m_CurrentUser;
 
         private Define.E_EquipmentMode m_CurrentEquipmentMode;
@@ -24,6 +26,13 @@ namespace INT_LKD_PTB.DataStore
         #endregion
 
         #region Property
+
+        public bool InspectionReady
+        {
+            get { return this.m_InspectionReady; }
+            set { this.m_InspectionReady = value; }
+        }
+
         public UserItem CurrentUser
         {
             get { return this.m_CurrentUser; }
@@ -55,6 +64,8 @@ namespace INT_LKD_PTB.DataStore
         #region Method
         private void Initialize()
         {
+            this.InspectionReady = false;
+
             this.CurrentUser = new UserItem();
 
             this.CurrentEquipmentMode = Define.E_EquipmentMode.Normal;

INT_LKD_PTB6_DW/DataStore/Update.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Collections.Generic;
 using System.Text;
 
-namespace INT_LKD_PTB.DataStore
+namespace INT_LKD_PTB6_DW.DataStore
 {
     public class UpdateForMainBoard
     {

INT_LKD_PTB6_DW/DataStore/User.cs

@@ -5,7 +5,7 @@ using System.Collections.ObjectModel;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace INT_LKD_PTB.DataStore
+namespace INT_LKD_PTB6_DW.DataStore
 {
     #region UserGroup
     public class UserGroup

INT_LKD_PTB6_DW/DialogForms/DialogFormHexKeyPad.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.DialogForms
+namespace INT_LKD_PTB6_DW.DialogForms
 {
     partial class DialogFormHexKeyPad
     {

INT_LKD_PTB6_DW/DialogForms/DialogFormHexKeyPad.cs

@@ -8,9 +8,9 @@ using System.Text;
 using System.Windows.Forms;
 
 using SmartX;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
 
-namespace INT_LKD_PTB.DialogForms
+namespace INT_LKD_PTB6_DW.DialogForms
 {
     public partial class DialogFormHexKeyPad : Form
     {

INT_LKD_PTB6_DW/DialogForms/DialogFormLogOn.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Forms
+namespace INT_LKD_PTB6_DW.Forms
 {
     partial class DialogFormLogOn
     {

INT_LKD_PTB6_DW/DialogForms/DialogFormLogOn.cs

@@ -7,11 +7,11 @@ using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
 
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
-using INT_LKD_PTB.Part11_UserManager;
+using INT_LKD_PTB6_DW.Part11_UserManager;
-using INT_LKD_PTB.DialogForms;
+using INT_LKD_PTB6_DW.DialogForms;
 
-namespace INT_LKD_PTB.Forms
+namespace INT_LKD_PTB6_DW.Forms
 {
     public partial class DialogFormLogOn : Form
     {

INT_LKD_PTB6_DW/DialogForms/DialogFormMessage.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.DialogForms
+namespace INT_LKD_PTB6_DW.DialogForms
 {
     partial class DialogFormMessage
     {

INT_LKD_PTB6_DW/DialogForms/DialogFormMessage.cs

@@ -7,9 +7,9 @@ using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
 
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
 
-namespace INT_LKD_PTB.DialogForms
+namespace INT_LKD_PTB6_DW.DialogForms
 {
     public partial class DialogFormMessage : Form
     {

INT_LKD_PTB6_DW/DialogForms/DialogFormNumKeyPad.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.DialogForms
+namespace INT_LKD_PTB6_DW.DialogForms
 {
     partial class DialogFormNumKeyPad
     {

INT_LKD_PTB6_DW/DialogForms/DialogFormNumKeyPad.cs

@@ -6,9 +6,9 @@ using System.Data;
 using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
 
-namespace INT_LKD_PTB.DialogForms
+namespace INT_LKD_PTB6_DW.DialogForms
 {
     public partial class DialogFormNumKeyPad : Form
     {

INT_LKD_PTB6_DW/DialogForms/DialogFormPasswordKeyPad.cs

@@ -7,9 +7,9 @@ using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
 
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
 
-namespace INT_LKD_PTB.DialogForms
+namespace INT_LKD_PTB6_DW.DialogForms
 {
     public partial class DialogFormPasswordKeyPad : Form
     {

INT_LKD_PTB6_DW/DialogForms/DialogFormPasswordKeyPad.designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.DialogForms
+namespace INT_LKD_PTB6_DW.DialogForms
 {
     partial class DialogFormPasswordKeyPad
     {

INT_LKD_PTB6_DW/DialogForms/DialogFormProgressBar.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.DialogForms
+namespace INT_LKD_PTB6_DW.DialogForms
 {
     partial class DialogFormProgressBar
     {

INT_LKD_PTB6_DW/DialogForms/DialogFormProgressBar.cs

@@ -10,10 +10,10 @@ using System.IO;
 using System.Collections.ObjectModel;
 
 using SmartX;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
 
-namespace INT_LKD_PTB.DialogForms
+namespace INT_LKD_PTB6_DW.DialogForms
 {
     public partial class DialogFormProgressBar : Form
     {

INT_LKD_PTB6_DW/DialogForms/DialogFormYesNo.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.DialogForms
+namespace INT_LKD_PTB6_DW.DialogForms
 {
     partial class DialogFormYesNo
     {

INT_LKD_PTB6_DW/DialogForms/DialogFormYesNo.cs

@@ -7,9 +7,9 @@ using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
 
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
 
-namespace INT_LKD_PTB.DialogForms
+namespace INT_LKD_PTB6_DW.DialogForms
 {
     public partial class DialogFormYesNo : Form
     {

INT_LKD_PTB6_DW/Forms/FormMain.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Forms
+namespace INT_LKD_PTB6_DW.Forms
 {
     partial class FormMain
     {

INT_LKD_PTB6_DW/Forms/FormMainDisplay.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Forms
+namespace INT_LKD_PTB6_DW.Forms
 {
     partial class FormMainDisplay
     {
@@ -30,6 +30,8 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMainDisplay));
             this.smartForm1 = new SmartX.SmartForm();
+            this.buttonInfinity = new SmartX.SmartButton();
+            this.smartButton1 = new SmartX.SmartButton();
             this.labelTitleLeakDetetor = new SmartX.SmartLabel();
             this.labelTitleTime = new SmartX.SmartLabel();
             this.buttonDischarge = new SmartX.SmartButton();
@@ -68,6 +70,8 @@
             this.smartForm1.BackGroundFillStyle = SmartXUIBase.SmartUIControlFormBase.BackGroundFillStyles.UseBackImage;
             this.smartForm1.BackImage = ((System.Drawing.Image)(resources.GetObject("smartForm1.BackImage")));
             this.smartForm1.CenterLocation = false;
+            this.smartForm1.Controls.Add(this.buttonInfinity);
+            this.smartForm1.Controls.Add(this.smartButton1);
             this.smartForm1.Controls.Add(this.labelTitleLeakDetetor);
             this.smartForm1.Controls.Add(this.labelTitleTime);
             this.smartForm1.Controls.Add(this.buttonDischarge);
@@ -106,6 +110,79 @@
             this.smartForm1.SpecialFunctionClickPointSize = 100;
             this.smartForm1.UseMainMenu = false;
             // 
+            // buttonInfinity
+            // 
+            this.buttonInfinity.BackGround = this.smartForm1;
+            this.buttonInfinity.BackGroundColor = System.Drawing.Color.Gray;
+            this.buttonInfinity.ButtonColor = System.Drawing.Color.Teal;
+            this.buttonInfinity.ButtonDownColor = System.Drawing.Color.DarkSlateGray;
+            this.buttonInfinity.ButtonImageAutoSize = true;
+            this.buttonInfinity.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
+            this.buttonInfinity.ButtonText = "Infinity";
+            this.buttonInfinity.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+            this.buttonInfinity.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
+            this.buttonInfinity.GroupID = 0;
+            this.buttonInfinity.ImageDisable = null;
+            this.buttonInfinity.ImageDown = null;
+            this.buttonInfinity.ImageUp = null;
+            this.buttonInfinity.Location = new System.Drawing.Point(917, 484);
+            this.buttonInfinity.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+            this.buttonInfinity.Name = "buttonInfinity";
+            this.buttonInfinity.NestedClickEventPrevent = false;
+            this.buttonInfinity.OutlinePixel = 2;
+            this.buttonInfinity.OverlapOptimize = true;
+            this.buttonInfinity.RepeatInterval = 200;
+            this.buttonInfinity.RepeatIntervalAccelerate = null;
+            this.buttonInfinity.RoundSize = 10;
+            this.buttonInfinity.SafeInterval = 200;
+            this.buttonInfinity.Size = new System.Drawing.Size(100, 60);
+            this.buttonInfinity.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+            this.buttonInfinity.TabIndex = 630;
+            this.buttonInfinity.Text = null;
+            this.buttonInfinity.TextColor = System.Drawing.Color.White;
+            this.buttonInfinity.TextColorDisable = System.Drawing.Color.Gainsboro;
+            this.buttonInfinity.TextDownColor = System.Drawing.Color.Chartreuse;
+            this.buttonInfinity.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+            this.buttonInfinity.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+            this.buttonInfinity.Visible = false;
+            this.buttonInfinity.Click += new System.EventHandler(this.buttonInfinity_Click);
+            // 
+            // smartButton1
+            // 
+            this.smartButton1.BackGround = this.smartForm1;
+            this.smartButton1.BackGroundColor = System.Drawing.Color.Gray;
+            this.smartButton1.ButtonColor = System.Drawing.Color.Teal;
+            this.smartButton1.ButtonDownColor = System.Drawing.Color.DarkSlateGray;
+            this.smartButton1.ButtonImageAutoSize = true;
+            this.smartButton1.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
+            this.smartButton1.ButtonText = "EXIT";
+            this.smartButton1.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+            this.smartButton1.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
+            this.smartButton1.GroupID = 0;
+            this.smartButton1.ImageDisable = null;
+            this.smartButton1.ImageDown = null;
+            this.smartButton1.ImageUp = null;
+            this.smartButton1.Location = new System.Drawing.Point(917, 615);
+            this.smartButton1.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
+            this.smartButton1.Name = "smartButton1";
+            this.smartButton1.NestedClickEventPrevent = false;
+            this.smartButton1.OutlinePixel = 2;
+            this.smartButton1.OverlapOptimize = true;
+            this.smartButton1.RepeatInterval = 200;
+            this.smartButton1.RepeatIntervalAccelerate = null;
+            this.smartButton1.RoundSize = 10;
+            this.smartButton1.SafeInterval = 200;
+            this.smartButton1.Size = new System.Drawing.Size(100, 39);
+            this.smartButton1.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+            this.smartButton1.TabIndex = 626;
+            this.smartButton1.Text = null;
+            this.smartButton1.TextColor = System.Drawing.Color.White;
+            this.smartButton1.TextColorDisable = System.Drawing.Color.Gainsboro;
+            this.smartButton1.TextDownColor = System.Drawing.Color.Chartreuse;
+            this.smartButton1.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+            this.smartButton1.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+            this.smartButton1.Click += new System.EventHandler(this.smartButton1_Click);
+            // 
             // labelTitleLeakDetetor
             // 
             this.labelTitleLeakDetetor.BackGround = null;
@@ -803,5 +880,7 @@
         private SmartX.SmartLabel labelTitleTime;
         private SmartX.SmartLabel labelTitleAlarm;
         private SmartX.SmartLabel labelTitleLeakDetetor;
+        private SmartX.SmartButton smartButton1;
+        private SmartX.SmartButton buttonInfinity;
     }
 }

INT_LKD_PTB6_DW/Forms/FormMainDisplay.cs

@@ -10,13 +10,13 @@ using System.Windows.Forms;
 using System.Threading;
 
 using SmartX;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
-using INT_LKD_PTB.Controls;
+using INT_LKD_PTB6_DW.Controls;
-using INT_LKD_PTB.Part11_UserManager;
+using INT_LKD_PTB6_DW.Part11_UserManager;
-using INT_LKD_PTB.DialogForms;
+using INT_LKD_PTB6_DW.DialogForms;
-using INT_LKD_PTB.Controls.MainDisplay;
+using INT_LKD_PTB6_DW.Controls.MainDisplay;
 
-namespace INT_LKD_PTB.Forms
+namespace INT_LKD_PTB6_DW.Forms
 {
     public partial class FormMainDisplay : Form
     {
@@ -33,6 +33,7 @@ namespace INT_LKD_PTB.Forms
         public ControlMainModbus ChildModbus;
         public ControlMainDisplay_1 ChildMainDisplay_1;
         public ControlMainDisplay_2 ChildMainDisplay_2;
+        public ControlMainDisplay_4 ChildMainDisplay_3;
         #endregion
 
         #region Constructor
@@ -81,6 +82,12 @@ namespace INT_LKD_PTB.Forms
             this.ChildMainDisplay_2.BringToFront();
             this.ChildMainDisplay_2.Visible = false;
 
+            this.ChildMainDisplay_3 = new ControlMainDisplay_4(this);
+            this.Controls.Add(this.ChildMainDisplay_3);
+            this.ChildMainDisplay_3.Location = new Point(0, 339);
+            this.ChildMainDisplay_3.BringToFront();
+            this.ChildMainDisplay_3.Visible = false;
+
             this.buttonRecipeNo.ButtonText = this.ParentForm.SystemConfig.RECIPE_NUMBER.ToString();
             this.UpdateDisplayUser(this.ParentForm.CurrentSystemStatus.CurrentUser);
         }
@@ -180,6 +187,7 @@ namespace INT_LKD_PTB.Forms
                     this.buttonDischarge.Enabled = true;
                     this.buttonMenu.Enabled = true;
                     this.buttonDisplay.Visible = false;
+                    this.buttonInfinity.Visible = false;
                     break;
                 case Define.E_UserGroup.Level2:
                     id = user.ID;
@@ -197,6 +205,7 @@ namespace INT_LKD_PTB.Forms
                     this.buttonDischarge.Enabled = true;
                     this.buttonMenu.Enabled = true;
                     this.buttonDisplay.Visible = false;
+                    this.buttonInfinity.Visible = false;
                     break;
                 case Define.E_UserGroup.Level3:
                     id = user.ID;
@@ -214,6 +223,7 @@ namespace INT_LKD_PTB.Forms
                     this.buttonDischarge.Enabled = true;
                     this.buttonMenu.Enabled = true;
                     this.buttonDisplay.Visible = false;
+                    this.buttonInfinity.Visible = false;
                     break;
                 case Define.E_UserGroup.Admin:
                     id = user.ID;
@@ -231,6 +241,7 @@ namespace INT_LKD_PTB.Forms
                     this.buttonDischarge.Enabled = true;
                     this.buttonMenu.Enabled = true;
                     this.buttonDisplay.Visible = true;
+                    this.buttonInfinity.Visible = false;
                     break;
                 case Define.E_UserGroup.Developer:
                     id = user.ID;
@@ -248,6 +259,7 @@ namespace INT_LKD_PTB.Forms
                     this.buttonDischarge.Enabled = true;
                     this.buttonMenu.Enabled = true;
                     this.buttonDisplay.Visible = true;
+                    this.buttonInfinity.Visible = true;
                     break;
                 case Define.E_UserGroup.NotLogin:
                     id = "";
@@ -261,6 +273,7 @@ namespace INT_LKD_PTB.Forms
                     this.buttonDischarge.Enabled = true;
                     this.buttonMenu.Enabled = true;
                     this.buttonDisplay.Visible = false;
+                    this.buttonInfinity.Visible = false;
                     break;
                 case Define.E_UserGroup.LogOut:
                     id = "Log Off";
@@ -278,6 +291,7 @@ namespace INT_LKD_PTB.Forms
                     this.buttonDischarge.Enabled = false;
                     this.buttonMenu.Enabled = false;
                     this.buttonDisplay.Visible = false;
+                    this.buttonInfinity.Visible = false;
                     break;
                 default:
                     break;
@@ -754,6 +768,12 @@ namespace INT_LKD_PTB.Forms
             //}
         }
 
+        // Inspection Ready 상태
+        public void UpdateDisplayInspectionReadStatus(SystemStatus status)
+        {
+            this.ChildMainDisplay_1.UpdateDisplayInspectionReadStatus(status);
+        }
+
         // 진행상태 데이터
         public void UpdateDisplayProcessStatus(Define.E_ProcessStatus status)
         {
@@ -803,37 +823,42 @@ namespace INT_LKD_PTB.Forms
         }
 
         // 차압센서 데이터
-        public void UpdateDisplayDiffData(Collection<LeakData1> datas)
+        public void UpdateDisplayDiffData(Collection<LeakData> datas)
         {
             this.ChildMainDisplay_1.UpdateDisplayDiffData(datas);
             this.ChildMainDisplay_2.UpdateDisplayDiffData(datas);
         }
 
         // 변위센서 데이터
-        public void UpdateDisplayDispData(Collection<LeakData1> datas)
+        public void UpdateDisplayDispData(Collection<LeakData> datas)
         {
             this.ChildMainDisplay_1.UpdateDisplayDispData(datas);
             this.ChildMainDisplay_2.UpdateDisplayDispData(datas);
         }
 
         // 압력센서 데이터
-        public void UpdateDisplayPresData(Collection<LeakData1> datas)
+        public void UpdateDisplayPresData(Collection<LeakData> datas)
         {
             this.ChildMainDisplay_1.UpdateDisplayPresData(datas);
             this.ChildMainDisplay_2.UpdateDisplayPresData(datas);           
         }
         
         // 판정결과
-        public void UpdateDisplayJudgmentData(Collection<LeakData1> datas)
+        public void UpdateDisplayJudgmentData(Collection<LeakData> datas)
         {
             this.ChildMainDisplay_1.UpdateDisplayJudgmentData(datas);
             this.ChildMainDisplay_2.UpdateDisplayJudgmentData(datas);
+            this.ChildMainDisplay_3.UpdateDisplayJudgmentData(datas);
         }
 
         public void UpdateDisplayRecipeData(Recipe data)
         {
             this.buttonRecipeNo.ButtonText = data.NUMBER.ToString();
         }
+        public void UpdateDisplayCounterData(Collection<LeakData> datas)
+        {
+            this.ChildMainDisplay_3.UpdateDisplayCounterData(datas);
+        }
         public void UpdateDisplayTime(DateTime time)
         {
             this.labelTime.Text = time.ToString("yyyy-MM-dd HH:mm:ss");
@@ -851,6 +876,7 @@ namespace INT_LKD_PTB.Forms
 
             this.UpdateDisplayUser(this.ParentForm.CurrentSystemStatus.CurrentUser);
             this.UpdateDisplayRecipeData(this.ParentForm.CurrentRecipe);
+            this.UpdateDisplayInspectionReadStatus(this.ParentForm.CurrentSystemStatus);
         }
         #endregion
 
@@ -977,8 +1003,32 @@ namespace INT_LKD_PTB.Forms
             this.Part11AutomaticLogoutReset();
 
             this.ChildMainDisplay_1.InitializeDataAll();
+            this.ChildMainDisplay_2.InitializeData();
+            this.ChildMainDisplay_3.Clear();
             this.ChildModbus.ClearData();
         }
+        private void buttonInfinity_Click(object sender, EventArgs e)
+        {
+            string value = "", before = "", after = "";
+
+            if (this.buttonInfinity.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
+            {
+                before = "OFF";
+                after = "ON";
+
+                value = Helper.StringBlankFillDigits4("1");
+            }
+            else
+            {
+                before = "ON";
+                after = "OFF";
+
+                value = Helper.StringBlankFillDigits4("0");
+            }
+
+            this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._1712_OpMode, value);
+            this.ParentForm.SetTrackingHistoryData(Define.E_TrackingParameter.OP_Mode, "", before, after);
+        }
 
         private void buttonExit_Click(object sender, EventArgs e)
         {
@@ -1017,5 +1067,13 @@ namespace INT_LKD_PTB.Forms
             }
         }
         #endregion
+
+        private void smartButton1_Click(object sender, EventArgs e)
+        {
+            if (this.ChildMainDisplay_3.Visible == false)
+                this.ChildMainDisplay_3.Visible = true;
+            else
+                this.ChildMainDisplay_3.Visible = false;
+        }
     }
 }

INT_LKD_PTB6_DW/Forms/FormMenu.Designer.cs

@@ -1,4 +1,4 @@
-namespace INT_LKD_PTB.Forms
+namespace INT_LKD_PTB6_DW.Forms
 {
     partial class FormMenu
     {

INT_LKD_PTB6_DW/Forms/FormMenu.cs

@@ -10,12 +10,12 @@ using System.Windows.Forms;
 using System.IO;
 
 using SmartX;
-using INT_LKD_PTB.Controls;
+using INT_LKD_PTB6_DW.Controls;
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
-using INT_LKD_PTB.DialogForms;
+using INT_LKD_PTB6_DW.DialogForms;
-using INT_LKD_PTB.Part11_UserManager;
+using INT_LKD_PTB6_DW.Part11_UserManager;
 
-namespace INT_LKD_PTB.Forms
+namespace INT_LKD_PTB6_DW.Forms
 {
     public partial class FormMenu : Form
     {
@@ -1035,7 +1035,7 @@ namespace INT_LKD_PTB.Forms
         }
       
         // 변위센서 데이터
-        public void UpdateDisplayDisplacementData(Collection<LeakData1> datas)
+        public void UpdateDisplayDisplacementData(Collection<LeakData> datas)
         {
             switch (this.ParentForm.CurrentSystemStatus.CurrentDisplayMode)
             {
@@ -1073,7 +1073,7 @@ namespace INT_LKD_PTB.Forms
             }
         }
         // 차압센서 데이터
-        public void UpdateDisplayDiffPressureData(Collection<LeakData1> datas)
+        public void UpdateDisplayDiffPressureData(Collection<LeakData> datas)
         {
             switch (this.ParentForm.CurrentSystemStatus.CurrentDisplayMode)
             {
@@ -1111,7 +1111,7 @@ namespace INT_LKD_PTB.Forms
             }
         }
         // 압력센서 데이터
-        public void UpdateDisplayPressureData(Collection<LeakData1> datas)
+        public void UpdateDisplayPressureData(Collection<LeakData> datas)
         {
             switch (this.ParentForm.CurrentSystemStatus.CurrentDisplayMode)
             {
@@ -1149,7 +1149,7 @@ namespace INT_LKD_PTB.Forms
             }
         }
         // 판정결과
-        public void UpdateDisplayJudgmentData(Collection<LeakData1> datas)
+        public void UpdateDisplayJudgmentData(Collection<LeakData> datas)
         {
             switch (this.ParentForm.CurrentSystemStatus.CurrentDisplayMode)
             {

INT_LKD_PTB6_DW/Helper.cs

@@ -6,9 +6,9 @@ using System.Text;
 using System.Windows.Forms;
 using System.IO;
 
-using INT_LKD_PTB.DataStore;
+using INT_LKD_PTB6_DW.DataStore;
 
-namespace INT_LKD_PTB
+namespace INT_LKD_PTB6_DW
 {
     public class Helper
     {
@@ -182,7 +182,7 @@ namespace INT_LKD_PTB
                     status = Define.E_JudgmentStatus.Pass;
                     break;
                 case "2":
-                    status = Define.E_JudgmentStatus.Ng;
+                    status = Define.E_JudgmentStatus.Leak;
                     break;
                 case "3":
                     status = Define.E_JudgmentStatus.Empty;

INT_LKD_PTB6_DW/INT_LKD_PTB6_DW.csproj

@@ -85,6 +85,18 @@
     <Compile Include="Controls\MainDisplay\ControlMainDisplay_1.Designer.cs">
       <DependentUpon>ControlMainDisplay_1.cs</DependentUpon>
     </Compile>
+    <Compile Include="Controls\MainDisplay\ControlMainDisplay_3.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\MainDisplay\ControlMainDisplay_3.Designer.cs">
+      <DependentUpon>ControlMainDisplay_3.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\MainDisplay\ControlMainDisplay_4.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\MainDisplay\ControlMainDisplay_4.Designer.cs">
+      <DependentUpon>ControlMainDisplay_4.cs</DependentUpon>
+    </Compile>
     <Compile Include="Controls\Recipe\ControlMenuRecipeData.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -189,11 +201,13 @@
     </Compile>
     <Compile Include="DataStore\AlarmList.cs" />
     <Compile Include="DataStore\Communication.cs" />
+    <Compile Include="DataStore\LeakData\Counter.cs" />
     <Compile Include="DataStore\DataBackup.cs" />
     <Compile Include="DataStore\Define.cs" />
     <Compile Include="DataStore\LeakData\DiffData.cs" />
     <Compile Include="DataStore\LeakData\DispData.cs" />
     <Compile Include="DataStore\LeakData\LeakData.cs" />
+    <Compile Include="DataStore\LeakData\LeakResult.cs" />
     <Compile Include="DataStore\Log.cs" />
     <Compile Include="DataStore\ModbusData.cs" />
     <Compile Include="DataStore\Recipe.cs" />
@@ -285,6 +299,14 @@
       <DependentUpon>ControlMainDisplay_1.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Controls\MainDisplay\ControlMainDisplay_3.resx">
+      <DependentUpon>ControlMainDisplay_3.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\MainDisplay\ControlMainDisplay_4.resx">
+      <DependentUpon>ControlMainDisplay_4.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Controls\Recipe\ControlMenuRecipeData.resx">
       <DependentUpon>ControlMenuRecipeData.cs</DependentUpon>
       <SubType>Designer</SubType>

INT_LKD_PTB6_DW/Part11_UserManager/UserManager.Define.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Runtime.InteropServices;
 
-namespace INT_LKD_PTB.Part11_UserManager
+namespace INT_LKD_PTB6_DW.Part11_UserManager
 {
     public partial class UserManager
     {

INT_LKD_PTB6_DW/Part11_UserManager/UserManager.Structure.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Runtime.InteropServices;
 
-namespace INT_LKD_PTB.Part11_UserManager
+namespace INT_LKD_PTB6_DW.Part11_UserManager
 {
     public partial class UserManager
     {

INT_LKD_PTB6_DW/Part11_UserManager/UserManager.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Runtime.InteropServices;
 
-namespace INT_LKD_PTB.Part11_UserManager
+namespace INT_LKD_PTB6_DW.Part11_UserManager
 {
     public partial class UserManager
     {

INT_LKD_PTB6_DW/Program.cs

@@ -3,10 +3,10 @@ using System.Linq;
 using System.Collections.Generic;
 using System.Windows.Forms;
 
-using INT_LKD_PTB.Forms;
+using INT_LKD_PTB6_DW.Forms;
-using INT_LKD_PTB.DialogForms;
+using INT_LKD_PTB6_DW.DialogForms;
 
-namespace INT_LKD_PTB
+namespace INT_LKD_PTB6_DW
 {
     static class Program
     {

INT_LKD_PTB6_DW/SerialManager/SerialManager.Define.cs

@@ -9,7 +9,7 @@ using System.Windows.Forms;
 using System.Runtime.InteropServices;
 
 
-namespace INT_LKD_PTB.SerialManger
+namespace INT_LKD_PTB6_DW.SerialManger
 {
     public partial class SerialMgrComm
     {

INT_LKD_PTB6_DW/SerialManager/SerialManager.Structure.cs

@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 
-namespace INT_LKD_PTB.SerialManger
+namespace INT_LKD_PTB6_DW.SerialManger
 {
     public partial class SerialMgrComm
     {

INT_LKD_PTB6_DW/SerialManager/SerialManager.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading;
 using System.Collections;
 
-namespace INT_LKD_PTB.SerialManger
+namespace INT_LKD_PTB6_DW.SerialManger
 {
     public partial class SerialMgrComm
     {