INT_PT002/Controls/Log/ControlMenuLogAlarm.cs

@@ -231,37 +231,6 @@ namespace INT_PT002.Controls
 
             this.labelRemainIndex.Text = "0";
             this.labelTotalIndex.Text = "0";
-
-            // User
-            switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentUser.Group)
-            {
-                case Define.E_UserGroup.None:
-                    this.Enabled = false;
-                    break;
-                case Define.E_UserGroup.Level1:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuAlarmLog;
-                    break;
-                case Define.E_UserGroup.Level2:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuAlarmLog;
-                    break;
-                case Define.E_UserGroup.Level3:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuAlarmLog;
-                    break;
-                case Define.E_UserGroup.Admin:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuAlarmLog;
-                    break;
-                case Define.E_UserGroup.Developer:
-                    this.Enabled = true;
-                    break;
-                case Define.E_UserGroup.NotLogin:
-                    this.Enabled = false;
-                    break;
-                case Define.E_UserGroup.LogOut:
-                    this.Enabled = false;
-                    break;
-                default:
-                    break;
-            }
         }
         #endregion
 

INT_PT002/Controls/Log/ControlMenuLogHistory.cs

@@ -235,37 +235,6 @@ namespace INT_PT002.Controls
 
             this.labelRemainIndex.Text = "0";
             this.labelTotalIndex.Text = "0";
-
-            // User
-            switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentUser.Group)
-            {
-                case Define.E_UserGroup.None:
-                    this.Enabled = false;
-                    break;
-                case Define.E_UserGroup.Level1:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuAlarmLog;
-                    break;
-                case Define.E_UserGroup.Level2:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuAlarmLog;
-                    break;
-                case Define.E_UserGroup.Level3:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuAlarmLog;
-                    break;
-                case Define.E_UserGroup.Admin:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuAlarmLog;
-                    break;
-                case Define.E_UserGroup.Developer:
-                    this.Enabled = true;
-                    break;
-                case Define.E_UserGroup.NotLogin:
-                    this.Enabled = false;
-                    break;
-                case Define.E_UserGroup.LogOut:
-                    this.Enabled = false;
-                    break;
-                default:
-                    break;
-            }
         }
         #endregion
 

INT_PT002/Controls/Log/ControlMenuLogInspection.cs

@@ -173,18 +173,17 @@ namespace INT_PT002.Controls
 
             // Time
             this.listBoxTime.AddItem(sb[1]);
-
             // 1~10 판정데이터
             for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EQUIPMENT_LANE; i++)
             {
-                temp = sb[(i * 3) + 4];
+                temp = sb[i + 4];
 
                 if (temp == "Pass")
                     this.ListPassCount[i]++;
-                if (temp == "Leak")
+                if(temp == "Leak")
                     this.ListLeakCount[i]++;
 
-                this.CollectionListBox[i].AddItem(sb[(i * 3) + 4]);
+                this.CollectionListBox[i].AddItem(sb[i + 4]);
             }
         }
         private void UpdateDisplayFile()
@@ -319,37 +318,6 @@ namespace INT_PT002.Controls
                 this.CollectionPassCount[i].Text = "0";
                 this.CollectionLeakCount[i].Text = "0";
             }
-
-            // User
-            switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentUser.Group)
-            {
-                case Define.E_UserGroup.None:
-                    this.Enabled = false;
-                    break;
-                case Define.E_UserGroup.Level1:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuAlarmLog;
-                    break;
-                case Define.E_UserGroup.Level2:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuAlarmLog;
-                    break;
-                case Define.E_UserGroup.Level3:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuAlarmLog;
-                    break;
-                case Define.E_UserGroup.Admin:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuAlarmLog;
-                    break;
-                case Define.E_UserGroup.Developer:
-                    this.Enabled = true;
-                    break;
-                case Define.E_UserGroup.NotLogin:
-                    this.Enabled = false;
-                    break;
-                case Define.E_UserGroup.LogOut:
-                    this.Enabled = false;
-                    break;
-                default:
-                    break;
-            }
         }
         #endregion
 

INT_PT002/Controls/Log/ControlMenuLogTemporary.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+
+namespace INT_PT002.Controls.Log
+{
+    public partial class ControlMenuLogTemporary : UserControl
+    {
+        public ControlMenuLogTemporary()
+        {
+            InitializeComponent();
+        }
+    }
+}

INT_PT002/Controls/Log/ControlMenuLogTemporary.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_PT002/Controls/MainDisplay/ControlMainResult.Designer.cs

@@ -59,7 +59,7 @@
             // labelResultDiff
             // 
             this.labelResultDiff.BackGround = null;
-            this.labelResultDiff.BackGroundColor = System.Drawing.Color.Black;
+            this.labelResultDiff.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(39)))), ((int)(((byte)(200)))), ((int)(((byte)(64)))));
             this.labelResultDiff.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
             this.labelResultDiff.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelResultDiff.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);

INT_PT002/Controls/MainDisplay/ControlMainResult.cs

@@ -89,19 +89,19 @@ namespace INT_PT002.Controls.MainDisplay
             switch (judg)
             {
                 case Define.E_JudgmentStatus.None:
-                    label.TextColor = Color.Gainsboro;
+                    label.BackGroundColor = this.ColorResultNone;
                     break;
                 case Define.E_JudgmentStatus.Pass:
-                    label.TextColor = this.ColorResultPass;
+                    label.BackGroundColor = this.ColorResultPass;
                     break;
                 case Define.E_JudgmentStatus.Ng:
-                    label.TextColor = this.ColorResultNG;
+                    label.BackGroundColor = this.ColorResultNG;
                     break;
                 case Define.E_JudgmentStatus.Empty:
-                    label.TextColor = Color.Gainsboro;
+                    label.BackGroundColor = this.ColorResultNone;
                     break;
                 case Define.E_JudgmentStatus.Error:
-                    label.TextColor = Color.Gainsboro;
+                    label.BackGroundColor = this.ColorResultNone;
                     break;
                 default:
                     break;
@@ -117,19 +117,19 @@ namespace INT_PT002.Controls.MainDisplay
             switch (judg)
             {
                 case Define.E_JudgmentStatus.None:
-                    label.TextColor = Color.Gainsboro;
+                    label.BackGroundColor = this.ColorResultNone;
                     break;
                 case Define.E_JudgmentStatus.Pass:
-                    label.TextColor = this.ColorResultPass;
+                    label.BackGroundColor = this.ColorResultPass;
                     break;
                 case Define.E_JudgmentStatus.Ng:
-                    label.TextColor = this.ColorResultNG;
+                    label.BackGroundColor = this.ColorResultNG;
                     break;
                 case Define.E_JudgmentStatus.Empty:
-                    label.TextColor = Color.Gainsboro;
+                    label.BackGroundColor = this.ColorResultNone;
                     break;
                 case Define.E_JudgmentStatus.Error:
-                    label.TextColor = Color.Gainsboro;
+                    label.BackGroundColor = this.ColorResultNone;
                     break;
                 default:
                     break;

INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs

@@ -128,37 +128,6 @@ namespace INT_PT002.Controls
             SmartSplash.Finish();
 
             this.ParentForm.Enabled = true;
-            
-            switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentUser.Group)
-            {
-                case Define.E_UserGroup.None:
-                    this.Enabled = false;
-                    break;
-                case Define.E_UserGroup.Level1:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuIOTest;
-                    break;
-                case Define.E_UserGroup.Level2:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuIOTest;
-                    break;
-                case Define.E_UserGroup.Level3:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuIOTest;
-                    break;
-                case Define.E_UserGroup.Admin:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuIOTest;
-                    break;
-                case Define.E_UserGroup.Developer:
-                    this.Enabled = true;
-                    break;
-                case Define.E_UserGroup.NotLogin:
-                    this.Enabled = false;
-                    break;
-                case Define.E_UserGroup.LogOut:
-                    this.Enabled = false;
-                    break;
-                default:
-                    break;
-            }
-
         }
 
         // 변위센서 데이터

INT_PT002/Controls/Recipe/ControlMenuRecipeSetting.cs

@@ -22,7 +22,7 @@ namespace INT_PT002.Controls
 
         private FormMenu m_ParentForm;
 
-        private Collection<Control> CollControls;
+        private Collection<SmartLabel> CollLabel;
 
         private ControlMenuRecipeData ChildControlRecipeData1;
         private ControlMenuRecipeData ChildControlRecipeData2;
@@ -52,25 +52,19 @@ namespace INT_PT002.Controls
             this.smartGroupBox1.Text = "Recipe > Setting";
             this.MessageBoxRange = "";
 
-            this.CollControls = new Collection<Control>();
+            this.CollLabel = new Collection<SmartLabel>();
-            this.CollControls.Add(this.labelNumber);
+            this.CollLabel.Add(this.labelNumber);
-            this.CollControls.Add(this.labelPressureLevel);
+            this.CollLabel.Add(this.labelPressureLevel);
-            this.CollControls.Add(this.labelDispEmptyLevel);
+            this.CollLabel.Add(this.labelDispEmptyLevel);
-            this.CollControls.Add(this.labelDispMinHeight);
+            this.CollLabel.Add(this.labelDispMinHeight);
-            this.CollControls.Add(this.labelDispMaxDiff);
+            this.CollLabel.Add(this.labelDispMaxDiff);
-            this.CollControls.Add(this.labelDiffDelayTime);
+            this.CollLabel.Add(this.labelDiffDelayTime);
-            this.CollControls.Add(this.labelDiffLrLimit);
+            this.CollLabel.Add(this.labelDiffLrLimit);
-            this.CollControls.Add(this.labelDiffLrCycle);
+            this.CollLabel.Add(this.labelDiffLrCycle);
-            this.CollControls.Add(this.labelVacuumStart);
+            this.CollLabel.Add(this.labelVacuumStart);
-            this.CollControls.Add(this.labelVacuumHold1);
+            this.CollLabel.Add(this.labelVacuumHold1);
-            this.CollControls.Add(this.labelVacuumHold2);
+            this.CollLabel.Add(this.labelVacuumHold2);
-            this.CollControls.Add(this.labelVacuumBreak);
+            this.CollLabel.Add(this.labelVacuumBreak);
-            this.CollControls.Add(this.radioButton1);
-            this.CollControls.Add(this.radioButton3);
-            this.CollControls.Add(this.radioButton5);
-            this.CollControls.Add(this.radioButton7);
-            this.CollControls.Add(this.radioButton9);
-            this.CollControls.Add(this.buttonInspection);
 
             this.ChildControlRecipeData1 = new ControlMenuRecipeData(this.ParentForm);
             this.ChildControlRecipeData2 = new ControlMenuRecipeData(this.ParentForm);
@@ -88,8 +82,8 @@ namespace INT_PT002.Controls
 
         private void UpdateDisplauUserControls(bool enable)
         {
-            for (int i = 0; i < this.CollControls.Count; i++)
+            for (int i = 0; i < this.CollLabel.Count; i++)
-                this.CollControls[i].Enabled = enable;
+                this.CollLabel[i].Enabled = enable;
         }
         private void UpdateDisplayUser(UserItem user)
         {
@@ -218,6 +212,77 @@ namespace INT_PT002.Controls
                 this.labelDispMaxDiff.Enabled = false;
             }
         }
+        private void UpdateDisplayRecipeEnable(bool enable)
+        {
+            if (enable == true)
+            {
+                // BackGroundClor
+                this.labelNumber.BackGroundColor = Color.White;
+
+                this.labelPressureLevel.BackGroundColor = Color.White;
+                this.labelVacuumStart.BackGroundColor = Color.White;
+                this.labelVacuumHold1.BackGroundColor = Color.White;
+                this.labelVacuumHold2.BackGroundColor = Color.White;
+                this.labelVacuumBreak.BackGroundColor = Color.White;
+
+                this.labelDiffLrLimit.BackGroundColor = Color.White;
+                this.labelDiffLrCycle.BackGroundColor = Color.White;
+                this.labelDiffDelayTime.BackGroundColor = Color.White;
+
+                // Enable
+                this.labelNumber.Enabled = true;
+
+                this.labelPressureLevel.Enabled = true;
+                this.labelVacuumStart.Enabled = true;
+                this.labelVacuumHold1.Enabled = true;
+                this.labelVacuumHold2.Enabled = true;
+                this.labelVacuumBreak.Enabled = true;
+
+                this.labelDiffLrLimit.Enabled = true;
+                this.labelDiffLrCycle.Enabled = true;
+                this.labelDiffDelayTime.Enabled = true;
+
+                this.buttonDispEnable.Enabled = true;
+                this.UpdateDisplayDispEnable(this.ParentForm.ParentForm.CurrentRecipe.DISP_JUDG_ENABLE);
+            }
+            else
+            {
+                // BackGroundClor
+                this.labelNumber.BackGroundColor = Color.Silver;
+
+                this.labelPressureLevel.BackGroundColor = Color.Silver;
+                this.labelVacuumStart.BackGroundColor = Color.Silver;
+                this.labelVacuumHold1.BackGroundColor = Color.Silver;
+                this.labelVacuumHold2.BackGroundColor = Color.Silver;
+                this.labelVacuumBreak.BackGroundColor = Color.Silver;
+
+                this.labelDiffLrLimit.BackGroundColor = Color.Silver;
+                this.labelDiffLrCycle.BackGroundColor = Color.Silver;
+                this.labelDiffDelayTime.BackGroundColor = Color.Silver;
+
+                this.labelDispEmptyLevel.BackGroundColor = Color.Silver;
+                this.labelDispMinHeight.BackGroundColor = Color.Silver;
+                this.labelDispMaxDiff.BackGroundColor = Color.Silver;
+
+                // Enable
+                this.labelNumber.Enabled = false;
+
+                this.labelPressureLevel.Enabled = false;
+                this.labelVacuumStart.Enabled = false;
+                this.labelVacuumHold1.Enabled = false;
+                this.labelVacuumHold2.Enabled = false;
+                this.labelVacuumBreak.Enabled = false;
+
+                this.labelDiffLrLimit.Enabled = false;
+                this.labelDiffLrCycle.Enabled = false;
+                this.labelDiffDelayTime.Enabled = false;
+
+                this.labelDispEmptyLevel.Enabled = false;
+                this.labelDispMinHeight.Enabled = false;
+                this.labelDispMaxDiff.Enabled = false;
+                this.buttonDispEnable.Enabled = false;
+            }
+        }
 
         // Process
         public void UpdateDisplayProcessStatus(Define.E_ProcessStatus status)
@@ -238,7 +303,7 @@ namespace INT_PT002.Controls
                     if (this.labelProgress9.BackGroundColor != Define.ColorProgressOff) this.labelProgress9.BackGroundColor = Define.ColorProgressOff;
                     if (this.labelProgress10.BackGroundColor != Define.ColorProgressOff) this.labelProgress10.BackGroundColor = Define.ColorProgressOff;
 
-                    this.UpdateDisplayUser(this.ParentForm.ParentForm.CurrentSystemStatus.CurrentUser);
+                    this.UpdateDisplayRecipeEnable(true);
                     break;
                 case Define.E_ProcessStatus._2_ProductEntry:
                     if (this.labelProgress1.BackGroundColor != Define.ColorProgressOff) this.labelProgress1.BackGroundColor = Define.ColorProgressOff;
@@ -252,7 +317,7 @@ namespace INT_PT002.Controls
                     if (this.labelProgress9.BackGroundColor != Define.ColorProgressOff) this.labelProgress9.BackGroundColor = Define.ColorProgressOff;
                     if (this.labelProgress10.BackGroundColor != Define.ColorProgressOff) this.labelProgress10.BackGroundColor = Define.ColorProgressOff;
 
-                    this.UpdateDisplauUserControls(false);
+                    this.UpdateDisplayRecipeEnable(false);
                     //this.ChildControlRecipeData1.InitializeData();
                     //this.ChildControlRecipeData2.InitializeData();
                     break;
@@ -544,9 +609,6 @@ namespace INT_PT002.Controls
 
             this.UpdateDisplayUser(this.ParentForm.ParentForm.CurrentSystemStatus.CurrentUser);
 
-            this.ChildControlRecipeData1.InitializeData();
-            this.ChildControlRecipeData2.InitializeData();
-
             this.ChildControlRecipeData1.CalScaleDiff(this.ParentForm.ParentForm.CurrentRecipe.DIFF_LR_LIMIT);
             this.ChildControlRecipeData2.CalScaleDiff(this.ParentForm.ParentForm.CurrentRecipe.DIFF_LR_LIMIT);
             this.ChildControlRecipeData1.DrawDiffReferenceLine(this.ParentForm.ParentForm.CurrentRecipe.DIFF_LR_LIMIT);
@@ -950,16 +1012,48 @@ namespace INT_PT002.Controls
             string id = "";
 
             if (this.radioButton1.Checked == true)
+            {
                 id = CommunicationID.SubBoard1;
+
+                this.button1.ButtonText = "1";
+                this.button2.ButtonText = "2";
+            }
             else if (this.radioButton3.Checked == true)
+            {
                 id = CommunicationID.SubBoard3;
+
+                this.button1.ButtonText = "3";
+                this.button2.ButtonText = "4";
+            }
             else if (this.radioButton5.Checked == true)
+            {
                 id = CommunicationID.SubBoard5;
+
+                this.button1.ButtonText = "5";
+                this.button2.ButtonText = "6";
+            }
             else if (this.radioButton7.Checked == true)
+            {
                 id = CommunicationID.SubBoard7;
+
+                this.button1.ButtonText = "7";
+                this.button2.ButtonText = "8";
+            }
             else if (this.radioButton9.Checked == true)
+            {
                 id = CommunicationID.SubBoard9;
 
+                this.button1.ButtonText = "9";
+                this.button2.ButtonText = "10";
+            }
+            else
+            {
+                id = CommunicationID.SubBoard1;
+
+                this.button1.ButtonText = "1";
+                this.button2.ButtonText = "2";
+            }
+
             this.ChildControlRecipeData1.InitializeData();
             this.ChildControlRecipeData2.InitializeData();
 
@@ -967,9 +1061,6 @@ namespace INT_PT002.Controls
         }
         private void radioButton1_Click(object sender, EventArgs e)
         {
-            this.button1.ButtonText = "1";
-            this.button2.ButtonText = "2";
-
             this.radioButton1.RadioBackColor = Define.ColorSelected;
             this.radioButton3.RadioBackColor = Define.ColorNoneSelected;
             this.radioButton5.RadioBackColor = Define.ColorNoneSelected;
@@ -984,9 +1075,6 @@ namespace INT_PT002.Controls
         }
         private void radioButton3_Click(object sender, EventArgs e)
         {
-            this.button1.ButtonText = "3";
-            this.button2.ButtonText = "4";
-
             this.radioButton1.RadioBackColor = Define.ColorNoneSelected;
             this.radioButton3.RadioBackColor = Define.ColorSelected;
             this.radioButton5.RadioBackColor = Define.ColorNoneSelected;
@@ -1001,9 +1089,6 @@ namespace INT_PT002.Controls
         }
         private void radioButton5_Click(object sender, EventArgs e)
         {
-            this.button1.ButtonText = "5";
-            this.button2.ButtonText = "6";
-
             this.radioButton1.RadioBackColor = Define.ColorNoneSelected;
             this.radioButton3.RadioBackColor = Define.ColorNoneSelected;
             this.radioButton5.RadioBackColor = Define.ColorSelected;
@@ -1018,9 +1103,6 @@ namespace INT_PT002.Controls
         }
         private void radioButton7_Click(object sender, EventArgs e)
         {
-            this.button1.ButtonText = "7";
-            this.button2.ButtonText = "8";
-
             this.radioButton1.RadioBackColor = Define.ColorNoneSelected;
             this.radioButton3.RadioBackColor = Define.ColorNoneSelected;
             this.radioButton5.RadioBackColor = Define.ColorNoneSelected;
@@ -1035,9 +1117,6 @@ namespace INT_PT002.Controls
         }
         private void radioButton9_Click(object sender, EventArgs e)
         {
-            this.button1.ButtonText = "9";
-            this.button2.ButtonText = "10";
-
             this.radioButton1.RadioBackColor = Define.ColorNoneSelected;
             this.radioButton3.RadioBackColor = Define.ColorNoneSelected;
             this.radioButton5.RadioBackColor = Define.ColorNoneSelected;

INT_PT002/Controls/System/ControlMenuSystemEthernet.cs

@@ -389,36 +389,6 @@ namespace INT_PT002.Controls
             this.UpdateMACAddressDisplay();
 
             this.buttonSaveMode.Visible = false;
-
-            switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentUser.Group)
-            {
-                case Define.E_UserGroup.None:
-                    this.Enabled = false;
-                    break;
-                case Define.E_UserGroup.Level1:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuEthernet;
-                    break;
-                case Define.E_UserGroup.Level2:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsMenuEthernet;
-                    break;
-                case Define.E_UserGroup.Level3:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsMenuEthernet;
-                    break;
-                case Define.E_UserGroup.Admin:
-                    this.Enabled = true;
-                    break;
-                case Define.E_UserGroup.Developer:
-                    this.Enabled = true;
-                    break;
-                case Define.E_UserGroup.NotLogin:
-                    this.Enabled = false;
-                    break;
-                case Define.E_UserGroup.LogOut:
-                    this.Enabled = false;
-                    break;
-                default:
-                    break;
-            }
         }
         #endregion
 

INT_PT002/Controls/System/ControlMenuSystemInformation.cs

@@ -50,7 +50,6 @@ namespace INT_PT002.Controls
             this.smartGroupBox1.Text = "System > Information";
 
             this.labelDisplayVersion.Text = "1.0.0";
-            this.labelSerialNo.Text = this.ParentForm.ParentForm.SystemConfig.SERIAL_NUMBER;
 
             this.USBPath = "하드 디스크\\";
             this.UpdateFileDisplayPath = this.USBPath + "UpdateFiles\\";
@@ -287,36 +286,6 @@ namespace INT_PT002.Controls
             this.upDownMinute.Value = currentTime.Minute;
 
             this.buttonSave.Visible = false;
-
-            switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentUser.Group)
-            {
-                case Define.E_UserGroup.None:
-                    this.Enabled = false;
-                    break;
-                case Define.E_UserGroup.Level1:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuInformation;
-                    break;
-                case Define.E_UserGroup.Level2:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuInformation;
-                    break;
-                case Define.E_UserGroup.Level3:
-                    this.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMenuInformation;
-                    break;
-                case Define.E_UserGroup.Admin:
-                    this.Enabled = true;
-                    break;
-                case Define.E_UserGroup.Developer:
-                    this.Enabled = true;
-                    break;
-                case Define.E_UserGroup.NotLogin:
-                    this.Enabled = false;
-                    break;
-                case Define.E_UserGroup.LogOut:
-                    this.Enabled = false;
-                    break;
-                default:
-                    break;
-            }
         }
         #endregion
 

INT_PT002/Controls/System/ControlMenuSystemStatus1.cs

@@ -433,9 +433,6 @@ namespace INT_PT002.Controls
                 #region Stop
                 //this.labelStart.Visible = false;
                 //this.labelStop.Visible = true;
-
-                this.InitializeData();
-                this.ParentForm.Child_System_Equipment10_1.InitializeData();
                 #endregion
             }
         }
@@ -1188,14 +1185,6 @@ namespace INT_PT002.Controls
             {
                 this.CalScaleDiff(this.ParentForm.ParentForm.CurrentRecipe.DIFF_LR_LIMIT);
                 this.DrawDiffReferenceLine(this.ParentForm.ParentForm.CurrentRecipe.DIFF_LR_LIMIT);
-                
-                // 화면 데이터 초기화
-                this.InitializeData();
-                this.ParentForm.Child_System_Equipment10_1.InitializeData();
-            }
-            else
-            {
-               
             }
 
             if (this.ParentForm.ParentForm.CurrentRecipe.DISP_JUDG_ENABLE == false)

INT_PT002/Controls/User/ControlMenuUserGroupEditor.Designer.cs

@@ -121,9 +121,6 @@
             this.smartGroupBox1.BackImage = null;
             this.smartGroupBox1.Controls.Add(this.smartLabel1);
             this.smartGroupBox1.Controls.Add(this.smartKeyboard);
-            this.smartGroupBox1.Controls.Add(this.checkBoxL3MenuUserGroupEditor);
-            this.smartGroupBox1.Controls.Add(this.checkBoxL2MenuUserGroupEditor);
-            this.smartGroupBox1.Controls.Add(this.checkBoxL1MenuUserGroupEditor);
             this.smartGroupBox1.Controls.Add(this.buttonGroupNameChange);
             this.smartGroupBox1.Controls.Add(this.labelTitleMenuUserGroupEditor);
             this.smartGroupBox1.Controls.Add(this.groupBoxDefault);
@@ -133,9 +130,6 @@
             this.smartGroupBox1.Controls.Add(this.labelTitleMenuEquipment);
             this.smartGroupBox1.Controls.Add(this.labelTitleMenuInformation);
             this.smartGroupBox1.Controls.Add(this.labelTitleMenuAlarmLog);
-            this.smartGroupBox1.Controls.Add(this.checkBoxL3MenuEquipment);
-            this.smartGroupBox1.Controls.Add(this.checkBoxL2MenuEquipment);
-            this.smartGroupBox1.Controls.Add(this.checkBoxL1MenuEquipment);
             this.smartGroupBox1.Controls.Add(this.labelTitleMenuInspectionLog);
             this.smartGroupBox1.Controls.Add(this.labelTitleMenuHistoryLog);
             this.smartGroupBox1.Controls.Add(this.labelTitleMenuIOTest);
@@ -168,7 +162,7 @@
             this.smartLabel1.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.smartLabel1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.smartLabel1.LineSpacing = 0F;
-            this.smartLabel1.Location = new System.Drawing.Point(158, 486);
+            this.smartLabel1.Location = new System.Drawing.Point(158, 515);
             this.smartLabel1.Name = "smartLabel1";
             this.smartLabel1.OverlapOptimize = true;
             this.smartLabel1.PasswordChar = '\0';
@@ -271,7 +265,7 @@
             this.labelTitleMenuUserGroupEditor.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelTitleMenuUserGroupEditor.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.labelTitleMenuUserGroupEditor.LineSpacing = 0F;
-            this.labelTitleMenuUserGroupEditor.Location = new System.Drawing.Point(158, 598);
+            this.labelTitleMenuUserGroupEditor.Location = new System.Drawing.Point(158, 341);
             this.labelTitleMenuUserGroupEditor.Name = "labelTitleMenuUserGroupEditor";
             this.labelTitleMenuUserGroupEditor.OverlapOptimize = true;
             this.labelTitleMenuUserGroupEditor.PasswordChar = '\0';
@@ -284,7 +278,6 @@
             this.labelTitleMenuUserGroupEditor.TextColorDisable = System.Drawing.Color.Gray;
             this.labelTitleMenuUserGroupEditor.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
             this.labelTitleMenuUserGroupEditor.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
-            this.labelTitleMenuUserGroupEditor.Visible = false;
             this.labelTitleMenuUserGroupEditor.Wordwrap = false;
             // 
             // groupBoxDefault
@@ -622,6 +615,7 @@
             this.groupBoxLevel3.BackImage = null;
             this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuEthernet);
             this.groupBoxLevel3.Controls.Add(this.textBoxLevel3);
+            this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuUserGroupEditor);
             this.groupBoxLevel3.Controls.Add(this.checkBoxL3MainProductChange);
             this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuUserSetting);
             this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuProduct);
@@ -630,6 +624,7 @@
             this.groupBoxLevel3.Controls.Add(this.checkBoxL3MainClear);
             this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuHistoryLog);
             this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuInspectionLog);
+            this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuEquipment);
             this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuAlarmLog);
             this.groupBoxLevel3.Controls.Add(this.checkBoxL3MenuInformation);
             this.groupBoxLevel3.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(92)))), ((int)(((byte)(118)))));
@@ -640,7 +635,7 @@
             this.groupBoxLevel3.Location = new System.Drawing.Point(566, 98);
             this.groupBoxLevel3.Name = "groupBoxLevel3";
             this.groupBoxLevel3.RoundRadius = 5;
-            this.groupBoxLevel3.Size = new System.Drawing.Size(120, 435);
+            this.groupBoxLevel3.Size = new System.Drawing.Size(120, 486);
             this.groupBoxLevel3.TabIndex = 220;
             this.groupBoxLevel3.Text = "Level 3";
             this.groupBoxLevel3.TextColor = System.Drawing.Color.White;
@@ -659,7 +654,7 @@
             this.checkBoxL3MenuEthernet.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL3MenuEthernet.ImageCheckBox = null;
             this.checkBoxL3MenuEthernet.ImageUnCheckBox = null;
-            this.checkBoxL3MenuEthernet.Location = new System.Drawing.Point(48, 388);
+            this.checkBoxL3MenuEthernet.Location = new System.Drawing.Point(48, 417);
             this.checkBoxL3MenuEthernet.Name = "checkBoxL3MenuEthernet";
             this.checkBoxL3MenuEthernet.OverlapOptimize = true;
             this.checkBoxL3MenuEthernet.Size = new System.Drawing.Size(23, 23);
@@ -682,7 +677,7 @@
             // 
             // checkBoxL3MenuUserGroupEditor
             // 
-            this.checkBoxL3MenuUserGroupEditor.BackGround = this.smartGroupBox1;
+            this.checkBoxL3MenuUserGroupEditor.BackGround = this.groupBoxLevel3;
             this.checkBoxL3MenuUserGroupEditor.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32)))));
             this.checkBoxL3MenuUserGroupEditor.CheckBoxBackColor = System.Drawing.Color.White;
             this.checkBoxL3MenuUserGroupEditor.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid;
@@ -693,7 +688,7 @@
             this.checkBoxL3MenuUserGroupEditor.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL3MenuUserGroupEditor.ImageCheckBox = null;
             this.checkBoxL3MenuUserGroupEditor.ImageUnCheckBox = null;
-            this.checkBoxL3MenuUserGroupEditor.Location = new System.Drawing.Point(614, 598);
+            this.checkBoxL3MenuUserGroupEditor.Location = new System.Drawing.Point(48, 243);
             this.checkBoxL3MenuUserGroupEditor.Name = "checkBoxL3MenuUserGroupEditor";
             this.checkBoxL3MenuUserGroupEditor.OverlapOptimize = true;
             this.checkBoxL3MenuUserGroupEditor.Size = new System.Drawing.Size(23, 23);
@@ -701,7 +696,6 @@
             this.checkBoxL3MenuUserGroupEditor.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
             this.checkBoxL3MenuUserGroupEditor.TextColorDisable = System.Drawing.Color.Gray;
             this.checkBoxL3MenuUserGroupEditor.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
-            this.checkBoxL3MenuUserGroupEditor.Visible = false;
             this.checkBoxL3MenuUserGroupEditor.Click += new System.EventHandler(this.checkBox_Click);
             // 
             // checkBoxL3MainProductChange
@@ -785,7 +779,7 @@
             this.checkBoxL3MenuIOTest.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL3MenuIOTest.ImageCheckBox = null;
             this.checkBoxL3MenuIOTest.ImageUnCheckBox = null;
-            this.checkBoxL3MenuIOTest.Location = new System.Drawing.Point(48, 243);
+            this.checkBoxL3MenuIOTest.Location = new System.Drawing.Point(48, 272);
             this.checkBoxL3MenuIOTest.Name = "checkBoxL3MenuIOTest";
             this.checkBoxL3MenuIOTest.OverlapOptimize = true;
             this.checkBoxL3MenuIOTest.Size = new System.Drawing.Size(23, 23);
@@ -853,7 +847,7 @@
             this.checkBoxL3MenuHistoryLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL3MenuHistoryLog.ImageCheckBox = null;
             this.checkBoxL3MenuHistoryLog.ImageUnCheckBox = null;
-            this.checkBoxL3MenuHistoryLog.Location = new System.Drawing.Point(48, 272);
+            this.checkBoxL3MenuHistoryLog.Location = new System.Drawing.Point(48, 301);
             this.checkBoxL3MenuHistoryLog.Name = "checkBoxL3MenuHistoryLog";
             this.checkBoxL3MenuHistoryLog.OverlapOptimize = true;
             this.checkBoxL3MenuHistoryLog.Size = new System.Drawing.Size(23, 23);
@@ -876,7 +870,7 @@
             this.checkBoxL3MenuInspectionLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL3MenuInspectionLog.ImageCheckBox = null;
             this.checkBoxL3MenuInspectionLog.ImageUnCheckBox = null;
-            this.checkBoxL3MenuInspectionLog.Location = new System.Drawing.Point(48, 301);
+            this.checkBoxL3MenuInspectionLog.Location = new System.Drawing.Point(48, 330);
             this.checkBoxL3MenuInspectionLog.Name = "checkBoxL3MenuInspectionLog";
             this.checkBoxL3MenuInspectionLog.OverlapOptimize = true;
             this.checkBoxL3MenuInspectionLog.Size = new System.Drawing.Size(23, 23);
@@ -888,7 +882,7 @@
             // 
             // checkBoxL3MenuEquipment
             // 
-            this.checkBoxL3MenuEquipment.BackGround = this.smartGroupBox1;
+            this.checkBoxL3MenuEquipment.BackGround = this.groupBoxLevel3;
             this.checkBoxL3MenuEquipment.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32)))));
             this.checkBoxL3MenuEquipment.CheckBoxBackColor = System.Drawing.Color.White;
             this.checkBoxL3MenuEquipment.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid;
@@ -899,7 +893,7 @@
             this.checkBoxL3MenuEquipment.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL3MenuEquipment.ImageCheckBox = null;
             this.checkBoxL3MenuEquipment.ImageUnCheckBox = null;
-            this.checkBoxL3MenuEquipment.Location = new System.Drawing.Point(614, 627);
+            this.checkBoxL3MenuEquipment.Location = new System.Drawing.Point(48, 446);
             this.checkBoxL3MenuEquipment.Name = "checkBoxL3MenuEquipment";
             this.checkBoxL3MenuEquipment.OverlapOptimize = true;
             this.checkBoxL3MenuEquipment.Size = new System.Drawing.Size(23, 23);
@@ -907,7 +901,6 @@
             this.checkBoxL3MenuEquipment.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
             this.checkBoxL3MenuEquipment.TextColorDisable = System.Drawing.Color.Gray;
             this.checkBoxL3MenuEquipment.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
-            this.checkBoxL3MenuEquipment.Visible = false;
             this.checkBoxL3MenuEquipment.Click += new System.EventHandler(this.checkBox_Click);
             // 
             // checkBoxL3MenuAlarmLog
@@ -923,7 +916,7 @@
             this.checkBoxL3MenuAlarmLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL3MenuAlarmLog.ImageCheckBox = null;
             this.checkBoxL3MenuAlarmLog.ImageUnCheckBox = null;
-            this.checkBoxL3MenuAlarmLog.Location = new System.Drawing.Point(48, 330);
+            this.checkBoxL3MenuAlarmLog.Location = new System.Drawing.Point(48, 359);
             this.checkBoxL3MenuAlarmLog.Name = "checkBoxL3MenuAlarmLog";
             this.checkBoxL3MenuAlarmLog.OverlapOptimize = true;
             this.checkBoxL3MenuAlarmLog.Size = new System.Drawing.Size(23, 23);
@@ -946,7 +939,7 @@
             this.checkBoxL3MenuInformation.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL3MenuInformation.ImageCheckBox = null;
             this.checkBoxL3MenuInformation.ImageUnCheckBox = null;
-            this.checkBoxL3MenuInformation.Location = new System.Drawing.Point(48, 359);
+            this.checkBoxL3MenuInformation.Location = new System.Drawing.Point(48, 388);
             this.checkBoxL3MenuInformation.Name = "checkBoxL3MenuInformation";
             this.checkBoxL3MenuInformation.OverlapOptimize = true;
             this.checkBoxL3MenuInformation.Size = new System.Drawing.Size(23, 23);
@@ -963,6 +956,7 @@
             this.groupBoxLevel2.BackImage = null;
             this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuEthernet);
             this.groupBoxLevel2.Controls.Add(this.textBoxLevel2);
+            this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuUserGroupEditor);
             this.groupBoxLevel2.Controls.Add(this.checkBoxL2MainProductChange);
             this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuUserSetting);
             this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuProduct);
@@ -971,6 +965,7 @@
             this.groupBoxLevel2.Controls.Add(this.checkBoxL2MainClear);
             this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuHistoryLog);
             this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuInspectionLog);
+            this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuEquipment);
             this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuAlarmLog);
             this.groupBoxLevel2.Controls.Add(this.checkBoxL2MenuInformation);
             this.groupBoxLevel2.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(92)))), ((int)(((byte)(118)))));
@@ -981,7 +976,7 @@
             this.groupBoxLevel2.Location = new System.Drawing.Point(440, 98);
             this.groupBoxLevel2.Name = "groupBoxLevel2";
             this.groupBoxLevel2.RoundRadius = 5;
-            this.groupBoxLevel2.Size = new System.Drawing.Size(120, 435);
+            this.groupBoxLevel2.Size = new System.Drawing.Size(120, 486);
             this.groupBoxLevel2.TabIndex = 219;
             this.groupBoxLevel2.Text = "Level 2";
             this.groupBoxLevel2.TextColor = System.Drawing.Color.White;
@@ -1000,7 +995,7 @@
             this.checkBoxL2MenuEthernet.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL2MenuEthernet.ImageCheckBox = null;
             this.checkBoxL2MenuEthernet.ImageUnCheckBox = null;
-            this.checkBoxL2MenuEthernet.Location = new System.Drawing.Point(51, 388);
+            this.checkBoxL2MenuEthernet.Location = new System.Drawing.Point(51, 417);
             this.checkBoxL2MenuEthernet.Name = "checkBoxL2MenuEthernet";
             this.checkBoxL2MenuEthernet.OverlapOptimize = true;
             this.checkBoxL2MenuEthernet.Size = new System.Drawing.Size(23, 23);
@@ -1023,7 +1018,7 @@
             // 
             // checkBoxL2MenuUserGroupEditor
             // 
-            this.checkBoxL2MenuUserGroupEditor.BackGround = this.smartGroupBox1;
+            this.checkBoxL2MenuUserGroupEditor.BackGround = this.groupBoxLevel2;
             this.checkBoxL2MenuUserGroupEditor.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32)))));
             this.checkBoxL2MenuUserGroupEditor.CheckBoxBackColor = System.Drawing.Color.White;
             this.checkBoxL2MenuUserGroupEditor.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid;
@@ -1034,7 +1029,7 @@
             this.checkBoxL2MenuUserGroupEditor.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL2MenuUserGroupEditor.ImageCheckBox = null;
             this.checkBoxL2MenuUserGroupEditor.ImageUnCheckBox = null;
-            this.checkBoxL2MenuUserGroupEditor.Location = new System.Drawing.Point(491, 598);
+            this.checkBoxL2MenuUserGroupEditor.Location = new System.Drawing.Point(51, 243);
             this.checkBoxL2MenuUserGroupEditor.Name = "checkBoxL2MenuUserGroupEditor";
             this.checkBoxL2MenuUserGroupEditor.OverlapOptimize = true;
             this.checkBoxL2MenuUserGroupEditor.Size = new System.Drawing.Size(23, 23);
@@ -1042,7 +1037,6 @@
             this.checkBoxL2MenuUserGroupEditor.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
             this.checkBoxL2MenuUserGroupEditor.TextColorDisable = System.Drawing.Color.Gray;
             this.checkBoxL2MenuUserGroupEditor.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
-            this.checkBoxL2MenuUserGroupEditor.Visible = false;
             this.checkBoxL2MenuUserGroupEditor.Click += new System.EventHandler(this.checkBox_Click);
             // 
             // checkBoxL2MainProductChange
@@ -1126,7 +1120,7 @@
             this.checkBoxL2MenuIOTest.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL2MenuIOTest.ImageCheckBox = null;
             this.checkBoxL2MenuIOTest.ImageUnCheckBox = null;
-            this.checkBoxL2MenuIOTest.Location = new System.Drawing.Point(51, 243);
+            this.checkBoxL2MenuIOTest.Location = new System.Drawing.Point(51, 272);
             this.checkBoxL2MenuIOTest.Name = "checkBoxL2MenuIOTest";
             this.checkBoxL2MenuIOTest.OverlapOptimize = true;
             this.checkBoxL2MenuIOTest.Size = new System.Drawing.Size(23, 23);
@@ -1194,7 +1188,7 @@
             this.checkBoxL2MenuHistoryLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL2MenuHistoryLog.ImageCheckBox = null;
             this.checkBoxL2MenuHistoryLog.ImageUnCheckBox = null;
-            this.checkBoxL2MenuHistoryLog.Location = new System.Drawing.Point(51, 272);
+            this.checkBoxL2MenuHistoryLog.Location = new System.Drawing.Point(51, 301);
             this.checkBoxL2MenuHistoryLog.Name = "checkBoxL2MenuHistoryLog";
             this.checkBoxL2MenuHistoryLog.OverlapOptimize = true;
             this.checkBoxL2MenuHistoryLog.Size = new System.Drawing.Size(23, 23);
@@ -1217,7 +1211,7 @@
             this.checkBoxL2MenuInspectionLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL2MenuInspectionLog.ImageCheckBox = null;
             this.checkBoxL2MenuInspectionLog.ImageUnCheckBox = null;
-            this.checkBoxL2MenuInspectionLog.Location = new System.Drawing.Point(51, 301);
+            this.checkBoxL2MenuInspectionLog.Location = new System.Drawing.Point(51, 330);
             this.checkBoxL2MenuInspectionLog.Name = "checkBoxL2MenuInspectionLog";
             this.checkBoxL2MenuInspectionLog.OverlapOptimize = true;
             this.checkBoxL2MenuInspectionLog.Size = new System.Drawing.Size(23, 23);
@@ -1229,7 +1223,7 @@
             // 
             // checkBoxL2MenuEquipment
             // 
-            this.checkBoxL2MenuEquipment.BackGround = this.smartGroupBox1;
+            this.checkBoxL2MenuEquipment.BackGround = this.groupBoxLevel2;
             this.checkBoxL2MenuEquipment.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32)))));
             this.checkBoxL2MenuEquipment.CheckBoxBackColor = System.Drawing.Color.White;
             this.checkBoxL2MenuEquipment.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid;
@@ -1240,7 +1234,7 @@
             this.checkBoxL2MenuEquipment.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL2MenuEquipment.ImageCheckBox = null;
             this.checkBoxL2MenuEquipment.ImageUnCheckBox = null;
-            this.checkBoxL2MenuEquipment.Location = new System.Drawing.Point(491, 627);
+            this.checkBoxL2MenuEquipment.Location = new System.Drawing.Point(51, 446);
             this.checkBoxL2MenuEquipment.Name = "checkBoxL2MenuEquipment";
             this.checkBoxL2MenuEquipment.OverlapOptimize = true;
             this.checkBoxL2MenuEquipment.Size = new System.Drawing.Size(23, 23);
@@ -1248,7 +1242,6 @@
             this.checkBoxL2MenuEquipment.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
             this.checkBoxL2MenuEquipment.TextColorDisable = System.Drawing.Color.Gray;
             this.checkBoxL2MenuEquipment.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
-            this.checkBoxL2MenuEquipment.Visible = false;
             this.checkBoxL2MenuEquipment.Click += new System.EventHandler(this.checkBox_Click);
             // 
             // checkBoxL2MenuAlarmLog
@@ -1264,7 +1257,7 @@
             this.checkBoxL2MenuAlarmLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL2MenuAlarmLog.ImageCheckBox = null;
             this.checkBoxL2MenuAlarmLog.ImageUnCheckBox = null;
-            this.checkBoxL2MenuAlarmLog.Location = new System.Drawing.Point(51, 330);
+            this.checkBoxL2MenuAlarmLog.Location = new System.Drawing.Point(51, 359);
             this.checkBoxL2MenuAlarmLog.Name = "checkBoxL2MenuAlarmLog";
             this.checkBoxL2MenuAlarmLog.OverlapOptimize = true;
             this.checkBoxL2MenuAlarmLog.Size = new System.Drawing.Size(23, 23);
@@ -1287,7 +1280,7 @@
             this.checkBoxL2MenuInformation.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL2MenuInformation.ImageCheckBox = null;
             this.checkBoxL2MenuInformation.ImageUnCheckBox = null;
-            this.checkBoxL2MenuInformation.Location = new System.Drawing.Point(51, 359);
+            this.checkBoxL2MenuInformation.Location = new System.Drawing.Point(51, 388);
             this.checkBoxL2MenuInformation.Name = "checkBoxL2MenuInformation";
             this.checkBoxL2MenuInformation.OverlapOptimize = true;
             this.checkBoxL2MenuInformation.Size = new System.Drawing.Size(23, 23);
@@ -1304,6 +1297,7 @@
             this.groupBoxLevel1.BackImage = null;
             this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuEthernet);
             this.groupBoxLevel1.Controls.Add(this.textBoxLevel1);
+            this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuUserGroupEditor);
             this.groupBoxLevel1.Controls.Add(this.checkBoxL1MainProductChange);
             this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuUserSetting);
             this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuProduct);
@@ -1312,6 +1306,7 @@
             this.groupBoxLevel1.Controls.Add(this.checkBoxL1MainClear);
             this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuHistoryLog);
             this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuInspectionLog);
+            this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuEquipment);
             this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuAlarmLog);
             this.groupBoxLevel1.Controls.Add(this.checkBoxL1MenuInformation);
             this.groupBoxLevel1.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(92)))), ((int)(((byte)(118)))));
@@ -1322,7 +1317,7 @@
             this.groupBoxLevel1.Location = new System.Drawing.Point(314, 98);
             this.groupBoxLevel1.Name = "groupBoxLevel1";
             this.groupBoxLevel1.RoundRadius = 5;
-            this.groupBoxLevel1.Size = new System.Drawing.Size(120, 435);
+            this.groupBoxLevel1.Size = new System.Drawing.Size(120, 486);
             this.groupBoxLevel1.TabIndex = 218;
             this.groupBoxLevel1.Text = "Level 1";
             this.groupBoxLevel1.TextColor = System.Drawing.Color.White;
@@ -1341,7 +1336,7 @@
             this.checkBoxL1MenuEthernet.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL1MenuEthernet.ImageCheckBox = null;
             this.checkBoxL1MenuEthernet.ImageUnCheckBox = null;
-            this.checkBoxL1MenuEthernet.Location = new System.Drawing.Point(50, 388);
+            this.checkBoxL1MenuEthernet.Location = new System.Drawing.Point(50, 417);
             this.checkBoxL1MenuEthernet.Name = "checkBoxL1MenuEthernet";
             this.checkBoxL1MenuEthernet.OverlapOptimize = true;
             this.checkBoxL1MenuEthernet.Size = new System.Drawing.Size(23, 23);
@@ -1364,7 +1359,7 @@
             // 
             // checkBoxL1MenuUserGroupEditor
             // 
-            this.checkBoxL1MenuUserGroupEditor.BackGround = this.smartGroupBox1;
+            this.checkBoxL1MenuUserGroupEditor.BackGround = this.groupBoxLevel1;
             this.checkBoxL1MenuUserGroupEditor.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32)))));
             this.checkBoxL1MenuUserGroupEditor.CheckBoxBackColor = System.Drawing.Color.White;
             this.checkBoxL1MenuUserGroupEditor.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid;
@@ -1375,7 +1370,7 @@
             this.checkBoxL1MenuUserGroupEditor.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL1MenuUserGroupEditor.ImageCheckBox = null;
             this.checkBoxL1MenuUserGroupEditor.ImageUnCheckBox = null;
-            this.checkBoxL1MenuUserGroupEditor.Location = new System.Drawing.Point(364, 598);
+            this.checkBoxL1MenuUserGroupEditor.Location = new System.Drawing.Point(50, 243);
             this.checkBoxL1MenuUserGroupEditor.Name = "checkBoxL1MenuUserGroupEditor";
             this.checkBoxL1MenuUserGroupEditor.OverlapOptimize = true;
             this.checkBoxL1MenuUserGroupEditor.Size = new System.Drawing.Size(23, 23);
@@ -1383,7 +1378,6 @@
             this.checkBoxL1MenuUserGroupEditor.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
             this.checkBoxL1MenuUserGroupEditor.TextColorDisable = System.Drawing.Color.Gray;
             this.checkBoxL1MenuUserGroupEditor.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
-            this.checkBoxL1MenuUserGroupEditor.Visible = false;
             this.checkBoxL1MenuUserGroupEditor.Click += new System.EventHandler(this.checkBox_Click);
             // 
             // checkBoxL1MainProductChange
@@ -1467,7 +1461,7 @@
             this.checkBoxL1MenuIOTest.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL1MenuIOTest.ImageCheckBox = null;
             this.checkBoxL1MenuIOTest.ImageUnCheckBox = null;
-            this.checkBoxL1MenuIOTest.Location = new System.Drawing.Point(50, 243);
+            this.checkBoxL1MenuIOTest.Location = new System.Drawing.Point(50, 272);
             this.checkBoxL1MenuIOTest.Name = "checkBoxL1MenuIOTest";
             this.checkBoxL1MenuIOTest.OverlapOptimize = true;
             this.checkBoxL1MenuIOTest.Size = new System.Drawing.Size(23, 23);
@@ -1535,7 +1529,7 @@
             this.checkBoxL1MenuHistoryLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL1MenuHistoryLog.ImageCheckBox = null;
             this.checkBoxL1MenuHistoryLog.ImageUnCheckBox = null;
-            this.checkBoxL1MenuHistoryLog.Location = new System.Drawing.Point(50, 272);
+            this.checkBoxL1MenuHistoryLog.Location = new System.Drawing.Point(50, 301);
             this.checkBoxL1MenuHistoryLog.Name = "checkBoxL1MenuHistoryLog";
             this.checkBoxL1MenuHistoryLog.OverlapOptimize = true;
             this.checkBoxL1MenuHistoryLog.Size = new System.Drawing.Size(23, 23);
@@ -1558,7 +1552,7 @@
             this.checkBoxL1MenuInspectionLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL1MenuInspectionLog.ImageCheckBox = null;
             this.checkBoxL1MenuInspectionLog.ImageUnCheckBox = null;
-            this.checkBoxL1MenuInspectionLog.Location = new System.Drawing.Point(50, 301);
+            this.checkBoxL1MenuInspectionLog.Location = new System.Drawing.Point(50, 330);
             this.checkBoxL1MenuInspectionLog.Name = "checkBoxL1MenuInspectionLog";
             this.checkBoxL1MenuInspectionLog.OverlapOptimize = true;
             this.checkBoxL1MenuInspectionLog.Size = new System.Drawing.Size(23, 23);
@@ -1570,7 +1564,7 @@
             // 
             // checkBoxL1MenuEquipment
             // 
-            this.checkBoxL1MenuEquipment.BackGround = this.smartGroupBox1;
+            this.checkBoxL1MenuEquipment.BackGround = this.groupBoxLevel1;
             this.checkBoxL1MenuEquipment.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32)))));
             this.checkBoxL1MenuEquipment.CheckBoxBackColor = System.Drawing.Color.White;
             this.checkBoxL1MenuEquipment.CheckBoxCheckColor = System.Drawing.Color.DarkOrchid;
@@ -1581,7 +1575,7 @@
             this.checkBoxL1MenuEquipment.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL1MenuEquipment.ImageCheckBox = null;
             this.checkBoxL1MenuEquipment.ImageUnCheckBox = null;
-            this.checkBoxL1MenuEquipment.Location = new System.Drawing.Point(364, 627);
+            this.checkBoxL1MenuEquipment.Location = new System.Drawing.Point(50, 446);
             this.checkBoxL1MenuEquipment.Name = "checkBoxL1MenuEquipment";
             this.checkBoxL1MenuEquipment.OverlapOptimize = true;
             this.checkBoxL1MenuEquipment.Size = new System.Drawing.Size(23, 23);
@@ -1589,7 +1583,6 @@
             this.checkBoxL1MenuEquipment.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
             this.checkBoxL1MenuEquipment.TextColorDisable = System.Drawing.Color.Gray;
             this.checkBoxL1MenuEquipment.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
-            this.checkBoxL1MenuEquipment.Visible = false;
             this.checkBoxL1MenuEquipment.Click += new System.EventHandler(this.checkBox_Click);
             // 
             // checkBoxL1MenuAlarmLog
@@ -1605,7 +1598,7 @@
             this.checkBoxL1MenuAlarmLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL1MenuAlarmLog.ImageCheckBox = null;
             this.checkBoxL1MenuAlarmLog.ImageUnCheckBox = null;
-            this.checkBoxL1MenuAlarmLog.Location = new System.Drawing.Point(50, 330);
+            this.checkBoxL1MenuAlarmLog.Location = new System.Drawing.Point(50, 359);
             this.checkBoxL1MenuAlarmLog.Name = "checkBoxL1MenuAlarmLog";
             this.checkBoxL1MenuAlarmLog.OverlapOptimize = true;
             this.checkBoxL1MenuAlarmLog.Size = new System.Drawing.Size(23, 23);
@@ -1628,7 +1621,7 @@
             this.checkBoxL1MenuInformation.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxL1MenuInformation.ImageCheckBox = null;
             this.checkBoxL1MenuInformation.ImageUnCheckBox = null;
-            this.checkBoxL1MenuInformation.Location = new System.Drawing.Point(50, 359);
+            this.checkBoxL1MenuInformation.Location = new System.Drawing.Point(50, 388);
             this.checkBoxL1MenuInformation.Name = "checkBoxL1MenuInformation";
             this.checkBoxL1MenuInformation.OverlapOptimize = true;
             this.checkBoxL1MenuInformation.Size = new System.Drawing.Size(23, 23);
@@ -1646,7 +1639,7 @@
             this.labelTitleMenuEquipment.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelTitleMenuEquipment.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.labelTitleMenuEquipment.LineSpacing = 0F;
-            this.labelTitleMenuEquipment.Location = new System.Drawing.Point(158, 627);
+            this.labelTitleMenuEquipment.Location = new System.Drawing.Point(158, 544);
             this.labelTitleMenuEquipment.Name = "labelTitleMenuEquipment";
             this.labelTitleMenuEquipment.OverlapOptimize = true;
             this.labelTitleMenuEquipment.PasswordChar = '\0';
@@ -1659,7 +1652,6 @@
             this.labelTitleMenuEquipment.TextColorDisable = System.Drawing.Color.Gray;
             this.labelTitleMenuEquipment.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
             this.labelTitleMenuEquipment.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
-            this.labelTitleMenuEquipment.Visible = false;
             this.labelTitleMenuEquipment.Wordwrap = false;
             // 
             // labelTitleMenuInformation
@@ -1670,7 +1662,7 @@
             this.labelTitleMenuInformation.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelTitleMenuInformation.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.labelTitleMenuInformation.LineSpacing = 0F;
-            this.labelTitleMenuInformation.Location = new System.Drawing.Point(158, 457);
+            this.labelTitleMenuInformation.Location = new System.Drawing.Point(158, 486);
             this.labelTitleMenuInformation.Name = "labelTitleMenuInformation";
             this.labelTitleMenuInformation.OverlapOptimize = true;
             this.labelTitleMenuInformation.PasswordChar = '\0';
@@ -1693,7 +1685,7 @@
             this.labelTitleMenuAlarmLog.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelTitleMenuAlarmLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.labelTitleMenuAlarmLog.LineSpacing = 0F;
-            this.labelTitleMenuAlarmLog.Location = new System.Drawing.Point(158, 428);
+            this.labelTitleMenuAlarmLog.Location = new System.Drawing.Point(158, 457);
             this.labelTitleMenuAlarmLog.Name = "labelTitleMenuAlarmLog";
             this.labelTitleMenuAlarmLog.OverlapOptimize = true;
             this.labelTitleMenuAlarmLog.PasswordChar = '\0';
@@ -1716,7 +1708,7 @@
             this.labelTitleMenuInspectionLog.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelTitleMenuInspectionLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.labelTitleMenuInspectionLog.LineSpacing = 0F;
-            this.labelTitleMenuInspectionLog.Location = new System.Drawing.Point(158, 399);
+            this.labelTitleMenuInspectionLog.Location = new System.Drawing.Point(158, 428);
             this.labelTitleMenuInspectionLog.Name = "labelTitleMenuInspectionLog";
             this.labelTitleMenuInspectionLog.OverlapOptimize = true;
             this.labelTitleMenuInspectionLog.PasswordChar = '\0';
@@ -1739,7 +1731,7 @@
             this.labelTitleMenuHistoryLog.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelTitleMenuHistoryLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.labelTitleMenuHistoryLog.LineSpacing = 0F;
-            this.labelTitleMenuHistoryLog.Location = new System.Drawing.Point(158, 370);
+            this.labelTitleMenuHistoryLog.Location = new System.Drawing.Point(158, 399);
             this.labelTitleMenuHistoryLog.Name = "labelTitleMenuHistoryLog";
             this.labelTitleMenuHistoryLog.OverlapOptimize = true;
             this.labelTitleMenuHistoryLog.PasswordChar = '\0';
@@ -1762,7 +1754,7 @@
             this.labelTitleMenuIOTest.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelTitleMenuIOTest.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.labelTitleMenuIOTest.LineSpacing = 0F;
-            this.labelTitleMenuIOTest.Location = new System.Drawing.Point(158, 341);
+            this.labelTitleMenuIOTest.Location = new System.Drawing.Point(158, 370);
             this.labelTitleMenuIOTest.Name = "labelTitleMenuIOTest";
             this.labelTitleMenuIOTest.OverlapOptimize = true;
             this.labelTitleMenuIOTest.PasswordChar = '\0';

INT_PT002/Controls/User/ControlMenuUserUserEditor.Designer.cs

@@ -170,7 +170,6 @@
             this.labelTitleContents.TextColorDisable = System.Drawing.Color.Gray;
             this.labelTitleContents.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
             this.labelTitleContents.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
-            this.labelTitleContents.Visible = false;
             this.labelTitleContents.Wordwrap = false;
             // 
             // labelNumberOfLoginFailures
@@ -781,7 +780,7 @@
             this.checkBoxMenuEthernet.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxMenuEthernet.ImageCheckBox = null;
             this.checkBoxMenuEthernet.ImageUnCheckBox = null;
-            this.checkBoxMenuEthernet.Location = new System.Drawing.Point(339, 80);
+            this.checkBoxMenuEthernet.Location = new System.Drawing.Point(339, 112);
             this.checkBoxMenuEthernet.Name = "checkBoxMenuEthernet";
             this.checkBoxMenuEthernet.OverlapOptimize = true;
             this.checkBoxMenuEthernet.Size = new System.Drawing.Size(150, 23);
@@ -805,7 +804,7 @@
             this.checkBoxMenuUserGroupEditor.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxMenuUserGroupEditor.ImageCheckBox = null;
             this.checkBoxMenuUserGroupEditor.ImageUnCheckBox = null;
-            this.checkBoxMenuUserGroupEditor.Location = new System.Drawing.Point(339, 167);
+            this.checkBoxMenuUserGroupEditor.Location = new System.Drawing.Point(177, 112);
             this.checkBoxMenuUserGroupEditor.Name = "checkBoxMenuUserGroupEditor";
             this.checkBoxMenuUserGroupEditor.OverlapOptimize = true;
             this.checkBoxMenuUserGroupEditor.Size = new System.Drawing.Size(150, 23);
@@ -814,7 +813,6 @@
             this.checkBoxMenuUserGroupEditor.TextColor = System.Drawing.Color.LightGray;
             this.checkBoxMenuUserGroupEditor.TextColorDisable = System.Drawing.Color.LightGray;
             this.checkBoxMenuUserGroupEditor.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
-            this.checkBoxMenuUserGroupEditor.Visible = false;
             // 
             // checkBoxMenuInformation
             // 
@@ -830,7 +828,7 @@
             this.checkBoxMenuInformation.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxMenuInformation.ImageCheckBox = null;
             this.checkBoxMenuInformation.ImageUnCheckBox = null;
-            this.checkBoxMenuInformation.Location = new System.Drawing.Point(339, 51);
+            this.checkBoxMenuInformation.Location = new System.Drawing.Point(339, 54);
             this.checkBoxMenuInformation.Name = "checkBoxMenuInformation";
             this.checkBoxMenuInformation.OverlapOptimize = true;
             this.checkBoxMenuInformation.Size = new System.Drawing.Size(150, 23);
@@ -854,7 +852,7 @@
             this.checkBoxMenuAlarmList.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxMenuAlarmList.ImageCheckBox = null;
             this.checkBoxMenuAlarmList.ImageUnCheckBox = null;
-            this.checkBoxMenuAlarmList.Location = new System.Drawing.Point(177, 196);
+            this.checkBoxMenuAlarmList.Location = new System.Drawing.Point(177, 228);
             this.checkBoxMenuAlarmList.Name = "checkBoxMenuAlarmList";
             this.checkBoxMenuAlarmList.OverlapOptimize = true;
             this.checkBoxMenuAlarmList.Size = new System.Drawing.Size(150, 23);
@@ -878,7 +876,7 @@
             this.checkBoxMenuEquipment.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxMenuEquipment.ImageCheckBox = null;
             this.checkBoxMenuEquipment.ImageUnCheckBox = null;
-            this.checkBoxMenuEquipment.Location = new System.Drawing.Point(339, 196);
+            this.checkBoxMenuEquipment.Location = new System.Drawing.Point(339, 83);
             this.checkBoxMenuEquipment.Name = "checkBoxMenuEquipment";
             this.checkBoxMenuEquipment.OverlapOptimize = true;
             this.checkBoxMenuEquipment.Size = new System.Drawing.Size(150, 23);
@@ -887,7 +885,6 @@
             this.checkBoxMenuEquipment.TextColor = System.Drawing.Color.LightGray;
             this.checkBoxMenuEquipment.TextColorDisable = System.Drawing.Color.LightGray;
             this.checkBoxMenuEquipment.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
-            this.checkBoxMenuEquipment.Visible = false;
             // 
             // checkBoxMenuCheckLog
             // 
@@ -903,7 +900,7 @@
             this.checkBoxMenuCheckLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxMenuCheckLog.ImageCheckBox = null;
             this.checkBoxMenuCheckLog.ImageUnCheckBox = null;
-            this.checkBoxMenuCheckLog.Location = new System.Drawing.Point(177, 167);
+            this.checkBoxMenuCheckLog.Location = new System.Drawing.Point(177, 199);
             this.checkBoxMenuCheckLog.Name = "checkBoxMenuCheckLog";
             this.checkBoxMenuCheckLog.OverlapOptimize = true;
             this.checkBoxMenuCheckLog.Size = new System.Drawing.Size(150, 23);
@@ -927,7 +924,7 @@
             this.checkBoxMenuHistoryLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxMenuHistoryLog.ImageCheckBox = null;
             this.checkBoxMenuHistoryLog.ImageUnCheckBox = null;
-            this.checkBoxMenuHistoryLog.Location = new System.Drawing.Point(177, 138);
+            this.checkBoxMenuHistoryLog.Location = new System.Drawing.Point(177, 170);
             this.checkBoxMenuHistoryLog.Name = "checkBoxMenuHistoryLog";
             this.checkBoxMenuHistoryLog.OverlapOptimize = true;
             this.checkBoxMenuHistoryLog.Size = new System.Drawing.Size(150, 23);
@@ -951,7 +948,7 @@
             this.checkBoxMenuIOTest.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxMenuIOTest.ImageCheckBox = null;
             this.checkBoxMenuIOTest.ImageUnCheckBox = null;
-            this.checkBoxMenuIOTest.Location = new System.Drawing.Point(177, 109);
+            this.checkBoxMenuIOTest.Location = new System.Drawing.Point(177, 141);
             this.checkBoxMenuIOTest.Name = "checkBoxMenuIOTest";
             this.checkBoxMenuIOTest.OverlapOptimize = true;
             this.checkBoxMenuIOTest.Size = new System.Drawing.Size(150, 23);
@@ -969,7 +966,7 @@
             this.labelTitleMenu.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelTitleMenu.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
             this.labelTitleMenu.LineSpacing = 0F;
-            this.labelTitleMenu.Location = new System.Drawing.Point(175, 22);
+            this.labelTitleMenu.Location = new System.Drawing.Point(175, 25);
             this.labelTitleMenu.Name = "labelTitleMenu";
             this.labelTitleMenu.OverlapOptimize = true;
             this.labelTitleMenu.PasswordChar = '\0';
@@ -992,7 +989,7 @@
             this.labelTitleMain.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
             this.labelTitleMain.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
             this.labelTitleMain.LineSpacing = 0F;
-            this.labelTitleMain.Location = new System.Drawing.Point(19, 22);
+            this.labelTitleMain.Location = new System.Drawing.Point(19, 25);
             this.labelTitleMain.Name = "labelTitleMain";
             this.labelTitleMain.OverlapOptimize = true;
             this.labelTitleMain.PasswordChar = '\0';
@@ -1021,7 +1018,7 @@
             this.checkBoxMenuUserEditor.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxMenuUserEditor.ImageCheckBox = null;
             this.checkBoxMenuUserEditor.ImageUnCheckBox = null;
-            this.checkBoxMenuUserEditor.Location = new System.Drawing.Point(177, 80);
+            this.checkBoxMenuUserEditor.Location = new System.Drawing.Point(177, 83);
             this.checkBoxMenuUserEditor.Name = "checkBoxMenuUserEditor";
             this.checkBoxMenuUserEditor.OverlapOptimize = true;
             this.checkBoxMenuUserEditor.Size = new System.Drawing.Size(150, 23);
@@ -1045,7 +1042,7 @@
             this.checkBoxMenuRecipe.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxMenuRecipe.ImageCheckBox = null;
             this.checkBoxMenuRecipe.ImageUnCheckBox = null;
-            this.checkBoxMenuRecipe.Location = new System.Drawing.Point(177, 51);
+            this.checkBoxMenuRecipe.Location = new System.Drawing.Point(177, 54);
             this.checkBoxMenuRecipe.Name = "checkBoxMenuRecipe";
             this.checkBoxMenuRecipe.OverlapOptimize = true;
             this.checkBoxMenuRecipe.Size = new System.Drawing.Size(150, 23);
@@ -1069,7 +1066,7 @@
             this.checkBoxMainSubMenu.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxMainSubMenu.ImageCheckBox = null;
             this.checkBoxMainSubMenu.ImageUnCheckBox = null;
-            this.checkBoxMainSubMenu.Location = new System.Drawing.Point(19, 109);
+            this.checkBoxMainSubMenu.Location = new System.Drawing.Point(19, 112);
             this.checkBoxMainSubMenu.Name = "checkBoxMainSubMenu";
             this.checkBoxMainSubMenu.OverlapOptimize = true;
             this.checkBoxMainSubMenu.Size = new System.Drawing.Size(150, 23);
@@ -1094,7 +1091,7 @@
             this.checkBoxMainClear.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxMainClear.ImageCheckBox = null;
             this.checkBoxMainClear.ImageUnCheckBox = null;
-            this.checkBoxMainClear.Location = new System.Drawing.Point(19, 80);
+            this.checkBoxMainClear.Location = new System.Drawing.Point(19, 83);
             this.checkBoxMainClear.Name = "checkBoxMainClear";
             this.checkBoxMainClear.OverlapOptimize = true;
             this.checkBoxMainClear.Size = new System.Drawing.Size(150, 23);
@@ -1118,7 +1115,7 @@
             this.checkBoxMainProductChange.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
             this.checkBoxMainProductChange.ImageCheckBox = null;
             this.checkBoxMainProductChange.ImageUnCheckBox = null;
-            this.checkBoxMainProductChange.Location = new System.Drawing.Point(19, 51);
+            this.checkBoxMainProductChange.Location = new System.Drawing.Point(19, 54);
             this.checkBoxMainProductChange.Name = "checkBoxMainProductChange";
             this.checkBoxMainProductChange.OverlapOptimize = true;
             this.checkBoxMainProductChange.Size = new System.Drawing.Size(150, 23);

INT_PT002/DialogForms/DialogFormLogOn.Designer.cs

@@ -93,9 +93,9 @@
             this.buttonAdmin.RepeatInterval = 200;
             this.buttonAdmin.RepeatIntervalAccelerate = null;
             this.buttonAdmin.RoundSize = 10;
-            this.buttonAdmin.SafeInterval = 3000;
+            this.buttonAdmin.SafeInterval = 200;
             this.buttonAdmin.Size = new System.Drawing.Size(80, 32);
-            this.buttonAdmin.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.SAFE;
+            this.buttonAdmin.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
             this.buttonAdmin.TabIndex = 99;
             this.buttonAdmin.Text = null;
             this.buttonAdmin.TextColor = System.Drawing.Color.White;

INT_PT002/DialogForms/DialogFormLogOn.cs

@@ -141,7 +141,7 @@ namespace INT_PT002.Forms
             y = Screen.PrimaryScreen.Bounds.Height / 2 - this.Size.Height / 2;
 
             this.Location = new Point(x, y);
-            this.Size = new Size(652, 402);
+            this.Size = new Size(650, 400);
 
             //this.smartKeyboard.HanYoungKeyToggle();
             this.smartKeyboard.HanYoungKeyDisable = true;
@@ -211,7 +211,7 @@ namespace INT_PT002.Forms
 
             if (this.textBoxID.Text == "admin00" && this.textBoxPassword.Text == "admin20090810")
             {
-                DialogFormYesNo dlg = new DialogFormYesNo(this.ParentForm.SystemConfig.LANGUAGE, 18);
+                DialogFormYesNo dlg = new DialogFormYesNo(this.ParentForm.SystemConfig.LANGUAGE, 29);
                 if (dlg.ShowDialog() == DialogResult.Yes)
                 {
                     if (this.ParentForm.SystemConfig.EQUIPMENT_LANE == 10)

INT_PT002/DialogForms/DialogFormYesNo.cs

@@ -108,18 +108,10 @@ namespace INT_PT002.DialogForms
                         this.labelMessage1.Text = "신규 유저 등록 하시겠습니까?";
                         break;
                     case 18:
-                        this.smartGroupBox1.Text = "로그인";
+                        this.smartGroupBox1.Text = "Login";
                         this.labelMessage1.Text = "비밀번호를 초기화 하시겠습니까?";
                         this.labelMessage2.Text = "";
                         break;
-                    case 21:
-                        this.smartGroupBox1.Text = "이더넷";
-                        this.labelMessage1.Text = "로컬IP주소 수동으로 설정하시겠습니까?";
-                        break;
-                    case 22:
-                        this.smartGroupBox1.Text = "이더넷";
-                        this.labelMessage1.Text = "로컬IP주소 자동으로 설정하시겠습니까?";
-                        break;
                     default:
                         break;
                 }
@@ -206,14 +198,6 @@ namespace INT_PT002.DialogForms
                         this.labelMessage1.Text = "Do you want to reset your password?";
                         this.labelMessage2.Text = "";
                         break;
-                    case 21:
-                        this.smartGroupBox1.Text = "Ethernet";
-                        this.labelMessage1.Text = "Do you want to set the local IP address static?";
-                        break;
-                    case 22:
-                        this.smartGroupBox1.Text = "Ethernet";
-                        this.labelMessage1.Text = "Do you want to set the local IP address to DHCP?";
-                        break;
                     default:
                         break;
                 }

INT_PT002/Forms/FormMain.cs

@@ -1484,15 +1484,44 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[0].Judgment.DispResult = Helper.StringToJudgmentStatus(receiveData.Substring(2, 1));
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
+                            switch (this.CurrentSystemStatus.CurrentDisplayMode)
                             {
+                                case Define.E_DisplayModeStore.MainDisplay:
+                                    break;
+                                case Define.E_DisplayModeStore.Recipe:
+                                    break;
+                                case Define.E_DisplayModeStore.UserEditor:
+                                    break;
+                                case Define.E_DisplayModeStore.UserMyPage:
+                                    break;
+                                case Define.E_DisplayModeStore.UserGroupEditor:
+                                    break;
+                                case Define.E_DisplayModeStore.IOTest:
+                                    break;
+                                case Define.E_DisplayModeStore.LogInspection:
+                                    break;
+                                case Define.E_DisplayModeStore.LogHistory:
+                                    break;
+                                case Define.E_DisplayModeStore.LogAlarm:
+                                    break;
+                                case Define.E_DisplayModeStore.Information:
+                                    break;
+                                case Define.E_DisplayModeStore.Ethernet:
+                                    break;
+                                case Define.E_DisplayModeStore.Equipment:
+                                    break;
+                                case Define.E_DisplayModeStore.Equipment1:
+                                    break;
+                                default:
+                                    break;
+                            }
+
                         if (this.SystemConfig.EQUIPMENT_LANE == 1)
                             this.ChildFormMainDisplay4.UpdateDisplayJudgmentData1(this.CurrentLeakDatas[0]);
                         else
                             this.ChildFormMainDisplay3.UpdateDisplayJudgmentData1(this.CurrentLeakDatas[0]);
-                        }
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentJudgmentData1(this.CurrentLeakDatas[0]);
+
                         #endregion
                         break;
                     case "B":
@@ -1503,9 +1532,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[1].Judgment.DispResult = Helper.StringToJudgmentStatus(receiveData.Substring(2, 1));
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayJudgmentData2(this.CurrentLeakDatas[1]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentJudgmentData2(this.CurrentLeakDatas[1]);
                         #endregion
                         break;
@@ -1517,9 +1544,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[2].Judgment.DispResult = Helper.StringToJudgmentStatus(receiveData.Substring(2, 1));
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayJudgmentData3(this.CurrentLeakDatas[2]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentJudgmentData3(this.CurrentLeakDatas[2]);
                         #endregion
                         break;
@@ -1531,9 +1556,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[3].Judgment.DispResult = Helper.StringToJudgmentStatus(receiveData.Substring(2, 1));
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayJudgmentData4(this.CurrentLeakDatas[3]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentJudgmentData4(this.CurrentLeakDatas[3]);
                         #endregion
                         break;
@@ -1545,9 +1568,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[4].Judgment.DispResult = Helper.StringToJudgmentStatus(receiveData.Substring(2, 1));
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayJudgmentData5(this.CurrentLeakDatas[4]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentJudgmentData5(this.CurrentLeakDatas[4]);
                         #endregion
                         break;
@@ -1559,9 +1580,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[5].Judgment.DispResult = Helper.StringToJudgmentStatus(receiveData.Substring(2, 1));
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayJudgmentData6(this.CurrentLeakDatas[5]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentJudgmentData6(this.CurrentLeakDatas[5]);
                         #endregion
                         break;
@@ -1573,9 +1592,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[6].Judgment.DispResult = Helper.StringToJudgmentStatus(receiveData.Substring(2, 1));
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayJudgmentData7(this.CurrentLeakDatas[6]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentJudgmentData7(this.CurrentLeakDatas[6]);
                         #endregion
                         break;
@@ -1587,9 +1604,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[7].Judgment.DispResult = Helper.StringToJudgmentStatus(receiveData.Substring(2, 1));
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayJudgmentData8(this.CurrentLeakDatas[7]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentJudgmentData8(this.CurrentLeakDatas[7]);
                         #endregion
                         break;
@@ -1601,9 +1616,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[8].Judgment.DispResult = Helper.StringToJudgmentStatus(receiveData.Substring(2, 1));
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayJudgmentData9(this.CurrentLeakDatas[8]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentJudgmentData9(this.CurrentLeakDatas[8]);
                         #endregion
                         break;
@@ -1615,9 +1628,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[9].Judgment.DispResult = Helper.StringToJudgmentStatus(receiveData.Substring(2, 1));
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayJudgmentData10(this.CurrentLeakDatas[9]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentJudgmentData10(this.CurrentLeakDatas[9]);
                         #endregion
                         break;
@@ -1654,9 +1665,6 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[0].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
                         this.CurrentLeakDatas[1].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
                         #endregion
-                        // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
-                        {
                         // MainDisplay
                         if (this.SystemConfig.EQUIPMENT_LANE == 1)
                         {
@@ -1667,14 +1675,10 @@ namespace INT_PT002.Forms
                             this.ChildFormMainDisplay3.UpdateDisplayProcessStatus(this.CurrentLeakDatas[0].ProcessStatus);
                             this.ChildFormMainDisplay3.UpdateDisplayProcessStatus1(this.CurrentLeakDatas[0].ProcessStatus);
                         }
-                        }
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
-                        {
                         // Equipment
                         this.ChildFormMenu.UpdateDisplay_Equipment_ProcessStatus(this.CurrentLeakDatas[0].ProcessStatus);
                         this.ChildFormMenu.UpdateDisplay_Equipment1_ProcessStatusMeasuring1(this.CurrentLeakDatas[0].ProcessStatus, "1");
                         this.ChildFormMenu.UpdateDisplay_Equipment1_ProcessStatusMeasuring2(this.CurrentLeakDatas[0].ProcessStatus, "2");
-                        }
                         break;
                     case "C":
                     case "D":
@@ -1682,20 +1686,13 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[2].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
                         this.CurrentLeakDatas[3].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
                         #endregion
-                        // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
-                        {
                         // MainDisplay
                         this.ChildFormMainDisplay3.UpdateDisplayProcessStatus(this.CurrentLeakDatas[2].ProcessStatus);
                         this.ChildFormMainDisplay3.UpdateDisplayProcessStatus3(this.CurrentLeakDatas[2].ProcessStatus);
-                        }
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
-                        {
                         // Equipment
                         this.ChildFormMenu.UpdateDisplay_Equipment_ProcessStatus(this.CurrentLeakDatas[2].ProcessStatus);
                         this.ChildFormMenu.UpdateDisplay_Equipment1_ProcessStatusMeasuring1(this.CurrentLeakDatas[2].ProcessStatus, "3");
                         this.ChildFormMenu.UpdateDisplay_Equipment1_ProcessStatusMeasuring2(this.CurrentLeakDatas[2].ProcessStatus, "4");
-                        }
                         break;
                     case "E":
                     case "F":
@@ -1703,20 +1700,13 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[4].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
                         this.CurrentLeakDatas[5].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
                         #endregion
-                        // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
-                        {
                         // MainDisplay
                         this.ChildFormMainDisplay3.UpdateDisplayProcessStatus(this.CurrentLeakDatas[4].ProcessStatus);
                         this.ChildFormMainDisplay3.UpdateDisplayProcessStatus5(this.CurrentLeakDatas[4].ProcessStatus);
-                        }
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
-                        {
                         // Equipment
                         this.ChildFormMenu.UpdateDisplay_Equipment_ProcessStatus(this.CurrentLeakDatas[4].ProcessStatus);
                         this.ChildFormMenu.UpdateDisplay_Equipment1_ProcessStatusMeasuring1(this.CurrentLeakDatas[4].ProcessStatus, "5");
                         this.ChildFormMenu.UpdateDisplay_Equipment1_ProcessStatusMeasuring2(this.CurrentLeakDatas[4].ProcessStatus, "6");
-                        }
                         break;
                     case "G":
                     case "H":
@@ -1724,20 +1714,13 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[6].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
                         this.CurrentLeakDatas[7].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
                         #endregion
-                        // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
-                        {
                         // MainDisplay
                         this.ChildFormMainDisplay3.UpdateDisplayProcessStatus(this.CurrentLeakDatas[6].ProcessStatus);
                         this.ChildFormMainDisplay3.UpdateDisplayProcessStatus7(this.CurrentLeakDatas[6].ProcessStatus);
-                        }
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
-                        {
                         // Equipment
                         this.ChildFormMenu.UpdateDisplay_Equipment_ProcessStatus(this.CurrentLeakDatas[6].ProcessStatus);
                         this.ChildFormMenu.UpdateDisplay_Equipment1_ProcessStatusMeasuring1(this.CurrentLeakDatas[6].ProcessStatus, "7");
                         this.ChildFormMenu.UpdateDisplay_Equipment1_ProcessStatusMeasuring2(this.CurrentLeakDatas[6].ProcessStatus, "8");
-                        }
                         break;
                     case "I":
                     case "J":
@@ -1745,20 +1728,13 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[8].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
                         this.CurrentLeakDatas[9].ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 2));
                         #endregion
-                        // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
-                        {
                         // MainDisplay
                         this.ChildFormMainDisplay3.UpdateDisplayProcessStatus(this.CurrentLeakDatas[8].ProcessStatus);
                         this.ChildFormMainDisplay3.UpdateDisplayProcessStatus9(this.CurrentLeakDatas[8].ProcessStatus);
-                        }
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
-                        {
                         // Equipment
                         this.ChildFormMenu.UpdateDisplay_Equipment_ProcessStatus(this.CurrentLeakDatas[8].ProcessStatus);
                         this.ChildFormMenu.UpdateDisplay_Equipment1_ProcessStatusMeasuring1(this.CurrentLeakDatas[8].ProcessStatus, "9");
                         this.ChildFormMenu.UpdateDisplay_Equipment1_ProcessStatusMeasuring2(this.CurrentLeakDatas[8].ProcessStatus, "10");
-                        }
                         break;
                     default:
                         break;
@@ -1789,18 +1765,12 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[0].DiffData.SecBufMax = receiveData.Substring(24, 8).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
-                        {
                         if (this.SystemConfig.EQUIPMENT_LANE == 1)
                             this.ChildFormMainDisplay4.UpdateDisplayDiffData1(this.CurrentLeakDatas[0]);
                         else
                             this.ChildFormMainDisplay3.UpdateDisplayDiffData1(this.CurrentLeakDatas[0]);
-                        }
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
-                        {
                         this.ChildFormMenu.UpdateDisplayIOTestDiffData1(this.CurrentLeakDatas[0]);
                         this.ChildFormMenu.UpdateDisplayEquipmentDiffData1(this.CurrentLeakDatas[0]);
-                        }
                         #endregion
                         break;
                     case "B":
@@ -1812,13 +1782,9 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[1].DiffData.SecBufMax = receiveData.Substring(24, 8).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayDiffData2(this.CurrentLeakDatas[1]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
-                        {
                         this.ChildFormMenu.UpdateDisplayIOTestDiffData2(this.CurrentLeakDatas[1]);
                         this.ChildFormMenu.UpdateDisplayEquipmentDiffData2(this.CurrentLeakDatas[1]);
-                        }
                         #endregion
                         break;
                     case "C":
@@ -1830,9 +1796,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[2].DiffData.SecBufMax = receiveData.Substring(24, 8).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayDiffData3(this.CurrentLeakDatas[2]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentDiffData3(this.CurrentLeakDatas[2]);
                         #endregion
                         break;
@@ -1845,9 +1809,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[3].DiffData.SecBufMax = receiveData.Substring(24, 8).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayDiffData4(this.CurrentLeakDatas[3]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentDiffData4(this.CurrentLeakDatas[3]);
                         #endregion
                         break;
@@ -1860,9 +1822,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[4].DiffData.SecBufMax = receiveData.Substring(24, 8).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayDiffData5(this.CurrentLeakDatas[4]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentDiffData5(this.CurrentLeakDatas[4]);
                         #endregion
                         break;
@@ -1875,9 +1835,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[5].DiffData.SecBufMax = receiveData.Substring(24, 8).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayDiffData6(this.CurrentLeakDatas[5]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentDiffData6(this.CurrentLeakDatas[5]);
                         #endregion
                         break;
@@ -1890,9 +1848,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[6].DiffData.SecBufMax = receiveData.Substring(24, 8).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayDiffData7(this.CurrentLeakDatas[6]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentDiffData7(this.CurrentLeakDatas[6]);
                         #endregion
                         break;
@@ -1905,9 +1861,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[7].DiffData.SecBufMax = receiveData.Substring(24, 8).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayDiffData8(this.CurrentLeakDatas[7]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentDiffData8(this.CurrentLeakDatas[7]);
                         #endregion
                         break;
@@ -1920,9 +1874,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[8].DiffData.SecBufMax = receiveData.Substring(24, 8).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayDiffData9(this.CurrentLeakDatas[8]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentDiffData9(this.CurrentLeakDatas[8]);
                         #endregion
                         break;
@@ -1935,9 +1887,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[9].DiffData.SecBufMax = receiveData.Substring(24, 8).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayDiffData10(this.CurrentLeakDatas[9]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentDiffData10(this.CurrentLeakDatas[9]);
                         #endregion
                         break;
@@ -1970,18 +1920,12 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[0].DispData.MDataMax = receiveData.Substring(18, 6).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
-                        {
                         if (this.SystemConfig.EQUIPMENT_LANE == 1)
                             this.ChildFormMainDisplay4.UpdateDisplayDispData1(this.CurrentLeakDatas[0]);
                         else
                             this.ChildFormMainDisplay3.UpdateDisplayDispData1(this.CurrentLeakDatas[0]);
-                        }
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
-                        {
                         this.ChildFormMenu.UpdateDisplayIOTestDispData1(this.CurrentLeakDatas[0]);
                         this.ChildFormMenu.UpdateDisplayEquipmentDispData1(this.CurrentLeakDatas[0]);
-                        }
                         #endregion
                         break;
                     case "B":
@@ -1993,13 +1937,9 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[1].DispData.MDataMax = receiveData.Substring(18, 6).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayDispData2(this.CurrentLeakDatas[1]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
-                        {
                         this.ChildFormMenu.UpdateDisplayIOTestDispData2(this.CurrentLeakDatas[1]);
                         this.ChildFormMenu.UpdateDisplayEquipmentDispData2(this.CurrentLeakDatas[1]);
-                        }
                         #endregion
                         break;
                     case "C":
@@ -2011,9 +1951,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[2].DispData.MDataMax = receiveData.Substring(18, 6).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayDispData3(this.CurrentLeakDatas[2]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentDispData3(this.CurrentLeakDatas[2]);
                         #endregion
                         break;
@@ -2026,9 +1964,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[3].DispData.MDataMax = receiveData.Substring(18, 6).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayDispData4(this.CurrentLeakDatas[3]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentDispData4(this.CurrentLeakDatas[3]);
                         #endregion
                         break;
@@ -2041,9 +1977,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[4].DispData.MDataMax = receiveData.Substring(18, 6).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayDispData5(this.CurrentLeakDatas[4]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentDispData5(this.CurrentLeakDatas[4]);
                         #endregion
                         break;
@@ -2056,9 +1990,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[5].DispData.MDataMax = receiveData.Substring(18, 6).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayDispData6(this.CurrentLeakDatas[5]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentDispData6(this.CurrentLeakDatas[5]);
                         #endregion
                         break;
@@ -2071,9 +2003,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[6].DispData.MDataMax = receiveData.Substring(18, 6).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayDispData7(this.CurrentLeakDatas[6]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentDispData7(this.CurrentLeakDatas[6]);
                         #endregion
                         break;
@@ -2086,9 +2016,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[7].DispData.MDataMax = receiveData.Substring(18, 6).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayDispData8(this.CurrentLeakDatas[7]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentDispData8(this.CurrentLeakDatas[7]);
                         #endregion
                         break;
@@ -2101,9 +2029,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[8].DispData.MDataMax = receiveData.Substring(18, 6).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayDispData9(this.CurrentLeakDatas[8]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentDispData9(this.CurrentLeakDatas[8]);
                         #endregion
                         break;
@@ -2116,9 +2042,7 @@ namespace INT_PT002.Forms
                         this.CurrentLeakDatas[9].DispData.MDataMax = receiveData.Substring(18, 6).Trim();
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayDispData10(this.CurrentLeakDatas[9]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentDispData10(this.CurrentLeakDatas[9]);
                         #endregion
                         break;
@@ -2151,18 +2075,12 @@ namespace INT_PT002.Forms
                             string.Format("{0}{1}", receiveData.Substring(6, 1), receiveData.Substring(7, 5).Trim());
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
-                        {
                         if (this.SystemConfig.EQUIPMENT_LANE == 1)
                             this.ChildFormMainDisplay4.UpdateDisplayPresData1(this.CurrentLeakDatas[0]);
                         else
                             this.ChildFormMainDisplay3.UpdateDisplayPresData1(this.CurrentLeakDatas[0]);
-                        }
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
-                        {
                         this.ChildFormMenu.UpdateDisplayIOTestPresData1(this.CurrentLeakDatas[0]);
                         this.ChildFormMenu.UpdateDisplayEquipmentPresData1(this.CurrentLeakDatas[0]);
-                        }
                         #endregion
                         break;
                     case "B":
@@ -2174,13 +2092,9 @@ namespace INT_PT002.Forms
                             string.Format("{0}{1}", receiveData.Substring(6, 1), receiveData.Substring(7, 5).Trim());
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayPresData2(this.CurrentLeakDatas[1]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
-                        {
                         this.ChildFormMenu.UpdateDisplayIOTestPresData2(this.CurrentLeakDatas[1]);
                         this.ChildFormMenu.UpdateDisplayEquipmentPresData2(this.CurrentLeakDatas[1]);
-                        }
                         #endregion
                         break;
                     case "C":
@@ -2192,9 +2106,7 @@ namespace INT_PT002.Forms
                             string.Format("{0}{1}", receiveData.Substring(6, 1), receiveData.Substring(7, 5).Trim());
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayPresData3(this.CurrentLeakDatas[2]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentPresData3(this.CurrentLeakDatas[2]);
                         #endregion
                         break;
@@ -2207,9 +2119,7 @@ namespace INT_PT002.Forms
                             string.Format("{0}{1}", receiveData.Substring(6, 1), receiveData.Substring(7, 5).Trim());
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayPresData4(this.CurrentLeakDatas[3]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentPresData4(this.CurrentLeakDatas[3]);
                         #endregion
                         break;
@@ -2222,9 +2132,7 @@ namespace INT_PT002.Forms
                             string.Format("{0}{1}", receiveData.Substring(6, 1), receiveData.Substring(7, 5).Trim());
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayPresData5(this.CurrentLeakDatas[4]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentPresData5(this.CurrentLeakDatas[4]);
                         #endregion
                         break;
@@ -2237,9 +2145,7 @@ namespace INT_PT002.Forms
                             string.Format("{0}{1}", receiveData.Substring(6, 1), receiveData.Substring(7, 5).Trim());
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayPresData6(this.CurrentLeakDatas[5]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentPresData6(this.CurrentLeakDatas[5]);
                         #endregion
                         break;
@@ -2252,9 +2158,7 @@ namespace INT_PT002.Forms
                             string.Format("{0}{1}", receiveData.Substring(6, 1), receiveData.Substring(7, 5).Trim());
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayPresData7(this.CurrentLeakDatas[6]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentPresData7(this.CurrentLeakDatas[6]);
                         #endregion
                         break;
@@ -2267,9 +2171,7 @@ namespace INT_PT002.Forms
                             string.Format("{0}{1}", receiveData.Substring(6, 1), receiveData.Substring(7, 5).Trim());
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayPresData8(this.CurrentLeakDatas[7]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentPresData8(this.CurrentLeakDatas[7]);
                         #endregion
                         break;
@@ -2282,9 +2184,7 @@ namespace INT_PT002.Forms
                             string.Format("{0}{1}", receiveData.Substring(6, 1), receiveData.Substring(7, 5).Trim());
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayPresData9(this.CurrentLeakDatas[8]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentPresData9(this.CurrentLeakDatas[8]);
                         #endregion
                         break;
@@ -2297,9 +2197,7 @@ namespace INT_PT002.Forms
                             string.Format("{0}{1}", receiveData.Substring(6, 1), receiveData.Substring(7, 5).Trim());
                         #endregion
                         // 화면 표시
-                        if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
                         this.ChildFormMainDisplay3.UpdateDisplayPresData10(this.CurrentLeakDatas[9]);
-                        else if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMenu)
                         this.ChildFormMenu.UpdateDisplayEquipmentPresData10(this.CurrentLeakDatas[9]);
                         #endregion
                         break;
@@ -2348,7 +2246,7 @@ namespace INT_PT002.Forms
                     this.CurrentAlarmList.SetAlarm(receiveData.Substring(0, 8));
                     #endregion
 
-                    if (this.CurrentSystemStatus.CurrentForm == Define.E_FormStore.FormMainDisplay)
+                    if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.MainDisplay)
                     {
                         if (this.SystemConfig.EQUIPMENT_LANE == 1)
                             this.ChildFormMainDisplay4.UpdateDisplayAlarmView(this.CurrentAlarmList);
@@ -2357,7 +2255,9 @@ namespace INT_PT002.Forms
                     }
                     else
                     {
+                        if (this.CurrentSystemStatus.CurrentDisplayMode == Define.E_DisplayModeStore.IOTest)
                             this.ChildFormMenu.UpdateDisplayIOTestAlarmView(this.CurrentAlarmList);
+
                         this.ChildFormMenu.UpdateDisplayAlarmView(this.CurrentAlarmList);
                     }
 

INT_PT002/Forms/FormMainDisplay3.Designer.cs

@@ -2470,7 +2470,6 @@
             this.buttonExit.TextDownColor = System.Drawing.Color.Chartreuse;
             this.buttonExit.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
             this.buttonExit.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
-            this.buttonExit.Visible = false;
             this.buttonExit.Click += new System.EventHandler(this.buttonExit_Click);
             // 
             // buttonInspection