From abde305ebe82fe5762f58deaae56bd946b9ec0b0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-999R8N3\\CJY" Date: Wed, 6 Sep 2023 17:38:25 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B2=84=EA=B7=B8=EC=88=98=EC=A0=95&=EC=BD=94?= =?UTF-8?q?=EB=93=9C=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT69DB_2A/DataStore.cs | 25 +- .../DialogFormDataStatistics.Designer.cs | 4 +- .../DialogForms/DialogFormDataStatistics.cs | 6 +- .../DialogForms/DialogFormDataStatistics.resx | 79 ++- .../DialogFormDataViewerFilter.Designer.cs | 6 +- .../DialogForms/DialogFormDataViewerFilter.cs | 6 +- .../DialogFormHistoryData.designer.cs | 12 +- .../DialogForms/DialogFormHistoryData.resx | 79 ++- INT69DB_2A/DialogForms/DialogFormLogOn.cs | 19 +- INT69DB_2A/Forms/FormCommunication.cs | 16 + INT69DB_2A/Forms/FormCommunication.resx | 4 +- INT69DB_2A/Forms/FormConfiguration.cs | 5 +- .../Forms/FormDataBackup_Part11.Designer.cs | 7 - INT69DB_2A/Forms/FormDataBackup_Part11.cs | 43 +- INT69DB_2A/Forms/FormDataBackup_Part11.resx | 6 +- INT69DB_2A/Forms/FormDataStatistics.cs | 76 ++- INT69DB_2A/Forms/FormDataViewer.Designer.cs | 71 +- INT69DB_2A/Forms/FormDataViewer.cs | 17 +- .../Forms/FormEquipmentSetting.Designer.cs | 292 ++++---- INT69DB_2A/Forms/FormEquipmentSetting.cs | 72 +- INT69DB_2A/Forms/FormEquipmentTest.cs | 2 +- INT69DB_2A/Forms/FormInitialization.cs | 139 ++-- INT69DB_2A/Forms/FormMain.cs | 644 ++++++++++++++++-- INT69DB_2A/Forms/FormMainDisplay.cs | 121 ++-- ...ogForms.DialogFormDataStatistics.resources | Bin 24502 -> 24793 bytes ...ialogForms.DialogFormHistoryData.resources | Bin 24502 -> 24793 bytes 26 files changed, 1254 insertions(+), 497 deletions(-) diff --git a/INT69DB_2A/DataStore.cs b/INT69DB_2A/DataStore.cs index 3af3154..7f56133 100644 --- a/INT69DB_2A/DataStore.cs +++ b/INT69DB_2A/DataStore.cs @@ -376,6 +376,7 @@ namespace INT69DB_2A SerialNumber, EquipmentColumns, TimeStamp, + EquipmentType, } public enum MessageBoxIcon @@ -428,6 +429,10 @@ namespace INT69DB_2A MotorChangeID, MotorChangeValueEach, MotorChangeValueAll, + TryEthernetStart, + TryEthernetStop, + EthernetConnect, + EthernetDisconnect, } public enum TrackingParameter { @@ -568,7 +573,7 @@ namespace INT69DB_2A public static readonly string MotorUp = "Cmu00"; // Cut 신호 - public static readonly string CutInpupt = "Cbc00"; + public static readonly string CutInput = "Cbc00"; // 공장초기화 public static readonly string Initialization = "Cbi00"; // 운전 @@ -1185,7 +1190,7 @@ namespace INT69DB_2A private string m_User_Level1_Name; private string m_User_Level2_Name; private string m_User_Level3_Name; - private int m_StoragePeriod; + private int m_DataStoragePeriod; private int m_AutomaticLogout; #endregion @@ -1458,10 +1463,10 @@ namespace INT69DB_2A get { return this.m_User_Level3_Name; } set { this.m_User_Level3_Name = value; } } - public int StoragePeriod + public int DataStoragePeriod { - get { return this.m_StoragePeriod; } - set { this.m_StoragePeriod = value; } + get { return this.m_DataStoragePeriod; } + set { this.m_DataStoragePeriod = value; } } public int AutomaticLogout { @@ -1528,7 +1533,7 @@ namespace INT69DB_2A this.User_Level1_Name = "Level 1"; this.User_Level2_Name = "Level 2"; this.User_Level3_Name = "Level 3"; - this.StoragePeriod = 12; + this.DataStoragePeriod = 36; this.AutomaticLogout = 90; } #endregion @@ -1635,7 +1640,7 @@ namespace INT69DB_2A public int EthernetServerPort; public int DummyInt10; public int AutomaticLogout; - public int StoragePeriod; + public int DataStoragePeriod; [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 8)] public string DummyString1; @@ -3744,6 +3749,7 @@ namespace INT69DB_2A { #region Field private int m_EquipmentColumns; + private int m_EquipmentType; private string m_LoginId; private string m_SerialNumber; @@ -3763,6 +3769,11 @@ namespace INT69DB_2A get { return this.m_EquipmentColumns; } set { this.m_EquipmentColumns = value; } } + public int EquipmentType + { + get { return this.m_EquipmentType; } + set { this.m_EquipmentType = value; } + } public string LoginId { diff --git a/INT69DB_2A/DialogForms/DialogFormDataStatistics.Designer.cs b/INT69DB_2A/DialogForms/DialogFormDataStatistics.Designer.cs index 4078c06..78bea22 100644 --- a/INT69DB_2A/DialogForms/DialogFormDataStatistics.Designer.cs +++ b/INT69DB_2A/DialogForms/DialogFormDataStatistics.Designer.cs @@ -180,7 +180,7 @@ this.labelProductNo.ForeColor = System.Drawing.Color.White; this.labelProductNo.InitVisible = true; this.labelProductNo.LineSpacing = 0F; - this.labelProductNo.Location = new System.Drawing.Point(237, 126); + this.labelProductNo.Location = new System.Drawing.Point(237, 130); this.labelProductNo.Name = "labelProductNo"; this.labelProductNo.Size = new System.Drawing.Size(100, 20); this.labelProductNo.TabIndex = 17; @@ -222,7 +222,7 @@ this.labelDate.ForeColor = System.Drawing.Color.White; this.labelDate.InitVisible = true; this.labelDate.LineSpacing = 0F; - this.labelDate.Location = new System.Drawing.Point(237, 50); + this.labelDate.Location = new System.Drawing.Point(237, 54); this.labelDate.Name = "labelDate"; this.labelDate.Size = new System.Drawing.Size(100, 20); this.labelDate.TabIndex = 15; diff --git a/INT69DB_2A/DialogForms/DialogFormDataStatistics.cs b/INT69DB_2A/DialogForms/DialogFormDataStatistics.cs index aeded29..2fd41dc 100644 --- a/INT69DB_2A/DialogForms/DialogFormDataStatistics.cs +++ b/INT69DB_2A/DialogForms/DialogFormDataStatistics.cs @@ -64,7 +64,7 @@ namespace INT69DB_2A.DialogForms this.ListInspectionFile = new List(); if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == false) - this.DisplayTreeViewUpdate11(); + this.DisplayTreeViewUpdate1(); else this.DisplayTreeViewUpdate2(); @@ -155,7 +155,7 @@ namespace INT69DB_2A.DialogForms /// /// Part11 미사용 /// - private void DisplayTreeViewUpdate11() + private void DisplayTreeViewUpdate1() { DirectoryInfo dir = new DirectoryInfo(this.ParentForm.ParentForm.PathDataBackupFolder); List fileNames = new List(); @@ -265,7 +265,7 @@ namespace INT69DB_2A.DialogForms public void DisplayRefresh() { if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == false) - this.DisplayTreeViewUpdate11(); + this.DisplayTreeViewUpdate1(); else this.DisplayTreeViewUpdate2(); } diff --git a/INT69DB_2A/DialogForms/DialogFormDataStatistics.resx b/INT69DB_2A/DialogForms/DialogFormDataStatistics.resx index cac7339..2d01929 100644 --- a/INT69DB_2A/DialogForms/DialogFormDataStatistics.resx +++ b/INT69DB_2A/DialogForms/DialogFormDataStatistics.resx @@ -120,7 +120,7 @@ - iVBORw0KGgoAAAANSUhEUgAAAV4AAAHWCAIAAACwqnb4AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH + iVBORw0KGgoAAAANSUhEUgAAAV4AAAHWCAYAAAA/yOGvAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp bGUAAEjHnZZ3VFTXFofPvXd6oc0w0hl6ky4wgPQuIB0EURhmBhjKAMMMTWyIqEBEEREBRZCggAGjoUis iGIhKKhgD0gQUGIwiqioZEbWSnx5ee/l5ffHvd/aZ+9z99l7n7UuACRPHy4vBZYCIJkn4Ad6ONNXhUfQ @@ -165,42 +165,47 @@ RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK - j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAAOxAAADsQBlSsOGwAACCtJREFUeF7t1EENwlAA - BUGU4AmFdVNd3N4m5TtgJqthX5/rlqRH1iDpkDVIOtQa3sDf2xCsAciGYA1ANgRrALIhWAOQDcEagGwI - 1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCy - IVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwB - yIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOw - BiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5AN - wRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1A - NgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1 - ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI - 1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCy - IVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwB - yIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOw - BiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5AN - wRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1A - NgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1 - ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI - 1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCy - IVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwB - yIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOw - BiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5AN - wRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1A - NgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1 - ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI - 1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCy - IVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwB - yIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOw - BiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5AN - wRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1A - NgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1 - ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI - 1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCy - IVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwB - yIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOw - BiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5AN - wRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1A - NgRrALIhWAOQDcEagGwI1gBkQ7AGIBtCa5CkZQ2SDlmDpJ+u+wuVLeXultOGrgAAAABJRU5ErkJggg== + j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAAOxAAADsQBlSsOGwAACU5JREFUeF7t1DEBwkAA + RTFksLCz178ENB3rr4C+KUMs5HV+1wGgI16AmHgBYrd4P983AA/Ya8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrb/EC8DzxAsTEC5C6zh+3E9zRrxF86gAAAABJRU5ErkJggg== diff --git a/INT69DB_2A/DialogForms/DialogFormDataViewerFilter.Designer.cs b/INT69DB_2A/DialogForms/DialogFormDataViewerFilter.Designer.cs index eb7c814..b622a91 100644 --- a/INT69DB_2A/DialogForms/DialogFormDataViewerFilter.Designer.cs +++ b/INT69DB_2A/DialogForms/DialogFormDataViewerFilter.Designer.cs @@ -158,7 +158,7 @@ this.checkBoxTypeParameter.ImageCheckBox = null; this.checkBoxTypeParameter.ImageUnCheckBox = null; this.checkBoxTypeParameter.InitVisible = true; - this.checkBoxTypeParameter.Location = new System.Drawing.Point(433, 27); + this.checkBoxTypeParameter.Location = new System.Drawing.Point(461, 27); this.checkBoxTypeParameter.Name = "checkBoxTypeParameter"; this.checkBoxTypeParameter.Size = new System.Drawing.Size(200, 40); this.checkBoxTypeParameter.TabIndex = 2; @@ -181,7 +181,7 @@ this.checkBoxTypeOperation.ImageCheckBox = null; this.checkBoxTypeOperation.ImageUnCheckBox = null; this.checkBoxTypeOperation.InitVisible = true; - this.checkBoxTypeOperation.Location = new System.Drawing.Point(227, 27); + this.checkBoxTypeOperation.Location = new System.Drawing.Point(255, 27); this.checkBoxTypeOperation.Name = "checkBoxTypeOperation"; this.checkBoxTypeOperation.Size = new System.Drawing.Size(200, 40); this.checkBoxTypeOperation.TabIndex = 1; @@ -204,7 +204,7 @@ this.checkBoxTypeAlarm.ImageCheckBox = null; this.checkBoxTypeAlarm.ImageUnCheckBox = null; this.checkBoxTypeAlarm.InitVisible = true; - this.checkBoxTypeAlarm.Location = new System.Drawing.Point(21, 27); + this.checkBoxTypeAlarm.Location = new System.Drawing.Point(49, 27); this.checkBoxTypeAlarm.Name = "checkBoxTypeAlarm"; this.checkBoxTypeAlarm.Size = new System.Drawing.Size(200, 40); this.checkBoxTypeAlarm.TabIndex = 0; diff --git a/INT69DB_2A/DialogForms/DialogFormDataViewerFilter.cs b/INT69DB_2A/DialogForms/DialogFormDataViewerFilter.cs index b41e89e..2d2a66e 100644 --- a/INT69DB_2A/DialogForms/DialogFormDataViewerFilter.cs +++ b/INT69DB_2A/DialogForms/DialogFormDataViewerFilter.cs @@ -25,7 +25,7 @@ namespace INT69DB_2A.DialogForms this.ParentForm = parent; this.InitializeDesign(); - this.InitializeContnrol(); + this.InitializeControl(); this.DefaultSetting(); } #endregion @@ -58,7 +58,7 @@ namespace INT69DB_2A.DialogForms } } - private void InitializeContnrol() + private void InitializeControl() { int x = 0, y = 0; @@ -67,7 +67,7 @@ namespace INT69DB_2A.DialogForms this.Location = new Point(x, y); - this.Size = new Size(450, 165); + this.Size = new Size(710, 470); } private void DefaultSetting() { diff --git a/INT69DB_2A/DialogForms/DialogFormHistoryData.designer.cs b/INT69DB_2A/DialogForms/DialogFormHistoryData.designer.cs index d944ccd..b5e9f7e 100644 --- a/INT69DB_2A/DialogForms/DialogFormHistoryData.designer.cs +++ b/INT69DB_2A/DialogForms/DialogFormHistoryData.designer.cs @@ -100,7 +100,7 @@ // labelFileName // this.labelFileName.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.labelFileName.BackPictureBox = null; + this.labelFileName.BackPictureBox = this.smartForm1; this.labelFileName.BackPictureBox1 = null; this.labelFileName.BackPictureBox2 = null; this.labelFileName.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); @@ -114,7 +114,7 @@ this.labelFileName.Size = new System.Drawing.Size(100, 32); this.labelFileName.TabIndex = 7; this.labelFileName.Text = "20200214_1"; - this.labelFileName.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; + this.labelFileName.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelFileName.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelFileName.Visible = false; this.labelFileName.Wordwrap = false; @@ -168,7 +168,7 @@ // labelDate // this.labelDate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.labelDate.BackPictureBox = null; + this.labelDate.BackPictureBox = this.smartForm1; this.labelDate.BackPictureBox1 = null; this.labelDate.BackPictureBox2 = null; this.labelDate.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); @@ -177,7 +177,7 @@ this.labelDate.ForeColor = System.Drawing.Color.White; this.labelDate.InitVisible = true; this.labelDate.LineSpacing = 0F; - this.labelDate.Location = new System.Drawing.Point(237, 50); + this.labelDate.Location = new System.Drawing.Point(237, 54); this.labelDate.Name = "labelDate"; this.labelDate.Size = new System.Drawing.Size(100, 20); this.labelDate.TabIndex = 15; @@ -189,7 +189,7 @@ // labelNodeIndex // this.labelNodeIndex.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); - this.labelNodeIndex.BackPictureBox = null; + this.labelNodeIndex.BackPictureBox = this.smartForm1; this.labelNodeIndex.BackPictureBox1 = null; this.labelNodeIndex.BackPictureBox2 = null; this.labelNodeIndex.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); @@ -203,7 +203,7 @@ this.labelNodeIndex.Size = new System.Drawing.Size(100, 32); this.labelNodeIndex.TabIndex = 14; this.labelNodeIndex.Text = "20200214_1"; - this.labelNodeIndex.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; + this.labelNodeIndex.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelNodeIndex.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelNodeIndex.Visible = false; this.labelNodeIndex.Wordwrap = false; diff --git a/INT69DB_2A/DialogForms/DialogFormHistoryData.resx b/INT69DB_2A/DialogForms/DialogFormHistoryData.resx index cac7339..2d01929 100644 --- a/INT69DB_2A/DialogForms/DialogFormHistoryData.resx +++ b/INT69DB_2A/DialogForms/DialogFormHistoryData.resx @@ -120,7 +120,7 @@ - iVBORw0KGgoAAAANSUhEUgAAAV4AAAHWCAIAAACwqnb4AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH + iVBORw0KGgoAAAANSUhEUgAAAV4AAAHWCAYAAAA/yOGvAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp bGUAAEjHnZZ3VFTXFofPvXd6oc0w0hl6ky4wgPQuIB0EURhmBhjKAMMMTWyIqEBEEREBRZCggAGjoUis iGIhKKhgD0gQUGIwiqioZEbWSnx5ee/l5ffHvd/aZ+9z99l7n7UuACRPHy4vBZYCIJkn4Ad6ONNXhUfQ @@ -165,42 +165,47 @@ RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK - j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAAOxAAADsQBlSsOGwAACCtJREFUeF7t1EENwlAA - BUGU4AmFdVNd3N4m5TtgJqthX5/rlqRH1iDpkDVIOtQa3sDf2xCsAciGYA1ANgRrALIhWAOQDcEagGwI - 1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCy - IVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwB - yIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOw - BiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5AN - wRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1A - NgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1 - ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI - 1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCy - IVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwB - yIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOw - BiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5AN - wRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1A - NgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1 - ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI - 1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCy - IVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwB - yIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOw - BiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5AN - wRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1A - NgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1 - ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI - 1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCy - IVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwB - yIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOw - BiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5AN - wRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1A - NgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1 - ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI - 1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCy - IVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwB - yIZgDUA2BGsAsiFYA5ANwRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOw - BiAbgjUA2RCsAciGYA1ANgRrALIhWAOQDcEagGwI1gBkQ7AGIBuCNQDZEKwByIZgDUA2BGsAsiFYA5AN - wRqAbAjWAGRDsAYgG4I1ANkQrAHIhmANQDYEawCyIVgDkA3BGoBsCNYAZEOwBiAbgjUA2RCsAciGYA1A - NgRrALIhWAOQDcEagGwI1gBkQ7AGIBtCa5CkZQ2SDlmDpJ+u+wuVLeXultOGrgAAAABJRU5ErkJggg== + j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAAOxAAADsQBlSsOGwAACU5JREFUeF7t1DEBwkAA + RTFksLCz178ENB3rr4C+KUMs5HV+1wGgI16AmHgBYrd4P983AA/Ya8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhrxQsQ2GvFCxDYa8ULENhr + xQsQ2GvFCxDYa8ULENhrb/EC8DzxAsTEC5C6zh+3E9zRrxF86gAAAABJRU5ErkJggg== diff --git a/INT69DB_2A/DialogForms/DialogFormLogOn.cs b/INT69DB_2A/DialogForms/DialogFormLogOn.cs index 92e6e98..3f5ad92 100644 --- a/INT69DB_2A/DialogForms/DialogFormLogOn.cs +++ b/INT69DB_2A/DialogForms/DialogFormLogOn.cs @@ -109,6 +109,8 @@ namespace INT69DB_2A.DialogForms this.labelTitle1.Text = "User Loigin"; this.labelTitle2.Text = "ID"; this.labelTitle3.Text = "Password"; + + this.textBoxID.PasswordChar = default(char); } else { @@ -155,7 +157,7 @@ namespace INT69DB_2A.DialogForms UserManager.UserManager_UserLoginDirect(this.textBoxID.Text, this.textBoxPassword.Text, ref userInfo); - if (userInfo.status == 0) + if (userInfo.status == 0 && userInfo.fFirstPW == 0) { //MessageBox.Show("로그인 성공"); @@ -190,11 +192,19 @@ namespace INT69DB_2A.DialogForms this.ParentForm.SystemConfig.CurrentUser.IsLockPassword = userInfo.password_flock_status == 0 ? false : true; this.ParentForm.SystemConfig.CurrentUser.IsAdmin = userInfo.fadmin == 0 ? false : true; this.ParentForm.SystemConfig.CurrentUser.ActiveLevel = userInfo.active_level; + this.ParentForm.SystemConfig.CurrentUser.IsFirstPassword = userInfo.fFirstPW; #endregion this.DialogResult = DialogResult.OK; this.Close(); } + else if (userInfo.fFirstPW == 1) + { + // 최초 로그인 시 비밀번호 변경 + this.ParentForm.ChildFormMainDisplay.ChangeID = this.textBoxID.Text; + this.DialogResult = DialogResult.Abort; + this.Close(); + } else { DialogFormMessage myMsg = new DialogFormMessage(null, userInfo.status, this.ParentForm.SystemConfig.Language); @@ -297,6 +307,7 @@ namespace INT69DB_2A.DialogForms this.ParentForm.SystemConfig.CurrentUser.IsLockPassword = userInfo.password_flock_status == 0 ? false : true; this.ParentForm.SystemConfig.CurrentUser.IsAdmin = userInfo.fadmin == 0 ? false : true; this.ParentForm.SystemConfig.CurrentUser.ActiveLevel = userInfo.active_level; + this.ParentForm.SystemConfig.CurrentUser.IsFirstPassword = userInfo.fFirstPW; #endregion this.DialogResult = DialogResult.OK; @@ -311,6 +322,8 @@ namespace INT69DB_2A.DialogForms else { // 비밀번호 변경 실패 시 메시지?? + DialogFormMessage myMsg = new DialogFormMessage(null, ret, this.ParentForm.SystemConfig.Language); + myMsg.ShowDialog(); } } #endregion @@ -356,25 +369,21 @@ namespace INT69DB_2A.DialogForms this.textBoxID.Text = "Intech"; this.textBoxPassword.Text = "I20090810!"; } - private void smartButtonAdmin_Click(object sender, EventArgs e) { this.textBoxID.Text = "admin00"; this.textBoxPassword.Text = "admin12!"; } - private void smartButtonIUser11_Click(object sender, EventArgs e) { this.textBoxID.Text = "user11"; this.textBoxPassword.Text = "user11!"; } - private void smartButtonUser22_Click(object sender, EventArgs e) { this.textBoxID.Text = "user22"; this.textBoxPassword.Text = "user22!"; } - private void smartButtonUser33_Click(object sender, EventArgs e) { this.textBoxID.Text = "user33"; diff --git a/INT69DB_2A/Forms/FormCommunication.cs b/INT69DB_2A/Forms/FormCommunication.cs index bc20205..19969e9 100644 --- a/INT69DB_2A/Forms/FormCommunication.cs +++ b/INT69DB_2A/Forms/FormCommunication.cs @@ -207,12 +207,16 @@ namespace INT69DB_2A.Forms private void EthernetStart() { + string detail = ""; + this.buttonStart.Enabled = true; this.buttonStop.Enabled = true; this.buttonTestSend.Enabled = true; if (this.ParentForm.SystemConfig.EthernetOperationMode == 1) { + detail = "Server"; + if (string.Compare(this.ParentForm.smartConfigs.IPSettings.DeviceIP, "0.0.0.0") == 0) { if (this.labelServerStatus.Text != ">Addr Err") @@ -232,13 +236,20 @@ namespace INT69DB_2A.Forms } else if (this.ParentForm.SystemConfig.EthernetOperationMode == 2) { + detail = "Client"; this.ParentForm.EthernetClientConnect(); } + + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.TryEthernetStart, detail); } private void EthernetStop() { + string detail = ""; + if (this.ParentForm.SystemConfig.EthernetOperationMode == 1) { + detail = "Server"; + this.timerServer.Enabled = false; this.ParentForm.EthernetServerStop(); @@ -247,8 +258,11 @@ namespace INT69DB_2A.Forms } else if (this.ParentForm.SystemConfig.EthernetOperationMode == 2) { + detail = "Client"; this.ParentForm.EthernetClientDisconnect(); } + + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.TryEthernetStop, detail); } private void EthernetDataTestSend() { @@ -804,6 +818,7 @@ namespace INT69DB_2A.Forms { if (this.labelServerStatus.Text != ">Start") this.labelServerStatus.Text = ">Start"; + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.EthernetConnect, "Server"); this.labelConnectedIP.Text = "-"; @@ -814,6 +829,7 @@ namespace INT69DB_2A.Forms { if (this.labelServerStatus.Text != ">Stop") this.labelServerStatus.Text = ">Stop"; + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.EthernetDisconnect, "Server"); } } diff --git a/INT69DB_2A/Forms/FormCommunication.resx b/INT69DB_2A/Forms/FormCommunication.resx index b62ac44..5efb401 100644 --- a/INT69DB_2A/Forms/FormCommunication.resx +++ b/INT69DB_2A/Forms/FormCommunication.resx @@ -585,7 +585,7 @@ - 17, 17 + 15, 5 @@ -2258,6 +2258,6 @@ False - 42 + 37 \ No newline at end of file diff --git a/INT69DB_2A/Forms/FormConfiguration.cs b/INT69DB_2A/Forms/FormConfiguration.cs index d4ed065..4fedb72 100644 --- a/INT69DB_2A/Forms/FormConfiguration.cs +++ b/INT69DB_2A/Forms/FormConfiguration.cs @@ -514,12 +514,13 @@ namespace INT69DB_2A.Forms before = this.BeforeVariate; + this.ParentForm.CurrentZeroParameterItem.Variate = this.comboBoxZeroParameterVariate.SelectedIndex.ToString(); + value = Helper.StringZeroFillDigits4(this.comboBoxZeroParameterVariate.SelectedIndex.ToString()); + this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._4003_ZeroVariate, value); after = this.comboBoxZeroParameterVariate.SelectedItem.ToString(); - this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._4003_ZeroVariate, value); - if (before != after) this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.AutoZeroVariance, "", before, after); } diff --git a/INT69DB_2A/Forms/FormDataBackup_Part11.Designer.cs b/INT69DB_2A/Forms/FormDataBackup_Part11.Designer.cs index b827722..e63ad0f 100644 --- a/INT69DB_2A/Forms/FormDataBackup_Part11.Designer.cs +++ b/INT69DB_2A/Forms/FormDataBackup_Part11.Designer.cs @@ -49,7 +49,6 @@ this.labelInspectionFileCount = new SmartX.SmartLabel(); this.timerEncryption = new System.Windows.Forms.Timer(); this.timerFileCopy = new System.Windows.Forms.Timer(); - this.timerTimeout = new System.Windows.Forms.Timer(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); this.smartGroupBox3.SuspendLayout(); this.smartGroupBox2.SuspendLayout(); @@ -416,11 +415,6 @@ // this.timerFileCopy.Tick += new System.EventHandler(this.timerFileCopy_Tick); // - // timerTimeout - // - this.timerTimeout.Interval = 10000; - this.timerTimeout.Tick += new System.EventHandler(this.timerTimeout_Tick); - // // FormDataBackup_Part11 // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -468,6 +462,5 @@ private SmartX.SmartLabel labelInspectionFileCount; private System.Windows.Forms.Timer timerEncryption; private System.Windows.Forms.Timer timerFileCopy; - private System.Windows.Forms.Timer timerTimeout; } } \ No newline at end of file diff --git a/INT69DB_2A/Forms/FormDataBackup_Part11.cs b/INT69DB_2A/Forms/FormDataBackup_Part11.cs index df8ea8c..2818590 100644 --- a/INT69DB_2A/Forms/FormDataBackup_Part11.cs +++ b/INT69DB_2A/Forms/FormDataBackup_Part11.cs @@ -124,6 +124,7 @@ namespace INT69DB_2A.Forms return; targetPath = "하드 디스크\\"; + listSelectedFile = this.GetSeletedNodeList(view); #region USB 장착 유무 체크 dir = new DirectoryInfo(targetPath); @@ -135,8 +136,6 @@ namespace INT69DB_2A.Forms return; } #endregion - - listSelectedFile = this.GetSeletedNodeList(view); #region 백업할 파일 유무 체크 if (listSelectedFile.Count == 0) { @@ -155,19 +154,6 @@ namespace INT69DB_2A.Forms this.DirectoryFileDelete(this.ParentForm.PathHeaderFolder); #endregion - #region USB 장착 유무 체크 - // USB 장착 유무 체크 - dir = new DirectoryInfo(targetPath); - if (dir.Exists == false) - { - // USB메모리가 장착되지 않았습니다 - DialogFormMessage msg = new DialogFormMessage(5, this.ParentForm.SystemConfig.Language); - this.SplashFinish(); - msg.ShowDialog(); - return; - } - #endregion - try { #region Header 파일 생성 @@ -177,6 +163,7 @@ namespace INT69DB_2A.Forms header.LoginId = this.ParentForm.SystemConfig.CurrentUser.ID; header.SerialNumber = this.ParentForm.SystemConfig.SerialNumber; header.EquipmentColumns = this.ParentForm.SystemConfig.EquipmentColumns; + header.EquipmentType = 103; for (int i = 0; i < listSelectedFile.Count; i++) this.CreateHeaderFile(this.ParentForm.PathHeaderFolder, listSelectedFile[i], header); @@ -279,7 +266,7 @@ namespace INT69DB_2A.Forms } // 복사 완료 메시지 - DialogFormMessage msg = new DialogFormMessage(count.ToString(), this.ParentForm.SystemConfig.Language); + DialogFormMessage msg = new DialogFormMessage((count / 2).ToString(), this.ParentForm.SystemConfig.Language); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.DataBackup, type.ToString()); this.SplashFinish(); msg.ShowDialog(); @@ -400,8 +387,8 @@ namespace INT69DB_2A.Forms { this.Splash = new SmartX.SmartSplash(); this.Splash.CenterPosition = false; - this.Splash.Left = 462; - this.Splash.Top = 200; + this.Splash.Left = 380; + this.Splash.Top = 280; this.Splash.AnimationInterval = 200; this.Splash.LoadingImagePathname = "SmartLoading4"; this.Splash.Start(); @@ -747,6 +734,12 @@ namespace INT69DB_2A.Forms value = header.TimeStamp.ToString("MM/dd/yyyy HH:mm:ss"); IniFile.WriteString(filePath, section, key, value); Thread.Sleep(5); + + // EquipmentType + key = DataStore.E_FileHeaderItem.EquipmentType.ToString(); + value = header.EquipmentType.ToString(); + IniFile.WriteString(filePath, section, key, value); + Thread.Sleep(5); } private void DirectoryFileDelete(string dirPath) { @@ -830,8 +823,8 @@ namespace INT69DB_2A.Forms this.UpdateDisplayHistoryFile(); this.UpdateDisplayOtherFile(); - this.treeViewInspection.ExpandAll(); - this.treeViewHistory.ExpandAll(); + //this.treeViewInspection.ExpandAll(); + //this.treeViewHistory.ExpandAll(); } #endregion @@ -888,16 +881,6 @@ namespace INT69DB_2A.Forms this.timerFileCopy.Enabled = false; this.FileCopy(this.SelecteDataType); } - private void timerTimeout_Tick(object sender, EventArgs e) - { - this.timerTimeout.Enabled = false; - //if (this.ParentForm.IsCommunicationLogOpen == true) - // this.ParentForm.smartFileCommunicationLog.WriteString(string.Format("timerTimeout_Tick() ({0:yyyy-MM-dd HH:mm:ss}): timeout false", DateTime.Now)); - this.SplashFinish(); - - DialogFormMessage myMsg = new DialogFormMessage(16, this.ParentForm.SystemConfig.Language); - myMsg.ShowDialog(); - } #endregion } } \ No newline at end of file diff --git a/INT69DB_2A/Forms/FormDataBackup_Part11.resx b/INT69DB_2A/Forms/FormDataBackup_Part11.resx index 0fc4ee0..9e634fa 100644 --- a/INT69DB_2A/Forms/FormDataBackup_Part11.resx +++ b/INT69DB_2A/Forms/FormDataBackup_Part11.resx @@ -1448,13 +1448,13 @@ 157, 17 - - 290, 22 - WEBPAD False + + 51 + \ No newline at end of file diff --git a/INT69DB_2A/Forms/FormDataStatistics.cs b/INT69DB_2A/Forms/FormDataStatistics.cs index 4758f8a..4bd8cb5 100644 --- a/INT69DB_2A/Forms/FormDataStatistics.cs +++ b/INT69DB_2A/Forms/FormDataStatistics.cs @@ -483,7 +483,57 @@ namespace INT69DB_2A.Forms private void DataAnalysis() { #region Set Data - if (this.ParentForm.SystemConfig.EquipmentColumns == 7) + if (this.ParentForm.SystemConfig.EquipmentColumns == 2) + { + for (int i = 0; i < this.CollectionWeightData.Count; i++) + { + this.SetData(this.CollectionLaneData[0], this.CollectionWeightData[i][9], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][10])); + this.SetData(this.CollectionLaneData[1], this.CollectionWeightData[i][11], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][12])); + } + } + else if (this.ParentForm.SystemConfig.EquipmentColumns == 3) + { + for (int i = 0; i < this.CollectionWeightData.Count; i++) + { + this.SetData(this.CollectionLaneData[0], this.CollectionWeightData[i][9], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][10])); + this.SetData(this.CollectionLaneData[1], this.CollectionWeightData[i][11], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][12])); + this.SetData(this.CollectionLaneData[2], this.CollectionWeightData[i][13], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][14])); + } + } + else if (this.ParentForm.SystemConfig.EquipmentColumns == 4) + { + for (int i = 0; i < this.CollectionWeightData.Count; i++) + { + this.SetData(this.CollectionLaneData[0], this.CollectionWeightData[i][9], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][10])); + this.SetData(this.CollectionLaneData[1], this.CollectionWeightData[i][11], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][12])); + this.SetData(this.CollectionLaneData[2], this.CollectionWeightData[i][13], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][14])); + this.SetData(this.CollectionLaneData[3], this.CollectionWeightData[i][15], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][16])); + } + } + else if (this.ParentForm.SystemConfig.EquipmentColumns == 5) + { + for (int i = 0; i < this.CollectionWeightData.Count; i++) + { + this.SetData(this.CollectionLaneData[0], this.CollectionWeightData[i][9], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][10])); + this.SetData(this.CollectionLaneData[1], this.CollectionWeightData[i][11], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][12])); + this.SetData(this.CollectionLaneData[2], this.CollectionWeightData[i][13], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][14])); + this.SetData(this.CollectionLaneData[3], this.CollectionWeightData[i][15], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][16])); + this.SetData(this.CollectionLaneData[4], this.CollectionWeightData[i][17], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][18])); + } + } + else if (this.ParentForm.SystemConfig.EquipmentColumns == 6) + { + for (int i = 0; i < this.CollectionWeightData.Count; i++) + { + this.SetData(this.CollectionLaneData[0], this.CollectionWeightData[i][9], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][10])); + this.SetData(this.CollectionLaneData[1], this.CollectionWeightData[i][11], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][12])); + this.SetData(this.CollectionLaneData[2], this.CollectionWeightData[i][13], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][14])); + this.SetData(this.CollectionLaneData[3], this.CollectionWeightData[i][15], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][16])); + this.SetData(this.CollectionLaneData[4], this.CollectionWeightData[i][17], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][18])); + this.SetData(this.CollectionLaneData[5], this.CollectionWeightData[i][19], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][20])); + } + } + else if (this.ParentForm.SystemConfig.EquipmentColumns == 7) { for (int i = 0; i < this.CollectionWeightData.Count; i++) { @@ -842,6 +892,7 @@ namespace INT69DB_2A.Forms for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++) { + #region 데이터 출력 // Lane Number sw.Write("{0}", i + 1); sw.Write(","); @@ -972,6 +1023,7 @@ namespace INT69DB_2A.Forms sw.Write(datas[i].TotalNGCount); sw.WriteLine(); + #endregion } sw.Close(); @@ -1015,6 +1067,18 @@ namespace INT69DB_2A.Forms this.FileCopy(file, fileName); } } + + private void CreateScreenCapture(string path, DateTime time) + { + string filePath = ""; + Bitmap bitMap = new Bitmap(800, 600); + + bitMap = IntechGraphics.CopyFromScreen(); + filePath = string.Format("{0}S{1:yyyyMMdd-HHmmss}.jpg", path, time); + + bitMap.Save(filePath, ImageFormat.Jpeg); + } + private int Backup1() { int ret = 0; @@ -1082,16 +1146,6 @@ namespace INT69DB_2A.Forms return ret; } - private void CreateScreenCapture(string path, DateTime time) - { - string filePath = ""; - Bitmap bitMap = new Bitmap(1024, 768); - - bitMap = IntechGraphics.CopyFromScreen(); - filePath = string.Format("{0}S{1:yyyyMMdd-HHmmss}.jpg", path, time); - - bitMap.Save(filePath, ImageFormat.Jpeg); - } public void DisplayRefresh() { diff --git a/INT69DB_2A/Forms/FormDataViewer.Designer.cs b/INT69DB_2A/Forms/FormDataViewer.Designer.cs index 3a31342..19ea37b 100644 --- a/INT69DB_2A/Forms/FormDataViewer.Designer.cs +++ b/INT69DB_2A/Forms/FormDataViewer.Designer.cs @@ -61,6 +61,9 @@ this.smartTimer1 = new SmartX.SmartTimer(this.components); this.labelDisplayUpdateElapsedTime = new SmartX.SmartLabel(); this.labelFileReadElapsedTime = new SmartX.SmartLabel(); + this.labelCurrentIndex = new SmartX.SmartLabel(); + this.smartSeparatorLine1 = new SmartX.SmartSeparatorLine(); + this.labelTotalIndex = new SmartX.SmartLabel(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); this.panel1.SuspendLayout(); this.SuspendLayout(); @@ -110,6 +113,9 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(228)))), ((int)(((byte)(180))))); + this.panel1.Controls.Add(this.labelCurrentIndex); + this.panel1.Controls.Add(this.smartSeparatorLine1); + this.panel1.Controls.Add(this.labelTotalIndex); this.panel1.Controls.Add(this.listBoxEvent); this.panel1.Controls.Add(this.labelItemCount); this.panel1.Controls.Add(this.listBoxType); @@ -176,13 +182,14 @@ this.labelItemCount.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelItemCount.InitVisible = true; this.labelItemCount.LineSpacing = 0F; - this.labelItemCount.Location = new System.Drawing.Point(726, 231); + this.labelItemCount.Location = new System.Drawing.Point(725, 5); this.labelItemCount.Name = "labelItemCount"; this.labelItemCount.Size = new System.Drawing.Size(70, 30); this.labelItemCount.TabIndex = 38; this.labelItemCount.Text = "0 / 0 "; this.labelItemCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelItemCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelItemCount.Visible = false; this.labelItemCount.Wordwrap = false; // // listBoxType @@ -408,7 +415,7 @@ this.buttonDown.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Regular); this.buttonDown.GroupID = 0; this.buttonDown.InitVisible = true; - this.buttonDown.Location = new System.Drawing.Point(725, 296); + this.buttonDown.Location = new System.Drawing.Point(725, 286); this.buttonDown.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonDown.Name = "buttonDown"; this.buttonDown.NestedClickEventPrevent = false; @@ -416,7 +423,7 @@ this.buttonDown.RepeatInterval = 200; this.buttonDown.RepeatIntervalAccelerate = null; this.buttonDown.SafeInterval = 200; - this.buttonDown.Size = new System.Drawing.Size(70, 150); + this.buttonDown.Size = new System.Drawing.Size(70, 160); this.buttonDown.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; this.buttonDown.TabIndex = 30; this.buttonDown.Text = "▼"; @@ -449,7 +456,7 @@ this.buttonUp.RepeatInterval = 200; this.buttonUp.RepeatIntervalAccelerate = null; this.buttonUp.SafeInterval = 200; - this.buttonUp.Size = new System.Drawing.Size(70, 150); + this.buttonUp.Size = new System.Drawing.Size(70, 160); this.buttonUp.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; this.buttonUp.TabIndex = 29; this.buttonUp.Text = "▲"; @@ -821,6 +828,59 @@ this.labelFileReadElapsedTime.Visible = false; this.labelFileReadElapsedTime.Wordwrap = false; // + // labelCurrentIndex + // + this.labelCurrentIndex.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151))))); + this.labelCurrentIndex.BackPictureBox = this.smartForm1; + this.labelCurrentIndex.BackPictureBox1 = null; + this.labelCurrentIndex.BackPictureBox2 = null; + this.labelCurrentIndex.BorderColor = System.Drawing.Color.Black; + this.labelCurrentIndex.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelCurrentIndex.InitVisible = true; + this.labelCurrentIndex.LineSpacing = 0F; + this.labelCurrentIndex.Location = new System.Drawing.Point(725, 218); + this.labelCurrentIndex.Name = "labelCurrentIndex"; + this.labelCurrentIndex.Size = new System.Drawing.Size(70, 20); + this.labelCurrentIndex.TabIndex = 242; + this.labelCurrentIndex.Text = "0"; + this.labelCurrentIndex.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelCurrentIndex.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelCurrentIndex.Wordwrap = false; + // + // smartSeparatorLine1 + // + this.smartSeparatorLine1.InitVisible = true; + this.smartSeparatorLine1.Line1Color = System.Drawing.Color.DimGray; + this.smartSeparatorLine1.Line1Width = 1F; + this.smartSeparatorLine1.Line2Color = System.Drawing.Color.LightGray; + this.smartSeparatorLine1.Line2Visible = true; + this.smartSeparatorLine1.Line2Width = 1F; + this.smartSeparatorLine1.LineDirection = SmartX.SmartSeparatorLine.DIR.Horizontal; + this.smartSeparatorLine1.Location = new System.Drawing.Point(725, 244); + this.smartSeparatorLine1.Name = "smartSeparatorLine1"; + this.smartSeparatorLine1.Size = new System.Drawing.Size(70, 2); + this.smartSeparatorLine1.TabIndex = 241; + this.smartSeparatorLine1.Text = "smartSeparatorLine1"; + // + // labelTotalIndex + // + this.labelTotalIndex.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151))))); + this.labelTotalIndex.BackPictureBox = this.smartForm1; + this.labelTotalIndex.BackPictureBox1 = null; + this.labelTotalIndex.BackPictureBox2 = null; + this.labelTotalIndex.BorderColor = System.Drawing.Color.Black; + this.labelTotalIndex.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTotalIndex.InitVisible = true; + this.labelTotalIndex.LineSpacing = 0F; + this.labelTotalIndex.Location = new System.Drawing.Point(725, 252); + this.labelTotalIndex.Name = "labelTotalIndex"; + this.labelTotalIndex.Size = new System.Drawing.Size(70, 20); + this.labelTotalIndex.TabIndex = 240; + this.labelTotalIndex.Text = "0"; + this.labelTotalIndex.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTotalIndex.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTotalIndex.Wordwrap = false; + // // FormDataViewer // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -881,5 +941,8 @@ private SmartX.SmartTimer smartTimer1; private SmartX.SmartLabel labelDisplayUpdateElapsedTime; private SmartX.SmartLabel labelFileReadElapsedTime; + private SmartX.SmartLabel labelCurrentIndex; + private SmartX.SmartSeparatorLine smartSeparatorLine1; + private SmartX.SmartLabel labelTotalIndex; } } \ No newline at end of file diff --git a/INT69DB_2A/Forms/FormDataViewer.cs b/INT69DB_2A/Forms/FormDataViewer.cs index a5d92e4..36296ee 100644 --- a/INT69DB_2A/Forms/FormDataViewer.cs +++ b/INT69DB_2A/Forms/FormDataViewer.cs @@ -23,6 +23,7 @@ namespace INT69DB_2A.Forms private int DataRemainCNT; private int DataAllCNT; public string PathDestinationFileName; + private static int ViewerDataCount = 22; private FormMain m_ParentForm; private Collection CollectionHistoryData; // 파일에서 읽은 데이터 @@ -229,10 +230,10 @@ namespace INT69DB_2A.Forms private void UpdateDisplay() { int cnt = 0; - if (this.ListTime.Count > 50) + if (this.ListTime.Count > ViewerDataCount) { - cnt = 50; - this.DataRemainCNT = this.ListTime.Count - 50; + cnt = ViewerDataCount; + this.DataRemainCNT = this.ListTime.Count - ViewerDataCount; } else cnt = this.ListTime.Count; @@ -267,9 +268,9 @@ namespace INT69DB_2A.Forms index = this.ListTime.Count - this.DataRemainCNT; - if (this.DataRemainCNT > 50) + if (this.DataRemainCNT > ViewerDataCount) { - range = index + 50; + range = index + ViewerDataCount; for (int i = index; i < range; i++) { //this.listBoxDate.AddItem(this.ListDate[i]); @@ -282,7 +283,7 @@ namespace INT69DB_2A.Forms this.listBoxType.AddItem(this.ListType[i]); } - this.DataRemainCNT = this.DataRemainCNT - 50; + this.DataRemainCNT = this.DataRemainCNT - ViewerDataCount; } else { @@ -452,7 +453,7 @@ namespace INT69DB_2A.Forms if (this.StartIndex < 6) this.ListBoxScrollUp(); else - this.ListBoxScrollUp(50); + this.ListBoxScrollUp(ViewerDataCount); } private void buttonDown_Click(object sender, EventArgs e) { @@ -468,7 +469,7 @@ namespace INT69DB_2A.Forms if (this.RemainCNT < 6) this.ListBoxScrollDown(); else - this.ListBoxScrollDown(50); + this.ListBoxScrollDown(ViewerDataCount); } private void listBox_SelectedIndexChanged(object sender, EventArgs e) diff --git a/INT69DB_2A/Forms/FormEquipmentSetting.Designer.cs b/INT69DB_2A/Forms/FormEquipmentSetting.Designer.cs index dd0c8eb..cc56993 100644 --- a/INT69DB_2A/Forms/FormEquipmentSetting.Designer.cs +++ b/INT69DB_2A/Forms/FormEquipmentSetting.Designer.cs @@ -58,8 +58,6 @@ this.panel7 = new System.Windows.Forms.Panel(); this.radioButtonFeedingConveyorRunNg = new System.Windows.Forms.RadioButton(); this.radioButtonFeedingConveyorRunPass = new System.Windows.Forms.RadioButton(); - this.labelStaticRCRotationDirection = new SmartX.SmartLabel(); - this.labelStaticFeedingCVRun = new SmartX.SmartLabel(); this.labelStaticImpellerRotationDirection = new SmartX.SmartLabel(); this.labelStaticImpellerBaudrate = new SmartX.SmartLabel(); this.panel5 = new System.Windows.Forms.Panel(); @@ -86,13 +84,16 @@ this.labelStaticPingTimer = new SmartX.SmartLabel(); this.buttonPingTimer = new SmartX.SmartButton(); this.groupBoxSpecialMenu = new SmartX.SmartGroupBox(); + this.smartLabel2 = new SmartX.SmartLabel(); + this.buttonIntegratedTransmission = new SmartX.SmartButton(); + this.labelStaticIntegratedTransmission = new SmartX.SmartLabel(); this.labelTitle = new SmartX.SmartLabel(); this.pictureBoxFormIcon = new System.Windows.Forms.PictureBox(); this.buttonSave = new SmartX.SmartButton(); this.buttonBack = new SmartX.SmartButton(); - this.buttonIntegratedTransmission = new SmartX.SmartButton(); - this.labelStaticIntegratedTransmission = new SmartX.SmartLabel(); - this.smartLabel2 = new SmartX.SmartLabel(); + this.labelDataStoragePeriod = new SmartX.SmartLabel(); + this.labelStaticDataStoragePeriod = new SmartX.SmartLabel(); + this.smartLabel6 = new SmartX.SmartLabel(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); this.panel1.SuspendLayout(); this.panel3.SuspendLayout(); @@ -148,9 +149,9 @@ this.labelStaticEquipmentLine.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelStaticEquipmentLine.InitVisible = true; this.labelStaticEquipmentLine.LineSpacing = 0F; - this.labelStaticEquipmentLine.Location = new System.Drawing.Point(530, 79); + this.labelStaticEquipmentLine.Location = new System.Drawing.Point(16, 110); this.labelStaticEquipmentLine.Name = "labelStaticEquipmentLine"; - this.labelStaticEquipmentLine.Size = new System.Drawing.Size(86, 25); + this.labelStaticEquipmentLine.Size = new System.Drawing.Size(204, 25); this.labelStaticEquipmentLine.TabIndex = 119; this.labelStaticEquipmentLine.Text = "장비 열"; this.labelStaticEquipmentLine.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; @@ -167,7 +168,7 @@ this.labelStaticWeightCheck.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelStaticWeightCheck.InitVisible = true; this.labelStaticWeightCheck.LineSpacing = 0F; - this.labelStaticWeightCheck.Location = new System.Drawing.Point(12, 110); + this.labelStaticWeightCheck.Location = new System.Drawing.Point(12, 141); this.labelStaticWeightCheck.Name = "labelStaticWeightCheck"; this.labelStaticWeightCheck.Size = new System.Drawing.Size(208, 25); this.labelStaticWeightCheck.TabIndex = 119; @@ -187,7 +188,7 @@ this.labelStaticSelectSensor.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelStaticSelectSensor.InitVisible = true; this.labelStaticSelectSensor.LineSpacing = 0F; - this.labelStaticSelectSensor.Location = new System.Drawing.Point(12, 203); + this.labelStaticSelectSensor.Location = new System.Drawing.Point(12, 234); this.labelStaticSelectSensor.Name = "labelStaticSelectSensor"; this.labelStaticSelectSensor.Size = new System.Drawing.Size(208, 25); this.labelStaticSelectSensor.TabIndex = 119; @@ -227,7 +228,7 @@ this.labelStaticIndividualNG.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelStaticIndividualNG.InitVisible = true; this.labelStaticIndividualNG.LineSpacing = 0F; - this.labelStaticIndividualNG.Location = new System.Drawing.Point(12, 172); + this.labelStaticIndividualNG.Location = new System.Drawing.Point(12, 203); this.labelStaticIndividualNG.Name = "labelStaticIndividualNG"; this.labelStaticIndividualNG.Size = new System.Drawing.Size(208, 25); this.labelStaticIndividualNG.TabIndex = 125; @@ -248,7 +249,7 @@ this.buttonEachNG.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEachNG.DownImage"))); this.buttonEachNG.GroupID = 0; this.buttonEachNG.InitVisible = true; - this.buttonEachNG.Location = new System.Drawing.Point(226, 172); + this.buttonEachNG.Location = new System.Drawing.Point(226, 203); this.buttonEachNG.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonEachNG.Name = "buttonEachNG"; this.buttonEachNG.NestedClickEventPrevent = false; @@ -277,7 +278,7 @@ this.labelStaticRejectConveyor.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelStaticRejectConveyor.InitVisible = true; this.labelStaticRejectConveyor.LineSpacing = 0F; - this.labelStaticRejectConveyor.Location = new System.Drawing.Point(12, 234); + this.labelStaticRejectConveyor.Location = new System.Drawing.Point(12, 265); this.labelStaticRejectConveyor.Name = "labelStaticRejectConveyor"; this.labelStaticRejectConveyor.Size = new System.Drawing.Size(208, 25); this.labelStaticRejectConveyor.TabIndex = 125; @@ -298,7 +299,7 @@ this.buttonDischargeConveyor.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonDischargeConveyor.DownImage"))); this.buttonDischargeConveyor.GroupID = 0; this.buttonDischargeConveyor.InitVisible = true; - this.buttonDischargeConveyor.Location = new System.Drawing.Point(226, 234); + this.buttonDischargeConveyor.Location = new System.Drawing.Point(226, 265); this.buttonDischargeConveyor.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonDischargeConveyor.Name = "buttonDischargeConveyor"; this.buttonDischargeConveyor.NestedClickEventPrevent = false; @@ -327,7 +328,7 @@ this.labelStaticFeedingConveyor.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelStaticFeedingConveyor.InitVisible = true; this.labelStaticFeedingConveyor.LineSpacing = 0F; - this.labelStaticFeedingConveyor.Location = new System.Drawing.Point(428, 233); + this.labelStaticFeedingConveyor.Location = new System.Drawing.Point(12, 296); this.labelStaticFeedingConveyor.Name = "labelStaticFeedingConveyor"; this.labelStaticFeedingConveyor.Size = new System.Drawing.Size(208, 25); this.labelStaticFeedingConveyor.TabIndex = 125; @@ -348,7 +349,7 @@ this.buttonFeedingConveyor.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonFeedingConveyor.DownImage"))); this.buttonFeedingConveyor.GroupID = 0; this.buttonFeedingConveyor.InitVisible = true; - this.buttonFeedingConveyor.Location = new System.Drawing.Point(642, 233); + this.buttonFeedingConveyor.Location = new System.Drawing.Point(226, 296); this.buttonFeedingConveyor.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonFeedingConveyor.Name = "buttonFeedingConveyor"; this.buttonFeedingConveyor.NestedClickEventPrevent = false; @@ -370,7 +371,7 @@ // comboBoxEquipmentColumn // this.comboBoxEquipmentColumn.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); - this.comboBoxEquipmentColumn.Location = new System.Drawing.Point(622, 76); + this.comboBoxEquipmentColumn.Location = new System.Drawing.Point(226, 107); this.comboBoxEquipmentColumn.Name = "comboBoxEquipmentColumn"; this.comboBoxEquipmentColumn.Size = new System.Drawing.Size(104, 29); this.comboBoxEquipmentColumn.TabIndex = 127; @@ -379,7 +380,7 @@ // comboBoxInputSensorSelect // this.comboBoxInputSensorSelect.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); - this.comboBoxInputSensorSelect.Location = new System.Drawing.Point(226, 199); + this.comboBoxInputSensorSelect.Location = new System.Drawing.Point(226, 230); this.comboBoxInputSensorSelect.Name = "comboBoxInputSensorSelect"; this.comboBoxInputSensorSelect.Size = new System.Drawing.Size(165, 29); this.comboBoxInputSensorSelect.TabIndex = 127; @@ -450,9 +451,9 @@ this.panel3.Controls.Add(this.radioButtonDischargeConveyorDirectionCWCCW); this.panel3.Controls.Add(this.radioButtonDischargeConveyorDirectionCCW); this.panel3.Controls.Add(this.radioButtonDischargeConveyorDirectionCW); - this.panel3.Location = new System.Drawing.Point(226, 265); + this.panel3.Location = new System.Drawing.Point(316, 265); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(500, 25); + this.panel3.Size = new System.Drawing.Size(410, 25); // // radioButtonDischargeConveyorDirectionCWCCW // @@ -520,16 +521,16 @@ this.panel7.BackColor = System.Drawing.SystemColors.ControlLight; this.panel7.Controls.Add(this.radioButtonFeedingConveyorRunNg); this.panel7.Controls.Add(this.radioButtonFeedingConveyorRunPass); - this.panel7.Location = new System.Drawing.Point(226, 296); + this.panel7.Location = new System.Drawing.Point(316, 296); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(500, 25); + this.panel7.Size = new System.Drawing.Size(410, 25); // // radioButtonFeedingConveyorRunNg // this.radioButtonFeedingConveyorRunNg.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); - this.radioButtonFeedingConveyorRunNg.Location = new System.Drawing.Point(232, 3); + this.radioButtonFeedingConveyorRunNg.Location = new System.Drawing.Point(146, 3); this.radioButtonFeedingConveyorRunNg.Name = "radioButtonFeedingConveyorRunNg"; - this.radioButtonFeedingConveyorRunNg.Size = new System.Drawing.Size(180, 20); + this.radioButtonFeedingConveyorRunNg.Size = new System.Drawing.Size(120, 20); this.radioButtonFeedingConveyorRunNg.TabIndex = 1; this.radioButtonFeedingConveyorRunNg.Text = "NG"; this.radioButtonFeedingConveyorRunNg.Click += new System.EventHandler(this.control_Click); @@ -540,49 +541,11 @@ this.radioButtonFeedingConveyorRunPass.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.radioButtonFeedingConveyorRunPass.Location = new System.Drawing.Point(20, 3); this.radioButtonFeedingConveyorRunPass.Name = "radioButtonFeedingConveyorRunPass"; - this.radioButtonFeedingConveyorRunPass.Size = new System.Drawing.Size(180, 20); + this.radioButtonFeedingConveyorRunPass.Size = new System.Drawing.Size(120, 20); this.radioButtonFeedingConveyorRunPass.TabIndex = 0; this.radioButtonFeedingConveyorRunPass.Text = "PASS"; this.radioButtonFeedingConveyorRunPass.Click += new System.EventHandler(this.control_Click); // - // labelStaticRCRotationDirection - // - this.labelStaticRCRotationDirection.BackPictureBox = this.smartForm1; - this.labelStaticRCRotationDirection.BackPictureBox1 = null; - this.labelStaticRCRotationDirection.BackPictureBox2 = null; - this.labelStaticRCRotationDirection.BorderColor = System.Drawing.Color.Black; - this.labelStaticRCRotationDirection.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticRCRotationDirection.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); - this.labelStaticRCRotationDirection.InitVisible = true; - this.labelStaticRCRotationDirection.LineSpacing = 0F; - this.labelStaticRCRotationDirection.Location = new System.Drawing.Point(12, 265); - this.labelStaticRCRotationDirection.Name = "labelStaticRCRotationDirection"; - this.labelStaticRCRotationDirection.Size = new System.Drawing.Size(208, 25); - this.labelStaticRCRotationDirection.TabIndex = 129; - this.labelStaticRCRotationDirection.Text = "선별 컨베어 회전방향"; - this.labelStaticRCRotationDirection.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; - this.labelStaticRCRotationDirection.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelStaticRCRotationDirection.Wordwrap = false; - // - // labelStaticFeedingCVRun - // - this.labelStaticFeedingCVRun.BackPictureBox = this.smartForm1; - this.labelStaticFeedingCVRun.BackPictureBox1 = null; - this.labelStaticFeedingCVRun.BackPictureBox2 = null; - this.labelStaticFeedingCVRun.BorderColor = System.Drawing.Color.Black; - this.labelStaticFeedingCVRun.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticFeedingCVRun.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); - this.labelStaticFeedingCVRun.InitVisible = true; - this.labelStaticFeedingCVRun.LineSpacing = 0F; - this.labelStaticFeedingCVRun.Location = new System.Drawing.Point(12, 296); - this.labelStaticFeedingCVRun.Name = "labelStaticFeedingCVRun"; - this.labelStaticFeedingCVRun.Size = new System.Drawing.Size(208, 25); - this.labelStaticFeedingCVRun.TabIndex = 129; - this.labelStaticFeedingCVRun.Text = "이송 컨베어 구동"; - this.labelStaticFeedingCVRun.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; - this.labelStaticFeedingCVRun.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelStaticFeedingCVRun.Wordwrap = false; - // // labelStaticImpellerRotationDirection // this.labelStaticImpellerRotationDirection.BackPictureBox = this.smartForm1; @@ -685,7 +648,7 @@ this.panel2.BackColor = System.Drawing.SystemColors.ControlLight; this.panel2.Controls.Add(this.radioButtonWeightViewReverse); this.panel2.Controls.Add(this.radioButtonWeightViewForward); - this.panel2.Location = new System.Drawing.Point(226, 110); + this.panel2.Location = new System.Drawing.Point(226, 141); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(500, 25); this.panel2.Visible = false; @@ -723,7 +686,7 @@ this.smartLabel12.ForeColor = System.Drawing.Color.Red; this.smartLabel12.InitVisible = true; this.smartLabel12.LineSpacing = 0F; - this.smartLabel12.Location = new System.Drawing.Point(428, 173); + this.smartLabel12.Location = new System.Drawing.Point(428, 204); this.smartLabel12.Name = "smartLabel12"; this.smartLabel12.Size = new System.Drawing.Size(267, 23); this.smartLabel12.TabIndex = 145; @@ -744,7 +707,7 @@ this.smartLabel14.ForeColor = System.Drawing.Color.Red; this.smartLabel14.InitVisible = true; this.smartLabel14.LineSpacing = 0F; - this.smartLabel14.Location = new System.Drawing.Point(428, 204); + this.smartLabel14.Location = new System.Drawing.Point(428, 235); this.smartLabel14.Name = "smartLabel14"; this.smartLabel14.Size = new System.Drawing.Size(267, 23); this.smartLabel14.TabIndex = 145; @@ -987,6 +950,9 @@ // this.groupBoxSpecialMenu.BackPictureBox = this.smartForm1; this.groupBoxSpecialMenu.BackPictureBox1 = null; + this.groupBoxSpecialMenu.Controls.Add(this.smartLabel6); + this.groupBoxSpecialMenu.Controls.Add(this.labelDataStoragePeriod); + this.groupBoxSpecialMenu.Controls.Add(this.labelStaticDataStoragePeriod); this.groupBoxSpecialMenu.Controls.Add(this.smartLabel2); this.groupBoxSpecialMenu.Controls.Add(this.buttonIntegratedTransmission); this.groupBoxSpecialMenu.Controls.Add(this.labelStaticIntegratedTransmission); @@ -1010,8 +976,6 @@ this.groupBoxSpecialMenu.Controls.Add(this.panel5); this.groupBoxSpecialMenu.Controls.Add(this.labelStaticImpellerBaudrate); this.groupBoxSpecialMenu.Controls.Add(this.labelStaticImpellerRotationDirection); - this.groupBoxSpecialMenu.Controls.Add(this.labelStaticFeedingCVRun); - this.groupBoxSpecialMenu.Controls.Add(this.labelStaticRCRotationDirection); this.groupBoxSpecialMenu.Controls.Add(this.panel7); this.groupBoxSpecialMenu.Controls.Add(this.panel6); this.groupBoxSpecialMenu.Controls.Add(this.panel3); @@ -1044,6 +1008,77 @@ this.groupBoxSpecialMenu.TabIndex = 144; this.groupBoxSpecialMenu.TextColor = System.Drawing.Color.Black; // + // smartLabel2 + // + this.smartLabel2.BackColor = System.Drawing.Color.Silver; + this.smartLabel2.BackPictureBox = this.smartForm1; + this.smartLabel2.BackPictureBox1 = null; + this.smartLabel2.BackPictureBox2 = null; + this.smartLabel2.BorderColor = System.Drawing.Color.Black; + this.smartLabel2.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.smartLabel2.ForeColor = System.Drawing.Color.Red; + this.smartLabel2.InitVisible = true; + this.smartLabel2.LineSpacing = 0F; + this.smartLabel2.Location = new System.Drawing.Point(428, 172); + this.smartLabel2.Name = "smartLabel2"; + this.smartLabel2.Size = new System.Drawing.Size(267, 25); + this.smartLabel2.TabIndex = 248; + this.smartLabel2.Text = "Active Only Stick II"; + this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.smartLabel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel2.Wordwrap = false; + // + // buttonIntegratedTransmission + // + this.buttonIntegratedTransmission.BackPictureBox = null; + this.buttonIntegratedTransmission.BackPictureBox1 = null; + this.buttonIntegratedTransmission.BackPictureBox2 = null; + this.buttonIntegratedTransmission.ButtonColor = System.Drawing.Color.Gray; + this.buttonIntegratedTransmission.ButtonImageAutoSize = true; + this.buttonIntegratedTransmission.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonIntegratedTransmission.DisableImage = null; + this.buttonIntegratedTransmission.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonIntegratedTransmission.DownImage"))); + this.buttonIntegratedTransmission.GroupID = 0; + this.buttonIntegratedTransmission.InitVisible = true; + this.buttonIntegratedTransmission.Location = new System.Drawing.Point(226, 172); + this.buttonIntegratedTransmission.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; + this.buttonIntegratedTransmission.Name = "buttonIntegratedTransmission"; + this.buttonIntegratedTransmission.NestedClickEventPrevent = false; + this.buttonIntegratedTransmission.OutlinePixel = 1; + this.buttonIntegratedTransmission.RepeatInterval = 200; + this.buttonIntegratedTransmission.RepeatIntervalAccelerate = null; + this.buttonIntegratedTransmission.SafeInterval = 200; + this.buttonIntegratedTransmission.Size = new System.Drawing.Size(84, 25); + this.buttonIntegratedTransmission.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonIntegratedTransmission.TabIndex = 247; + this.buttonIntegratedTransmission.TextColor = System.Drawing.Color.Black; + this.buttonIntegratedTransmission.TextDownColor = System.Drawing.Color.White; + this.buttonIntegratedTransmission.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonIntegratedTransmission.TextLocation = new System.Drawing.Point(0, 0); + this.buttonIntegratedTransmission.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonIntegratedTransmission.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonIntegratedTransmission.UpImage"))); + this.buttonIntegratedTransmission.Click += new System.EventHandler(this.control_Click); + // + // labelStaticIntegratedTransmission + // + this.labelStaticIntegratedTransmission.BackPictureBox = this.smartForm1; + this.labelStaticIntegratedTransmission.BackPictureBox1 = null; + this.labelStaticIntegratedTransmission.BackPictureBox2 = null; + this.labelStaticIntegratedTransmission.BorderColor = System.Drawing.Color.Black; + this.labelStaticIntegratedTransmission.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelStaticIntegratedTransmission.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.labelStaticIntegratedTransmission.InitVisible = true; + this.labelStaticIntegratedTransmission.LineSpacing = 0F; + this.labelStaticIntegratedTransmission.Location = new System.Drawing.Point(12, 172); + this.labelStaticIntegratedTransmission.Name = "labelStaticIntegratedTransmission"; + this.labelStaticIntegratedTransmission.Size = new System.Drawing.Size(208, 25); + this.labelStaticIntegratedTransmission.TabIndex = 246; + this.labelStaticIntegratedTransmission.Text = "통합 전송"; + this.labelStaticIntegratedTransmission.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; + this.labelStaticIntegratedTransmission.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelStaticIntegratedTransmission.Wordwrap = false; + // // labelTitle // this.labelTitle.BackPictureBox = this.smartForm1; @@ -1134,76 +1169,64 @@ this.buttonBack.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonBack.UpImage"))); this.buttonBack.Click += new System.EventHandler(this.buttonBack_Click); // - // buttonIntegratedTransmission + // labelDataStoragePeriod // - this.buttonIntegratedTransmission.BackPictureBox = null; - this.buttonIntegratedTransmission.BackPictureBox1 = null; - this.buttonIntegratedTransmission.BackPictureBox2 = null; - this.buttonIntegratedTransmission.ButtonColor = System.Drawing.Color.Gray; - this.buttonIntegratedTransmission.ButtonImageAutoSize = true; - this.buttonIntegratedTransmission.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonIntegratedTransmission.DisableImage = null; - this.buttonIntegratedTransmission.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonIntegratedTransmission.DownImage"))); - this.buttonIntegratedTransmission.GroupID = 0; - this.buttonIntegratedTransmission.InitVisible = true; - this.buttonIntegratedTransmission.Location = new System.Drawing.Point(226, 141); - this.buttonIntegratedTransmission.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; - this.buttonIntegratedTransmission.Name = "buttonIntegratedTransmission"; - this.buttonIntegratedTransmission.NestedClickEventPrevent = false; - this.buttonIntegratedTransmission.OutlinePixel = 1; - this.buttonIntegratedTransmission.RepeatInterval = 200; - this.buttonIntegratedTransmission.RepeatIntervalAccelerate = null; - this.buttonIntegratedTransmission.SafeInterval = 200; - this.buttonIntegratedTransmission.Size = new System.Drawing.Size(84, 25); - this.buttonIntegratedTransmission.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonIntegratedTransmission.TabIndex = 247; - this.buttonIntegratedTransmission.TextColor = System.Drawing.Color.Black; - this.buttonIntegratedTransmission.TextDownColor = System.Drawing.Color.White; - this.buttonIntegratedTransmission.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonIntegratedTransmission.TextLocation = new System.Drawing.Point(0, 0); - this.buttonIntegratedTransmission.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonIntegratedTransmission.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonIntegratedTransmission.UpImage"))); - this.buttonIntegratedTransmission.Click += new System.EventHandler(this.control_Click); + this.labelDataStoragePeriod.BackColor = System.Drawing.SystemColors.Window; + this.labelDataStoragePeriod.BackPictureBox = null; + this.labelDataStoragePeriod.BackPictureBox1 = null; + this.labelDataStoragePeriod.BackPictureBox2 = null; + this.labelDataStoragePeriod.BorderColor = System.Drawing.Color.Black; + this.labelDataStoragePeriod.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelDataStoragePeriod.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Bold); + this.labelDataStoragePeriod.InitVisible = true; + this.labelDataStoragePeriod.LineSpacing = 0F; + this.labelDataStoragePeriod.Location = new System.Drawing.Point(226, 327); + this.labelDataStoragePeriod.Name = "labelDataStoragePeriod"; + this.labelDataStoragePeriod.Size = new System.Drawing.Size(84, 25); + this.labelDataStoragePeriod.TabIndex = 258; + this.labelDataStoragePeriod.Text = "100"; + this.labelDataStoragePeriod.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; + this.labelDataStoragePeriod.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelDataStoragePeriod.Wordwrap = false; + this.labelDataStoragePeriod.Click += new System.EventHandler(this.labelDataStoragePeriod_Click); // - // labelStaticIntegratedTransmission + // labelStaticDataStoragePeriod // - this.labelStaticIntegratedTransmission.BackPictureBox = this.smartForm1; - this.labelStaticIntegratedTransmission.BackPictureBox1 = null; - this.labelStaticIntegratedTransmission.BackPictureBox2 = null; - this.labelStaticIntegratedTransmission.BorderColor = System.Drawing.Color.Black; - this.labelStaticIntegratedTransmission.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticIntegratedTransmission.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); - this.labelStaticIntegratedTransmission.InitVisible = true; - this.labelStaticIntegratedTransmission.LineSpacing = 0F; - this.labelStaticIntegratedTransmission.Location = new System.Drawing.Point(12, 141); - this.labelStaticIntegratedTransmission.Name = "labelStaticIntegratedTransmission"; - this.labelStaticIntegratedTransmission.Size = new System.Drawing.Size(208, 25); - this.labelStaticIntegratedTransmission.TabIndex = 246; - this.labelStaticIntegratedTransmission.Text = "통합 전송"; - this.labelStaticIntegratedTransmission.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; - this.labelStaticIntegratedTransmission.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelStaticIntegratedTransmission.Wordwrap = false; + this.labelStaticDataStoragePeriod.BackPictureBox = this.smartForm1; + this.labelStaticDataStoragePeriod.BackPictureBox1 = null; + this.labelStaticDataStoragePeriod.BackPictureBox2 = null; + this.labelStaticDataStoragePeriod.BorderColor = System.Drawing.Color.Black; + this.labelStaticDataStoragePeriod.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelStaticDataStoragePeriod.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.labelStaticDataStoragePeriod.InitVisible = true; + this.labelStaticDataStoragePeriod.LineSpacing = 0F; + this.labelStaticDataStoragePeriod.Location = new System.Drawing.Point(12, 327); + this.labelStaticDataStoragePeriod.Name = "labelStaticDataStoragePeriod"; + this.labelStaticDataStoragePeriod.Size = new System.Drawing.Size(208, 25); + this.labelStaticDataStoragePeriod.TabIndex = 257; + this.labelStaticDataStoragePeriod.Text = "데이터 저장 기한"; + this.labelStaticDataStoragePeriod.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; + this.labelStaticDataStoragePeriod.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelStaticDataStoragePeriod.Wordwrap = false; // - // smartLabel2 + // smartLabel6 // - this.smartLabel2.BackColor = System.Drawing.Color.Silver; - this.smartLabel2.BackPictureBox = this.smartForm1; - this.smartLabel2.BackPictureBox1 = null; - this.smartLabel2.BackPictureBox2 = null; - this.smartLabel2.BorderColor = System.Drawing.Color.Black; - this.smartLabel2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); - this.smartLabel2.ForeColor = System.Drawing.Color.Red; - this.smartLabel2.InitVisible = true; - this.smartLabel2.LineSpacing = 0F; - this.smartLabel2.Location = new System.Drawing.Point(428, 141); - this.smartLabel2.Name = "smartLabel2"; - this.smartLabel2.Size = new System.Drawing.Size(267, 25); - this.smartLabel2.TabIndex = 248; - this.smartLabel2.Text = "Active Only Stick II"; - this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel2.Wordwrap = false; + this.smartLabel6.BackPictureBox = this.smartForm1; + this.smartLabel6.BackPictureBox1 = null; + this.smartLabel6.BackPictureBox2 = null; + this.smartLabel6.BorderColor = System.Drawing.Color.Black; + this.smartLabel6.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel6.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Regular); + this.smartLabel6.InitVisible = true; + this.smartLabel6.LineSpacing = 0F; + this.smartLabel6.Location = new System.Drawing.Point(316, 327); + this.smartLabel6.Name = "smartLabel6"; + this.smartLabel6.Size = new System.Drawing.Size(174, 25); + this.smartLabel6.TabIndex = 259; + this.smartLabel6.Text = "months"; + this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.smartLabel6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel6.Wordwrap = false; // // FormEquipmentSetting // @@ -1259,8 +1282,6 @@ private System.Windows.Forms.Panel panel7; public System.Windows.Forms.RadioButton radioButtonFeedingConveyorRunNg; public System.Windows.Forms.RadioButton radioButtonFeedingConveyorRunPass; - private SmartX.SmartLabel labelStaticRCRotationDirection; - private SmartX.SmartLabel labelStaticFeedingCVRun; private SmartX.SmartLabel labelStaticImpellerRotationDirection; private SmartX.SmartLabel labelStaticImpellerBaudrate; private System.Windows.Forms.Panel panel5; @@ -1294,5 +1315,8 @@ private SmartX.SmartLabel smartLabel2; private SmartX.SmartButton buttonIntegratedTransmission; private SmartX.SmartLabel labelStaticIntegratedTransmission; + public SmartX.SmartLabel labelDataStoragePeriod; + private SmartX.SmartLabel labelStaticDataStoragePeriod; + private SmartX.SmartLabel smartLabel6; } } \ No newline at end of file diff --git a/INT69DB_2A/Forms/FormEquipmentSetting.cs b/INT69DB_2A/Forms/FormEquipmentSetting.cs index baaf64d..4391fe7 100644 --- a/INT69DB_2A/Forms/FormEquipmentSetting.cs +++ b/INT69DB_2A/Forms/FormEquipmentSetting.cs @@ -58,10 +58,9 @@ namespace INT69DB_2A.Forms this.labelStaticIndividualNG.Text = "Individual NG"; this.labelStaticSelectSensor.Text = "Select Entry sensor"; this.labelStaticRejectConveyor.Text = "Reject conveyor"; - this.labelStaticRCRotationDirection.Text = "┖ Rotation direction"; this.labelStaticFeedingConveyor.Text = "Feeding conveyor"; - this.labelStaticFeedingCVRun.Text = "┖ Operation"; this.labelStaticEquipmentID.Text = "Equipment ID"; + this.labelStaticDataStoragePeriod.Text = "Data storage period"; this.labelStaticImpellerBaudrate.Text = "Impeller:baudrate"; this.labelStaticImpellerRotationDirection.Text = "Impeller:Direction"; this.labelStaticLanguage.Text = "Language"; @@ -85,10 +84,9 @@ namespace INT69DB_2A.Forms this.labelStaticIndividualNG.Text = "单独NG"; this.labelStaticSelectSensor.Text = "选择输入传感器"; this.labelStaticRejectConveyor.Text = "排放输送带"; - this.labelStaticRCRotationDirection.Text = "┖ 排放输送带旋转方向"; this.labelStaticFeedingConveyor.Text = "进料输送带"; - this.labelStaticFeedingCVRun.Text = "┖ 进料输送带驱动"; this.labelStaticEquipmentID.Text = "设备编号"; + this.labelStaticDataStoragePeriod.Text = "数据保存期限"; this.labelStaticImpellerBaudrate.Text = "波特率"; this.labelStaticImpellerRotationDirection.Text = "排放输送机旋转方向"; this.labelStaticLanguage.Text = "语言"; @@ -153,7 +151,7 @@ namespace INT69DB_2A.Forms this.comboBoxStepMotorType.Items.Add("Moons"); } - private void UpdateParameter() + private void UpdateDisplay() { // 장비타입 if (this.ParentForm.SystemConfig.EquipmentMode == 1) @@ -217,6 +215,10 @@ namespace INT69DB_2A.Forms if (this.labelEquipmentID.Text != this.ParentForm.SystemConfig.EquipmentID.ToString()) this.labelEquipmentID.Text = this.ParentForm.SystemConfig.EquipmentID.ToString(); + // 데이터 저장기간 + if (this.labelDataStoragePeriod.Text != this.ParentForm.SystemConfig.DataStoragePeriod.ToString()) + this.labelDataStoragePeriod.Text = this.ParentForm.SystemConfig.DataStoragePeriod.ToString(); + // 임펠러모터 통신속도 if (this.ParentForm.SystemConfig.ImpellerMotorBaudrate == 1) this.radioButtonImpellerMotorBaudrate9600.Checked = true; @@ -266,12 +268,21 @@ namespace INT69DB_2A.Forms public void DisplayRefresh() { - this.UpdateParameter(); + this.UpdateDisplay(); this.ParentForm.SystemConfig.CurrentForm = DataStore.FormStore.FormEquipmentSetting; } #endregion + #region Override Member + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + + this.InitializeDesign(); + } + #endregion + #region Event Handler private void buttonPingTimer_Click(object sender, EventArgs e) { @@ -283,18 +294,6 @@ namespace INT69DB_2A.Forms this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); } - private void control_Click(object sender, EventArgs e) - { - if (this.buttonSave.Visible != true) - this.buttonSave.Visible = true; - - SmartX.SmartButton button = sender as SmartX.SmartButton; - if (button == this.buttonLogin) - { - if (this.ParentForm.SystemConfig.IsPart11 == true) - this.buttonLogin.ButtonDown(); - } - } private void labelEquipmentID_Click(object sender, EventArgs e) { @@ -311,6 +310,39 @@ namespace INT69DB_2A.Forms } } } + private void labelDataStoragePeriod_Click(object sender, EventArgs e) + { + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelDataStoragePeriod.Text, 2, 0, false, this.ParentForm.SystemConfig.Language); + if (myKeyPad.ShowDialog() == DialogResult.OK) + { + if (myKeyPad.doubleValue < 1 || myKeyPad.doubleValue > 99) + { + // 입력범위를 확인하세요 + DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.SystemConfig.Language); + myMsg.ShowDialog(); + } + else + { + this.labelDataStoragePeriod.Text = myKeyPad.StringValue; + + if (this.buttonSave.Visible != true) + this.buttonSave.Visible = true; + } + } + } + + private void control_Click(object sender, EventArgs e) + { + if (this.buttonSave.Visible != true) + this.buttonSave.Visible = true; + + SmartX.SmartButton button = sender as SmartX.SmartButton; + if (button == this.buttonLogin) + { + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.buttonLogin.ButtonDown(); + } + } private void buttonSave_Click(object sender, EventArgs e) { @@ -389,8 +421,8 @@ namespace INT69DB_2A.Forms // 장비 ID this.ParentForm.SystemConfig.EquipmentID = int.Parse(this.labelEquipmentID.Text); - - this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); + // 데이터 저장기간 + this.ParentForm.SystemConfig.DataStoragePeriod = int.Parse(this.labelDataStoragePeriod.Text); // 임펠러모터 통신속도 if (this.radioButtonImpellerMotorBaudrate9600.Checked == true) diff --git a/INT69DB_2A/Forms/FormEquipmentTest.cs b/INT69DB_2A/Forms/FormEquipmentTest.cs index c83062e..62d2317 100644 --- a/INT69DB_2A/Forms/FormEquipmentTest.cs +++ b/INT69DB_2A/Forms/FormEquipmentTest.cs @@ -777,7 +777,7 @@ namespace INT69DB_2A.Forms } private void buttonCut_Click(object sender, EventArgs e) { - this.ParentForm.TransferData(CommunicationCommand.CutInpupt, CommunicationID.MainBoard); + this.ParentForm.TransferData(CommunicationCommand.CutInput, CommunicationID.MainBoard); } private void buttonAllContinue_Click(object sender, EventArgs e) { diff --git a/INT69DB_2A/Forms/FormInitialization.cs b/INT69DB_2A/Forms/FormInitialization.cs index 3bf29bb..64dec60 100644 --- a/INT69DB_2A/Forms/FormInitialization.cs +++ b/INT69DB_2A/Forms/FormInitialization.cs @@ -107,7 +107,8 @@ namespace INT69DB_2A.Forms { string fullFilePath = ""; bool fileCheck = false; - StructSystemConfigurationItem structItem; + StructSystemConfigurationItem structItem1; + StructSystemConfigurationItem1 structItem2; fullFilePath = this.ParentForm.PathSystemFileFolder1 + "system.cfg"; this.ParentForm.smartFileIO.FilePathName = fullFilePath; @@ -119,51 +120,111 @@ namespace INT69DB_2A.Forms this.ParentForm.SystemConfig.Initialization(); - structItem.IsDataBackup = this.ParentForm.SystemConfig.IsDataBackup; - structItem.IsPingTimer = this.ParentForm.SystemConfig.IsPingTimer; - structItem.IsFeedingConveyor = this.ParentForm.SystemConfig.IsFeedingConveyor; - structItem.IsEachNG = this.ParentForm.SystemConfig.IsEachNG; - structItem.IsDischargeConveyor = this.ParentForm.SystemConfig.IsDischargeConveyor; - structItem.IsImpellerMotorDirectionCW = this.ParentForm.SystemConfig.IsImpellerMotorDirectionCW; - structItem.IsPart11 = this.ParentForm.SystemConfig.IsPart11; - structItem.IsWeightViewForward = this.ParentForm.SystemConfig.IsWeightViewForward; - structItem.DecimalPlaces = this.ParentForm.SystemConfig.DecimalPlaces; - structItem.EthernetPort = this.ParentForm.SystemConfig.EthernetPort; - structItem.EquipmentColumns = this.ParentForm.SystemConfig.EquipmentColumns; - structItem.EquipmentID = this.ParentForm.SystemConfig.EquipmentID; - structItem.EquipmentMode = this.ParentForm.SystemConfig.EquipmentMode; - structItem.ProductNumber = this.ParentForm.SystemConfig.ProductNumber; - structItem.DummyInt1 = 1; - structItem.DischargeConveyorDirectionCW = (int)this.ParentForm.SystemConfig.DischargeConveyorDirectionCW; - structItem.UsbID = this.ParentForm.SystemConfig.UsbID; - structItem.DummyString6 = ""; - structItem.Unit = this.ParentForm.SystemConfig.Unit; - structItem.Language = this.ParentForm.SystemConfig.Language; - structItem.ImpellerMotorBaudrate = this.ParentForm.SystemConfig.ImpellerMotorBaudrate; - structItem.ImpellerMotorAnglePass = this.ParentForm.SystemConfig.ImpellerMotorAnglePass; - structItem.SerialNumber = this.ParentForm.SystemConfig.SerialNumber; + #region StructItem1 + structItem1.IsDataBackup = this.ParentForm.SystemConfig.IsDataBackup; + structItem1.IsPingTimer = this.ParentForm.SystemConfig.IsPingTimer; + structItem1.IsFeedingConveyor = this.ParentForm.SystemConfig.IsFeedingConveyor; + structItem1.IsEachNG = this.ParentForm.SystemConfig.IsEachNG; + structItem1.IsDischargeConveyor = this.ParentForm.SystemConfig.IsDischargeConveyor; + structItem1.IsImpellerMotorDirectionCW = this.ParentForm.SystemConfig.IsImpellerMotorDirectionCW; + structItem1.IsPart11 = this.ParentForm.SystemConfig.IsPart11; + structItem1.IsWeightViewForward = this.ParentForm.SystemConfig.IsWeightViewForward; + structItem1.DecimalPlaces = this.ParentForm.SystemConfig.DecimalPlaces; + structItem1.EthernetPort = this.ParentForm.SystemConfig.EthernetPort; + structItem1.EquipmentColumns = this.ParentForm.SystemConfig.EquipmentColumns; + structItem1.EquipmentID = this.ParentForm.SystemConfig.EquipmentID; + structItem1.EquipmentMode = this.ParentForm.SystemConfig.EquipmentMode; + structItem1.ProductNumber = this.ParentForm.SystemConfig.ProductNumber; + structItem1.DummyInt1 = 1; + structItem1.DischargeConveyorDirectionCW = (int)this.ParentForm.SystemConfig.DischargeConveyorDirectionCW; + structItem1.UsbID = this.ParentForm.SystemConfig.UsbID; + structItem1.DummyString6 = ""; + structItem1.Unit = this.ParentForm.SystemConfig.Unit; + structItem1.Language = this.ParentForm.SystemConfig.Language; + structItem1.ImpellerMotorBaudrate = this.ParentForm.SystemConfig.ImpellerMotorBaudrate; + structItem1.ImpellerMotorAnglePass = this.ParentForm.SystemConfig.ImpellerMotorAnglePass; + structItem1.SerialNumber = this.ParentForm.SystemConfig.SerialNumber; // Dummy bool - structItem.DummyBool1 = false; - structItem.IsIntegratedTransmission = this.ParentForm.SystemConfig.IsIntegratedTransmission; - structItem.IsLogin = this.ParentForm.SystemConfig.IsLogin; - structItem.IsFeedingConveyorRunPass = this.ParentForm.SystemConfig.IsFeedingConveyorRunPass; + structItem1.DummyBool1 = false; + structItem1.IsIntegratedTransmission = this.ParentForm.SystemConfig.IsIntegratedTransmission; + structItem1.IsLogin = this.ParentForm.SystemConfig.IsLogin; + structItem1.IsFeedingConveyorRunPass = this.ParentForm.SystemConfig.IsFeedingConveyorRunPass; // Dummy int - structItem.StepMotorType = this.ParentForm.SystemConfig.StepMotorType; - structItem.ImpellerMotorAngleNG = this.ParentForm.SystemConfig.ImpellerMotorAngleNG; - structItem.InputSensorSelect = this.ParentForm.SystemConfig.InputSensorSelect; - structItem.Serial3BaudRate = this.ParentForm.SystemConfig.Serial3BaudRate; - structItem.Serial3Mode = this.ParentForm.SystemConfig.Serial3Mode; + structItem1.StepMotorType = this.ParentForm.SystemConfig.StepMotorType; + structItem1.ImpellerMotorAngleNG = this.ParentForm.SystemConfig.ImpellerMotorAngleNG; + structItem1.InputSensorSelect = this.ParentForm.SystemConfig.InputSensorSelect; + structItem1.Serial3BaudRate = this.ParentForm.SystemConfig.Serial3BaudRate; + structItem1.Serial3Mode = this.ParentForm.SystemConfig.Serial3Mode; // Dummy string - structItem.User_Level1_Name = this.ParentForm.SystemConfig.User_Level1_Name; - structItem.User_Level2_Name = this.ParentForm.SystemConfig.User_Level2_Name; - structItem.User_Level3_Name = this.ParentForm.SystemConfig.User_Level3_Name; - structItem.DummyString4 = ""; - structItem.DummyString5 = ""; + structItem1.User_Level1_Name = this.ParentForm.SystemConfig.User_Level1_Name; + structItem1.User_Level2_Name = this.ParentForm.SystemConfig.User_Level2_Name; + structItem1.User_Level3_Name = this.ParentForm.SystemConfig.User_Level3_Name; + structItem1.DummyString4 = ""; + structItem1.DummyString5 = ""; + #endregion + + this.ParentForm.smartFileIO.WriteStructure(structItem1, 0); + + #region StructItem2 + structItem2.DummyBool1 = false; + structItem2.DummyBool2 = false; + structItem2.DummyBool3 = false; + structItem2.DummyBool4 = false; + structItem2.DummyBool5 = false; + structItem2.DummyBool6 = false; + structItem2.DummyBool7 = false; + structItem2.DummyBool8 = false; + structItem2.DummyBool9 = false; + structItem2.DummyBool10 = false; + structItem2.DummyBool11 = false; + structItem2.DummyBool12 = false; + structItem2.DummyBool13 = false; + structItem2.DummyBool14 = false; + structItem2.DummyBool15 = false; + structItem2.DummyBool16 = false; + structItem2.DummyBool17 = false; + structItem2.DummyBool18 = false; + structItem2.DummyBool19 = false; + structItem2.DummyBool20 = false; + + structItem2.DummyInt1 = 0; + structItem2.DummyInt2 = 0; + structItem2.DummyInt3 = 0; + structItem2.DummyInt4 = 0; + structItem2.DummyInt5 = 0; + structItem2.DummyInt6 = 0; + structItem2.DummyInt7 = 0; + structItem2.DummyInt8 = 0; + structItem2.DummyInt9 = 0; + structItem2.ModbusTcpStartAddress = this.ParentForm.SystemConfig.ModbusTcpStartAddress; + structItem2.ModbusRtuSlaveID = this.ParentForm.SystemConfig.ModbusRtuSlaveID; + structItem2.ModbusTcpAddress1 = this.ParentForm.SystemConfig.ModbusTcpAddress1; + structItem2.ModbusTcpAddress2 = this.ParentForm.SystemConfig.ModbusTcpAddress2; + structItem2.EthernetLocalPort = this.ParentForm.SystemConfig.EthernetLocalPort; + structItem2.EthernetOperationMode = this.ParentForm.SystemConfig.EthernetOperationMode; + structItem2.EthernetMode = this.ParentForm.SystemConfig.EthernetMode; + structItem2.EthernetServerPort = this.ParentForm.SystemConfig.EthernetServerPort; + structItem2.DummyInt10 = 0; + structItem2.AutomaticLogout = this.ParentForm.SystemConfig.AutomaticLogout; + structItem2.DataStoragePeriod = this.ParentForm.SystemConfig.DataStoragePeriod; + + structItem2.DummyString1 = ""; + structItem2.DummyString2 = ""; + structItem2.DummyString3 = ""; + structItem2.DummyString4 = ""; + structItem2.DummyString5 = ""; + structItem2.EthernetServerAddress = this.ParentForm.SystemConfig.EthernetServerAddress; + structItem2.DummyString7 = ""; + structItem2.DummyString8 = ""; + structItem2.DummyString9 = ""; + structItem2.DummyString10 = ""; + #endregion + + this.ParentForm.smartFileIO.WriteStructure(structItem2, 1); - this.ParentForm.smartFileIO.WriteStructure(structItem, 0); this.ParentForm.smartFileIO.Close(); } public void ResetProductFile() diff --git a/INT69DB_2A/Forms/FormMain.cs b/INT69DB_2A/Forms/FormMain.cs index 4dc32f4..33b9c9b 100644 --- a/INT69DB_2A/Forms/FormMain.cs +++ b/INT69DB_2A/Forms/FormMain.cs @@ -3347,6 +3347,7 @@ namespace INT69DB_2A.Forms this.DelegateUISeverStatus(true); this.DelegateTextStatusOut(">Connected Server"); + this.SetTrackingHistoryData(DataStore.TrackingOperation.EthernetConnect, "Client"); if (this.IsCommunicationLogOpen == true) this.smartFileCommunicationLog.WriteString(string.Format("Client ({0:yyyy-MM-dd HH:mm:ss}): Connect", DateTime.Now)); @@ -3417,6 +3418,7 @@ namespace INT69DB_2A.Forms this.IsEthernetThreadStop = true; this.DelegateUISeverStatus(false); this.DelegateTextStatusOut(">Disconnected Server"); + this.SetTrackingHistoryData(DataStore.TrackingOperation.EthernetDisconnect, "Client"); if (null != this.EthernetStmReader) this.EthernetStmReader.Close(); @@ -4562,13 +4564,56 @@ namespace INT69DB_2A.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay - this.TrackingInspectionData(this.CollectionWeightData[0], 1); - this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay1(this.EquipmentStatus, this.CollectionWeightData[0]); this.Update30000ModbusData(0); - this.TreatSerialCommunication(1, this.CollectionWeightData[0]); - this.TreatEthernetCommunication(1, this.CollectionWeightData[0]); + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[0].IsUpdate = true; + this.ChildFormMainDisplay.UpdateStartWeightDisplay1(this.EquipmentStatus, this.CollectionWeightData[0]); + this.TreatSerialCommunication(1, this.CollectionWeightData[0]); + this.TreatEthernetCommunication(1, this.CollectionWeightData[0]); + //this.TrackingInspectionData(this.CollectionWeightData[0], 1); + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 1].IsUpdate = true; + #region 열 순서 Reverse + switch (this.SystemConfig.EquipmentColumns) + { + case 2: + this.ChildFormMainDisplay.UpdateStartWeightDisplay2(this.EquipmentStatus, this.CollectionWeightData[1]); + break; + case 3: + this.ChildFormMainDisplay.UpdateStartWeightDisplay3(this.EquipmentStatus, this.CollectionWeightData[2]); + break; + case 4: + this.ChildFormMainDisplay.UpdateStartWeightDisplay4(this.EquipmentStatus, this.CollectionWeightData[3]); + break; + case 5: + this.ChildFormMainDisplay.UpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightData[4]); + break; + case 6: + this.ChildFormMainDisplay.UpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[5]); + break; + case 7: + this.ChildFormMainDisplay.UpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[6]); + break; + case 8: + this.ChildFormMainDisplay.UpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightData[7]); + break; + case 9: + this.ChildFormMainDisplay.UpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightData[8]); + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[9]); + break; + default: + break; + } + #endregion + } + if (this.SystemConfig.IsIntegratedTransmission == true) { #region 통합 전송 @@ -4599,12 +4644,66 @@ namespace INT69DB_2A.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay - this.TrackingInspectionData(this.CollectionWeightData[1], 2); - this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay2(this.EquipmentStatus, this.CollectionWeightData[1]); this.Update30000ModbusData(1); - this.TreatSerialCommunication(2, this.CollectionWeightData[1]); - this.TreatEthernetCommunication(2, this.CollectionWeightData[1]); + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[1].IsUpdate = true; + this.ChildFormMainDisplay.UpdateStartWeightDisplay2(this.EquipmentStatus, this.CollectionWeightData[1]); + this.TreatSerialCommunication(2, this.CollectionWeightData[1]); + this.TreatEthernetCommunication(2, this.CollectionWeightData[1]); + //this.TrackingInspectionData(this.CollectionWeightData[1], 2); + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 2].IsUpdate = true; + + #region 열 순서 Reverse + switch (this.SystemConfig.EquipmentColumns) + { + case 2: + this.ChildFormMainDisplay.UpdateStartWeightDisplay2(this.EquipmentStatus, this.CollectionWeightData[0]); + break; + case 3: + this.ChildFormMainDisplay.UpdateStartWeightDisplay3(this.EquipmentStatus, this.CollectionWeightData[1]); + break; + case 4: + this.ChildFormMainDisplay.UpdateStartWeightDisplay4(this.EquipmentStatus, this.CollectionWeightData[2]); + break; + case 5: + this.ChildFormMainDisplay.UpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightData[3]); + break; + case 6: + this.ChildFormMainDisplay.UpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[4]); + break; + case 7: + this.ChildFormMainDisplay.UpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[5]); + break; + case 8: + this.ChildFormMainDisplay.UpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightData[6]); + break; + case 9: + this.ChildFormMainDisplay.UpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightData[7]); + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[8]); + break; + default: + break; + } + #endregion + } + + if (this.SystemConfig.IsIntegratedTransmission == true) + { + #region 통합 전송 + if (this.timerTimeOutTransmission.Enabled == false) + this.timerTimeOutTransmission.Enabled = true; + + // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) + this.IntegratedTransmissionCheck(this.CollectionWeightData); + #endregion + } #endregion } else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest) @@ -4625,12 +4724,65 @@ namespace INT69DB_2A.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay - this.TrackingInspectionData(this.CollectionWeightData[2], 3); - this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay3(this.EquipmentStatus, this.CollectionWeightData[2]); this.Update30000ModbusData(2); - this.TreatSerialCommunication(3, this.CollectionWeightData[2]); - this.TreatEthernetCommunication(3, this.CollectionWeightData[2]); + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[2].IsUpdate = true; + this.ChildFormMainDisplay.UpdateStartWeightDisplay3(this.EquipmentStatus, this.CollectionWeightData[2]); + this.TreatSerialCommunication(3, this.CollectionWeightData[2]); + this.TreatEthernetCommunication(3, this.CollectionWeightData[2]); + //this.TrackingInspectionData(this.CollectionWeightData[2], 3); + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 3].IsUpdate = true; + + #region 열 순서 Reverse + switch (this.SystemConfig.EquipmentColumns) + { + case 2: + break; + case 3: + this.ChildFormMainDisplay.UpdateStartWeightDisplay3(this.EquipmentStatus, this.CollectionWeightData[0]); + break; + case 4: + this.ChildFormMainDisplay.UpdateStartWeightDisplay4(this.EquipmentStatus, this.CollectionWeightData[1]); + break; + case 5: + this.ChildFormMainDisplay.UpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightData[2]); + break; + case 6: + this.ChildFormMainDisplay.UpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[3]); + break; + case 7: + this.ChildFormMainDisplay.UpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[4]); + break; + case 8: + this.ChildFormMainDisplay.UpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightData[5]); + break; + case 9: + this.ChildFormMainDisplay.UpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightData[6]); + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[7]); + break; + default: + break; + } + #endregion + } + + if (this.SystemConfig.IsIntegratedTransmission == true) + { + #region 통합 전송 + if (this.timerTimeOutTransmission.Enabled == false) + this.timerTimeOutTransmission.Enabled = true; + + // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) + this.IntegratedTransmissionCheck(this.CollectionWeightData); + #endregion + } #endregion } else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest) @@ -4651,12 +4803,63 @@ namespace INT69DB_2A.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay - this.TrackingInspectionData(this.CollectionWeightData[3], 4); - this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay4(this.EquipmentStatus, this.CollectionWeightData[3]); this.Update30000ModbusData(3); - this.TreatSerialCommunication(4, this.CollectionWeightData[3]); - this.TreatEthernetCommunication(4, this.CollectionWeightData[3]); + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[3].IsUpdate = true; + this.ChildFormMainDisplay.UpdateStartWeightDisplay4(this.EquipmentStatus, this.CollectionWeightData[3]); + this.TreatSerialCommunication(4, this.CollectionWeightData[3]); + this.TreatEthernetCommunication(4, this.CollectionWeightData[3]); + //this.TrackingInspectionData(this.CollectionWeightData[3], 4); + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 4].IsUpdate = true; + + #region 열 순서 Reverse + switch (this.SystemConfig.EquipmentColumns) + { + case 2: + case 3: + break; + case 4: + this.ChildFormMainDisplay.UpdateStartWeightDisplay4(this.EquipmentStatus, this.CollectionWeightData[0]); + break; + case 5: + this.ChildFormMainDisplay.UpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightData[1]); + break; + case 6: + this.ChildFormMainDisplay.UpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[2]); + break; + case 7: + this.ChildFormMainDisplay.UpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[3]); + break; + case 8: + this.ChildFormMainDisplay.UpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightData[4]); + break; + case 9: + this.ChildFormMainDisplay.UpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightData[5]); + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[6]); + break; + default: + break; + } + #endregion + } + + if (this.SystemConfig.IsIntegratedTransmission == true) + { + #region 통합 전송 + if (this.timerTimeOutTransmission.Enabled == false) + this.timerTimeOutTransmission.Enabled = true; + + // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) + this.IntegratedTransmissionCheck(this.CollectionWeightData); + #endregion + } #endregion } else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest) @@ -4677,12 +4880,61 @@ namespace INT69DB_2A.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay - this.TrackingInspectionData(this.CollectionWeightData[4], 5); - this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightData[4]); this.Update30000ModbusData(4); - this.TreatSerialCommunication(5, this.CollectionWeightData[4]); - this.TreatEthernetCommunication(5, this.CollectionWeightData[4]); + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[4].IsUpdate = true; + this.ChildFormMainDisplay.UpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightData[4]); + this.TreatSerialCommunication(5, this.CollectionWeightData[4]); + this.TreatEthernetCommunication(5, this.CollectionWeightData[4]); + //this.TrackingInspectionData(this.CollectionWeightData[4], 5); + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 5].IsUpdate = true; + + #region 열 순서 Reverse + switch (this.SystemConfig.EquipmentColumns) + { + case 2: + case 3: + case 4: + break; + case 5: + this.ChildFormMainDisplay.UpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightData[0]); + break; + case 6: + this.ChildFormMainDisplay.UpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[1]); + break; + case 7: + this.ChildFormMainDisplay.UpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[2]); + break; + case 8: + this.ChildFormMainDisplay.UpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightData[3]); + break; + case 9: + this.ChildFormMainDisplay.UpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightData[4]); + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[5]); + break; + default: + break; + } + #endregion + } + + if (this.SystemConfig.IsIntegratedTransmission == true) + { + #region 통합 전송 + if (this.timerTimeOutTransmission.Enabled == false) + this.timerTimeOutTransmission.Enabled = true; + + // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) + this.IntegratedTransmissionCheck(this.CollectionWeightData); + #endregion + } #endregion } else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest) @@ -4703,12 +4955,59 @@ namespace INT69DB_2A.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay - this.TrackingInspectionData(this.CollectionWeightData[5], 6); - this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[5]); this.Update30000ModbusData(5); - this.TreatSerialCommunication(6, this.CollectionWeightData[5]); - this.TreatEthernetCommunication(6, this.CollectionWeightData[5]); + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[5].IsUpdate = true; + this.ChildFormMainDisplay.UpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[5]); + this.TreatSerialCommunication(6, this.CollectionWeightData[5]); + this.TreatEthernetCommunication(6, this.CollectionWeightData[5]); + //this.TrackingInspectionData(this.CollectionWeightData[5], 6); + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 6].IsUpdate = true; + + #region 열 순서 Reverse + switch (this.SystemConfig.EquipmentColumns) + { + case 2: + case 3: + case 4: + case 5: + break; + case 6: + this.ChildFormMainDisplay.UpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[0]); + break; + case 7: + this.ChildFormMainDisplay.UpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[1]); + break; + case 8: + this.ChildFormMainDisplay.UpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightData[2]); + break; + case 9: + this.ChildFormMainDisplay.UpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightData[3]); + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[4]); + break; + default: + break; + } + #endregion + } + + if (this.SystemConfig.IsIntegratedTransmission == true) + { + #region 통합 전송 + if (this.timerTimeOutTransmission.Enabled == false) + this.timerTimeOutTransmission.Enabled = true; + + // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) + this.IntegratedTransmissionCheck(this.CollectionWeightData); + #endregion + } #endregion } else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest) @@ -4729,12 +5028,57 @@ namespace INT69DB_2A.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay - this.TrackingInspectionData(this.CollectionWeightData[6], 7); - this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[6]); this.Update30000ModbusData(6); - this.TreatSerialCommunication(7, this.CollectionWeightData[6]); - this.TreatEthernetCommunication(7, this.CollectionWeightData[6]); + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[6].IsUpdate = true; + this.ChildFormMainDisplay.UpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[6]); + this.TreatSerialCommunication(7, this.CollectionWeightData[6]); + this.TreatEthernetCommunication(7, this.CollectionWeightData[6]); + //this.TrackingInspectionData(this.CollectionWeightData[6], 7); + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 7].IsUpdate = true; + + #region 열 순서 Reverse + switch (this.SystemConfig.EquipmentColumns) + { + case 2: + case 3: + case 4: + case 5: + case 6: + break; + case 7: + this.ChildFormMainDisplay.UpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[0]); + break; + case 8: + this.ChildFormMainDisplay.UpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightData[1]); + break; + case 9: + this.ChildFormMainDisplay.UpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightData[2]); + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[3]); + break; + default: + break; + } + #endregion + } + + if (this.SystemConfig.IsIntegratedTransmission == true) + { + #region 통합 전송 + if (this.timerTimeOutTransmission.Enabled == false) + this.timerTimeOutTransmission.Enabled = true; + + // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) + this.IntegratedTransmissionCheck(this.CollectionWeightData); + #endregion + } #endregion } else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest) @@ -4754,13 +5098,56 @@ namespace INT69DB_2A.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { - #region FormMainDisplay - this.TrackingInspectionData(this.CollectionWeightData[7], 8); - this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightData[7]); + #region FormMainDisplay this.Update30000ModbusData(7); - this.TreatSerialCommunication(8, this.CollectionWeightData[7]); - this.TreatEthernetCommunication(8, this.CollectionWeightData[7]); + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[7].IsUpdate = true; + this.ChildFormMainDisplay.UpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightData[7]); + this.TreatSerialCommunication(8, this.CollectionWeightData[7]); + this.TreatEthernetCommunication(8, this.CollectionWeightData[7]); + //this.TrackingInspectionData(this.CollectionWeightData[7], 8); + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 8].IsUpdate = true; + + #region 열 순서 Reverse + switch (this.SystemConfig.EquipmentColumns) + { + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + break; + case 8: + this.ChildFormMainDisplay.UpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightData[0]); + break; + case 9: + this.ChildFormMainDisplay.UpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightData[1]); + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[2]); + break; + default: + break; + } + #endregion + } + + if (this.SystemConfig.IsIntegratedTransmission == true) + { + #region 통합 전송 + if (this.timerTimeOutTransmission.Enabled == false) + this.timerTimeOutTransmission.Enabled = true; + + // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) + this.IntegratedTransmissionCheck(this.CollectionWeightData); + #endregion + } #endregion } else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest) @@ -4781,12 +5168,53 @@ namespace INT69DB_2A.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay - this.TrackingInspectionData(this.CollectionWeightData[8], 9); - this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightData[8]); this.Update30000ModbusData(8); - this.TreatSerialCommunication(9, this.CollectionWeightData[8]); - this.TreatEthernetCommunication(9, this.CollectionWeightData[8]); + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[8].IsUpdate = true; + this.ChildFormMainDisplay.UpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightData[8]); + this.TreatSerialCommunication(9, this.CollectionWeightData[8]); + this.TreatEthernetCommunication(9, this.CollectionWeightData[8]); + //this.TrackingInspectionData(this.CollectionWeightData[8], 9); + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 9].IsUpdate = true; + + #region 열 순서 Reverse + switch (this.SystemConfig.EquipmentColumns) + { + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + break; + case 9: + this.ChildFormMainDisplay.UpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightData[0]); + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[1]); + break; + default: + break; + } + #endregion + } + + if (this.SystemConfig.IsIntegratedTransmission == true) + { + #region 통합 전송 + if (this.timerTimeOutTransmission.Enabled == false) + this.timerTimeOutTransmission.Enabled = true; + + // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) + this.IntegratedTransmissionCheck(this.CollectionWeightData); + #endregion + } #endregion } else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest) @@ -4807,12 +5235,51 @@ namespace INT69DB_2A.Forms if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { #region FormMainDisplay - this.TrackingInspectionData(this.CollectionWeightData[9], 10); - this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[9]); this.Update30000ModbusData(9); - this.TreatSerialCommunication(10, this.CollectionWeightData[9]); - this.TreatEthernetCommunication(10, this.CollectionWeightData[9]); + if (this.SystemConfig.IsWeightViewForward == true) + { + this.CollectionWeightData[9].IsUpdate = true; + this.ChildFormMainDisplay.UpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[9]); + this.TreatSerialCommunication(10, this.CollectionWeightData[9]); + this.TreatEthernetCommunication(10, this.CollectionWeightData[9]); + //this.TrackingInspectionData(this.CollectionWeightData[9], 10); + } + else + { + this.CollectionWeightData[this.CollectionWeightData.Count - 10].IsUpdate = true; + + #region 열 순서 Reverse + switch (this.SystemConfig.EquipmentColumns) + { + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + break; + case 10: + this.ChildFormMainDisplay.UpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[0]); + break; + default: + break; + } + #endregion + } + + if (this.SystemConfig.IsIntegratedTransmission == true) + { + #region 통합 전송 + if (this.timerTimeOutTransmission.Enabled == false) + this.timerTimeOutTransmission.Enabled = true; + + // EquipmentColumns 수 만큼 중량이 들어왔는지 체크 후 데이터 전송하는 함수(EquipmentColumns 갯수가 다 들어아야 데이터 전송함) + this.IntegratedTransmissionCheck(this.CollectionWeightData); + #endregion + } #endregion } else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest) @@ -4825,28 +5292,57 @@ namespace INT69DB_2A.Forms #region Value Assign if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { - for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) + if (this.SystemConfig.IsWeightViewForward == true) { - this.CollectionWeightData[i].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(i * 12, 2)); - this.CollectionWeightData[i].Weight = Helper.StringToWeight(receiveData.Substring(i * 12 + 2, 5), this.SystemConfig.DecimalPlaces); - this.CollectionWeightData[i].WeightString = receiveData.Substring(i * 12 + 2, 5); - this.CollectionWeightData[i].ADCValue = receiveData.Substring(i * 12 + 7, 5); + for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) + { + this.CollectionWeightData[i].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(i * 12, 2)); + this.CollectionWeightData[i].Weight = Helper.StringToWeight(receiveData.Substring(i * 12 + 2, 5), this.SystemConfig.DecimalPlaces); + this.CollectionWeightData[i].WeightString = receiveData.Substring(i * 12 + 2, 5); + this.CollectionWeightData[i].ADCValue = receiveData.Substring(i * 12 + 7, 5); + + this.Update30000ModbusData(i); + } + } + else + { + for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++) + { + this.CollectionWeightData[this.CollectionWeightData.Count - i].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring((i - 1) * 12, 2)); + this.CollectionWeightData[this.CollectionWeightData.Count - i].Weight = Helper.StringToWeight(receiveData.Substring((i - 1) * 12 + 2, 5), this.SystemConfig.DecimalPlaces); + this.CollectionWeightData[this.CollectionWeightData.Count - i].WeightString = receiveData.Substring((i - 1) * 12 + 2, 5); + this.CollectionWeightData[this.CollectionWeightData.Count - i].ADCValue = receiveData.Substring((i - 1) * 12 + 7, 5); + + this.Update30000ModbusData(this.CollectionWeightData.Count - i); + } } } else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest) { - for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) + if (this.SystemConfig.IsWeightViewForward == true) { - this.CollectionWeightDataTest[i].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(i * 12, 2)); - this.CollectionWeightDataTest[i].Weight = Helper.StringToWeight(receiveData.Substring(i * 12 + 2, 5), this.SystemConfig.DecimalPlaces); - this.CollectionWeightDataTest[i].ADCValue = receiveData.Substring(i * 12 + 7, 5); + for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) + { + this.CollectionWeightDataTest[i].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(i * 12, 2)); + this.CollectionWeightDataTest[i].Weight = Helper.StringToWeight(receiveData.Substring(i * 12 + 2, 5), this.SystemConfig.DecimalPlaces); + this.CollectionWeightDataTest[i].ADCValue = receiveData.Substring(i * 12 + 7, 5); + } + } + else + { + for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++) + { + this.CollectionWeightDataTest[this.CollectionWeightDataTest.Count - i].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring((i - 1) * 12, 2)); + this.CollectionWeightDataTest[this.CollectionWeightDataTest.Count - i].Weight = Helper.StringToWeight(receiveData.Substring((i - 1) * 12 + 2, 5), this.SystemConfig.DecimalPlaces); + this.CollectionWeightDataTest[this.CollectionWeightDataTest.Count - i].ADCValue = receiveData.Substring((i - 1) * 12 + 7, 5); + } } } #endregion if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) { this.TrackingInspectionData(this.CollectionWeightData); - this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay(this.EquipmentStatus, this.CollectionWeightData); + this.ChildFormMainDisplay.UpdateStartWeightDisplay(this.EquipmentStatus, this.CollectionWeightData); for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) this.Update30000ModbusData(i); @@ -5660,7 +6156,7 @@ namespace INT69DB_2A.Forms structItem2.EthernetServerPort = this.SystemConfig.EthernetServerPort; structItem2.DummyInt10 = 0; structItem2.AutomaticLogout = this.SystemConfig.AutomaticLogout; - structItem2.StoragePeriod = this.SystemConfig.StoragePeriod; + structItem2.DataStoragePeriod = this.SystemConfig.DataStoragePeriod; structItem2.DummyString1 = ""; structItem2.DummyString2 = ""; @@ -5783,7 +6279,7 @@ namespace INT69DB_2A.Forms structItem2.EthernetServerPort = item.EthernetServerPort; structItem2.DummyInt10 = 0; structItem2.AutomaticLogout = item.AutomaticLogout; - structItem2.StoragePeriod = item.StoragePeriod; + structItem2.DataStoragePeriod = item.DataStoragePeriod; structItem2.DummyString1 = ""; structItem2.DummyString2 = ""; @@ -5895,7 +6391,7 @@ namespace INT69DB_2A.Forms this.SystemConfig.ModbusRtuSlaveID = structItem2.ModbusRtuSlaveID; this.SystemConfig.ModbusTcpAddress1 = structItem2.ModbusTcpAddress1; this.SystemConfig.ModbusTcpAddress2 = structItem2.ModbusTcpAddress2; - this.SystemConfig.StoragePeriod = structItem2.StoragePeriod; + this.SystemConfig.DataStoragePeriod = structItem2.DataStoragePeriod; this.SystemConfig.AutomaticLogout = structItem2.AutomaticLogout; } catch @@ -6924,7 +7420,7 @@ namespace INT69DB_2A.Forms foreach (string file in Directory.GetFiles(path)) { FileInfo fi = new FileInfo(file); - if (DateTime.ParseExact(fi.Name.Substring(1, 8), "yyyyMMdd", null) < DateTime.Now.AddMonths(-1 * this.SystemConfig.StoragePeriod)) + if (DateTime.ParseExact(fi.Name.Substring(1, 8), "yyyyMMdd", null) < DateTime.Now.AddMonths(-1 * this.SystemConfig.DataStoragePeriod)) fi.Delete(); } } @@ -6963,7 +7459,7 @@ namespace INT69DB_2A.Forms } } /// - /// 스틱1 + /// 스틱1, 스틱2 통합백업 /// /// private void TrackingInspectionData(Collection items) @@ -7041,17 +7537,37 @@ namespace INT69DB_2A.Forms for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) { - sw.Write(","); - sw.Write(Helper.DoubleToString(items[i].Weight, this.SystemConfig.DecimalPlaces)); - sw.Write(","); - sw.Write(items[i].JudgmentStatus); + if (this.SystemConfig.EquipmentMode == 2) + { + if (items[i].IsUpdate == true) + { + sw.Write(","); + sw.Write(Helper.DoubleToString(items[i].Weight, this.SystemConfig.DecimalPlaces)); + sw.Write(","); + sw.Write(items[i].JudgmentStatus); + } + else + { + sw.Write(","); + sw.Write(Helper.DoubleToString(0.0, this.SystemConfig.DecimalPlaces)); + sw.Write(","); + sw.Write(DataStore.JudgmentStatus.Empty); + } + } + else + { + sw.Write(","); + sw.Write(Helper.DoubleToString(items[i].Weight, this.SystemConfig.DecimalPlaces)); + sw.Write(","); + sw.Write(items[i].JudgmentStatus); + } } sw.WriteLine(); sw.Close(); } } /// - /// 스틱2 + /// 스틱2 -> 사용X /// /// private void TrackingInspectionData(WeightData item, int lane) @@ -7134,13 +7650,14 @@ namespace INT69DB_2A.Forms private void RemoveInspectionDataFile() { + bool directoryCheck = false; + try { if (this.SystemConfig.IsPart11 == true) this.DeleteLogFile(this.PathDataInspectionFolder, DataStore.E_DataType.Inspection); else { - bool directoryCheck = false; string dday = string.Format("{0:yyyyMMdd}", DateTime.Now.AddDays(-180)) + ".csv"; DirectoryInfo dir = new DirectoryInfo(this.PathDataInspectionFolder); @@ -7343,6 +7860,9 @@ namespace INT69DB_2A.Forms { this.InitializeUserManager(); this.SystemConfig.CurrentUser.Group = DataStore.UserGroup.LogOut; + + if (this.SystemConfig.IsPart11 == false) + UserManager.UserManager_AutoLogoutTimeoutPause(); } else this.SystemConfig.CurrentUser.Group = DataStore.UserGroup.NotLogin; diff --git a/INT69DB_2A/Forms/FormMainDisplay.cs b/INT69DB_2A/Forms/FormMainDisplay.cs index c96ac13..10e43f7 100644 --- a/INT69DB_2A/Forms/FormMainDisplay.cs +++ b/INT69DB_2A/Forms/FormMainDisplay.cs @@ -583,6 +583,7 @@ namespace INT69DB_2A.Forms { UserManager.UserManager_AutoLogoutTimeoutReset(); } + public string DisplayExpireOfPassword(DataStore.UserGroup group) { string ret = ""; @@ -872,7 +873,9 @@ namespace INT69DB_2A.Forms } public void UpdateDisplayUser(UserItem user) { - string id = "", group = "", expireDate = ""; + string id = "", group = "", expirePW = ""; + int expireDate = 0; + Color colorExpirePW = this.ParentForm.ColorLogOff; switch (user.Group) { @@ -959,13 +962,13 @@ namespace INT69DB_2A.Forms this.labelUserLevel.ForeColor = this.labelUserID.ForeColor = this.ParentForm.ColorLogOn; this.buttonUser.ButtonDown(); - this.buttonProductNo.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMainDisplayProductNo; - this.buttonSubMenu.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMainDisplaySubMenu; - this.buttonClear.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMainDisplayClear; - this.buttonUnder.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMainDisplayWeightSetting; - this.buttonPass.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMainDisplayWeightSetting; - this.buttonOver.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMainDisplayWeightSetting; - this.buttonTare.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMainDisplayWeightSetting; + this.buttonProductNo.Enabled = true; + this.buttonSubMenu.Enabled = true; + this.buttonClear.Enabled = true; + this.buttonUnder.Enabled = true; + this.buttonPass.Enabled = true; + this.buttonOver.Enabled = true; + this.buttonTare.Enabled = true; this.buttonMenu.Enabled = true; break; @@ -1049,45 +1052,43 @@ namespace INT69DB_2A.Forms { if (this.ParentForm.SystemConfig.IsPart11 == true) { - expireDate = this.DisplayExpireOfPassword(user.Group); - if (expireDate != "-") + if (user.ExpirePassword != 0) { - int intExpireDate = int.Parse(expireDate); - - if (intExpireDate == 0) + expireDate = user.GetPasswordExpiryDday(); + if (expireDate == 9999) { - this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOff; - this.labelExpireOfPassword.Text = "D-0"; - } - else if (intExpireDate < 0) - { - if (intExpireDate * -1 > this.ParentForm.SystemConfig.CurrentUser.ExpirePassword) - expireDate = "-" + (this.ParentForm.SystemConfig.CurrentUser.ExpirePassword - 1).ToString(); - - this.labelExpireOfPassword.Text = "D" + expireDate; - if (intExpireDate >= -10) - this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOff; - else - this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOn; + // Administrator or Developer + colorExpirePW = this.ParentForm.ColorLogOn; + expirePW = "-"; } else { - this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOn; - this.labelExpireOfPassword.Text = "D+" + expireDate; + if (expireDate >= -10) + { + colorExpirePW = this.ParentForm.ColorLogOff; + if (expireDate > 0) + expirePW = string.Format("D+{0}", expireDate); + else + expirePW = string.Format("D{0}", expireDate); + } + else + { + colorExpirePW = this.ParentForm.ColorLogOn; + expirePW = string.Format("D{0}", expireDate); + } } } else { - // Administrator or Developer - this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOn; - this.labelExpireOfPassword.Text = "-"; + colorExpirePW = this.ParentForm.ColorLogOn; + expirePW = "-"; } } else { // Part11 미사용 - this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOn; - this.labelExpireOfPassword.Text = "-"; + colorExpirePW = this.ParentForm.ColorLogOn; + expirePW = "-"; } } @@ -1095,6 +1096,10 @@ namespace INT69DB_2A.Forms this.labelUserLevel.Text = group; if (this.labelUserID.Text != id) this.labelUserID.Text = id; + if (this.labelExpireOfPassword.ForeColor != colorExpirePW) + this.labelExpireOfPassword.ForeColor = colorExpirePW; + if (this.labelExpireOfPassword.Text != expirePW) + this.labelExpireOfPassword.Text = expirePW; } public void Clear() @@ -1729,7 +1734,7 @@ namespace INT69DB_2A.Forms break; } } - public void UpdateUpdateStartWeightDisplay(DataStore.EquipmentStatus status, Collection weightDatas) + public void UpdateStartWeightDisplay(DataStore.EquipmentStatus status, Collection weightDatas) { string value = ""; @@ -1809,7 +1814,7 @@ namespace INT69DB_2A.Forms this.SetTotalCount(); } - public void UpdateUpdateStartWeightDisplay1(DataStore.EquipmentStatus status, WeightData weightData) + public void UpdateStartWeightDisplay1(DataStore.EquipmentStatus status, WeightData weightData) { string value = ""; @@ -1892,7 +1897,7 @@ namespace INT69DB_2A.Forms this.SetTotalCount(); } - public void UpdateUpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData weightData) + public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData weightData) { switch (this.ParentForm.SystemConfig.EquipmentColumns) { @@ -1966,7 +1971,7 @@ namespace INT69DB_2A.Forms this.SetTotalCount(); } - public void UpdateUpdateStartWeightDisplay3(DataStore.EquipmentStatus status, WeightData weightData) + public void UpdateStartWeightDisplay3(DataStore.EquipmentStatus status, WeightData weightData) { switch (this.ParentForm.SystemConfig.EquipmentColumns) { @@ -2034,7 +2039,7 @@ namespace INT69DB_2A.Forms this.SetTotalCount(); } - public void UpdateUpdateStartWeightDisplay4(DataStore.EquipmentStatus status, WeightData weightData) + public void UpdateStartWeightDisplay4(DataStore.EquipmentStatus status, WeightData weightData) { switch (this.ParentForm.SystemConfig.EquipmentColumns) { @@ -2096,7 +2101,7 @@ namespace INT69DB_2A.Forms this.SetTotalCount(); } - public void UpdateUpdateStartWeightDisplay5(DataStore.EquipmentStatus status, WeightData weightData) + public void UpdateStartWeightDisplay5(DataStore.EquipmentStatus status, WeightData weightData) { switch (this.ParentForm.SystemConfig.EquipmentColumns) { @@ -2152,7 +2157,7 @@ namespace INT69DB_2A.Forms this.SetTotalCount(); } - public void UpdateUpdateStartWeightDisplay6(DataStore.EquipmentStatus status, WeightData weightData) + public void UpdateStartWeightDisplay6(DataStore.EquipmentStatus status, WeightData weightData) { switch (this.ParentForm.SystemConfig.EquipmentColumns) { @@ -2202,7 +2207,7 @@ namespace INT69DB_2A.Forms this.SetTotalCount(); } - public void UpdateUpdateStartWeightDisplay7(DataStore.EquipmentStatus status, WeightData weightData) + public void UpdateStartWeightDisplay7(DataStore.EquipmentStatus status, WeightData weightData) { switch (this.ParentForm.SystemConfig.EquipmentColumns) { @@ -2246,7 +2251,7 @@ namespace INT69DB_2A.Forms this.SetTotalCount(); } - public void UpdateUpdateStartWeightDisplay8(DataStore.EquipmentStatus status, WeightData weightData) + public void UpdateStartWeightDisplay8(DataStore.EquipmentStatus status, WeightData weightData) { switch (this.ParentForm.SystemConfig.EquipmentColumns) { @@ -2284,7 +2289,7 @@ namespace INT69DB_2A.Forms this.SetTotalCount(); } - public void UpdateUpdateStartWeightDisplay9(DataStore.EquipmentStatus status, WeightData weightData) + public void UpdateStartWeightDisplay9(DataStore.EquipmentStatus status, WeightData weightData) { switch (this.ParentForm.SystemConfig.EquipmentColumns) { @@ -2316,7 +2321,7 @@ namespace INT69DB_2A.Forms this.SetTotalCount(); } - public void UpdateUpdateStartWeightDisplay10(DataStore.EquipmentStatus status, WeightData weightData) + public void UpdateStartWeightDisplay10(DataStore.EquipmentStatus status, WeightData weightData) { switch (this.ParentForm.SystemConfig.EquipmentColumns) { @@ -2719,33 +2724,7 @@ namespace INT69DB_2A.Forms if (this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.LogOut) { - //string[] sValue; - //int day; - this.Login(); - - // 만료 10일 이내면 패스워드 변경 권유창 생성 - //sValue = this.labelExpireOfPassword.Text.Split('-'); - //day = int.Parse(sValue[sValue.Count() - 1]); - //if (day <= 10) - //{ - // DialogFormYesNo df = new DialogFormYesNo(this.ParentForm.SystemConfig.Language, 2, day.ToString()); - // df.BringToFront(); - // if (df.ShowDialog() == DialogResult.Yes) - // { - //DialogFormLogOn changePW = new DialogFormLogOn(this.ParentForm, this.ParentForm.SystemConfig.Language, this.textBoxID.Text); - //if (changePW.ShowDialog() == DialogResult.OK) - //{ - // UserManager.UserManager_UserLockRelease(this.textBoxID.Text, false, true); - // UserManager.UserManager_UserLoginDirect(this.textBoxID.Text, this.ParentForm.SystemConfig.CurrentUser.Password, ref this.UserInfo); - - // this.SuccessLogin(this.UserInfo); - //} - // } - //} - - - // 만료 시 패스워드 변경 } else { @@ -3125,7 +3104,7 @@ namespace INT69DB_2A.Forms if (this.ParentForm.SystemConfig.IsPart11 == true) this.Part11AutomaticLogoutReset(); - this.ParentForm.TransferData(CommunicationCommand.CutInpupt, CommunicationID.MainBoard); + this.ParentForm.TransferData(CommunicationCommand.CutInput, CommunicationID.MainBoard); this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MainCut, ""); } diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormDataStatistics.resources b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormDataStatistics.resources index 7cdbce7f89a21a67c01992a00750bc65b930e8dd..c136bd84683ee93be53dc468cd392ed584f308fd 100644 GIT binary patch delta 2454 zcmdnCpYi5F#tqwim}EsJ@9>e~U}Iolus`u|{bqlO8C><8ex5FlAr*0NuNX2Oa$s;Z zOxdtu^Y#5KCbF;BH|*1N)_GD|cb##8a$LiV3dW@E754Yd8TfBxALSOH3Q0{{R3 delta 2161 zcmcb4ka637#tqwin0^UO-r*y|!NkD8uwhl%kInuPGq~zGv^`xMLn`9lUUB3-6u`jh zIOPFnYiV%ooqK9etrOH%C&tfzJ#C5mHHDWGOg*fwNZmVd|F*yy#uIG`ybfk8*$kT$ zBbX=f9+Yax;kd?-;=F-PLAuG5;U=+4>ZxN4*{0N!>R_^M!fsJLMWIKzW9q3Fm1H@l zo}5HOmQC0#s;4*wQ|6d@67mXVHet7@p4^N}CCAiLr4%9GG4&*tSLEA--J*I*3QsCH zrk-jgIeCt$C!@|F&nD~^)l*u5QRtX@;;TvuZNhF*5NY+cQ}%=e~U}Iolus`u|{bqlO8C><8ex5FlAr*0NuNX2Oa$s;Z zOxdtu^Y#5KCbF;BH|*1N)_GD|cb##8a$LiV3dW@E754Yd8TfBxALSOH3Q0{{R3 delta 2161 zcmcb4ka637#tqwin0^UO-r*y|!NkD8uwhl%kInuPGq~zGv^`xMLn`9lUUB3-6u`jh zIOPFnYiV%ooqK9etrOH%C&tfzJ#C5mHHDWGOg*fwNZmVd|F*yy#uIG`ybfk8*$kT$ zBbX=f9+Yax;kd?-;=F-PLAuG5;U=+4>ZxN4*{0N!>R_^M!fsJLMWIKzW9q3Fm1H@l zo}5HOmQC0#s;4*wQ|6d@67mXVHet7@p4^N}CCAiLr4%9GG4&*tSLEA--J*I*3QsCH zrk-jgIeCt$C!@|F&nD~^)l*u5QRtX@;;TvuZNhF*5NY+cQ}%=