diff --git a/INT69DB_2A/Controls/ControlUserSetting.Designer.cs b/INT69DB_2A/Controls/ControlUserSetting.Designer.cs
index a55a52e..2f07de6 100644
--- a/INT69DB_2A/Controls/ControlUserSetting.Designer.cs
+++ b/INT69DB_2A/Controls/ControlUserSetting.Designer.cs
@@ -52,7 +52,7 @@
this.labelStatusExpirePassword.ForeColor = System.Drawing.Color.DarkRed;
this.labelStatusExpirePassword.InitVisible = true;
this.labelStatusExpirePassword.LineSpacing = 0F;
- this.labelStatusExpirePassword.Location = new System.Drawing.Point(642, 252);
+ this.labelStatusExpirePassword.Location = new System.Drawing.Point(639, 247);
this.labelStatusExpirePassword.Name = "labelStatusExpirePassword";
this.labelStatusExpirePassword.Size = new System.Drawing.Size(100, 30);
this.labelStatusExpirePassword.TabIndex = 240;
@@ -73,7 +73,7 @@
this.labelStatusExpireAccount.ForeColor = System.Drawing.Color.DarkRed;
this.labelStatusExpireAccount.InitVisible = true;
this.labelStatusExpireAccount.LineSpacing = 0F;
- this.labelStatusExpireAccount.Location = new System.Drawing.Point(642, 216);
+ this.labelStatusExpireAccount.Location = new System.Drawing.Point(639, 211);
this.labelStatusExpireAccount.Name = "labelStatusExpireAccount";
this.labelStatusExpireAccount.Size = new System.Drawing.Size(100, 30);
this.labelStatusExpireAccount.TabIndex = 239;
@@ -84,7 +84,7 @@
//
// labelExpirePasswordDate
//
- this.labelExpirePasswordDate.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.labelExpirePasswordDate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(228)))), ((int)(((byte)(180)))));
this.labelExpirePasswordDate.BackPictureBox = null;
this.labelExpirePasswordDate.BackPictureBox1 = null;
this.labelExpirePasswordDate.BackPictureBox2 = null;
@@ -92,7 +92,7 @@
this.labelExpirePasswordDate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labelExpirePasswordDate.InitVisible = true;
this.labelExpirePasswordDate.LineSpacing = 0F;
- this.labelExpirePasswordDate.Location = new System.Drawing.Point(345, 252);
+ this.labelExpirePasswordDate.Location = new System.Drawing.Point(342, 247);
this.labelExpirePasswordDate.Name = "labelExpirePasswordDate";
this.labelExpirePasswordDate.Size = new System.Drawing.Size(291, 30);
this.labelExpirePasswordDate.TabIndex = 242;
@@ -103,7 +103,7 @@
//
// labelExpireAccountDate
//
- this.labelExpireAccountDate.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.labelExpireAccountDate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(228)))), ((int)(((byte)(180)))));
this.labelExpireAccountDate.BackPictureBox = null;
this.labelExpireAccountDate.BackPictureBox1 = null;
this.labelExpireAccountDate.BackPictureBox2 = null;
@@ -111,7 +111,7 @@
this.labelExpireAccountDate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labelExpireAccountDate.InitVisible = true;
this.labelExpireAccountDate.LineSpacing = 0F;
- this.labelExpireAccountDate.Location = new System.Drawing.Point(345, 216);
+ this.labelExpireAccountDate.Location = new System.Drawing.Point(342, 211);
this.labelExpireAccountDate.Name = "labelExpireAccountDate";
this.labelExpireAccountDate.Size = new System.Drawing.Size(291, 30);
this.labelExpireAccountDate.TabIndex = 241;
@@ -132,7 +132,7 @@
this.smartLabel2.ForeColor = System.Drawing.Color.White;
this.smartLabel2.InitVisible = true;
this.smartLabel2.LineSpacing = 0F;
- this.smartLabel2.Location = new System.Drawing.Point(152, 252);
+ this.smartLabel2.Location = new System.Drawing.Point(149, 247);
this.smartLabel2.Name = "smartLabel2";
this.smartLabel2.Size = new System.Drawing.Size(187, 30);
this.smartLabel2.TabIndex = 238;
@@ -153,7 +153,7 @@
this.labelTitleExpireAccount.ForeColor = System.Drawing.Color.White;
this.labelTitleExpireAccount.InitVisible = true;
this.labelTitleExpireAccount.LineSpacing = 0F;
- this.labelTitleExpireAccount.Location = new System.Drawing.Point(152, 216);
+ this.labelTitleExpireAccount.Location = new System.Drawing.Point(149, 211);
this.labelTitleExpireAccount.Name = "labelTitleExpireAccount";
this.labelTitleExpireAccount.Size = new System.Drawing.Size(187, 30);
this.labelTitleExpireAccount.TabIndex = 237;
@@ -172,7 +172,7 @@
this.labelPassword.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelPassword.InitVisible = true;
this.labelPassword.LineSpacing = 0F;
- this.labelPassword.Location = new System.Drawing.Point(345, 180);
+ this.labelPassword.Location = new System.Drawing.Point(342, 175);
this.labelPassword.Name = "labelPassword";
this.labelPassword.Size = new System.Drawing.Size(291, 30);
this.labelPassword.TabIndex = 236;
@@ -194,7 +194,7 @@
this.labelTitlePassword.ForeColor = System.Drawing.Color.White;
this.labelTitlePassword.InitVisible = true;
this.labelTitlePassword.LineSpacing = 0F;
- this.labelTitlePassword.Location = new System.Drawing.Point(152, 180);
+ this.labelTitlePassword.Location = new System.Drawing.Point(149, 175);
this.labelTitlePassword.Name = "labelTitlePassword";
this.labelTitlePassword.Size = new System.Drawing.Size(187, 30);
this.labelTitlePassword.TabIndex = 235;
@@ -213,7 +213,7 @@
this.labelID.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelID.InitVisible = true;
this.labelID.LineSpacing = 0F;
- this.labelID.Location = new System.Drawing.Point(345, 144);
+ this.labelID.Location = new System.Drawing.Point(342, 139);
this.labelID.Name = "labelID";
this.labelID.Size = new System.Drawing.Size(291, 30);
this.labelID.TabIndex = 234;
@@ -234,7 +234,7 @@
this.labelTitleID.ForeColor = System.Drawing.Color.White;
this.labelTitleID.InitVisible = true;
this.labelTitleID.LineSpacing = 0F;
- this.labelTitleID.Location = new System.Drawing.Point(152, 144);
+ this.labelTitleID.Location = new System.Drawing.Point(149, 139);
this.labelTitleID.Name = "labelTitleID";
this.labelTitleID.Size = new System.Drawing.Size(187, 30);
this.labelTitleID.TabIndex = 233;
@@ -259,7 +259,7 @@
this.Controls.Add(this.labelID);
this.Controls.Add(this.labelTitleID);
this.Name = "ControlUserSetting";
- this.Size = new System.Drawing.Size(800, 452);
+ this.Size = new System.Drawing.Size(800, 446);
this.ResumeLayout(false);
}
diff --git a/INT69DB_2A/Controls/ControlUserSetting.cs b/INT69DB_2A/Controls/ControlUserSetting.cs
index b0fb29d..1847926 100644
--- a/INT69DB_2A/Controls/ControlUserSetting.cs
+++ b/INT69DB_2A/Controls/ControlUserSetting.cs
@@ -103,8 +103,8 @@ namespace INT69DB_2A.Controls
this.labelID.Text = item.ID;
this.labelPassword.Text = item.Password;
- this.labelExpireAccountDate.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DateRegister, item.DateExpireRegister);
- this.labelExpirePasswordDate.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DateLogin, item.DateExpireLogin);
+ this.labelExpireAccountDate.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DateIdLogin, item.DateIdExpire);
+ this.labelExpirePasswordDate.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DatePasswordRegister, item.DatePasswordExpire);
this.labelStatusExpireAccount.Visible = item.IsLockAccount;
this.labelStatusExpirePassword.Visible = item.IsLockPassword;
}
@@ -176,7 +176,7 @@ namespace INT69DB_2A.Controls
private void labelPassword_Click(object sender, EventArgs e)
{
string value = "";
- DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelPassword.Text, this.labelTitlePassword.Text);
+ DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelPassword.Text);
if (keyboard.ShowDialog() == DialogResult.OK)
{
diff --git a/INT69DB_2A/DataStore.cs b/INT69DB_2A/DataStore.cs
index ca35b0b..7f56133 100644
--- a/INT69DB_2A/DataStore.cs
+++ b/INT69DB_2A/DataStore.cs
@@ -36,16 +36,18 @@ namespace INT69DB_2A
FormEquipmentTest,
FormUserEditor,
FormUserGroupEditor,
- FormDataBackup,
+ FormOption,
+ // 하단 세 항목은 위치를 맨 뒤로 고정할 것
FormDataStatistics,
+ FormDataBackup,
FormDataViewer,
};
- public enum FormMainDisplayStore
+ public enum MainDisplayStore
{
- FormMainDisplayBarGraph,
- FormMainDisplayDotGraph,
- FormMainDisplayTable,
+ BarGraph,
+ LineGraph,
+ Table,
};
public enum LanguageID
@@ -374,6 +376,7 @@ namespace INT69DB_2A
SerialNumber,
EquipmentColumns,
TimeStamp,
+ EquipmentType,
}
public enum MessageBoxIcon
@@ -426,6 +429,10 @@ namespace INT69DB_2A
MotorChangeID,
MotorChangeValueEach,
MotorChangeValueAll,
+ TryEthernetStart,
+ TryEthernetStop,
+ EthernetConnect,
+ EthernetDisconnect,
}
public enum TrackingParameter
{
@@ -495,9 +502,10 @@ namespace INT69DB_2A
MotorPosition1,
MotorPosition2,
- ChangeL1Name,
- ChangeL2Name,
- ChangeL3Name,
+ Level1Name,
+ Level2Name,
+ Level3Name,
+ AutoLogout,
}
public enum TrackingAlarm
{
@@ -565,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";
// 운전
@@ -1142,6 +1150,8 @@ namespace INT69DB_2A
private bool m_IsPrintPerProductEnable;
private bool m_IsIndividualTransmission;
private bool m_IsPingTimer;
+ private bool m_IsOptDataStatistics;
+ private bool m_IsIntegratedTransmission;
private int m_DecimalPlaces;
private int m_EthernetPort;
@@ -1175,14 +1185,13 @@ namespace INT69DB_2A
private int m_ModbusTcpAddress2;
private int m_ModbusTcpStartAddress;
private string m_EthernetServerAddress;
-
+
private bool m_IsPart11;
- private int m_AutomaticLogout;
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_UserAutomaticLogout;
+ private int m_DataStoragePeriod;
+ private int m_AutomaticLogout;
#endregion
#region Constructor
@@ -1274,6 +1283,16 @@ namespace INT69DB_2A
get { return this.m_IsPingTimer; }
set { this.m_IsPingTimer = value; }
}
+ public bool IsOptDataStatistics
+ {
+ get { return this.m_IsOptDataStatistics; }
+ set { this.m_IsOptDataStatistics = value; }
+ }
+ public bool IsIntegratedTransmission
+ {
+ get { return this.m_IsIntegratedTransmission; }
+ set { this.m_IsIntegratedTransmission = value; }
+ }
public int DecimalPlaces
{
@@ -1429,11 +1448,6 @@ namespace INT69DB_2A
get { return this.m_IsPart11; }
set { this.m_IsPart11 = value; }
}
- public int AutomaticLogout
- {
- get { return this.m_AutomaticLogout; }
- set { this.m_AutomaticLogout = value; }
- }
public string User_Level1_Name
{
get { return this.m_User_Level1_Name; }
@@ -1449,15 +1463,15 @@ 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 UserAutomaticLogout
+ public int AutomaticLogout
{
- get { return this.m_UserAutomaticLogout; }
- set { this.m_UserAutomaticLogout = value; }
+ get { return this.m_AutomaticLogout; }
+ set { this.m_AutomaticLogout = value; }
}
#endregion
@@ -1478,6 +1492,8 @@ namespace INT69DB_2A
this.IsCutView = false;
this.IsPrintPerProductEnable = false;
this.IsPingTimer = false;
+ this.IsOptDataStatistics = false;
+ this.IsIntegratedTransmission = false;
this.DecimalPlaces = 1;
this.EthernetPort = 5000;
@@ -1514,12 +1530,11 @@ namespace INT69DB_2A
this.EthernetServerAddress = "0.0.0.0";
this.IsPart11 = false;
- this.AutomaticLogout = 30;
this.User_Level1_Name = "Level 1";
this.User_Level2_Name = "Level 2";
this.User_Level3_Name = "Level 3";
- this.StoragePeriod = 12;
- this.UserAutomaticLogout = 90;
+ this.DataStoragePeriod = 36;
+ this.AutomaticLogout = 90;
}
#endregion
}
@@ -1543,7 +1558,7 @@ namespace INT69DB_2A
public int EquipmentID;
public int EquipmentMode;
public int ProductNumber;
- public int AutomaticLogout;
+ public int DummyInt1;
public int DischargeConveyorDirectionCW;
public int UsbID;
public int ImpellerMotorBaudrate;
@@ -1561,7 +1576,7 @@ namespace INT69DB_2A
public DataStore.LanguageID Language;
public bool DummyBool1;
- public bool DummyBool2;
+ public bool IsIntegratedTransmission;
public bool IsLogin;
public bool IsFeedingConveyorRunPass;
@@ -1624,8 +1639,8 @@ namespace INT69DB_2A
public int EthernetMode;
public int EthernetServerPort;
public int DummyInt10;
- public int UserAutomaticLogout;
- public int StoragePeriod;
+ public int AutomaticLogout;
+ public int DataStoragePeriod;
[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 8)]
public string DummyString1;
@@ -1826,6 +1841,8 @@ namespace INT69DB_2A
private int PreviousTimeTickCount;
private bool m_IsStart;
+ private bool m_IsUpdate;
+
private string m_WeightString;
private ushort m_UpdateCount;
#endregion
@@ -1965,7 +1982,6 @@ namespace INT69DB_2A
}
}
}
-
public DataStore.WeightStatus Status
{
get { return this.m_Status; }
@@ -1983,6 +1999,15 @@ namespace INT69DB_2A
set { this.m_IsStart = value; }
}
+ ///
+ /// 스틱2모드에서 데이터 갱신이 되었으면 true, 안되었으면 false
+ ///
+ public bool IsUpdate
+ {
+ get { return this.m_IsUpdate; }
+ set { this.m_IsUpdate = value; }
+ }
+
public string WeightString
{
get { return this.m_WeightString; }
@@ -2013,6 +2038,7 @@ namespace INT69DB_2A
this.ExNGCount = 0;
this.Weight = 0.0;
this.ADCValue = "12345";
+ this.IsUpdate = false;
this.JudgmentStatus = DataStore.JudgmentStatus.Empty;
this.ProductionSpeed = 0;
this.WeightString = "0";
@@ -3547,7 +3573,7 @@ namespace INT69DB_2A
#endregion
#region Property
- public bool TpyeAlarm
+ public bool TypeAlarm
{
get { return this.m_TpyeAlarm; }
set { this.m_TpyeAlarm = value; }
@@ -3567,7 +3593,7 @@ namespace INT69DB_2A
#region Method
private void Initialize()
{
- this.TpyeAlarm = true;
+ this.TypeAlarm = true;
this.TypeOperation = true;
this.TypeParameter = true;
}
@@ -3723,6 +3749,7 @@ namespace INT69DB_2A
{
#region Field
private int m_EquipmentColumns;
+ private int m_EquipmentType;
private string m_LoginId;
private string m_SerialNumber;
@@ -3742,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 be71787..35cdf88 100644
--- a/INT69DB_2A/DialogForms/DialogFormDataStatistics.Designer.cs
+++ b/INT69DB_2A/DialogForms/DialogFormDataStatistics.Designer.cs
@@ -34,8 +34,6 @@
this.buttonRead = new SmartX.SmartButton();
this.labelFileName = new SmartX.SmartLabel();
this.smartGroupBox1 = new SmartX.SmartGroupBox();
- this.smartLabel5 = new SmartX.SmartLabel();
- this.labelId = new SmartX.SmartLabel();
this.smartLabel3 = new SmartX.SmartLabel();
this.labelProductNo = new SmartX.SmartLabel();
this.smartLabel2 = new SmartX.SmartLabel();
@@ -127,8 +125,6 @@
//
this.smartGroupBox1.BackPictureBox = this.smartForm1;
this.smartGroupBox1.BackPictureBox1 = null;
- this.smartGroupBox1.Controls.Add(this.smartLabel5);
- this.smartGroupBox1.Controls.Add(this.labelId);
this.smartGroupBox1.Controls.Add(this.smartLabel3);
this.smartGroupBox1.Controls.Add(this.labelProductNo);
this.smartGroupBox1.Controls.Add(this.smartLabel2);
@@ -152,48 +148,6 @@
this.smartGroupBox1.Text = "smartGroupBox1";
this.smartGroupBox1.TextColor = System.Drawing.Color.Black;
//
- // smartLabel5
- //
- this.smartLabel5.BackColor = System.Drawing.Color.DimGray;
- this.smartLabel5.BackPictureBox = null;
- this.smartLabel5.BackPictureBox1 = null;
- this.smartLabel5.BackPictureBox2 = null;
- this.smartLabel5.BorderColor = System.Drawing.Color.DimGray;
- this.smartLabel5.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.smartLabel5.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
- this.smartLabel5.ForeColor = System.Drawing.Color.White;
- this.smartLabel5.InitVisible = true;
- this.smartLabel5.LineSpacing = 0F;
- this.smartLabel5.Location = new System.Drawing.Point(237, 180);
- this.smartLabel5.Name = "smartLabel5";
- this.smartLabel5.Size = new System.Drawing.Size(100, 20);
- this.smartLabel5.TabIndex = 20;
- this.smartLabel5.Text = "ID";
- this.smartLabel5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.smartLabel5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.smartLabel5.Wordwrap = false;
- //
- // labelId
- //
- this.labelId.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
- this.labelId.BackPictureBox = null;
- this.labelId.BackPictureBox1 = null;
- this.labelId.BackPictureBox2 = null;
- this.labelId.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
- this.labelId.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.labelId.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
- this.labelId.ForeColor = System.Drawing.Color.White;
- this.labelId.InitVisible = true;
- this.labelId.LineSpacing = 0F;
- this.labelId.Location = new System.Drawing.Point(237, 202);
- this.labelId.Name = "labelId";
- this.labelId.Size = new System.Drawing.Size(100, 20);
- this.labelId.TabIndex = 19;
- this.labelId.Text = "1";
- this.labelId.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.labelId.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelId.Wordwrap = false;
- //
// smartLabel3
//
this.smartLabel3.BackColor = System.Drawing.Color.DimGray;
@@ -227,7 +181,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;
@@ -269,7 +223,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;
@@ -358,8 +312,6 @@
private SmartX.SmartGroupBox smartGroupBox1;
private SmartX.SmartButton buttonClose;
private SmartX.SmartLabel labelNodeIndex;
- private SmartX.SmartLabel smartLabel5;
- private SmartX.SmartLabel labelId;
private SmartX.SmartLabel smartLabel3;
private SmartX.SmartLabel labelProductNo;
private SmartX.SmartLabel smartLabel2;
diff --git a/INT69DB_2A/DialogForms/DialogFormDataStatistics.cs b/INT69DB_2A/DialogForms/DialogFormDataStatistics.cs
index 928ee70..ec3d16d 100644
--- a/INT69DB_2A/DialogForms/DialogFormDataStatistics.cs
+++ b/INT69DB_2A/DialogForms/DialogFormDataStatistics.cs
@@ -17,8 +17,11 @@ namespace INT69DB_2A.DialogForms
{
#region Field
private FormDataStatistics m_ParentForm;
+
+ public List ListFiles; // 파일 리스트 - Part11 미사용 시
+ public List ListInspectionFile; // 파일 리스트 - Part11 사용 시
#endregion
-
+
#region Constructor
public DialogFormDataStatistics(FormDataStatistics parent)
{
@@ -29,7 +32,7 @@ namespace INT69DB_2A.DialogForms
this.InitializeDesign();
this.InitializeContnrol();
this.DefaultSetting();
- }
+ }
#endregion
#region Property
@@ -42,7 +45,7 @@ namespace INT69DB_2A.DialogForms
#region Method
private void InitializeDesign()
- {
+ {
}
private void InitializeContnrol()
{
@@ -52,108 +55,107 @@ namespace INT69DB_2A.DialogForms
y = Screen.PrimaryScreen.Bounds.Height / 2 - this.Size.Height / 2;
this.Location = new Point(x, y);
-
- this.Size = new Size(450, 165);
+ this.Size = new Size(350, 470);
}
private void DefaultSetting()
{
- this.DisplayTreeViewUpdate();
+ this.ListFiles = new List();
+ this.ListInspectionFile = new List();
+
+ if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == false)
+ this.DisplayTreeViewUpdate1();
+ else
+ this.DisplayTreeViewUpdate2();
this.labelNodeIndex.Text = "-";
this.labelFileName.Text = "-";
this.labelDate.Text = "-";
this.labelProductNo.Text = "-";
- this.labelId.Text = "-";
}
- private Collection> FileClassification(List files)
+ private List DirectorySort(DirectoryInfo[] directorys)
{
- string date = "", date1 = "";
- Collection> fileClassification = new Collection>();
- List list = new List();
+ List listDirectory = new List();
+ Dictionary dirNames = new Dictionary();
- for (int i = 0; i < files.Count; i++)
- {
- date = files[i].Substring(0, 12);
- if (i == 0)
- date1 = date;
+ foreach (DirectoryInfo dir in directorys)
+ dirNames.Add(dir.Name, int.Parse(dir.Name));
- if (date == date1)
- {
- list.Add(files[i]);
- }
- else
- {
- date1 = date;
+ // 순서데로 오름차순 정렬
+ var vrList = dirNames.OrderBy(x => x.Value);
+ foreach (var v in vrList)
+ listDirectory.Add(v.Key);
- List l = new List();
-
- foreach (string s in list)
- l.Add(s);
-
- fileClassification.Add(l);
- list = new List();
- list.Add(files[i]);
- }
- }
-
- List ls = new List();
- foreach (string s in list)
- ls.Add(s);
- fileClassification.Add(ls);
-
- return fileClassification;
+ return listDirectory;
}
- private List FileSort(FileInfo[] files)
+ private List DayInspectionDirectorySort(FileInfo[] files)
{
- List listFiles = new List();
- Dictionary fileNames = new Dictionary();
- Dictionary fileNamesSort = new Dictionary();
+ string[] fileName;
+ List listFile = new List();
+ Dictionary dirNames = new Dictionary();
+ #region File List 품번 순서데로 정렬
foreach (FileInfo file in files)
{
- if (file.Name.StartsWith("20") == true)
- fileNames.Add(file.Name, int.Parse(file.Name.Substring(11, 1)));
+ fileName = file.Name.Split('_');
+ dirNames.Add(file.Name, int.Parse(fileName[1].Substring(0, fileName[1].Length - 4)));
}
- var vrList = fileNames.Keys.ToList();
- vrList.Sort();
-
+ var vrList = dirNames.OrderBy(x => x.Value);
foreach (var v in vrList)
- fileNamesSort.Add(v, fileNames[v]);
+ listFile.Add(v.Key);
+ #endregion
- foreach (var v in fileNamesSort)
- listFiles.Add(v.Key);
+ #region File List 날짜 순서데로 정렬
+ dirNames = new Dictionary();
+ foreach (string f in listFile)
+ dirNames.Add(f, int.Parse(f.Substring(0, 8)));
- return listFiles;
+ listFile.Clear();
+ vrList = dirNames.OrderBy(x => x.Value);
+ foreach (var v in vrList)
+ listFile.Add(v.Key);
+ #endregion
+
+ return listFile;
}
- private List FileSort(List lst)
+ private List DayInspectionDirectorySort2(FileInfo[] files)
{
- List listFiles = new List();
- Dictionary fileNames = new Dictionary();
- Dictionary fileNamesSort = new Dictionary();
+ string[] fileName;
+ List listFile = new List();
+ Dictionary dirNames = new Dictionary();
- foreach (string list in lst)
+ #region File List 품번 순서데로 정렬
+ foreach (FileInfo file in files)
{
- if (list.Length == 22)
- fileNames.Add(list, int.Parse(list.Substring(13, 1)));
- else
- fileNames.Add(list, int.Parse(list.Substring(13, 2)));
+ fileName = file.Name.Split('_');
+ dirNames.Add(file.Name, int.Parse(fileName[1].Substring(0, fileName[1].Length - 4)));
}
- // Lane 순서데로 오름차순 정렬
- var vrList = fileNames.OrderBy(x => x.Value);
-
+ var vrList = dirNames.OrderBy(x => x.Value);
foreach (var v in vrList)
- listFiles.Add(v.Key);
+ listFile.Add(v.Key);
+ #endregion
- return listFiles;
+ #region File List 날짜 순서데로 정렬
+ dirNames = new Dictionary();
+ foreach (string f in listFile)
+ dirNames.Add(f, int.Parse(f.Substring(1, 8)));
+
+ listFile.Clear();
+ vrList = dirNames.OrderBy(x => x.Value);
+ foreach (var v in vrList)
+ listFile.Add(v.Key);
+ #endregion
+
+ return listFile;
}
- private void DisplayTreeViewUpdate()
+ ///
+ /// Part11 미사용
+ ///
+ private void DisplayTreeViewUpdate1()
{
- int fileCount = 0;
-
DirectoryInfo dir = new DirectoryInfo(this.ParentForm.ParentForm.PathDataBackupFolder);
List fileNames = new List();
@@ -163,44 +165,108 @@ namespace INT69DB_2A.DialogForms
FileInfo[] files = dir.GetFiles();
- foreach (FileInfo file in files)
+ if (files.Length != 0)
{
- if (file.Name.StartsWith("20") == true)
- fileCount++;
- }
+ // 날짜, 품번 순으로 정렬
+ fileNames = this.DayInspectionDirectorySort(files);
+ this.ListFiles = fileNames;
- if (fileCount != 0)
- {
- // 파일 이름 순으로 정렬
- fileNames = this.FileSort(files);
- // 파일 날짜 순으로 분류
- this.ParentForm.CollectionFileClassification = this.FileClassification(fileNames);
-
- foreach (List list in this.ParentForm.CollectionFileClassification)
+ foreach (string name in fileNames)
{
- List myList = new List();
+ this.treeView1.Nodes.Add(name);
+ }
+ }
+ }
+ ///
+ /// Part11 사용
+ ///
+ private void DisplayTreeViewUpdate2()
+ {
+ int fileCount = 0;
+ //TreeNode node;
+ List years = new List();
+ List months = new List();
+ List days = new List();
- // Lane 순서데로 오름 차순 정렬
- if (list.Count > 1 && list[0].Length > 18)
- myList = this.FileSort(list);
- else
- myList = list;
+ this.treeView1.Nodes.Clear();
+ this.ListInspectionFile.Clear();
- TreeNode node = new TreeNode(myList[0].Substring(0, 12));
+ DirectoryInfo dir = new DirectoryInfo(this.ParentForm.ParentForm.PathDataInspectionFolder);
+ List fileNames = new List();
- for (int i = 0; i < myList.Count; i++)
+ // 폴더 체크
+ if (dir.Exists == false)
+ dir.Create();
+
+ // year 폴더 가져오기
+ DirectoryInfo[] yearDirectorys = dir.GetDirectories();
+ // year 폴더 정렬
+ years = this.DirectorySort(yearDirectorys);
+
+ // Inspection File 리스트 생성
+ if (years.Count != 0)
+ {
+ // Year
+ foreach (string year in years)
+ {
+ DataBackupYear y = new DataBackupYear(year);
+ DirectoryInfo monthDir = new DirectoryInfo(string.Format("{0}{1}", this.ParentForm.ParentForm.PathDataInspectionFolder, year));
+ DirectoryInfo[] monthDirectorys = monthDir.GetDirectories();
+
+ months = this.DirectorySort(monthDirectorys);
+
+ if (months.Count != 0)
{
- node.Nodes.Add(myList[i]);
- }
+ // Month
+ foreach (string month in months)
+ {
+ DirectoryInfo dayDir = new DirectoryInfo(string.Format("{0}{1}\\{2}", this.ParentForm.ParentForm.PathDataInspectionFolder, year, month));
+ FileInfo[] dayFiles = dayDir.GetFiles();
+ days = this.DayInspectionDirectorySort2(dayFiles);
+
+ DataBackupMonth m = new DataBackupMonth(month);
+ m.Days = days;
+
+ y.Months.Add(m);
+ }
+
+ this.ListInspectionFile.Add(y);
+ }
+ else
+ {
+ this.ListInspectionFile.Add(y);
+ }
+ }
+
+ // node 생성
+ for (int i = 0; i < this.ListInspectionFile.Count; i++)
+ {
+ TreeNode node = new TreeNode(this.ListInspectionFile[i].Year);
+ for (int j = 0; j < this.ListInspectionFile[i].Months.Count; j++)
+ {
+ TreeNode nodeMonth = new TreeNode(this.ListInspectionFile[i].Months[j].Month);
+
+ for (int k = 0; k < this.ListInspectionFile[i].Months[j].Days.Count; k++)
+ {
+ nodeMonth.Nodes.Add(this.ListInspectionFile[i].Months[j].Days[k]);
+ fileCount++;
+ }
+ node.Nodes.Add(nodeMonth);
+ }
this.treeView1.Nodes.Add(node);
}
}
+
+ //this.labelInspectionFileCount.Text = fileCount.ToString();
}
public void DisplayRefresh()
{
- this.DisplayTreeViewUpdate();
+ if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == false)
+ this.DisplayTreeViewUpdate1();
+ else
+ this.DisplayTreeViewUpdate2();
}
#endregion
@@ -209,30 +275,23 @@ namespace INT69DB_2A.DialogForms
{
int ret = 0;
- if (this.ParentForm.SelectNodeIndex == -1)
+ if (this.ParentForm.SelectFilePath == "")
return;
this.treeView1.Enabled = false;
this.buttonRead.Enabled = false;
this.buttonClose.Enabled = false;
- if (this.treeView1.Nodes.Count != 0)
+ this.ParentForm.ClearData();
+ ret = this.ParentForm.DataRead();
+
+ if (ret == 0)
{
- this.ParentForm.ClearData();
-
- if (this.ParentForm.ParentForm.SystemConfig.EquipmentMode == 2)
- ret = this.ParentForm.DataRead2();
- else
- ret = this.ParentForm.DataRead1();
-
- if (ret == 0)
- {
- this.DialogResult = DialogResult.OK;
- this.Close();
- }
- else
- this.DialogResult = DialogResult.Cancel;
+ this.DialogResult = DialogResult.OK;
+ this.Close();
}
+ else
+ this.DialogResult = DialogResult.Cancel;
this.treeView1.Enabled = true;
this.buttonRead.Enabled = true;
@@ -246,25 +305,34 @@ namespace INT69DB_2A.DialogForms
private void treeView1_AfterSelect(object sender, TreeViewEventArgs e)
{
- string fileName = "";
+ string fileName = "", pathFileName = "";
+ string[] name;
- if (e.Node.Parent == null)
+ if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == false)
{
fileName = e.Node.Text;
- this.ParentForm.SelectNodeIndex = e.Node.Index;
- //this.labelNodeIndex.Text = string.Format("{0}", this.ParentForm.SelectNodeIndex + 1);
+
+ this.ParentForm.SelectFilePath = string.Format("{0}{1}", this.ParentForm.ParentForm.PathDataBackupFolder, fileName);
+ name = fileName.Split('_');
+ this.labelFileName.Text = fileName;
+ this.labelDate.Text = string.Format("{0}.{1}.{2}", name[0].Substring(0, 4), name[0].Substring(4, 2), name[0].Substring(6, 2));
+ this.labelProductNo.Text = name[1].Substring(0, name[1].Length - 4);
}
else
{
- fileName = e.Node.Parent.Text;
- this.ParentForm.SelectNodeIndex = e.Node.Parent.Index;
- //this.labelNodeIndex.Text = string.Format("{0}", this.ParentForm.SelectNodeIndex + 1);
- }
+ if (e.Node.Text.Length > 10)
+ {
+ fileName = e.Node.Text;
+ pathFileName = string.Format("{0}{1}\\{2}\\{3}",
+ this.ParentForm.ParentForm.PathDataInspectionFolder, fileName.Substring(1, 4), int.Parse(fileName.Substring(5, 2)), fileName);
+ this.ParentForm.SelectFilePath = pathFileName;
- this.labelFileName.Text = fileName;
- this.labelDate.Text = string.Format("{0}.{1}.{2}", fileName.Substring(0, 4), fileName.Substring(4, 2), fileName.Substring(6, 2));
- this.labelProductNo.Text = fileName.Substring(9, 1);
- this.labelId.Text = fileName.Substring(11, 1);
+ name = fileName.Split('_');
+ this.labelFileName.Text = fileName;
+ this.labelDate.Text = string.Format("{0}.{1}.{2}", name[0].Substring(1, 4), name[0].Substring(5, 2), name[0].Substring(7, 2));
+ this.labelProductNo.Text = name[1].Substring(0, name[1].Length - 4);
+ }
+ }
}
#endregion
}
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 @@
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
- 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
- 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 4ed4205..8a7c3f3 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;
@@ -66,8 +66,7 @@ namespace INT69DB_2A.DialogForms
y = Screen.PrimaryScreen.Bounds.Height / 2 - this.Size.Height / 2;
this.Location = new Point(x, y);
-
- this.Size = new Size(450, 165);
+ this.Size = new Size(710, 470);
}
private void DefaultSetting()
{
@@ -76,7 +75,7 @@ namespace INT69DB_2A.DialogForms
private void UpdateDisplay(DataViewerFilter filter)
{
- this.checkBoxTypeAlarm.Checked = filter.TpyeAlarm;
+ this.checkBoxTypeAlarm.Checked = filter.TypeAlarm;
this.checkBoxTypeOperation.Checked = filter.TypeOperation;
this.checkBoxTypeParameter.Checked = filter.TypeParameter;
}
@@ -90,7 +89,7 @@ namespace INT69DB_2A.DialogForms
#region Event Handler
private void buttonOk_Click(object sender, EventArgs e)
{
- this.ParentForm.ParentForm.CurrentDataViewerFilter.TpyeAlarm = this.checkBoxTypeAlarm.Checked;
+ this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeAlarm = this.checkBoxTypeAlarm.Checked;
this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeOperation = this.checkBoxTypeOperation.Checked;
this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeParameter = this.checkBoxTypeParameter.Checked;
diff --git a/INT69DB_2A/DialogForms/DialogFormHistoryData.cs b/INT69DB_2A/DialogForms/DialogFormHistoryData.cs
index 15e6d90..c0d7fb4 100644
--- a/INT69DB_2A/DialogForms/DialogFormHistoryData.cs
+++ b/INT69DB_2A/DialogForms/DialogFormHistoryData.cs
@@ -78,8 +78,7 @@ namespace INT69DB_2A.DialogForms
y = Screen.PrimaryScreen.Bounds.Height / 2 - this.Size.Height / 2;
this.Location = new Point(x, y);
-
- this.Size = new Size(450, 165);
+ this.Size = new Size(350, 470);
}
private void DefaultSetting()
{
@@ -213,6 +212,10 @@ namespace INT69DB_2A.DialogForms
public void DisplayRefresh()
{
this.DisplayTreeViewUpdate();
+
+ this.checkBoxTypeAlarm.Checked = this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeAlarm;
+ this.checkBoxTypeOperation.Checked = this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeOperation;
+ this.checkBoxTypeParameter.Checked = this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeParameter;
}
#endregion
@@ -228,6 +231,13 @@ namespace INT69DB_2A.DialogForms
this.treeView.Enabled = false;
this.buttonRead.Enabled = false;
this.buttonClose.Enabled = false;
+ this.checkBoxTypeAlarm.Enabled = false;
+ this.checkBoxTypeOperation.Enabled = false;
+ this.checkBoxTypeParameter.Enabled = false;
+
+ this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeAlarm = this.checkBoxTypeAlarm.Checked;
+ this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeOperation = this.checkBoxTypeOperation.Checked;
+ this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeParameter = this.checkBoxTypeParameter.Checked;
year = this.SeletedFilePath.Substring(1, 4);
iMonth = int.Parse(this.SeletedFilePath.Substring(5, 2));
@@ -246,6 +256,9 @@ namespace INT69DB_2A.DialogForms
this.treeView.Enabled = true;
this.buttonRead.Enabled = true;
this.buttonClose.Enabled = true;
+ this.checkBoxTypeAlarm.Enabled = true;
+ this.checkBoxTypeOperation.Enabled = true;
+ this.checkBoxTypeParameter.Enabled = true;
}
private void buttonClose_Click(object sender, EventArgs e)
{
diff --git a/INT69DB_2A/DialogForms/DialogFormHistoryData.designer.cs b/INT69DB_2A/DialogForms/DialogFormHistoryData.designer.cs
index d944ccd..96bed35 100644
--- a/INT69DB_2A/DialogForms/DialogFormHistoryData.designer.cs
+++ b/INT69DB_2A/DialogForms/DialogFormHistoryData.designer.cs
@@ -38,6 +38,9 @@
this.labelDate = new SmartX.SmartLabel();
this.labelNodeIndex = new SmartX.SmartLabel();
this.buttonClose = new SmartX.SmartButton();
+ this.checkBoxTypeAlarm = new SmartX.SmartCheckBox();
+ this.checkBoxTypeOperation = new SmartX.SmartCheckBox();
+ this.checkBoxTypeParameter = new SmartX.SmartCheckBox();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.smartGroupBox1.SuspendLayout();
this.SuspendLayout();
@@ -100,7 +103,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)))));
@@ -109,12 +112,12 @@
this.labelFileName.ForeColor = System.Drawing.Color.White;
this.labelFileName.InitVisible = true;
this.labelFileName.LineSpacing = 0F;
- this.labelFileName.Location = new System.Drawing.Point(237, 313);
+ this.labelFileName.Location = new System.Drawing.Point(237, 320);
this.labelFileName.Name = "labelFileName";
- this.labelFileName.Size = new System.Drawing.Size(100, 32);
+ this.labelFileName.Size = new System.Drawing.Size(100, 25);
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;
@@ -123,6 +126,9 @@
//
this.smartGroupBox1.BackPictureBox = this.smartForm1;
this.smartGroupBox1.BackPictureBox1 = null;
+ this.smartGroupBox1.Controls.Add(this.checkBoxTypeParameter);
+ this.smartGroupBox1.Controls.Add(this.checkBoxTypeOperation);
+ this.smartGroupBox1.Controls.Add(this.checkBoxTypeAlarm);
this.smartGroupBox1.Controls.Add(this.labelTitleDate);
this.smartGroupBox1.Controls.Add(this.labelDate);
this.smartGroupBox1.Controls.Add(this.labelNodeIndex);
@@ -168,7 +174,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 +183,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 +195,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)))));
@@ -198,12 +204,12 @@
this.labelNodeIndex.ForeColor = System.Drawing.Color.White;
this.labelNodeIndex.InitVisible = true;
this.labelNodeIndex.LineSpacing = 0F;
- this.labelNodeIndex.Location = new System.Drawing.Point(237, 275);
+ this.labelNodeIndex.Location = new System.Drawing.Point(237, 289);
this.labelNodeIndex.Name = "labelNodeIndex";
- this.labelNodeIndex.Size = new System.Drawing.Size(100, 32);
+ this.labelNodeIndex.Size = new System.Drawing.Size(100, 25);
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;
@@ -240,6 +246,72 @@
this.buttonClose.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonClose.UpImage")));
this.buttonClose.Click += new System.EventHandler(this.buttonClose_Click);
//
+ // checkBoxTypeAlarm
+ //
+ this.checkBoxTypeAlarm.BackPictureBox = this.smartForm1;
+ this.checkBoxTypeAlarm.BackPictureBox1 = null;
+ this.checkBoxTypeAlarm.BackPictureBox2 = null;
+ this.checkBoxTypeAlarm.CheckBoxBackColor = System.Drawing.Color.White;
+ this.checkBoxTypeAlarm.CheckBoxCheckColor = System.Drawing.Color.Green;
+ this.checkBoxTypeAlarm.CheckBoxForeColor = System.Drawing.Color.Black;
+ this.checkBoxTypeAlarm.CheckBoxSymbolSize = 15;
+ this.checkBoxTypeAlarm.Checked = false;
+ this.checkBoxTypeAlarm.CheckLineWidth = 3;
+ this.checkBoxTypeAlarm.ForeColor = System.Drawing.Color.White;
+ this.checkBoxTypeAlarm.ImageCheckBox = null;
+ this.checkBoxTypeAlarm.ImageUnCheckBox = null;
+ this.checkBoxTypeAlarm.InitVisible = true;
+ this.checkBoxTypeAlarm.Location = new System.Drawing.Point(241, 148);
+ this.checkBoxTypeAlarm.Name = "checkBoxTypeAlarm";
+ this.checkBoxTypeAlarm.Size = new System.Drawing.Size(90, 25);
+ this.checkBoxTypeAlarm.TabIndex = 17;
+ this.checkBoxTypeAlarm.Text = "Alarm";
+ this.checkBoxTypeAlarm.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
+ //
+ // checkBoxTypeOperation
+ //
+ this.checkBoxTypeOperation.BackPictureBox = this.smartForm1;
+ this.checkBoxTypeOperation.BackPictureBox1 = null;
+ this.checkBoxTypeOperation.BackPictureBox2 = null;
+ this.checkBoxTypeOperation.CheckBoxBackColor = System.Drawing.Color.White;
+ this.checkBoxTypeOperation.CheckBoxCheckColor = System.Drawing.Color.Green;
+ this.checkBoxTypeOperation.CheckBoxForeColor = System.Drawing.Color.Black;
+ this.checkBoxTypeOperation.CheckBoxSymbolSize = 15;
+ this.checkBoxTypeOperation.Checked = false;
+ this.checkBoxTypeOperation.CheckLineWidth = 3;
+ this.checkBoxTypeOperation.ForeColor = System.Drawing.Color.White;
+ this.checkBoxTypeOperation.ImageCheckBox = null;
+ this.checkBoxTypeOperation.ImageUnCheckBox = null;
+ this.checkBoxTypeOperation.InitVisible = true;
+ this.checkBoxTypeOperation.Location = new System.Drawing.Point(241, 179);
+ this.checkBoxTypeOperation.Name = "checkBoxTypeOperation";
+ this.checkBoxTypeOperation.Size = new System.Drawing.Size(90, 25);
+ this.checkBoxTypeOperation.TabIndex = 18;
+ this.checkBoxTypeOperation.Text = "Operation";
+ this.checkBoxTypeOperation.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
+ //
+ // checkBoxTypeParameter
+ //
+ this.checkBoxTypeParameter.BackPictureBox = this.smartForm1;
+ this.checkBoxTypeParameter.BackPictureBox1 = null;
+ this.checkBoxTypeParameter.BackPictureBox2 = null;
+ this.checkBoxTypeParameter.CheckBoxBackColor = System.Drawing.Color.White;
+ this.checkBoxTypeParameter.CheckBoxCheckColor = System.Drawing.Color.Green;
+ this.checkBoxTypeParameter.CheckBoxForeColor = System.Drawing.Color.Black;
+ this.checkBoxTypeParameter.CheckBoxSymbolSize = 15;
+ this.checkBoxTypeParameter.Checked = false;
+ this.checkBoxTypeParameter.CheckLineWidth = 3;
+ this.checkBoxTypeParameter.ForeColor = System.Drawing.Color.White;
+ this.checkBoxTypeParameter.ImageCheckBox = null;
+ this.checkBoxTypeParameter.ImageUnCheckBox = null;
+ this.checkBoxTypeParameter.InitVisible = true;
+ this.checkBoxTypeParameter.Location = new System.Drawing.Point(241, 210);
+ this.checkBoxTypeParameter.Name = "checkBoxTypeParameter";
+ this.checkBoxTypeParameter.Size = new System.Drawing.Size(90, 25);
+ this.checkBoxTypeParameter.TabIndex = 19;
+ this.checkBoxTypeParameter.Text = "Parameter";
+ this.checkBoxTypeParameter.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
+ //
// DialogFormHistoryData
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -268,5 +340,8 @@
private SmartX.SmartLabel labelNodeIndex;
private SmartX.SmartLabel labelTitleDate;
private SmartX.SmartLabel labelDate;
+ private SmartX.SmartCheckBox checkBoxTypeParameter;
+ private SmartX.SmartCheckBox checkBoxTypeOperation;
+ private SmartX.SmartCheckBox checkBoxTypeAlarm;
}
}
\ No newline at end of file
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 @@
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
- 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.Designer.cs b/INT69DB_2A/DialogForms/DialogFormLogOn.Designer.cs
index a429d5c..7f23a09 100644
--- a/INT69DB_2A/DialogForms/DialogFormLogOn.Designer.cs
+++ b/INT69DB_2A/DialogForms/DialogFormLogOn.Designer.cs
@@ -30,20 +30,20 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DialogFormLogOn));
this.smartForm1 = new SmartX.SmartForm();
+ this.smartKeyboard = new SmartX.SmartKeyboard();
this.textBoxID = new System.Windows.Forms.TextBox();
this.textBoxPassword = new System.Windows.Forms.TextBox();
- this.smartKeyboard = new SmartX.SmartKeyboard();
this.buttonLogOn = new SmartX.SmartButton();
this.buttonCancel = new SmartX.SmartButton();
- this.smartButtonUser33 = new SmartX.SmartButton();
- this.smartButtonUser22 = new SmartX.SmartButton();
- this.smartButtonIUser11 = new SmartX.SmartButton();
- this.smartButtonAdmin = new SmartX.SmartButton();
this.smartButton1 = new SmartX.SmartButton();
- this.labelTitlePassword = new SmartX.SmartLabel();
- this.labelTitleID = new SmartX.SmartLabel();
- this.labelTitle = new SmartX.SmartLabel();
+ this.smartButtonAdmin = new SmartX.SmartButton();
+ this.smartButtonIUser11 = new SmartX.SmartButton();
+ this.smartButtonUser22 = new SmartX.SmartButton();
+ this.smartButtonUser33 = new SmartX.SmartButton();
this.pictureBoxImage = new System.Windows.Forms.PictureBox();
+ this.labelTitle3 = new SmartX.SmartLabel();
+ this.labelTitle2 = new SmartX.SmartLabel();
+ this.labelTitle1 = new SmartX.SmartLabel();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.SuspendLayout();
//
@@ -62,36 +62,13 @@
this.smartForm1.SpecialFunctionClickPointSize = 100;
this.smartForm1.SuspendLayoutInterval = 1;
//
- // textBoxID
- //
- this.textBoxID.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Regular);
- this.textBoxID.Location = new System.Drawing.Point(254, 77);
- this.textBoxID.MaxLength = 20;
- this.textBoxID.Name = "textBoxID";
- this.textBoxID.Size = new System.Drawing.Size(248, 34);
- this.textBoxID.TabIndex = 1;
- this.textBoxID.Text = "ABCDEFGHJK";
- this.textBoxID.GotFocus += new System.EventHandler(this.textBoxID_GotFocus);
- //
- // textBoxPassword
- //
- this.textBoxPassword.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Regular);
- this.textBoxPassword.Location = new System.Drawing.Point(254, 122);
- this.textBoxPassword.MaxLength = 20;
- this.textBoxPassword.Name = "textBoxPassword";
- this.textBoxPassword.PasswordChar = '*';
- this.textBoxPassword.Size = new System.Drawing.Size(248, 34);
- this.textBoxPassword.TabIndex = 2;
- this.textBoxPassword.Text = "ABCDEFGHJK";
- this.textBoxPassword.GotFocus += new System.EventHandler(this.textBoxPassword_GotFocus);
- //
// smartKeyboard
//
- this.smartKeyboard.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(29)))), ((int)(((byte)(40)))), ((int)(((byte)(24)))));
+ this.smartKeyboard.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
this.smartKeyboard.ControlKeyDisable = false;
this.smartKeyboard.DesignMinimize = false;
this.smartKeyboard.FontColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
- this.smartKeyboard.HanYoungKeyDisable = false;
+ this.smartKeyboard.HanYoungKeyDisable = true;
this.smartKeyboard.KeyboardType = SmartX.SmartKeyboard.KEYBOARDTYPES.NORMAL;
this.smartKeyboard.KeyFillColor = System.Drawing.Color.Black;
this.smartKeyboard.KeyOutLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
@@ -103,22 +80,44 @@
this.smartKeyboard.KeyUpImage2 = null;
this.smartKeyboard.KeyUpImage3 = null;
this.smartKeyboard.LeftMargin = 5;
- this.smartKeyboard.Location = new System.Drawing.Point(7, 188);
+ this.smartKeyboard.Location = new System.Drawing.Point(12, 191);
this.smartKeyboard.Name = "smartKeyboard";
this.smartKeyboard.PressFontColor = System.Drawing.Color.Olive;
this.smartKeyboard.PressKeyFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.smartKeyboard.PressKeyOutLineColor = System.Drawing.Color.Green;
this.smartKeyboard.RoundedCorners = true;
this.smartKeyboard.SetBackimage = null;
- this.smartKeyboard.Size = new System.Drawing.Size(697, 276);
- this.smartKeyboard.TabIndex = 3;
+ this.smartKeyboard.Size = new System.Drawing.Size(692, 276);
+ this.smartKeyboard.TabIndex = 10;
this.smartKeyboard.TABKeyDisable = false;
this.smartKeyboard.TargetInputObject = null;
this.smartKeyboard.Text = "smartKeyboard1";
this.smartKeyboard.ThemeStyle = SmartX.SmartKeyboard.KEYBOARDTHEMESTYLE.CUSTOMIZED_LITE;
this.smartKeyboard.TopMargin = 5;
this.smartKeyboard.OnXKeyClick += new System.EventHandler(this.smartKeyboard_OnXKeyClick);
- this.smartKeyboard.Click += new System.EventHandler(this.smartKeyboard_Click);
+ //
+ // textBoxID
+ //
+ this.textBoxID.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Regular);
+ this.textBoxID.Location = new System.Drawing.Point(255, 81);
+ this.textBoxID.MaxLength = 20;
+ this.textBoxID.Name = "textBoxID";
+ this.textBoxID.Size = new System.Drawing.Size(248, 34);
+ this.textBoxID.TabIndex = 2;
+ this.textBoxID.Text = "ABCDEFGHJK";
+ this.textBoxID.GotFocus += new System.EventHandler(this.textBoxID_GotFocus);
+ //
+ // textBoxPassword
+ //
+ this.textBoxPassword.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Regular);
+ this.textBoxPassword.Location = new System.Drawing.Point(255, 126);
+ this.textBoxPassword.MaxLength = 20;
+ this.textBoxPassword.Name = "textBoxPassword";
+ this.textBoxPassword.PasswordChar = '*';
+ this.textBoxPassword.Size = new System.Drawing.Size(248, 34);
+ this.textBoxPassword.TabIndex = 5;
+ this.textBoxPassword.Text = "ABCDEFGHJK";
+ this.textBoxPassword.GotFocus += new System.EventHandler(this.textBoxPassword_GotFocus);
//
// buttonLogOn
//
@@ -132,7 +131,7 @@
this.buttonLogOn.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLogOn.DownImage")));
this.buttonLogOn.GroupID = 0;
this.buttonLogOn.InitVisible = true;
- this.buttonLogOn.Location = new System.Drawing.Point(508, 80);
+ this.buttonLogOn.Location = new System.Drawing.Point(512, 82);
this.buttonLogOn.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonLogOn.Name = "buttonLogOn";
this.buttonLogOn.NestedClickEventPrevent = false;
@@ -142,7 +141,7 @@
this.buttonLogOn.SafeInterval = 200;
this.buttonLogOn.Size = new System.Drawing.Size(75, 75);
this.buttonLogOn.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
- this.buttonLogOn.TabIndex = 5;
+ this.buttonLogOn.TabIndex = 6;
this.buttonLogOn.TextColor = System.Drawing.Color.Black;
this.buttonLogOn.TextDownColor = System.Drawing.Color.White;
this.buttonLogOn.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
@@ -163,7 +162,7 @@
this.buttonCancel.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonCancel.DownImage")));
this.buttonCancel.GroupID = 0;
this.buttonCancel.InitVisible = true;
- this.buttonCancel.Location = new System.Drawing.Point(589, 80);
+ this.buttonCancel.Location = new System.Drawing.Point(593, 82);
this.buttonCancel.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.NestedClickEventPrevent = false;
@@ -173,7 +172,7 @@
this.buttonCancel.SafeInterval = 200;
this.buttonCancel.Size = new System.Drawing.Size(75, 75);
this.buttonCancel.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
- this.buttonCancel.TabIndex = 6;
+ this.buttonCancel.TabIndex = 7;
this.buttonCancel.TextColor = System.Drawing.Color.Black;
this.buttonCancel.TextDownColor = System.Drawing.Color.White;
this.buttonCancel.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
@@ -182,134 +181,6 @@
this.buttonCancel.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonCancel.UpImage")));
this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
//
- // smartButtonUser33
- //
- this.smartButtonUser33.BackPictureBox = null;
- this.smartButtonUser33.BackPictureBox1 = null;
- this.smartButtonUser33.BackPictureBox2 = null;
- this.smartButtonUser33.ButtonColor = System.Drawing.Color.Gray;
- this.smartButtonUser33.ButtonImageAutoSize = true;
- this.smartButtonUser33.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.smartButtonUser33.DisableImage = null;
- this.smartButtonUser33.DownImage = null;
- this.smartButtonUser33.GroupID = 0;
- this.smartButtonUser33.InitVisible = true;
- this.smartButtonUser33.Location = new System.Drawing.Point(312, 31);
- this.smartButtonUser33.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
- this.smartButtonUser33.Name = "smartButtonUser33";
- this.smartButtonUser33.NestedClickEventPrevent = false;
- this.smartButtonUser33.OutlinePixel = 1;
- this.smartButtonUser33.RepeatInterval = 200;
- this.smartButtonUser33.RepeatIntervalAccelerate = null;
- this.smartButtonUser33.SafeInterval = 200;
- this.smartButtonUser33.Size = new System.Drawing.Size(75, 43);
- this.smartButtonUser33.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
- this.smartButtonUser33.TabIndex = 22;
- this.smartButtonUser33.Text = "user33";
- this.smartButtonUser33.TextColor = System.Drawing.Color.Black;
- this.smartButtonUser33.TextDownColor = System.Drawing.Color.White;
- this.smartButtonUser33.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
- this.smartButtonUser33.TextLocation = new System.Drawing.Point(0, 0);
- this.smartButtonUser33.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
- this.smartButtonUser33.UpImage = null;
- this.smartButtonUser33.Click += new System.EventHandler(this.smartButtonUser33_Click);
- //
- // smartButtonUser22
- //
- this.smartButtonUser22.BackPictureBox = null;
- this.smartButtonUser22.BackPictureBox1 = null;
- this.smartButtonUser22.BackPictureBox2 = null;
- this.smartButtonUser22.ButtonColor = System.Drawing.Color.Gray;
- this.smartButtonUser22.ButtonImageAutoSize = true;
- this.smartButtonUser22.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.smartButtonUser22.DisableImage = null;
- this.smartButtonUser22.DownImage = null;
- this.smartButtonUser22.GroupID = 0;
- this.smartButtonUser22.InitVisible = true;
- this.smartButtonUser22.Location = new System.Drawing.Point(231, 31);
- this.smartButtonUser22.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
- this.smartButtonUser22.Name = "smartButtonUser22";
- this.smartButtonUser22.NestedClickEventPrevent = false;
- this.smartButtonUser22.OutlinePixel = 1;
- this.smartButtonUser22.RepeatInterval = 200;
- this.smartButtonUser22.RepeatIntervalAccelerate = null;
- this.smartButtonUser22.SafeInterval = 200;
- this.smartButtonUser22.Size = new System.Drawing.Size(75, 43);
- this.smartButtonUser22.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
- this.smartButtonUser22.TabIndex = 21;
- this.smartButtonUser22.Text = "user22";
- this.smartButtonUser22.TextColor = System.Drawing.Color.Black;
- this.smartButtonUser22.TextDownColor = System.Drawing.Color.White;
- this.smartButtonUser22.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
- this.smartButtonUser22.TextLocation = new System.Drawing.Point(0, 0);
- this.smartButtonUser22.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
- this.smartButtonUser22.UpImage = null;
- this.smartButtonUser22.Click += new System.EventHandler(this.smartButtonUser22_Click);
- //
- // smartButtonIUser11
- //
- this.smartButtonIUser11.BackPictureBox = null;
- this.smartButtonIUser11.BackPictureBox1 = null;
- this.smartButtonIUser11.BackPictureBox2 = null;
- this.smartButtonIUser11.ButtonColor = System.Drawing.Color.Gray;
- this.smartButtonIUser11.ButtonImageAutoSize = true;
- this.smartButtonIUser11.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.smartButtonIUser11.DisableImage = null;
- this.smartButtonIUser11.DownImage = null;
- this.smartButtonIUser11.GroupID = 0;
- this.smartButtonIUser11.InitVisible = true;
- this.smartButtonIUser11.Location = new System.Drawing.Point(150, 31);
- this.smartButtonIUser11.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
- this.smartButtonIUser11.Name = "smartButtonIUser11";
- this.smartButtonIUser11.NestedClickEventPrevent = false;
- this.smartButtonIUser11.OutlinePixel = 1;
- this.smartButtonIUser11.RepeatInterval = 200;
- this.smartButtonIUser11.RepeatIntervalAccelerate = null;
- this.smartButtonIUser11.SafeInterval = 200;
- this.smartButtonIUser11.Size = new System.Drawing.Size(75, 43);
- this.smartButtonIUser11.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
- this.smartButtonIUser11.TabIndex = 20;
- this.smartButtonIUser11.Text = "user11";
- this.smartButtonIUser11.TextColor = System.Drawing.Color.Black;
- this.smartButtonIUser11.TextDownColor = System.Drawing.Color.White;
- this.smartButtonIUser11.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
- this.smartButtonIUser11.TextLocation = new System.Drawing.Point(0, 0);
- this.smartButtonIUser11.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
- this.smartButtonIUser11.UpImage = null;
- this.smartButtonIUser11.Click += new System.EventHandler(this.smartButtonIUser11_Click);
- //
- // smartButtonAdmin
- //
- this.smartButtonAdmin.BackPictureBox = null;
- this.smartButtonAdmin.BackPictureBox1 = null;
- this.smartButtonAdmin.BackPictureBox2 = null;
- this.smartButtonAdmin.ButtonColor = System.Drawing.Color.Gray;
- this.smartButtonAdmin.ButtonImageAutoSize = true;
- this.smartButtonAdmin.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.smartButtonAdmin.DisableImage = null;
- this.smartButtonAdmin.DownImage = null;
- this.smartButtonAdmin.GroupID = 0;
- this.smartButtonAdmin.InitVisible = true;
- this.smartButtonAdmin.Location = new System.Drawing.Point(570, 31);
- this.smartButtonAdmin.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
- this.smartButtonAdmin.Name = "smartButtonAdmin";
- this.smartButtonAdmin.NestedClickEventPrevent = false;
- this.smartButtonAdmin.OutlinePixel = 1;
- this.smartButtonAdmin.RepeatInterval = 200;
- this.smartButtonAdmin.RepeatIntervalAccelerate = null;
- this.smartButtonAdmin.SafeInterval = 200;
- this.smartButtonAdmin.Size = new System.Drawing.Size(75, 43);
- this.smartButtonAdmin.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
- this.smartButtonAdmin.TabIndex = 19;
- this.smartButtonAdmin.Text = "admin";
- this.smartButtonAdmin.TextColor = System.Drawing.Color.Black;
- this.smartButtonAdmin.TextDownColor = System.Drawing.Color.White;
- this.smartButtonAdmin.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
- this.smartButtonAdmin.TextLocation = new System.Drawing.Point(0, 0);
- this.smartButtonAdmin.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
- this.smartButtonAdmin.UpImage = null;
- this.smartButtonAdmin.Click += new System.EventHandler(this.smartButtonAdmin_Click);
- //
// smartButton1
//
this.smartButton1.BackPictureBox = null;
@@ -322,7 +193,7 @@
this.smartButton1.DownImage = null;
this.smartButton1.GroupID = 0;
this.smartButton1.InitVisible = true;
- this.smartButton1.Location = new System.Drawing.Point(489, 31);
+ this.smartButton1.Location = new System.Drawing.Point(512, 30);
this.smartButton1.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.smartButton1.Name = "smartButton1";
this.smartButton1.NestedClickEventPrevent = false;
@@ -332,7 +203,7 @@
this.smartButton1.SafeInterval = 200;
this.smartButton1.Size = new System.Drawing.Size(75, 43);
this.smartButton1.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
- this.smartButton1.TabIndex = 18;
+ this.smartButton1.TabIndex = 12;
this.smartButton1.Text = "Intech";
this.smartButton1.TextColor = System.Drawing.Color.Black;
this.smartButton1.TextDownColor = System.Drawing.Color.White;
@@ -340,78 +211,211 @@
this.smartButton1.TextLocation = new System.Drawing.Point(0, 0);
this.smartButton1.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.smartButton1.UpImage = null;
+ this.smartButton1.Visible = false;
this.smartButton1.Click += new System.EventHandler(this.smartButton1_Click);
//
- // labelTitlePassword
+ // smartButtonAdmin
//
- this.labelTitlePassword.BackColor = System.Drawing.Color.White;
- this.labelTitlePassword.BackPictureBox = null;
- this.labelTitlePassword.BackPictureBox1 = null;
- this.labelTitlePassword.BackPictureBox2 = null;
- this.labelTitlePassword.BorderColor = System.Drawing.Color.Black;
- this.labelTitlePassword.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.labelTitlePassword.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
- this.labelTitlePassword.ForeColor = System.Drawing.Color.Gray;
- this.labelTitlePassword.InitVisible = true;
- this.labelTitlePassword.LineSpacing = 0F;
- this.labelTitlePassword.Location = new System.Drawing.Point(129, 122);
- this.labelTitlePassword.Name = "labelTitlePassword";
- this.labelTitlePassword.Size = new System.Drawing.Size(120, 34);
- this.labelTitlePassword.TabIndex = 180;
- this.labelTitlePassword.Text = "비밀번호";
- this.labelTitlePassword.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.labelTitlePassword.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelTitlePassword.Wordwrap = false;
+ this.smartButtonAdmin.BackPictureBox = null;
+ this.smartButtonAdmin.BackPictureBox1 = null;
+ this.smartButtonAdmin.BackPictureBox2 = null;
+ this.smartButtonAdmin.ButtonColor = System.Drawing.Color.Gray;
+ this.smartButtonAdmin.ButtonImageAutoSize = true;
+ this.smartButtonAdmin.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.smartButtonAdmin.DisableImage = null;
+ this.smartButtonAdmin.DownImage = null;
+ this.smartButtonAdmin.GroupID = 0;
+ this.smartButtonAdmin.InitVisible = true;
+ this.smartButtonAdmin.Location = new System.Drawing.Point(593, 30);
+ this.smartButtonAdmin.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
+ this.smartButtonAdmin.Name = "smartButtonAdmin";
+ this.smartButtonAdmin.NestedClickEventPrevent = false;
+ this.smartButtonAdmin.OutlinePixel = 1;
+ this.smartButtonAdmin.RepeatInterval = 200;
+ this.smartButtonAdmin.RepeatIntervalAccelerate = null;
+ this.smartButtonAdmin.SafeInterval = 200;
+ this.smartButtonAdmin.Size = new System.Drawing.Size(75, 43);
+ this.smartButtonAdmin.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.smartButtonAdmin.TabIndex = 14;
+ this.smartButtonAdmin.Text = "admin";
+ this.smartButtonAdmin.TextColor = System.Drawing.Color.Black;
+ this.smartButtonAdmin.TextDownColor = System.Drawing.Color.White;
+ this.smartButtonAdmin.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.smartButtonAdmin.TextLocation = new System.Drawing.Point(0, 0);
+ this.smartButtonAdmin.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.smartButtonAdmin.UpImage = null;
+ this.smartButtonAdmin.Visible = false;
+ this.smartButtonAdmin.Click += new System.EventHandler(this.smartButtonAdmin_Click);
//
- // labelTitleID
+ // smartButtonIUser11
//
- this.labelTitleID.BackColor = System.Drawing.Color.White;
- this.labelTitleID.BackPictureBox = null;
- this.labelTitleID.BackPictureBox1 = null;
- this.labelTitleID.BackPictureBox2 = null;
- this.labelTitleID.BorderColor = System.Drawing.Color.Black;
- this.labelTitleID.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.labelTitleID.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
- this.labelTitleID.ForeColor = System.Drawing.Color.Gray;
- this.labelTitleID.InitVisible = true;
- this.labelTitleID.LineSpacing = 0F;
- this.labelTitleID.Location = new System.Drawing.Point(129, 77);
- this.labelTitleID.Name = "labelTitleID";
- this.labelTitleID.Size = new System.Drawing.Size(120, 34);
- this.labelTitleID.TabIndex = 179;
- this.labelTitleID.Text = "ID";
- this.labelTitleID.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.labelTitleID.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelTitleID.Wordwrap = false;
+ this.smartButtonIUser11.BackPictureBox = null;
+ this.smartButtonIUser11.BackPictureBox1 = null;
+ this.smartButtonIUser11.BackPictureBox2 = null;
+ this.smartButtonIUser11.ButtonColor = System.Drawing.Color.Gray;
+ this.smartButtonIUser11.ButtonImageAutoSize = true;
+ this.smartButtonIUser11.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.smartButtonIUser11.DisableImage = null;
+ this.smartButtonIUser11.DownImage = null;
+ this.smartButtonIUser11.GroupID = 0;
+ this.smartButtonIUser11.InitVisible = true;
+ this.smartButtonIUser11.Location = new System.Drawing.Point(173, 30);
+ this.smartButtonIUser11.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
+ this.smartButtonIUser11.Name = "smartButtonIUser11";
+ this.smartButtonIUser11.NestedClickEventPrevent = false;
+ this.smartButtonIUser11.OutlinePixel = 1;
+ this.smartButtonIUser11.RepeatInterval = 200;
+ this.smartButtonIUser11.RepeatIntervalAccelerate = null;
+ this.smartButtonIUser11.SafeInterval = 200;
+ this.smartButtonIUser11.Size = new System.Drawing.Size(75, 43);
+ this.smartButtonIUser11.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.smartButtonIUser11.TabIndex = 15;
+ this.smartButtonIUser11.Text = "user11";
+ this.smartButtonIUser11.TextColor = System.Drawing.Color.Black;
+ this.smartButtonIUser11.TextDownColor = System.Drawing.Color.White;
+ this.smartButtonIUser11.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.smartButtonIUser11.TextLocation = new System.Drawing.Point(0, 0);
+ this.smartButtonIUser11.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.smartButtonIUser11.UpImage = null;
+ this.smartButtonIUser11.Visible = false;
+ this.smartButtonIUser11.Click += new System.EventHandler(this.smartButtonIUser11_Click);
//
- // labelTitle
+ // smartButtonUser22
//
- this.labelTitle.BackColor = System.Drawing.Color.White;
- this.labelTitle.BackPictureBox = null;
- this.labelTitle.BackPictureBox1 = null;
- this.labelTitle.BackPictureBox2 = null;
- this.labelTitle.BorderColor = System.Drawing.Color.Black;
- this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.labelTitle.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold);
- this.labelTitle.ForeColor = System.Drawing.Color.Gray;
- this.labelTitle.InitVisible = true;
- this.labelTitle.LineSpacing = 0F;
- this.labelTitle.Location = new System.Drawing.Point(129, 24);
- this.labelTitle.Name = "labelTitle";
- this.labelTitle.Size = new System.Drawing.Size(546, 50);
- this.labelTitle.TabIndex = 178;
- this.labelTitle.Text = "로그인";
- this.labelTitle.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
- this.labelTitle.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelTitle.Wordwrap = false;
+ this.smartButtonUser22.BackPictureBox = null;
+ this.smartButtonUser22.BackPictureBox1 = null;
+ this.smartButtonUser22.BackPictureBox2 = null;
+ this.smartButtonUser22.ButtonColor = System.Drawing.Color.Gray;
+ this.smartButtonUser22.ButtonImageAutoSize = true;
+ this.smartButtonUser22.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.smartButtonUser22.DisableImage = null;
+ this.smartButtonUser22.DownImage = null;
+ this.smartButtonUser22.GroupID = 0;
+ this.smartButtonUser22.InitVisible = true;
+ this.smartButtonUser22.Location = new System.Drawing.Point(254, 30);
+ this.smartButtonUser22.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
+ this.smartButtonUser22.Name = "smartButtonUser22";
+ this.smartButtonUser22.NestedClickEventPrevent = false;
+ this.smartButtonUser22.OutlinePixel = 1;
+ this.smartButtonUser22.RepeatInterval = 200;
+ this.smartButtonUser22.RepeatIntervalAccelerate = null;
+ this.smartButtonUser22.SafeInterval = 200;
+ this.smartButtonUser22.Size = new System.Drawing.Size(75, 43);
+ this.smartButtonUser22.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.smartButtonUser22.TabIndex = 16;
+ this.smartButtonUser22.Text = "user22";
+ this.smartButtonUser22.TextColor = System.Drawing.Color.Black;
+ this.smartButtonUser22.TextDownColor = System.Drawing.Color.White;
+ this.smartButtonUser22.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.smartButtonUser22.TextLocation = new System.Drawing.Point(0, 0);
+ this.smartButtonUser22.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.smartButtonUser22.UpImage = null;
+ this.smartButtonUser22.Visible = false;
+ this.smartButtonUser22.Click += new System.EventHandler(this.smartButtonUser22_Click);
+ //
+ // smartButtonUser33
+ //
+ this.smartButtonUser33.BackPictureBox = null;
+ this.smartButtonUser33.BackPictureBox1 = null;
+ this.smartButtonUser33.BackPictureBox2 = null;
+ this.smartButtonUser33.ButtonColor = System.Drawing.Color.Gray;
+ this.smartButtonUser33.ButtonImageAutoSize = true;
+ this.smartButtonUser33.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.smartButtonUser33.DisableImage = null;
+ this.smartButtonUser33.DownImage = null;
+ this.smartButtonUser33.GroupID = 0;
+ this.smartButtonUser33.InitVisible = true;
+ this.smartButtonUser33.Location = new System.Drawing.Point(335, 30);
+ this.smartButtonUser33.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
+ this.smartButtonUser33.Name = "smartButtonUser33";
+ this.smartButtonUser33.NestedClickEventPrevent = false;
+ this.smartButtonUser33.OutlinePixel = 1;
+ this.smartButtonUser33.RepeatInterval = 200;
+ this.smartButtonUser33.RepeatIntervalAccelerate = null;
+ this.smartButtonUser33.SafeInterval = 200;
+ this.smartButtonUser33.Size = new System.Drawing.Size(75, 43);
+ this.smartButtonUser33.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.smartButtonUser33.TabIndex = 17;
+ this.smartButtonUser33.Text = "user33";
+ this.smartButtonUser33.TextColor = System.Drawing.Color.Black;
+ this.smartButtonUser33.TextDownColor = System.Drawing.Color.White;
+ this.smartButtonUser33.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.smartButtonUser33.TextLocation = new System.Drawing.Point(0, 0);
+ this.smartButtonUser33.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.smartButtonUser33.UpImage = null;
+ this.smartButtonUser33.Visible = false;
+ this.smartButtonUser33.Click += new System.EventHandler(this.smartButtonUser33_Click);
//
// pictureBoxImage
//
this.pictureBoxImage.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxImage.Image")));
- this.pictureBoxImage.Location = new System.Drawing.Point(40, 67);
+ this.pictureBoxImage.Location = new System.Drawing.Point(40, 68);
this.pictureBoxImage.Name = "pictureBoxImage";
this.pictureBoxImage.Size = new System.Drawing.Size(66, 72);
//
+ // labelTitle3
+ //
+ this.labelTitle3.BackColor = System.Drawing.Color.White;
+ this.labelTitle3.BackPictureBox = null;
+ this.labelTitle3.BackPictureBox1 = null;
+ this.labelTitle3.BackPictureBox2 = null;
+ this.labelTitle3.BorderColor = System.Drawing.Color.Black;
+ this.labelTitle3.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelTitle3.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.labelTitle3.ForeColor = System.Drawing.Color.Gray;
+ this.labelTitle3.InitVisible = true;
+ this.labelTitle3.LineSpacing = 0F;
+ this.labelTitle3.Location = new System.Drawing.Point(129, 126);
+ this.labelTitle3.Name = "labelTitle3";
+ this.labelTitle3.Size = new System.Drawing.Size(120, 34);
+ this.labelTitle3.TabIndex = 184;
+ this.labelTitle3.Text = "비밀번호";
+ this.labelTitle3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelTitle3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelTitle3.Wordwrap = false;
+ //
+ // labelTitle2
+ //
+ this.labelTitle2.BackColor = System.Drawing.Color.White;
+ this.labelTitle2.BackPictureBox = null;
+ this.labelTitle2.BackPictureBox1 = null;
+ this.labelTitle2.BackPictureBox2 = null;
+ this.labelTitle2.BorderColor = System.Drawing.Color.Black;
+ this.labelTitle2.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelTitle2.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.labelTitle2.ForeColor = System.Drawing.Color.Gray;
+ this.labelTitle2.InitVisible = true;
+ this.labelTitle2.LineSpacing = 0F;
+ this.labelTitle2.Location = new System.Drawing.Point(129, 81);
+ this.labelTitle2.Name = "labelTitle2";
+ this.labelTitle2.Size = new System.Drawing.Size(120, 34);
+ this.labelTitle2.TabIndex = 183;
+ this.labelTitle2.Text = "ID";
+ this.labelTitle2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelTitle2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelTitle2.Wordwrap = false;
+ //
+ // labelTitle1
+ //
+ this.labelTitle1.BackColor = System.Drawing.Color.White;
+ this.labelTitle1.BackPictureBox = null;
+ this.labelTitle1.BackPictureBox1 = null;
+ this.labelTitle1.BackPictureBox2 = null;
+ this.labelTitle1.BorderColor = System.Drawing.Color.Black;
+ this.labelTitle1.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelTitle1.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold);
+ this.labelTitle1.ForeColor = System.Drawing.Color.Gray;
+ this.labelTitle1.InitVisible = true;
+ this.labelTitle1.LineSpacing = 0F;
+ this.labelTitle1.Location = new System.Drawing.Point(129, 25);
+ this.labelTitle1.Name = "labelTitle1";
+ this.labelTitle1.Size = new System.Drawing.Size(546, 50);
+ this.labelTitle1.TabIndex = 182;
+ this.labelTitle1.Text = "로그인";
+ this.labelTitle1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelTitle1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelTitle1.Wordwrap = false;
+ //
// DialogFormLogOn
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -419,19 +423,19 @@
this.ClientSize = new System.Drawing.Size(710, 470);
this.ControlBox = false;
this.Controls.Add(this.pictureBoxImage);
+ this.Controls.Add(this.labelTitle3);
+ this.Controls.Add(this.labelTitle2);
this.Controls.Add(this.smartButtonUser33);
this.Controls.Add(this.smartButtonUser22);
this.Controls.Add(this.smartButtonIUser11);
this.Controls.Add(this.smartButtonAdmin);
this.Controls.Add(this.smartButton1);
- this.Controls.Add(this.labelTitlePassword);
- this.Controls.Add(this.labelTitleID);
- this.Controls.Add(this.labelTitle);
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonLogOn);
- this.Controls.Add(this.smartKeyboard);
this.Controls.Add(this.textBoxPassword);
this.Controls.Add(this.textBoxID);
+ this.Controls.Add(this.smartKeyboard);
+ this.Controls.Add(this.labelTitle1);
this.Controls.Add(this.smartForm1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Name = "DialogFormLogOn";
@@ -444,19 +448,19 @@
#endregion
private SmartX.SmartForm smartForm1;
+ private SmartX.SmartKeyboard smartKeyboard;
private System.Windows.Forms.TextBox textBoxID;
private System.Windows.Forms.TextBox textBoxPassword;
- private SmartX.SmartKeyboard smartKeyboard;
private SmartX.SmartButton buttonLogOn;
private SmartX.SmartButton buttonCancel;
- private SmartX.SmartButton smartButtonUser33;
- private SmartX.SmartButton smartButtonUser22;
- private SmartX.SmartButton smartButtonIUser11;
- private SmartX.SmartButton smartButtonAdmin;
private SmartX.SmartButton smartButton1;
- private SmartX.SmartLabel labelTitlePassword;
- private SmartX.SmartLabel labelTitleID;
- private SmartX.SmartLabel labelTitle;
+ private SmartX.SmartButton smartButtonAdmin;
+ private SmartX.SmartButton smartButtonIUser11;
+ private SmartX.SmartButton smartButtonUser22;
+ private SmartX.SmartButton smartButtonUser33;
private System.Windows.Forms.PictureBox pictureBoxImage;
+ private SmartX.SmartLabel labelTitle3;
+ private SmartX.SmartLabel labelTitle2;
+ private SmartX.SmartLabel labelTitle1;
}
}
\ No newline at end of file
diff --git a/INT69DB_2A/DialogForms/DialogFormLogOn.cs b/INT69DB_2A/DialogForms/DialogFormLogOn.cs
index d146d8f..58dde34 100644
--- a/INT69DB_2A/DialogForms/DialogFormLogOn.cs
+++ b/INT69DB_2A/DialogForms/DialogFormLogOn.cs
@@ -11,25 +11,31 @@ using INT69DB_2A_ImageDll;
using INT69DB_2A.Forms;
using INT69DB_2A.Part11_UserManager;
+using System.Text.RegularExpressions;
+
namespace INT69DB_2A.DialogForms
{
public partial class DialogFormLogOn : Form
{
#region Field
private FormMain m_ParentForm;
+ private bool IsLoginMode;
+ private bool IsChangePassword;
#endregion
#region Constructor
- public DialogFormLogOn(FormMain parent)
+ public DialogFormLogOn(FormMain parent, bool login, bool changePass)
{
InitializeComponent();
this.ParentForm = parent;
+ this.IsLoginMode = login;
+ this.IsChangePassword = changePass;
this.InitializeDesign();
this.InitializeControl();
this.DefaultSetting();
- }
+ }
#endregion
#region Property
@@ -47,49 +53,95 @@ namespace INT69DB_2A.DialogForms
if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.English)
{
- this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginDisable));
- this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginDown));
- this.buttonLogOn.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginUp));
- this.buttonCancel.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainCancelDisable));
- this.buttonCancel.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainCancelDown));
- this.buttonCancel.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainCancelUp));
+ this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginLoginDisable));
+ this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginLoginDown));
+ this.buttonLogOn.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginLoginUp));
+ this.buttonCancel.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginCancelDisable));
+ this.buttonCancel.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginCancelDown));
+ this.buttonCancel.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginCancelUp));
}
else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese)
{
this.smartForm1.Image = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnBackgroundUserLogin));
- this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginDisable));
- this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginDown));
- this.buttonLogOn.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginUp));
- this.buttonCancel.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainCancelDisable));
- this.buttonCancel.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainCancelDown));
- this.buttonCancel.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainCancelUp));
+ this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginLoginDisable));
+ this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginLoginDown));
+ this.buttonLogOn.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginLoginUp));
+ this.buttonCancel.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginCancelDisable));
+ this.buttonCancel.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginCancelDown));
+ this.buttonCancel.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnMainLoginCancelUp));
}
else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Czech)
{
-
+ this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginLoginDisable));
+ this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginLoginDown));
+ this.buttonLogOn.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginLoginUp));
+ this.buttonCancel.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginCancelDisable));
+ this.buttonCancel.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginCancelDown));
+ this.buttonCancel.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginCancelUp));
}
else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.German)
{
-
+ this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginLoginDisable));
+ this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginLoginDown));
+ this.buttonLogOn.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginLoginUp));
+ this.buttonCancel.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginCancelDisable));
+ this.buttonCancel.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginCancelDown));
+ this.buttonCancel.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginCancelUp));
}
else
{
- this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginDisable));
- this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginDown));
- this.buttonLogOn.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainLoginUp));
- this.buttonCancel.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainCancelDisable));
- this.buttonCancel.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainCancelDown));
- this.buttonCancel.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engMainCancelUp));
+
}
}
private void InitializeControl()
{
+ int x = 0, y = 0;
+
+ x = Screen.PrimaryScreen.Bounds.Width / 2 - this.Size.Width / 2;
+ y = Screen.PrimaryScreen.Bounds.Height / 2 - this.Size.Height / 2;
+
+ this.Location = new Point(x, y);
+ this.Size = new Size(710, 470);
+
+ if (this.IsChangePassword == false)
+ {
+ if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean)
+ {
+ this.labelTitle1.Text = "로그인";
+ this.labelTitle2.Text = "ID";
+ this.labelTitle3.Text = "비밀번호";
+ }
+ else
+ {
+ this.labelTitle1.Text = "User Login";
+ this.labelTitle2.Text = "ID";
+ this.labelTitle3.Text = "Password";
+ }
+
+ this.textBoxID.PasswordChar = default(char);
+ }
+ else
+ {
+ if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean)
+ {
+ this.labelTitle1.Text = "비밀번호 변경";
+ this.labelTitle2.Text = "변경할 비밀번호";
+ this.labelTitle3.Text = "비밀번호 확인";
+ }
+ else
+ {
+ this.labelTitle1.Text = "Change Password";
+ this.labelTitle2.Text = "New";
+ this.labelTitle3.Text = "Confirmation";
+ }
+
+ this.textBoxID.PasswordChar = '*';
+ }
+
this.textBoxID.Text = "";
this.textBoxPassword.Text = "";
- this.Location = new Point(45, 63);
-
//this.smartKeyboard.HanYoungKeyToggle();
this.smartKeyboard.HanYoungKeyDisable = true;
this.smartKeyboard.KeyboardType = SmartX.SmartKeyboard.KEYBOARDTYPES.NORMAL;
@@ -99,14 +151,9 @@ namespace INT69DB_2A.DialogForms
{
}
- #endregion
- #region Event Handler
- private void buttonLogOn_Click(object sender, EventArgs e)
+ private void LogOn()
{
- // Automatic Logout Reset
- this.ParentForm.ChildFormMainDisplay.Part11AutomaticLogoutReset();
-
UserManager.UserMgr_user_info_t userInfo = new UserManager.UserMgr_user_info_t();
if (this.textBoxID.Text == "")
@@ -128,7 +175,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("로그인 성공");
@@ -147,74 +194,192 @@ namespace INT69DB_2A.DialogForms
this.ParentForm.SystemConfig.CurrentUser.ID = userInfo.user_id;
this.ParentForm.SystemConfig.CurrentUser.Password = userInfo.user_pw;
- this.ParentForm.SystemConfig.CurrentUser.ExpireAccount = userInfo.expire_period_account;
- this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = userInfo.expire_period_pw;
+ this.ParentForm.SystemConfig.CurrentUser.ExpireId = userInfo.id_expire_period;
+ this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = userInfo.password_expire_period;
- DateTime time = DateTime.ParseExact(userInfo.register_date.GetDateTime(), "yyyyMMddHHmmss", null);
- this.ParentForm.SystemConfig.CurrentUser.DateRegister = time;
- time = DateTime.ParseExact(userInfo.login_date.GetDateTime(), "yyyyMMddHHmmss", null);
- this.ParentForm.SystemConfig.CurrentUser.DateLogin = time;
- time = DateTime.ParseExact(userInfo.expire_account_date.GetDateTime(), "yyyyMMddHHmmss", null);
- this.ParentForm.SystemConfig.CurrentUser.DateExpireRegister = time;
- time = DateTime.ParseExact(userInfo.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
- this.ParentForm.SystemConfig.CurrentUser.DateExpireLogin = time;
-
- this.ParentForm.SystemConfig.CurrentUser.IsLockAccount = userInfo.flock_status_account == 0 ? false : true;
- this.ParentForm.SystemConfig.CurrentUser.IsLockPassword = userInfo.flock_status_password == 0 ? false : true;
+ DateTime time = DateTime.ParseExact(userInfo.password_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.ParentForm.SystemConfig.CurrentUser.DatePasswordRegister = time;
+ time = DateTime.ParseExact(userInfo.id_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.ParentForm.SystemConfig.CurrentUser.DateIdLogin = time;
+ time = DateTime.ParseExact(userInfo.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.ParentForm.SystemConfig.CurrentUser.DateIdExpire = time;
+ time = DateTime.ParseExact(userInfo.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.ParentForm.SystemConfig.CurrentUser.DatePasswordExpire = time;
+ this.ParentForm.SystemConfig.CurrentUser.IsLockAccount = userInfo.id_flock_status == 0 ? false : true;
+ 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);
myMsg.ShowDialog();
+
+ // 비밀번호 만료 시
+ if (userInfo.status == 15)
+ {
+ this.ParentForm.ChildFormMainDisplay.ChangeID = this.textBoxID.Text;
+ this.DialogResult = DialogResult.Abort;
+ this.Close();
+ }
}
}
+ private void ChangePassword()
+ {
+ int ret = 0;
+ string id = "", pass = "";
+ UserManager.UserMgr_user_info_t userInfo = new UserManager.UserMgr_user_info_t();
+
+ if (this.textBoxID.Text == "")
+ {
+ // New Password : 6~20자 입력 하세요
+ DialogFormMessage myMsg = new DialogFormMessage(null, 9, this.ParentForm.SystemConfig.Language);
+ myMsg.ShowDialog();
+
+ return;
+ }
+ if (this.textBoxPassword.Text == "")
+ {
+ // New Password Confirmation : 6~20자 입력 하세요
+ DialogFormMessage myMsg = new DialogFormMessage(null, 9, this.ParentForm.SystemConfig.Language);
+ myMsg.ShowDialog();
+
+ return;
+ }
+ if (this.textBoxID.Text.Equals(this.textBoxPassword.Text) == false)
+ {
+ // 비밀번호를 확인하세요
+ DialogFormMessage myMsg = new DialogFormMessage(null, 14, this.ParentForm.SystemConfig.Language);
+ myMsg.ShowDialog();
+
+ return;
+ }
+
+ if (this.IsLoginMode == true)
+ {
+ id = this.ParentForm.SystemConfig.CurrentUser.ID;
+ pass = this.textBoxID.Text;
+
+ Console.WriteLine(string.Format("UserManager_UserModifyPW : {0}, {1}", id, pass));
+ ret = UserManager.UserManager_UserModifyPWDirect(id, pass);
+ }
+ else
+ {
+ id = this.ParentForm.ChildFormMainDisplay.ChangeID;
+ pass = this.textBoxID.Text;
+
+ Console.WriteLine(string.Format("UserManager_UserModifyPW : {0}, {1}", id, pass));
+ ret = UserManager.UserManager_UserModifyPWDirect(id, pass);
+ }
+
+ // 비밀번호 변경이 완료 되면 로그인 시도
+ if (ret == 0)
+ {
+ UserManager.UserManager_UserLoginDirect(id, pass, ref userInfo);
+
+ if (userInfo.status == 0)
+ {
+ //MessageBox.Show("로그인 성공");
+
+ #region 로그인 성공
+ if (userInfo.active_level == 1)
+ this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Level1;
+ else if (userInfo.active_level == 2)
+ this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Level2;
+ else if (userInfo.active_level == 3)
+ this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Level3;
+ else if (userInfo.active_level == 9)
+ this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Admin;
+ else if (userInfo.active_level == 10)
+ this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Developer;
+
+ this.ParentForm.SystemConfig.CurrentUser.ID = userInfo.user_id;
+ this.ParentForm.SystemConfig.CurrentUser.Password = userInfo.user_pw;
+
+ this.ParentForm.SystemConfig.CurrentUser.ExpireId = userInfo.id_expire_period;
+ this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = userInfo.password_expire_period;
+
+ DateTime time = DateTime.ParseExact(userInfo.password_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.ParentForm.SystemConfig.CurrentUser.DatePasswordRegister = time;
+ time = DateTime.ParseExact(userInfo.id_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.ParentForm.SystemConfig.CurrentUser.DateIdLogin = time;
+ time = DateTime.ParseExact(userInfo.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.ParentForm.SystemConfig.CurrentUser.DateIdExpire = time;
+ time = DateTime.ParseExact(userInfo.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.ParentForm.SystemConfig.CurrentUser.DatePasswordExpire = time;
+
+ this.ParentForm.SystemConfig.CurrentUser.IsLockAccount = userInfo.id_flock_status == 0 ? false : true;
+ 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
+ {
+ DialogFormMessage myMsg = new DialogFormMessage(null, ret, this.ParentForm.SystemConfig.Language);
+ myMsg.ShowDialog();
+ }
+ }
+ else
+ {
+ // 비밀번호 변경 실패 시 메시지??
+ DialogFormMessage myMsg = new DialogFormMessage(null, ret, this.ParentForm.SystemConfig.Language);
+ myMsg.ShowDialog();
+ }
+ }
+ #endregion
+
+ #region Event Handler
+ private void buttonLogOn_Click(object sender, EventArgs e)
+ {
+ // Automatic Logout Reset
+ this.ParentForm.ChildFormMainDisplay.Part11AutomaticLogoutReset();
+
+ if (this.IsChangePassword == false)
+ this.LogOn();
+ else
+ this.ChangePassword();
+ }
private void buttonCancel_Click(object sender, EventArgs e)
{
- // Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsPart11 == true)
- this.ParentForm.ChildFormMainDisplay.Part11AutomaticLogoutReset();
-
this.DialogResult = DialogResult.Cancel;
this.Close();
}
private void textBoxID_GotFocus(object sender, EventArgs e)
{
- // Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsPart11 == true)
- this.ParentForm.ChildFormMainDisplay.Part11AutomaticLogoutReset();
-
this.smartKeyboard.TargetInputObject = this.textBoxID;
+
this.textBoxID.Select(this.textBoxID.Text.Length, 0);
}
private void textBoxPassword_GotFocus(object sender, EventArgs e)
{
- // Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsPart11 == true)
- this.ParentForm.ChildFormMainDisplay.Part11AutomaticLogoutReset();
-
this.smartKeyboard.TargetInputObject = this.textBoxPassword;
+
this.textBoxPassword.Select(this.textBoxPassword.Text.Length, 0);
}
private void smartKeyboard_OnXKeyClick(object sender, EventArgs e)
{
this.smartKeyboard.Show();
- }
- private void smartKeyboard_Click(object sender, EventArgs e)
- {
- // Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsPart11 == true)
- this.ParentForm.ChildFormMainDisplay.Part11AutomaticLogoutReset();
- }
+ }
#endregion
private void smartButton1_Click(object sender, EventArgs e)
@@ -222,25 +387,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/DialogForms/DialogFormMessage.cs b/INT69DB_2A/DialogForms/DialogFormMessage.cs
index 25effe8..029e29c 100644
--- a/INT69DB_2A/DialogForms/DialogFormMessage.cs
+++ b/INT69DB_2A/DialogForms/DialogFormMessage.cs
@@ -976,7 +976,7 @@ namespace INT69DB_2A.DialogForms
}
}
- // 03
+ // 04
public DialogFormMessage(object dll, int code, DataStore.LanguageID language)
{
InitializeComponent();
@@ -992,83 +992,87 @@ namespace INT69DB_2A.DialogForms
switch (code)
{
case 1:
- this.labelErrorCode.Text = "Error 03_01";
+ this.labelErrorCode.Text = "Error 04_01";
this.labelMessage1.Text = "ID를 찾을 수 없습니다";
break;
case 2:
- this.labelErrorCode.Text = "Error 03_02";
+ this.labelErrorCode.Text = "Error 04_02";
this.labelMessage1.Text = "ID : 동일한 ID가 있습니다";
break;
case 3:
- this.labelErrorCode.Text = "Error 03_03";
+ this.labelErrorCode.Text = "Error 04_03";
this.labelMessage1.Text = "ID : 6~20자 입력하세요";
break;
case 4:
- this.labelErrorCode.Text = "Error 03_04";
+ this.labelErrorCode.Text = "Error 04_04";
this.labelMessage1.Text = "ID : 6~20자 입력하세요";
break;
case 5:
- this.labelErrorCode.Text = "Error 03_05";
+ this.labelErrorCode.Text = "Error 04_05";
this.labelMessage1.Text = "ID : 연속된 문자(123,321,abc,cba...)또는";
this.labelMessage2.Text = "동일한 문자(111,222,aaa...) 사용 할 수 없습니다";
break;
case 6:
- this.labelErrorCode.Text = "Error 03_06";
+ this.labelErrorCode.Text = "Error 04_06";
this.labelMessage1.Text = "ID : 사용할 수 없는 문자가 포함되어 있습니다";
break;
case 7:
- this.labelErrorCode.Text = "Error 03_07";
+ this.labelErrorCode.Text = "Error 04_07";
this.labelMessage1.Text = "ID : 사용자 계정이 만료 되었습니다";
break;
case 8:
- this.labelErrorCode.Text = "Error 03_08";
+ this.labelErrorCode.Text = "Error 04_08";
this.labelMessage1.Text = "PASSWORD : 이전 패스워드 입니다";
break;
case 9:
- this.labelErrorCode.Text = "Error 03_09";
+ this.labelErrorCode.Text = "Error 04_09";
this.labelMessage1.Text = "PASSWORD : 6~20자 입력하세요";
break;
case 10:
- this.labelErrorCode.Text = "Error 03_10";
+ this.labelErrorCode.Text = "Error 04_10";
this.labelMessage1.Text = "PASSWORD : 6~20자 입력하세요";
break;
case 11:
- this.labelErrorCode.Text = "Error 03_11";
+ this.labelErrorCode.Text = "Error 04_11";
this.labelMessage1.Text = "PASSWORD : 연속된 문자(123,321,abc,cba...)또는";
this.labelMessage2.Text = "동일한 문자(111,222,aaa...) 사용 할 수 없습니다";
break;
case 12:
- this.labelErrorCode.Text = "Error 03_12";
+ this.labelErrorCode.Text = "Error 04_12";
this.labelMessage1.Text = "PASSWORD : 사용할 수 없는 문자가 포함되어 있습니다";
this.labelMessage2.Text = "사용 가능 특수문자 : !@#$%^&*+-.";
break;
case 13:
- this.labelErrorCode.Text = "Error 03_13";
+ this.labelErrorCode.Text = "Error 04_13";
this.labelMessage1.Text = "PASSWORD : 영문1이상, 숫자1이상, 특수문자1이상";
this.labelMessage2.Text = "포함하여 주십시오";
break;
case 14:
- this.labelErrorCode.Text = "Error 03_14";
+ this.labelErrorCode.Text = "Error 04_14";
this.labelMessage1.Text = "비밀번호를 확인하세요";
break;
case 15:
- this.labelErrorCode.Text = "Error 03_15";
+ this.labelErrorCode.Text = "Error 04_15";
this.labelMessage1.Text = "PASSWORD : 비밀번호가 만료 되었습니다";
break;
case 16:
- this.labelErrorCode.Text = "Error 03_16";
- this.labelMessage1.Text = "필수 설정 항목을 설정해 주십시오";
+ this.labelErrorCode.Text = "Error 04_16";
+ this.labelMessage1.Text = "접근 권한을 설정해 주십시오";
break;
case 17:
- this.labelErrorCode.Text = "Error 03_17";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Error 04_17";
+ this.labelMessage1.Text = "비밀번호가 동일하지 않습니다";
break;
case 18:
- this.labelErrorCode.Text = "Error 03_18";
+ this.labelErrorCode.Text = "Error 04_18";
this.labelMessage1.Text = "";
break;
+ case 99:
+ this.labelErrorCode.Text = "Error 04_99";
+ this.labelMessage1.Text = "제조사에 문의하세요";
+ break;
default:
- this.labelErrorCode.Text = "Error 03_99";
+ this.labelErrorCode.Text = "Error 04_99";
this.labelMessage1.Text = "제조사에 문의하세요";
break;
}
@@ -1079,79 +1083,87 @@ namespace INT69DB_2A.DialogForms
switch (code)
{
case 1:
- this.labelErrorCode.Text = "Error 03_01";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Error 04_01";
+ this.labelMessage1.Text = "ID not found";
break;
case 2:
- this.labelErrorCode.Text = "Error 03_02";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Error 04_02";
+ this.labelMessage1.Text = "ID : ID already exists";
break;
case 3:
- this.labelErrorCode.Text = "Error 03_03";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Error 04_03";
+ this.labelMessage1.Text = "ID : Please enter 6~20 characters";
break;
case 4:
- this.labelErrorCode.Text = "Error 03_04";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Error 04_04";
+ this.labelMessage1.Text = "ID : Please enter 6~20 characters";
break;
case 5:
- this.labelErrorCode.Text = "Error 03_05";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Error 04_05";
+ this.labelMessage1.Text = "ID : Consecutive(123,321,abc,cba...) or";
+ this.labelMessage2.Text = "identical(111,222,aaa...) characters cannot be used.";
break;
case 6:
- this.labelErrorCode.Text = "Error 03_06";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Error 04_06";
+ this.labelMessage1.Text = "ID : Contains invalid characters";
break;
case 7:
- this.labelErrorCode.Text = "Error 03_07";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Error 04_07";
+ this.labelMessage1.Text = "ID : User account has expired";
break;
case 8:
- this.labelErrorCode.Text = "Error 03_08";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Error 04_08";
+ this.labelMessage1.Text = "PASSWORD : This is the old password";
break;
case 9:
- this.labelErrorCode.Text = "Error 03_09";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Error 04_09";
+ this.labelMessage1.Text = "PASSWORD : Please enter 6~20 characters";
break;
case 10:
- this.labelErrorCode.Text = "Error 03_10";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Error 04_10";
+ this.labelMessage1.Text = "PASSWORD : Please enter 6~20 characters";
break;
case 11:
- this.labelErrorCode.Text = "Error 03_11";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Error 04_11";
+ this.labelMessage1.Text = "PASSWORD : Consecutive(123,321,abc,cba...) or";
+ this.labelMessage2.Text = "identical(111,222,aaa...) characters cannot be used.";
break;
case 12:
- this.labelErrorCode.Text = "Error 03_12";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Error 04_12";
+ this.labelMessage1.Text = "PASSWORD : Contains invalid characters";
+ this.labelMessage2.Text = "Special characters allowed : !@#$%^&*+-.";
break;
case 13:
- this.labelErrorCode.Text = "Error 03_13";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Error 04_13";
+ this.labelMessage1.Text = "PASSWORD : Please include at least one English letter,";
+ this.labelMessage2.Text = "at least one number, and at least one special character";
break;
case 14:
- this.labelErrorCode.Text = "Error 03_14";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Error 04_14";
+ this.labelMessage1.Text = "Check your password";
break;
case 15:
- this.labelErrorCode.Text = "Error 03_15";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Error 04_15";
+ this.labelMessage1.Text = "PASSWORD : Password has expired";
break;
case 16:
- this.labelErrorCode.Text = "Error 03_16";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Error 04_16";
+ this.labelMessage1.Text = "Please set the access right";
break;
case 17:
- this.labelErrorCode.Text = "Error 03_17";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Error 04_17";
+ this.labelMessage1.Text = "Passwords are not the same";
break;
case 18:
- this.labelErrorCode.Text = "Error 03_18";
+ this.labelErrorCode.Text = "Error 04_18";
this.labelMessage1.Text = "";
break;
+ case 99:
+ this.labelErrorCode.Text = "Error 04_99";
+ this.labelMessage1.Text = "Please contact a manufacturer";
+ break;
default:
- this.labelErrorCode.Text = "Error 03_99";
+ this.labelErrorCode.Text = "Error 04_99";
this.labelMessage1.Text = "Please contact a manufacturer";
break;
}
@@ -1164,80 +1176,88 @@ namespace INT69DB_2A.DialogForms
switch (code)
{
case 1:
- this.labelErrorCode.Text = "错误 03_01";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "错误 04_01";
+ this.labelMessage1.Text = "未找到 ID";
break;
case 2:
- this.labelErrorCode.Text = "错误 03_02";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "错误 04_02";
+ this.labelMessage1.Text = "ID : ID已存在";
break;
case 3:
- this.labelErrorCode.Text = "错误 03_03";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "错误 04_03";
+ this.labelMessage1.Text = "ID : 请输入6~20个字符";
break;
case 4:
- this.labelErrorCode.Text = "错误 03_04";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "错误 04_04";
+ this.labelMessage1.Text = "ID : 请输入6~20个字符";
break;
case 5:
- this.labelErrorCode.Text = "错误 03_05";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "错误 04_05";
+ this.labelMessage1.Text = "ID : 不能使用连续的 (123,321,abc,cba...)";
+ this.labelMessage2.Text = "或相同的 (111,222,aaa...) 字符。";
break;
case 6:
- this.labelErrorCode.Text = "错误 03_06";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "错误 04_06";
+ this.labelMessage1.Text = "ID : 它包含无效字符";
break;
case 7:
- this.labelErrorCode.Text = "错误 03_07";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "错误 04_07";
+ this.labelMessage1.Text = "ID : 用户帐号已过期";
break;
case 8:
- this.labelErrorCode.Text = "错误 03_08";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "错误 04_08";
+ this.labelMessage1.Text = "密码 : 这是旧密码";
break;
case 9:
- this.labelErrorCode.Text = "错误 03_09";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "错误 04_09";
+ this.labelMessage1.Text = "密码 : 请输入6~20个字符";
break;
case 10:
- this.labelErrorCode.Text = "错误 03_10";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "错误 04_10";
+ this.labelMessage1.Text = "密码 : 请输入6~20个字符";
break;
case 11:
- this.labelErrorCode.Text = "错误 03_11";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "错误 04_11";
+ this.labelMessage1.Text = "密码 : 不能使用连续的 (123,321,abc,cba...)";
+ this.labelMessage2.Text = "或相同的 (111,222,aaa...) 字符。";
break;
case 12:
- this.labelErrorCode.Text = "错误 03_12";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "错误 04_12";
+ this.labelMessage1.Text = "密码 : 它包含无效字符";
+ this.labelMessage2.Text = "允许使用特殊字符 : !@#$%^&*+-.";
break;
case 13:
- this.labelErrorCode.Text = "错误 03_13";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "错误 04_13";
+ this.labelMessage1.Text = "密码 : 请至少包含一个英文字母，";
+ this.labelMessage2.Text = "至少一个数字，至少一个特殊字符";
break;
case 14:
- this.labelErrorCode.Text = "错误 03_14";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "错误 04_14";
+ this.labelMessage1.Text = "检查您的密码";
break;
case 15:
- this.labelErrorCode.Text = "错误 03_15";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "错误 04_15";
+ this.labelMessage1.Text = "密码 : 密码已过期";
break;
case 16:
- this.labelErrorCode.Text = "错误 03_16";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "错误 04_16";
+ this.labelMessage1.Text = "请设置访问权限";
break;
case 17:
- this.labelErrorCode.Text = "错误 03_17";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "错误 04_17";
+ this.labelMessage1.Text = "密码不一样";
break;
case 18:
- this.labelErrorCode.Text = "错误 03_18";
+ this.labelErrorCode.Text = "错误 04_18";
this.labelMessage1.Text = "";
break;
+ case 99:
+ this.labelErrorCode.Text = "错误 04_99";
+ this.labelMessage1.Text = "请联系制造商";
+ break;
default:
- this.labelErrorCode.Text = "错误 03_99";
- this.labelMessage1.Text = "请联系厂商";
+ this.labelErrorCode.Text = "错误 04_99";
+ this.labelMessage1.Text = "请联系制造商";
break;
}
#endregion
@@ -1247,79 +1267,83 @@ namespace INT69DB_2A.DialogForms
switch (code)
{
case 1:
- this.labelErrorCode.Text = "Chybě 03_01";
+ this.labelErrorCode.Text = "Chybě 04_01";
this.labelMessage1.Text = "";
break;
case 2:
- this.labelErrorCode.Text = "Chybě 03_02";
+ this.labelErrorCode.Text = "Chybě 04_02";
this.labelMessage1.Text = "";
break;
case 3:
- this.labelErrorCode.Text = "Chybě 03_03";
+ this.labelErrorCode.Text = "Chybě 04_03";
this.labelMessage1.Text = "";
break;
case 4:
- this.labelErrorCode.Text = "Chybě 03_04";
+ this.labelErrorCode.Text = "Chybě 04_04";
this.labelMessage1.Text = "";
break;
case 5:
- this.labelErrorCode.Text = "Chybě 03_05";
+ this.labelErrorCode.Text = "Chybě 04_05";
this.labelMessage1.Text = "";
break;
case 6:
- this.labelErrorCode.Text = "Chybě 03_06";
+ this.labelErrorCode.Text = "Chybě 04_06";
this.labelMessage1.Text = "";
break;
case 7:
- this.labelErrorCode.Text = "Chybě 03_07";
+ this.labelErrorCode.Text = "Chybě 04_07";
this.labelMessage1.Text = "";
break;
case 8:
- this.labelErrorCode.Text = "Chybě 03_08";
+ this.labelErrorCode.Text = "Chybě 04_08";
this.labelMessage1.Text = "";
break;
case 9:
- this.labelErrorCode.Text = "Chybě 03_09";
+ this.labelErrorCode.Text = "Chybě 04_09";
this.labelMessage1.Text = "";
break;
case 10:
- this.labelErrorCode.Text = "Chybě 03_10";
+ this.labelErrorCode.Text = "Chybě 04_10";
this.labelMessage1.Text = "";
break;
case 11:
- this.labelErrorCode.Text = "Chybě 03_11";
+ this.labelErrorCode.Text = "Chybě 04_11";
this.labelMessage1.Text = "";
break;
case 12:
- this.labelErrorCode.Text = "Chybě 03_12";
+ this.labelErrorCode.Text = "Chybě 04_12";
this.labelMessage1.Text = "";
break;
case 13:
- this.labelErrorCode.Text = "Chybě 03_13";
+ this.labelErrorCode.Text = "Chybě 04_13";
this.labelMessage1.Text = "";
break;
case 14:
- this.labelErrorCode.Text = "Chybě 03_14";
+ this.labelErrorCode.Text = "Chybě 04_14";
this.labelMessage1.Text = "";
break;
case 15:
- this.labelErrorCode.Text = "Chybě 03_15";
+ this.labelErrorCode.Text = "Chybě 04_15";
this.labelMessage1.Text = "";
break;
case 16:
- this.labelErrorCode.Text = "Chybě 03_16";
+ this.labelErrorCode.Text = "Chybě 04_16";
this.labelMessage1.Text = "";
break;
case 17:
- this.labelErrorCode.Text = "Chybě 03_17";
+ this.labelErrorCode.Text = "Chybě 04_17";
this.labelMessage1.Text = "";
break;
case 18:
- this.labelErrorCode.Text = "Chybě 03_18";
+ this.labelErrorCode.Text = "Chybě 04_18";
this.labelMessage1.Text = "";
break;
+ case 99:
+ this.labelErrorCode.Text = "Chybě 04_99";
+ this.labelMessage1.Text = "Kontaktujte výrobce";
+ break;
default:
- this.labelErrorCode.Text = "Chybě 03_99";
+ this.labelErrorCode.Text = "Chybě 04_99";
this.labelMessage1.Text = "Kontaktujte výrobce";
this.labelMessage2.Text = "";
break;
@@ -1328,83 +1352,93 @@ namespace INT69DB_2A.DialogForms
break;
case DataStore.LanguageID.German:
#region 독일어
+ this.buttonOK.Text = "Bestätigen";
+
switch (code)
{
case 1:
- this.labelErrorCode.Text = "Error 01";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Fehler 04_01";
+ this.labelMessage1.Text = "ID nicht gefunden";
break;
case 2:
- this.labelErrorCode.Text = "Error 02";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Fehler 04_02";
+ this.labelMessage1.Text = "ID : ID existiert bereits";
break;
case 3:
- this.labelErrorCode.Text = "Error 03";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Fehler 04_03";
+ this.labelMessage1.Text = "ID : Bitte geben Sie 6~20 Zeichen ein";
break;
case 4:
- this.labelErrorCode.Text = "Error 04";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Fehler 04_04";
+ this.labelMessage1.Text = "ID : Bitte geben Sie 6~20 Zeichen ein";
break;
case 5:
- this.labelErrorCode.Text = "Error 05";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Fehler 04_05";
+ this.labelMessage1.Text = "ID : Aufeinanderfolgende (123,321,abc,cba...)";
+ this.labelMessage2.Text = "oder identische (111,222,aaa...) Zeichen können nicht verwendet werden.";
break;
case 6:
- this.labelErrorCode.Text = "Error 06";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Fehler 04_06";
+ this.labelMessage1.Text = "ID : Es enthält ungültige Zeichen";
break;
case 7:
- this.labelErrorCode.Text = "Error 07";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Fehler 04_07";
+ this.labelMessage1.Text = "ID : Benutzerkonto ist abgelaufen";
break;
case 8:
- this.labelErrorCode.Text = "Error 08";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Fehler 04_08";
+ this.labelMessage1.Text = "Passwort : Dies ist das alte Passwort";
break;
case 9:
- this.labelErrorCode.Text = "Error 09";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Fehler 04_09";
+ this.labelMessage1.Text = "Passwort : Bitte geben Sie 6~20 Zeichen ein";
break;
case 10:
- this.labelErrorCode.Text = "Error 10";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Fehler 04_10";
+ this.labelMessage1.Text = "Passwort : Bitte geben Sie 6~20 Zeichen ein";
break;
case 11:
- this.labelErrorCode.Text = "Error 11";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Fehler 04_11";
+ this.labelMessage1.Text = "Passwort : Aufeinanderfolgende (123,321,abc,cba...)";
+ this.labelMessage2.Text = "oder identische (111,222,aaa...) Zeichen können nicht verwendet werden.";
break;
case 12:
- this.labelErrorCode.Text = "Error 12";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Fehler 04_12";
+ this.labelMessage1.Text = "Passwort : Es enthält ungültige Zeichen";
+ this.labelMessage2.Text = "Sonderzeichen erlaubt : !@#$%^&*+-.";
break;
case 13:
- this.labelErrorCode.Text = "Error 13";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Fehler 04_13";
+ this.labelMessage1.Text = "Passwort : Bitte geben Sie mindestens einen";
+ this.labelMessage2.Text = "englischen Buchstaben, mindestens eine Ziffer und mindestens ein Sonderzeichen an";
break;
case 14:
- this.labelErrorCode.Text = "Error 14";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Fehler 04_14";
+ this.labelMessage1.Text = "Überprüfen Sie Ihr Passwort";
break;
case 15:
- this.labelErrorCode.Text = "Error 15";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Fehler 04_15";
+ this.labelMessage1.Text = "Passwort : Passwort ist abgelaufen";
break;
case 16:
- this.labelErrorCode.Text = "Error 16";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Fehler 04_16";
+ this.labelMessage1.Text = "Bitte legen Sie Zugriffsrechte fest";
break;
case 17:
- this.labelErrorCode.Text = "Error 17";
- this.labelMessage1.Text = "";
+ this.labelErrorCode.Text = "Fehler 04_17";
+ this.labelMessage1.Text = "Passwörter sind nicht gleich";
break;
case 18:
- this.labelErrorCode.Text = "Error 18";
+ this.labelErrorCode.Text = "Fehler 04_18";
this.labelMessage1.Text = "";
break;
+ case 99:
+ this.labelErrorCode.Text = "Fehler 04_99";
+ this.labelMessage1.Text = "Bitte wenden Sie sich an einen Hersteller";
+ break;
default:
- this.labelErrorCode.Text = "Fehler 99";
- this.labelMessage1.Text = "Hersteller kontaktieren";
+ this.labelErrorCode.Text = "Fehler 04_99";
+ this.labelMessage1.Text = "Bitte wenden Sie sich an einen Hersteller";
break;
}
#endregion
@@ -1472,7 +1506,7 @@ namespace INT69DB_2A.DialogForms
#endregion
#region Method
- private void InitializeContnrol()
+ private void InitializeControl()
{
int x = 0, y = 0;
@@ -1490,7 +1524,7 @@ namespace INT69DB_2A.DialogForms
{
base.OnLoad(e);
- this.InitializeContnrol();
+ this.InitializeControl();
}
#endregion
diff --git a/INT69DB_2A/DialogForms/DialogFormPasswordKeyPad1.cs b/INT69DB_2A/DialogForms/DialogFormPasswordKeyPad.cs
similarity index 69%
rename from INT69DB_2A/DialogForms/DialogFormPasswordKeyPad1.cs
rename to INT69DB_2A/DialogForms/DialogFormPasswordKeyPad.cs
index 1ae1afa..8038e7a 100644
--- a/INT69DB_2A/DialogForms/DialogFormPasswordKeyPad1.cs
+++ b/INT69DB_2A/DialogForms/DialogFormPasswordKeyPad.cs
@@ -9,18 +9,23 @@ using System.Windows.Forms;
namespace INT69DB_2A.DialogForms
{
- public partial class DialogFormPasswordKeyPad1 : Form
+ public partial class DialogFormPasswordKeyPad : Form
{
#region Field
private string m_InputKey;
private string m_PassKey;
+ private string m_PasswordHiddenMenu;
+ private int m_Digit;
#endregion
#region Constructor
- public DialogFormPasswordKeyPad1(DataStore.LanguageID language)
+ public DialogFormPasswordKeyPad(int digit, DataStore.LanguageID language)
{
InitializeComponent();
+ this.Digit = digit;
+ this.PasswordHiddenMenu = DateTime.Now.ToString("MMdd") + "0810";
+
this.InitializeDesign(language);
}
#endregion
@@ -36,36 +41,43 @@ namespace INT69DB_2A.DialogForms
get { return this.m_PassKey; }
set { this.m_PassKey = value; }
}
+ private int Digit
+ {
+ get { return this.m_Digit; }
+ set { this.m_Digit = value; }
+ }
+ public string PasswordHiddenMenu
+ {
+ get { return this.m_PasswordHiddenMenu; }
+ set { this.m_PasswordHiddenMenu = value; }
+ }
#endregion
#region Method
private void InputNum(string key)
{
- if (this.InputKey.Length >= 4)
+ if (this.InputKey.Length >= this.Digit)
{
this.InputKey = key;
- this.labelScreen.Text = this.InputKey;
+ this.labelScreen.Text = "*";
}
else
{
this.InputKey += key;
- this.labelScreen.Text = this.InputKey;
+ this.labelScreen.Text += "*";
}
}
private void InitializeDesign(DataStore.LanguageID language)
{
- if (language == DataStore.LanguageID.Korean)
+ if (language == DataStore.LanguageID.English)
{
-
- }
- else if (language == DataStore.LanguageID.English)
- {
-
+ this.buttonCancel.Text = "ESC";
+ this.buttonEnter.Text = "Enter";
}
else if (language == DataStore.LanguageID.Chinese)
{
- this.labelSubject.Text = "密码";
+ this.labelSubject.Text = "键盘";
this.buttonCancel.Text = "取消";
this.buttonEnter.Text = "确认";
@@ -76,10 +88,11 @@ namespace INT69DB_2A.DialogForms
}
else
{
-
+ this.buttonCancel.Text = "ESC";
+ this.buttonEnter.Text = "Enter";
}
}
- private void InitializeContnrol()
+ private void InitializeControl()
{
int x = 0, y = 0;
@@ -100,17 +113,24 @@ namespace INT69DB_2A.DialogForms
{
base.OnLoad(e);
- this.InitializeContnrol();
+ this.InitializeControl();
}
#endregion
#region Event Handler
private void buttonEnter_Click(object sender, EventArgs e)
{
- if (this.labelScreen.Text.Length == 4)
+ if (this.labelScreen.Text.Length == 8)
{
- this.DialogResult = DialogResult.OK;
+ if (this.Digit == 8)
+ {
+ if (this.InputKey == this.PasswordHiddenMenu)
+ this.DialogResult = DialogResult.OK;
+ }
}
+
+ this.InputKey = "";
+ this.labelScreen.Text = "";
}
private void buttonNumber_Click(object sender, EventArgs e)
diff --git a/INT69DB_2A/DialogForms/DialogFormPasswordKeyPad1.designer.cs b/INT69DB_2A/DialogForms/DialogFormPasswordKeyPad.designer.cs
similarity index 99%
rename from INT69DB_2A/DialogForms/DialogFormPasswordKeyPad1.designer.cs
rename to INT69DB_2A/DialogForms/DialogFormPasswordKeyPad.designer.cs
index d5b0ed7..73464b8 100644
--- a/INT69DB_2A/DialogForms/DialogFormPasswordKeyPad1.designer.cs
+++ b/INT69DB_2A/DialogForms/DialogFormPasswordKeyPad.designer.cs
@@ -1,6 +1,6 @@
namespace INT69DB_2A.DialogForms
{
- partial class DialogFormPasswordKeyPad1
+ partial class DialogFormPasswordKeyPad
{
///
/// Required designer variable.
diff --git a/INT69DB_2A/DialogForms/DialogFormPasswordKeyPad1.resx b/INT69DB_2A/DialogForms/DialogFormPasswordKeyPad.resx
similarity index 100%
rename from INT69DB_2A/DialogForms/DialogFormPasswordKeyPad1.resx
rename to INT69DB_2A/DialogForms/DialogFormPasswordKeyPad.resx
diff --git a/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.Designer.cs b/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.Designer.cs
index 67b3a40..f4cd255 100644
--- a/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.Designer.cs
+++ b/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.Designer.cs
@@ -29,14 +29,31 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DialogFormUserEditorKeyboard));
- this.smartKeyboard = new SmartX.SmartKeyboard();
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.textBox = new System.Windows.Forms.TextBox();
- this.smartGroupBox1 = new SmartX.SmartGroupBox();
- this.labelTitle = new SmartX.SmartLabel();
+ this.smartKeyboard = new SmartX.SmartKeyboard();
this.pictureBoxImage = new System.Windows.Forms.PictureBox();
- this.smartGroupBox1.SuspendLayout();
+ this.labelTitle = new SmartX.SmartLabel();
this.SuspendLayout();
//
+ // pictureBox1
+ //
+ this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+ this.pictureBox1.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(710, 470);
+ //
+ // textBox
+ //
+ this.textBox.Font = new System.Drawing.Font("Tahoma", 25F, System.Drawing.FontStyle.Regular);
+ this.textBox.Location = new System.Drawing.Point(143, 99);
+ this.textBox.MaxLength = 20;
+ this.textBox.Name = "textBox";
+ this.textBox.Size = new System.Drawing.Size(489, 47);
+ this.textBox.TabIndex = 181;
+ this.textBox.Text = "ABCDE";
+ this.textBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox_KeyPress);
+ //
// smartKeyboard
//
this.smartKeyboard.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(29)))), ((int)(((byte)(40)))), ((int)(((byte)(24)))));
@@ -55,15 +72,15 @@
this.smartKeyboard.KeyUpImage2 = null;
this.smartKeyboard.KeyUpImage3 = null;
this.smartKeyboard.LeftMargin = 5;
- this.smartKeyboard.Location = new System.Drawing.Point(7, 188);
+ this.smartKeyboard.Location = new System.Drawing.Point(13, 190);
this.smartKeyboard.Name = "smartKeyboard";
this.smartKeyboard.PressFontColor = System.Drawing.Color.Olive;
this.smartKeyboard.PressKeyFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.smartKeyboard.PressKeyOutLineColor = System.Drawing.Color.Green;
this.smartKeyboard.RoundedCorners = true;
this.smartKeyboard.SetBackimage = null;
- this.smartKeyboard.Size = new System.Drawing.Size(697, 270);
- this.smartKeyboard.TabIndex = 3;
+ this.smartKeyboard.Size = new System.Drawing.Size(685, 268);
+ this.smartKeyboard.TabIndex = 182;
this.smartKeyboard.TABKeyDisable = false;
this.smartKeyboard.TargetInputObject = null;
this.smartKeyboard.Text = "smartKeyboard1";
@@ -72,38 +89,12 @@
this.smartKeyboard.OnXKeyClick += new System.EventHandler(this.smartKeyboard_OnXKeyClick);
this.smartKeyboard.KeyDown += new System.Windows.Forms.KeyEventHandler(this.smartKeyboard_KeyDown);
//
- // textBox
+ // pictureBoxImage
//
- this.textBox.Font = new System.Drawing.Font("Tahoma", 25F, System.Drawing.FontStyle.Regular);
- this.textBox.Location = new System.Drawing.Point(143, 99);
- this.textBox.MaxLength = 20;
- this.textBox.Name = "textBox";
- this.textBox.Size = new System.Drawing.Size(489, 47);
- this.textBox.TabIndex = 2;
- this.textBox.Text = "ABCDE";
- this.textBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox_KeyPress);
- //
- // smartGroupBox1
- //
- this.smartGroupBox1.BackPictureBox = null;
- this.smartGroupBox1.BackPictureBox1 = null;
- this.smartGroupBox1.Controls.Add(this.labelTitle);
- this.smartGroupBox1.Controls.Add(this.pictureBoxImage);
- this.smartGroupBox1.Controls.Add(this.smartKeyboard);
- this.smartGroupBox1.Controls.Add(this.textBox);
- this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.Black;
- this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.Black;
- this.smartGroupBox1.FrameLineThickness = 1;
- this.smartGroupBox1.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.None;
- this.smartGroupBox1.Image = ((System.Drawing.Image)(resources.GetObject("smartGroupBox1.Image")));
- this.smartGroupBox1.InitVisible = true;
- this.smartGroupBox1.Location = new System.Drawing.Point(0, 0);
- this.smartGroupBox1.Name = "smartGroupBox1";
- this.smartGroupBox1.RoundRadius = 5;
- this.smartGroupBox1.Size = new System.Drawing.Size(710, 470);
- this.smartGroupBox1.TabIndex = 4;
- this.smartGroupBox1.Text = "smartGroupBox1";
- this.smartGroupBox1.TextColor = System.Drawing.Color.Black;
+ this.pictureBoxImage.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxImage.Image")));
+ this.pictureBoxImage.Location = new System.Drawing.Point(40, 67);
+ this.pictureBoxImage.Name = "pictureBoxImage";
+ this.pictureBoxImage.Size = new System.Drawing.Size(66, 72);
//
// labelTitle
//
@@ -120,19 +111,12 @@
this.labelTitle.Location = new System.Drawing.Point(143, 43);
this.labelTitle.Name = "labelTitle";
this.labelTitle.Size = new System.Drawing.Size(489, 50);
- this.labelTitle.TabIndex = 179;
+ this.labelTitle.TabIndex = 183;
this.labelTitle.Text = "입력";
this.labelTitle.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitle.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitle.Wordwrap = false;
//
- // pictureBoxImage
- //
- this.pictureBoxImage.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxImage.Image")));
- this.pictureBoxImage.Location = new System.Drawing.Point(40, 67);
- this.pictureBoxImage.Name = "pictureBoxImage";
- this.pictureBoxImage.Size = new System.Drawing.Size(66, 72);
- //
// DialogFormUserEditorKeyboard
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -141,21 +125,26 @@
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.ClientSize = new System.Drawing.Size(710, 470);
this.ControlBox = false;
- this.Controls.Add(this.smartGroupBox1);
+ this.Controls.Add(this.labelTitle);
+ this.Controls.Add(this.pictureBoxImage);
+ this.Controls.Add(this.smartKeyboard);
+ this.Controls.Add(this.textBox);
+ this.Controls.Add(this.pictureBox1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Name = "DialogFormUserEditorKeyboard";
this.Text = "DialogFormUserEditorKeyboard";
- this.smartGroupBox1.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
- private SmartX.SmartKeyboard smartKeyboard;
+ private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.TextBox textBox;
- private SmartX.SmartGroupBox smartGroupBox1;
+ private SmartX.SmartKeyboard smartKeyboard;
private System.Windows.Forms.PictureBox pictureBoxImage;
private SmartX.SmartLabel labelTitle;
+
+
}
}
\ No newline at end of file
diff --git a/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.cs b/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.cs
index f5791b1..272446f 100644
--- a/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.cs
+++ b/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.cs
@@ -16,14 +16,14 @@ namespace INT69DB_2A.DialogForms
#endregion
#region Constructor
- public DialogFormUserEditorKeyboard(string value, string title)
+ public DialogFormUserEditorKeyboard(string value)
{
InitializeComponent();
- this.labelTitle.Text = title;
this.textBox.Text = value;
this.RetStringValue = value;
+ this.InitializeControl();
this.DefaultSetting();
}
#endregion
@@ -37,10 +37,18 @@ namespace INT69DB_2A.DialogForms
#endregion
#region Method
+ private void InitializeControl()
+ {
+ int x = 0, y = 0;
+
+ x = Screen.PrimaryScreen.Bounds.Width / 2 - this.Size.Width / 2;
+ y = Screen.PrimaryScreen.Bounds.Height / 2 - this.Size.Height / 2;
+
+ this.Location = new Point(x, y);
+ this.Size = new Size(713, 473);
+ }
private void DefaultSetting()
{
- this.Location = new Point(45, 63);
-
this.smartKeyboard.TargetInputObject = this.textBox;
this.smartKeyboard.KeyboardType = SmartX.SmartKeyboard.KEYBOARDTYPES.NORMAL;
this.smartKeyboard.Show();
diff --git a/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.resx b/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.resx
index 98db8cf..9adad6e 100644
--- a/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.resx
+++ b/INT69DB_2A/DialogForms/DialogFormUserEditorKeyboard.resx
@@ -118,78 +118,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 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
- YII=
-
-
-
+
iVBORw0KGgoAAAANSUhEUgAAAsYAAAHWCAYAAAB0Vk+zAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -358,6 +287,77 @@
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
+ YII=
diff --git a/INT69DB_2A/DialogForms/DialogFormYesNo.cs b/INT69DB_2A/DialogForms/DialogFormYesNo.cs
index 0db3dc9..6a57c0d 100644
--- a/INT69DB_2A/DialogForms/DialogFormYesNo.cs
+++ b/INT69DB_2A/DialogForms/DialogFormYesNo.cs
@@ -311,6 +311,14 @@ namespace INT69DB_2A.DialogForms
case DataStore.LanguageID.Korean:
switch (ok)
{
+ case 2:
+ this.labelErrorCode.Text = "비밀번호 만료";
+ if (int.Parse(msg) == 0)
+ this.labelMessage1.Text = "비밀번호 만료일입니다.";
+ else
+ this.labelMessage1.Text = string.Format("비밀번호 만료 {0}일 전입니다.", msg);
+ this.labelMessage2.Text = "비밀번호를 변경하시겠습니까?";
+ break;
case 31:
this.labelErrorCode.Text = "파일";
this.labelMessage1.Text = string.Format("{0} 파일이 이미 있습니다. 바꾸시겠습니까?", msg);
@@ -320,8 +328,43 @@ namespace INT69DB_2A.DialogForms
}
break;
case DataStore.LanguageID.English:
+ switch (ok)
+ {
+ case 2:
+ this.labelErrorCode.Text = "Password expiration";
+ if (int.Parse(msg) == 0)
+ this.labelMessage1.Text = "Today is the password expiration date.";
+ else
+ this.labelMessage1.Text = string.Format("{0} days before password expires", msg);
+ this.labelMessage2.Text = "Do you want to change the password?";
+ break;
+ case 31:
+ this.labelErrorCode.Text = "File";
+ this.labelMessage1.Text = string.Format("{0} already exists. Do you change the file?", msg);
+ break;
+ default:
+ break;
+ }
+ break;
break;
case DataStore.LanguageID.Chinese:
+ switch (ok)
+ {
+ case 2:
+ this.labelErrorCode.Text = "密码过期";
+ if (int.Parse(msg) == 0)
+ this.labelMessage1.Text = "今天是密码过期日期.";
+ else
+ this.labelMessage1.Text = string.Format("密码过期前{0}天", msg);
+ this.labelMessage2.Text = "您要更改密码吗？";
+ break;
+ case 31:
+ this.labelErrorCode.Text = "文件";
+ this.labelMessage1.Text = string.Format("{0} 已经存在。 你改文件了吗？", msg);
+ break;
+ default:
+ break;
+ }
break;
case DataStore.LanguageID.Czech:
break;
diff --git a/INT69DB_2A/Forms/FormCommunication.cs b/INT69DB_2A/Forms/FormCommunication.cs
index 03a297a..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()
{
@@ -259,30 +273,30 @@ namespace INT69DB_2A.Forms
if (this.ParentForm.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f1_OPT1)
{
if (this.ParentForm.SystemConfig.EquipmentMode == 1)
- data = this.ParentForm.OPT1(this.ParentForm.CollectionWeightData);
+ data = this.ParentForm.Protocol_OPT1(this.ParentForm.CollectionWeightData);
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
- data = this.ParentForm.OPT1(1, this.ParentForm.CollectionWeightData[0]);
+ data = this.ParentForm.Protocol_OPT1(1, this.ParentForm.CollectionWeightData[0]);
}
else if (this.ParentForm.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f2_OPT2)
{
if (this.ParentForm.SystemConfig.EquipmentMode == 1)
- data = this.ParentForm.OPT2(this.ParentForm.CollectionWeightData);
+ data = this.ParentForm.Protocol_OPT2(this.ParentForm.CollectionWeightData);
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
- data = this.ParentForm.OPT2(1, this.ParentForm.CollectionWeightData[0]);
+ data = this.ParentForm.Protocol_OPT2(1, this.ParentForm.CollectionWeightData[0]);
}
else if (this.ParentForm.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f3_OPT3)
{
if (this.ParentForm.SystemConfig.EquipmentMode == 1)
- data = this.ParentForm.OPT3(this.ParentForm.CollectionWeightData);
+ data = this.ParentForm.Protocol_OPT3(this.ParentForm.CollectionWeightData);
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
- data = this.ParentForm.OPT3(1, this.ParentForm.CollectionWeightData[0]);
+ data = this.ParentForm.Protocol_OPT3(1, this.ParentForm.CollectionWeightData[0]);
}
else if (this.ParentForm.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f5_OPT4)
{
if (this.ParentForm.SystemConfig.EquipmentMode == 1)
- data = this.ParentForm.OPT4(this.ParentForm.CollectionWeightData);
+ data = this.ParentForm.Protocol_OPT4(this.ParentForm.CollectionWeightData);
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
- data = this.ParentForm.OPT4(1, this.ParentForm.CollectionWeightData[0]);
+ data = this.ParentForm.Protocol_OPT4(1, this.ParentForm.CollectionWeightData[0]);
}
switch (this.ParentForm.SystemConfig.EthernetOperationMode)
@@ -317,30 +331,30 @@ namespace INT69DB_2A.Forms
if (this.ParentForm.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f1_OPT1)
{
if (this.ParentForm.SystemConfig.EquipmentMode == 1)
- this.ParentForm.SerialUart3Send(this.ParentForm.OPT1(this.ParentForm.CollectionWeightData));
+ this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT1(this.ParentForm.CollectionWeightData));
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
- this.ParentForm.SerialUart3Send(this.ParentForm.OPT1(1, this.ParentForm.CollectionWeightData[0]));
+ this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT1(1, this.ParentForm.CollectionWeightData[0]));
}
else if (this.ParentForm.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f2_OPT2)
{
if (this.ParentForm.SystemConfig.EquipmentMode == 1)
- this.ParentForm.SerialUart3Send(this.ParentForm.OPT2(this.ParentForm.CollectionWeightData));
+ this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT2(this.ParentForm.CollectionWeightData));
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
- this.ParentForm.SerialUart3Send(this.ParentForm.OPT2(1, this.ParentForm.CollectionWeightData[0]));
+ this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT2(1, this.ParentForm.CollectionWeightData[0]));
}
else if (this.ParentForm.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f3_OPT3)
{
if (this.ParentForm.SystemConfig.EquipmentMode == 1)
- this.ParentForm.SerialUart3Send(this.ParentForm.OPT3(this.ParentForm.CollectionWeightData));
+ this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT3(this.ParentForm.CollectionWeightData));
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
- this.ParentForm.SerialUart3Send(this.ParentForm.OPT3(1, this.ParentForm.CollectionWeightData[0]));
+ this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT3(1, this.ParentForm.CollectionWeightData[0]));
}
else if (this.ParentForm.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f5_OPT4)
{
if (this.ParentForm.SystemConfig.EquipmentMode == 1)
- this.ParentForm.SerialUart3Send(this.ParentForm.OPT4(this.ParentForm.CollectionWeightData));
+ this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT4(this.ParentForm.CollectionWeightData));
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
- this.ParentForm.SerialUart3Send(this.ParentForm.OPT4(1, this.ParentForm.CollectionWeightData[0]));
+ this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT4(1, this.ParentForm.CollectionWeightData[0]));
}
switch (this.ParentForm.SystemConfig.EthernetOperationMode)
@@ -393,7 +407,7 @@ namespace INT69DB_2A.Forms
{
if (this.comboBoxSerial3Mode.SelectedIndex == 1)
{
- if (this.ParentForm.SystemConfig.EquipmentMode == 1)
+ if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
@@ -406,7 +420,7 @@ namespace INT69DB_2A.Forms
}
else if (this.comboBoxSerial3Mode.SelectedIndex == 2)
{
- if (this.ParentForm.SystemConfig.EquipmentMode == 1)
+ if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionCOM3_2.Text = "{SIGN[1],GAP WEIGHT[6]} * n,ETX[1]";
@@ -419,7 +433,7 @@ namespace INT69DB_2A.Forms
}
else if (this.comboBoxSerial3Mode.SelectedIndex == 3)
{
- if (this.ParentForm.SystemConfig.EquipmentMode == 1)
+ if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PassRange[6],";
this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
@@ -437,7 +451,7 @@ namespace INT69DB_2A.Forms
}
else if (this.comboBoxSerial3Mode.SelectedIndex == 5)
{
- if (this.ParentForm.SystemConfig.EquipmentMode == 1)
+ if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],Under[6],Pass[6],Over[6],";
this.labelProtocolDescriptionCOM3_2.Text = "Tare[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
@@ -466,7 +480,7 @@ namespace INT69DB_2A.Forms
{
if (this.comboBoxMode.SelectedIndex == (int)DataStore.EthernetMode.f1_OPT1)
{
- if (this.ParentForm.SystemConfig.EquipmentMode == 1)
+ if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3)
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionEthernet_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
@@ -479,7 +493,7 @@ namespace INT69DB_2A.Forms
}
else if (this.comboBoxMode.SelectedIndex == (int)DataStore.EthernetMode.f2_OPT2)
{
- if (this.ParentForm.SystemConfig.EquipmentMode == 1)
+ if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3)
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionEthernet_2.Text = "{SIGN[1],GAP WEIGHT[6]} * n,ETX[1]";
@@ -492,7 +506,7 @@ namespace INT69DB_2A.Forms
}
else if (this.comboBoxMode.SelectedIndex == (int)DataStore.EthernetMode.f3_OPT3)
{
- if (this.ParentForm.SystemConfig.EquipmentMode == 1)
+ if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3)
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PassRange[6],";
this.labelProtocolDescriptionEthernet_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
@@ -510,7 +524,7 @@ namespace INT69DB_2A.Forms
}
else if (this.comboBoxMode.SelectedIndex == (int)DataStore.EthernetMode.f5_OPT4)
{
- if (this.ParentForm.SystemConfig.EquipmentMode == 1)
+ if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3)
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],Under[6],Pass[6],Over[6],";
this.labelProtocolDescriptionEthernet_2.Text = "Tare[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
@@ -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");
}
}
@@ -1486,38 +1502,38 @@ namespace INT69DB_2A.Forms
{
if (this.ParentForm.SystemConfig.Serial3Mode == (int)DataStore.SerialMode.f1_OPT1)
{
- if (this.ParentForm.SystemConfig.EquipmentMode == 1)
- this.ParentForm.SerialUart3Send(this.ParentForm.OPT1(this.ParentForm.CollectionWeightData));
+ if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3)
+ this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT1(this.ParentForm.CollectionWeightData));
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
- this.ParentForm.SerialUart3Send(this.ParentForm.OPT1(1, this.ParentForm.CollectionWeightData[0]));
+ this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT1(1, this.ParentForm.CollectionWeightData[0]));
}
else if (this.ParentForm.SystemConfig.Serial3Mode == (int)DataStore.SerialMode.f2_OPT2)
{
- if (this.ParentForm.SystemConfig.EquipmentMode == 1)
- this.ParentForm.SerialUart3Send(this.ParentForm.OPT2(this.ParentForm.CollectionWeightData));
+ if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3)
+ this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT2(this.ParentForm.CollectionWeightData));
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
- this.ParentForm.SerialUart3Send(this.ParentForm.OPT2(1, this.ParentForm.CollectionWeightData[0]));
+ this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT2(1, this.ParentForm.CollectionWeightData[0]));
}
else if (this.ParentForm.SystemConfig.Serial3Mode == (int)DataStore.SerialMode.f3_OPT3)
{
- if (this.ParentForm.SystemConfig.EquipmentMode == 1)
- this.ParentForm.SerialUart3Send(this.ParentForm.OPT3(this.ParentForm.CollectionWeightData));
+ if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3)
+ this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT3(this.ParentForm.CollectionWeightData));
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
- this.ParentForm.SerialUart3Send(this.ParentForm.OPT3(1, this.ParentForm.CollectionWeightData[0]));
+ this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT3(1, this.ParentForm.CollectionWeightData[0]));
}
else if (this.ParentForm.SystemConfig.Serial3Mode == (int)DataStore.SerialMode.f4_Printer)
{
- if (this.ParentForm.SystemConfig.EquipmentMode == 1)
- this.ParentForm.SerialUart3Send(this.ParentForm.Printer(this.ParentForm.CollectionWeightData));
+ if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3)
+ this.ParentForm.UartCom3Write(this.ParentForm.Protocol_Printer(this.ParentForm.CollectionWeightData));
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
- this.ParentForm.SerialUart3Send(this.ParentForm.Printer(1, this.ParentForm.CollectionWeightData[0]));
+ this.ParentForm.UartCom3Write(this.ParentForm.Protocol_Printer(1, this.ParentForm.CollectionWeightData[0]));
}
else if (this.ParentForm.SystemConfig.Serial3Mode == (int)DataStore.SerialMode.f5_OPT4)
{
- if (this.ParentForm.SystemConfig.EquipmentMode == 1)
- this.ParentForm.SerialUart3Send(this.ParentForm.OPT4(this.ParentForm.CollectionWeightData));
+ if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3)
+ this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT4(this.ParentForm.CollectionWeightData));
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
- this.ParentForm.SerialUart3Send(this.ParentForm.OPT4(1, this.ParentForm.CollectionWeightData[0]));
+ this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT4(1, this.ParentForm.CollectionWeightData[0]));
}
}
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 2f90d7a..2818590 100644
--- a/INT69DB_2A/Forms/FormDataBackup_Part11.cs
+++ b/INT69DB_2A/Forms/FormDataBackup_Part11.cs
@@ -108,6 +108,10 @@ namespace INT69DB_2A.Forms
break;
case DataStore.E_DataType.Inspection:
dataFolderPath = this.ParentForm.PathDataInspectionFolder;
+ //if (this.ParentForm.SystemConfig.EquipmentMode == 2)
+ // dataFolderPath = this.ParentForm.PathDataInspectionStick2Folder;
+ //else
+ // dataFolderPath = this.ParentForm.PathDataInspectionStick1Folder;
break;
case DataStore.E_DataType.Others:
dataFolderPath = this.ParentForm.PathDataOthersFolder;
@@ -120,6 +124,7 @@ namespace INT69DB_2A.Forms
return;
targetPath = "하드 디스크\\";
+ listSelectedFile = this.GetSeletedNodeList(view);
#region USB 장착 유무 체크
dir = new DirectoryInfo(targetPath);
@@ -131,8 +136,6 @@ namespace INT69DB_2A.Forms
return;
}
#endregion
-
- listSelectedFile = this.GetSeletedNodeList(view);
#region 백업할 파일 유무 체크
if (listSelectedFile.Count == 0)
{
@@ -151,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 파일 생성
@@ -173,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);
@@ -275,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();
@@ -396,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();
@@ -743,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)
{
@@ -826,8 +823,8 @@ namespace INT69DB_2A.Forms
this.UpdateDisplayHistoryFile();
this.UpdateDisplayOtherFile();
- this.treeViewInspection.ExpandAll();
- this.treeViewHistory.ExpandAll();
+ //this.treeViewInspection.ExpandAll();
+ //this.treeViewHistory.ExpandAll();
}
#endregion
@@ -884,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 93928ea..4a77a27 100644
--- a/INT69DB_2A/Forms/FormDataStatistics.cs
+++ b/INT69DB_2A/Forms/FormDataStatistics.cs
@@ -23,11 +23,12 @@ namespace INT69DB_2A.Forms
private int m_SelectNodeIndex;
private int FileIndex;
private bool FlagInforUp;
+ public string SelectFilePath;
private FormMain m_ParentForm;
public DataCommonList CurrentDataCommonList;
- private Collection CollectionWeightData; //스틱1 파일에서 읽은 데이터
+ private Collection CollectionWeightData; //파일에서 읽은 데이터
private Collection CollectionLaneData; //파일에서 읽은 데이터를 통계 계산 처리된 데이터
public Collection> CollectionFileClassification; // 스틱2 파일 리스트
private Collection> CollectionWeightDataStick2; // 스틱2 파일에서 읽은 데이터
@@ -141,11 +142,11 @@ namespace INT69DB_2A.Forms
}
else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Czech)
{
-
+ this.labelTitle.Text = "Data Statistics";
}
else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.German)
{
-
+ this.labelTitle.Text = "Data Statistics";
}
else
{
@@ -183,20 +184,26 @@ namespace INT69DB_2A.Forms
#endregion
#region Label Location
- //if (this.ParentForm.SystemConfig.EquipmentColumns == 2)
+ //if (this.ParentForm.SystemConfig.EquipmentColumns == 1)
// locationX = 80;
- //else if (this.ParentForm.SystemConfig.EquipmentColumns == 3)
+ //else if (this.ParentForm.SystemConfig.EquipmentColumns == 2)
// locationX = 70;
- //else if (this.ParentForm.SystemConfig.EquipmentColumns == 4)
+ //else if (this.ParentForm.SystemConfig.EquipmentColumns == 3)
// locationX = 60;
+ //else if (this.ParentForm.SystemConfig.EquipmentColumns == 4)
+ // locationX = 40;
//else if (this.ParentForm.SystemConfig.EquipmentColumns == 5)
// locationX = 50;
//else if (this.ParentForm.SystemConfig.EquipmentColumns == 6)
// locationX = 40;
//else if (this.ParentForm.SystemConfig.EquipmentColumns == 7)
- // locationX = 30;
- //else if (this.ParentForm.SystemConfig.EquipmentColumns == 8)
- // locationX = 20;
+ // locationX = 16;
+ //else if (this.ParentForm.SystemConfig.EquipmentColumns == 7)
+ // locationX = 16;
+ //else if (this.ParentForm.SystemConfig.EquipmentColumns == 7)
+ // locationX = 16;
+ //else if (this.ParentForm.SystemConfig.EquipmentColumns == 7)
+ // locationX = 16;
//for (int i = 1; i < this.ParentForm.SystemConfig.EquipmentColumns; i++)
//{
@@ -225,6 +232,7 @@ namespace INT69DB_2A.Forms
this.FileIndex = 0;
this.SelectNodeIndex = -1;
this.FlagInforUp = true;
+ this.SelectFilePath = "";
this.CurrentDataCommonList = new DataCommonList();
this.CollectionFileClassification = new Collection>();
@@ -292,10 +300,7 @@ namespace INT69DB_2A.Forms
}
for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++)
- {
- this.CollectionWeightDataStick2.Add(new List());
this.CollectionLaneData.Add(new DataCollector());
- }
this.InitializeLabels();
}
@@ -386,77 +391,6 @@ namespace INT69DB_2A.Forms
this.CurrentDataCommonList.TotalPassAverageWeight = passAverageWeight;
this.CurrentDataCommonList.TotalPassVariance = passVariance;
}
- private void SetCommonData(Collection> datas, Collection laneDatas)
- {
- double dValue1 = 0.0, dValue2 = 0.0, passSumWeight = 0.0, overSumWeight = 0.0, underSumWeight = 0.0, passAverageWeight = 0.0, passVariance = 0.0;
- string sValue = "";
- int underCount = 0, passCount = 0, overCount = 0, exNGCount = 0, index = -1;
-
- for (int i = 0; i < datas.Count; i++)
- {
- if (datas[i].Count != 0)
- {
- index = i;
- break;
- }
- }
-
- this.CurrentDataCommonList.ProductName = datas[index][datas[index].Count - 1][3];
- this.CurrentDataCommonList.Lot = datas[index][datas[index].Count - 1][4];
- this.CurrentDataCommonList.StartTime = string.Format("{0} {1}", datas[index][0][0], datas[index][0][1]);
- this.CurrentDataCommonList.EndTime = string.Format("{0} {1}", datas[index][datas[index].Count - 1][0], datas[index][datas[index].Count - 1][1]);
-
- dValue1 = double.Parse(datas[index][datas[index].Count - 1][5]);
- sValue = Helper.DoubleToString(dValue1, 1);
- this.CurrentDataCommonList.UnderRange = sValue;
-
- dValue1 = double.Parse(datas[index][datas[index].Count - 1][6]);
- sValue = Helper.DoubleToString(dValue1, 1);
- this.CurrentDataCommonList.PassRange = sValue;
-
- dValue1 = double.Parse(datas[index][datas[index].Count - 1][7]);
- sValue = Helper.DoubleToString(dValue1, 1);
- this.CurrentDataCommonList.OverRange = sValue;
-
- dValue1 = double.Parse(datas[index][datas[index].Count - 1][8]);
- sValue = Helper.DoubleToString(dValue1, 1);
- this.CurrentDataCommonList.TareRange = sValue;
-
- for (int i = 0; i < laneDatas.Count; i++)
- {
- underCount += laneDatas[i].UnderTotalCount;
- passCount += laneDatas[i].PassTotalCount;
- overCount += laneDatas[i].OverTotalCount;
- exNGCount += laneDatas[i].ExNgTotalCount;
-
- passSumWeight += laneDatas[i].PassSumWeight;
- overSumWeight += laneDatas[i].OverSumWeight;
- underSumWeight += laneDatas[i].UnderSumWeight;
- }
-
- // 전체 정량 평균
- passAverageWeight = passSumWeight / passCount;
- // 전체 정량 분산
- for (int i = 0; i < laneDatas.Count; i++)
- {
- for (int j = 0; j < laneDatas[i].PassWeightData.Count; j++)
- {
- dValue1 = passAverageWeight - laneDatas[i].PassWeightData[j];
- dValue2 += dValue1 * dValue1;
- }
- }
- passVariance = dValue2 / passCount;
-
- this.CurrentDataCommonList.TotalUnderCount = underCount;
- this.CurrentDataCommonList.TotalPassCount = passCount;
- this.CurrentDataCommonList.TotalOverCount = overCount;
- this.CurrentDataCommonList.TotalExNgCount = exNGCount;
- this.CurrentDataCommonList.TotalPassSumWeight = passSumWeight;
- this.CurrentDataCommonList.TotalOverSumWeight = overSumWeight;
- this.CurrentDataCommonList.TotalUnderSumWeight = underSumWeight;
- this.CurrentDataCommonList.TotalPassAverageWeight = passAverageWeight;
- this.CurrentDataCommonList.TotalPassVariance = passVariance;
- }
private void SetData(DataCollector data, string weight, DataStore.JudgmentStatus grade)
{
if (grade == DataStore.JudgmentStatus.Pass)
@@ -548,137 +482,136 @@ namespace INT69DB_2A.Forms
}
private void DataAnalysis()
{
- if (this.ParentForm.SystemConfig.EquipmentMode == 2)
+ #region Set Data
+ if (this.ParentForm.SystemConfig.EquipmentColumns == 2)
{
- #region Stick 2
- for (int i = 0; i < this.CollectionWeightDataStick2.Count; i++)
+ for (int i = 0; i < this.CollectionWeightData.Count; i++)
{
- for (int j = 0; j < this.CollectionWeightDataStick2[i].Count; j++)
- {
- this.SetData(this.CollectionLaneData[i], this.CollectionWeightDataStick2[i][j][9], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightDataStick2[i][j][10]));
- }
+ 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++)
+ {
+ 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]));
+ this.SetData(this.CollectionLaneData[6], this.CollectionWeightData[i][21], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][22]));
+ }
+ }
+ else if (this.ParentForm.SystemConfig.EquipmentColumns == 8)
+ {
+ 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]));
+ this.SetData(this.CollectionLaneData[6], this.CollectionWeightData[i][21], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][22]));
+ this.SetData(this.CollectionLaneData[7], this.CollectionWeightData[i][23], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][24]));
+ }
+ }
+ else if (this.ParentForm.SystemConfig.EquipmentColumns == 10)
+ {
+ 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]));
+ this.SetData(this.CollectionLaneData[6], this.CollectionWeightData[i][21], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][22]));
+ this.SetData(this.CollectionLaneData[7], this.CollectionWeightData[i][23], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][24]));
+ this.SetData(this.CollectionLaneData[8], this.CollectionWeightData[i][25], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][26]));
+ this.SetData(this.CollectionLaneData[9], this.CollectionWeightData[i][27], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][28]));
}
- #endregion
}
else
{
- #region Stick 1,3
- if (this.ParentForm.SystemConfig.EquipmentColumns == 2)
+ for (int i = 0; i < this.CollectionWeightData.Count; i++)
{
- 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[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]));
+ this.SetData(this.CollectionLaneData[6], this.CollectionWeightData[i][21], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][22]));
+ this.SetData(this.CollectionLaneData[7], this.CollectionWeightData[i][23], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][24]));
+ this.SetData(this.CollectionLaneData[8], this.CollectionWeightData[i][25], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][26]));
+ this.SetData(this.CollectionLaneData[9], this.CollectionWeightData[i][27], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][28]));
+ this.SetData(this.CollectionLaneData[10], this.CollectionWeightData[i][29], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][30]));
+ this.SetData(this.CollectionLaneData[11], this.CollectionWeightData[i][31], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][32]));
}
- 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++)
- {
- 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]));
- this.SetData(this.CollectionLaneData[6], this.CollectionWeightData[i][21], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][22]));
- }
- }
- else if (this.ParentForm.SystemConfig.EquipmentColumns == 8)
- {
- 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]));
- this.SetData(this.CollectionLaneData[6], this.CollectionWeightData[i][21], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][22]));
- this.SetData(this.CollectionLaneData[7], this.CollectionWeightData[i][23], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][24]));
- }
- }
- else
- {
- 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]));
- this.SetData(this.CollectionLaneData[6], this.CollectionWeightData[i][21], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][22]));
- this.SetData(this.CollectionLaneData[7], this.CollectionWeightData[i][23], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][24]));
- this.SetData(this.CollectionLaneData[8], this.CollectionWeightData[i][25], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][26]));
- this.SetData(this.CollectionLaneData[9], this.CollectionWeightData[i][27], Helper.StringToJudgmentStatusStatistics(this.CollectionWeightData[i][28]));
- }
- }
- #endregion
}
+ #endregion
for (int i = 0; i < this.CollectionLaneData.Count; i++)
this.CollectionLaneData[i].StatisticalAnalysis();
- if (this.ParentForm.SystemConfig.EquipmentMode == 2)
- this.SetCommonData(this.CollectionWeightDataStick2, this.CollectionLaneData);
- else
- this.SetCommonData(this.CollectionWeightData, this.CollectionLaneData);
-
+ this.SetCommonData(this.CollectionWeightData, this.CollectionLaneData);
this.UpdateDisplay(this.CurrentDataCommonList, this.CollectionLaneData);
}
- public int DataRead1()
+ public int DataRead()
{
- string path = "";
int ret = 0, flag = 0;
long count = 0;
- SmartX.SmartSplash splash;
+ if (this.SelectFilePath == "")
+ return ret = -1;
- splash = new SmartX.SmartSplash();
+ SmartSplash splash = new SmartSplash();
splash.CenterPosition = true;
splash.AnimationInterval = 100;
splash.LoadingImagePathname = "SmartLoading4";
@@ -686,9 +619,7 @@ namespace INT69DB_2A.Forms
this.CollectionWeightData.Clear();
- path = string.Format("{0}{1}", this.ParentForm.PathDataBackupFolder, this.CollectionFileClassification[this.SelectNodeIndex][0]);
-
- this.ParentForm.smartFileIO.FilePathName = path;
+ this.ParentForm.smartFileIO.FilePathName = this.SelectFilePath;
this.ParentForm.smartFileIO.Open(2000000);
this.ParentForm.smartFileIO.ReadStringAllBuffer();
@@ -725,57 +656,6 @@ namespace INT69DB_2A.Forms
return ret;
}
- public int DataRead2()
- {
- string path = "", lane = "";
- int ret = 0, index = 0;
- List lt;
-
- SmartX.SmartSplash splash;
-
- splash = new SmartX.SmartSplash();
- splash.CenterPosition = true;
- splash.AnimationInterval = 100;
- splash.LoadingImagePathname = "SmartLoading4";
- splash.Start();
-
- lt = new List();
-
- // 열별로 삭제
- for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++)
- this.CollectionWeightDataStick2[i].Clear();
-
- try
- {
- for (int i = 0; i < this.CollectionFileClassification[this.SelectNodeIndex].Count; i++)
- {
- lt.Clear();
- if (this.CollectionFileClassification[this.SelectNodeIndex][i].Length == 22)
- lane = this.CollectionFileClassification[this.SelectNodeIndex][i].Substring(13, 1);
- else
- lane = this.CollectionFileClassification[this.SelectNodeIndex][i].Substring(13, 2);
- index = int.Parse(lane);
-
- path = string.Format("{0}{1}", this.ParentForm.PathDataBackupFolder, this.CollectionFileClassification[this.SelectNodeIndex][i]);
- this.LoadDataBackupFile(ref this.CollectionWeightDataStick2, path, index - 1);
- }
-
- this.DataAnalysis();
- splash.Finish();
- ret = 0;
- }
- catch
- {
- ret = -1;
- splash.Finish();
- DialogFormMessage msg = new DialogFormMessage(13, this.ParentForm.SystemConfig.Language);
- msg.ShowDialog();
-
- this.ParentForm.smartFileIO.Close();
- }
-
- return ret;
- }
public void ClearData()
{
this.InitializeLabels();
@@ -783,16 +663,15 @@ namespace INT69DB_2A.Forms
for (int i = 0; i < this.CollectionLaneData.Count; i++)
this.CollectionLaneData[i].ClearDatas();
}
- private void FileBackup(DataCommonList commonList, Collection datas)
+ private void FileBackup1(string path, DateTime time, DataCommonList commonList, Collection datas)
{
bool fileCheck = false;
string fullFilePath = "";
StreamWriter sw;
- fullFilePath = string.Format("{0}{1:yyyyMMdd-HHmmss}_{2}_CheckList.csv",
- this.ParentForm.PathDataStatisticsFolder, DateTime.Now, this.ParentForm.SystemConfig.UsbID);
+ fullFilePath = string.Format("{0}S{1:yyyyMMdd-HHmmss}.csv", path, time);
this.ParentForm.smartFileIO.FilePathName = fullFilePath;
- sw = new StreamWriter(fullFilePath, true, Encoding.Default);
+ sw = new StreamWriter(fullFilePath, true, Encoding.UTF8);
FileInfo fileInfo = new FileInfo(fullFilePath);
fileCheck = fileInfo.Exists;
@@ -986,6 +865,169 @@ namespace INT69DB_2A.Forms
sw.Close();
}
+ private void FileBackup2(string path, DateTime time, DataCommonList commonList, Collection datas)
+ {
+ bool fileCheck = false;
+ string fullFilePath = "";
+ StreamWriter sw;
+
+ fullFilePath = string.Format("{0}S{1:yyyyMMdd-HHmmss}.csv", path, time);
+ this.ParentForm.smartFileIO.FilePathName = fullFilePath;
+ sw = new StreamWriter(fullFilePath, true, Encoding.UTF8);
+
+ FileInfo fileInfo = new FileInfo(fullFilePath);
+ fileCheck = fileInfo.Exists;
+
+ // 같은 파일이 있으면 초기화
+ if (fileCheck == true)
+ {
+ this.ParentForm.smartFileIO.Open(this.ParentForm.BufferSmartUart);
+
+ for (int i = 0; i < 40; i++)
+ {
+ this.ParentForm.smartFileIO.WriteString("");
+ }
+ this.ParentForm.smartFileIO.Close();
+ }
+
+ for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++)
+ {
+ #region 데이터 출력
+ // Lane Number
+ sw.Write("{0}", i + 1);
+ sw.Write(",");
+
+ // ProductName
+ sw.Write(commonList.ProductName);
+ sw.Write(",");
+ // Lot
+ sw.Write(commonList.Lot);
+ sw.Write(",");
+ // StartTime
+ sw.Write(commonList.StartTime);
+ sw.Write(",");
+ // EndTime
+ sw.Write(commonList.EndTime);
+ sw.Write(",");
+
+ // UnderRange
+ sw.Write(commonList.UnderRange);
+ sw.Write(",");
+ // PassRange
+ sw.Write(commonList.PassRange);
+ sw.Write(",");
+ // OverRange
+ sw.Write(commonList.OverRange);
+ sw.Write(",");
+ // TareRange
+ sw.Write(commonList.TareRange);
+ sw.Write(",");
+
+ // TotalCount
+ sw.Write(commonList.TotalCount);
+ sw.Write(",");
+ // TotalNGCount
+ sw.Write(commonList.TotalNGCount);
+ sw.Write(",");
+
+ // TotalPassCount
+ sw.Write(commonList.TotalPassCount);
+ sw.Write(",");
+ // TotalPassPercentage
+ sw.Write(commonList.TotalPassPercentage);
+ sw.Write(",");
+ // TotalPassAverage
+ sw.Write(string.Format("{0:0.000}", commonList.TotalPassAverageWeight));
+ sw.Write(",");
+ // TotalPassSD
+ sw.Write(string.Format("{0:0.00}", commonList.TotalPassStandardDeviation));
+ sw.Write(",");
+
+ // TotalUnderCount
+ sw.Write(commonList.TotalUnderCount);
+ sw.Write(",");
+ // TotalUnderPercentage
+ sw.Write(commonList.TotalUnderPercentage);
+ sw.Write(",");
+ // TotalUnderSumWeight
+ sw.Write(string.Format("{0:0.0000}", commonList.TotalUnderSumWeight / 1000));
+ sw.Write(",");
+
+ // TotalOverCount
+ sw.Write(commonList.TotalOverCount);
+ sw.Write(",");
+ // TotalOverPercentage
+ sw.Write(commonList.TotalOverPercentage);
+ sw.Write(",");
+ // TotalOverSumWeight
+ sw.Write(string.Format("{0:0.0000}", commonList.TotalOverSumWeight / 1000));
+ sw.Write(",");
+
+ // TotalExNgCount
+ sw.Write(commonList.TotalExNgCount);
+ sw.Write(",");
+ // TotalExNgPercentage
+ sw.Write(commonList.TotalExNgPercentage);
+ sw.Write(",");
+
+ // Lane PassCount
+ sw.Write(datas[i].PassTotalCount);
+ sw.Write(",");
+ // Lane PassAverage
+ sw.Write(string.Format("{0:0.000}", datas[i].PassAverage));
+ sw.Write(",");
+ // Lane PassPercentage
+ sw.Write(datas[i].PassPercentage);
+ sw.Write(",");
+ // Lane PassSD
+ sw.Write(string.Format("{0:0.00}", datas[i].PassStandardDeviation));
+ sw.Write(",");
+ // Lane PassMinWeight
+ sw.Write(Helper.DoubleToString(datas[i].PassMinWeight, 1));
+ sw.Write(",");
+ // Lane PassMaxWeight
+ sw.Write(Helper.DoubleToString(datas[i].PassMaxWeight, 1));
+ sw.Write(",");
+
+ // Lane OverCount
+ sw.Write(datas[i].OverTotalCount);
+ sw.Write(",");
+ // Lane OverSumWeight
+ sw.Write(Helper.DoubleToString(datas[i].OverSumWeight / 1000, 3));
+ sw.Write(",");
+ // Lane OverPercentage
+ sw.Write(datas[i].OverPercentage);
+ sw.Write(",");
+
+ // Lane UnderCount
+ sw.Write(datas[i].UnderTotalCount);
+ sw.Write(",");
+ // Lane UnderSumWeight
+ sw.Write(Helper.DoubleToString(datas[i].UnderSumWeight / 1000, 3));
+ sw.Write(",");
+ // Lane UnderPercentage
+ sw.Write(datas[i].UnderPercentage);
+ sw.Write(",");
+
+ // Lane ExNgCount
+ sw.Write(datas[i].ExNgTotalCount);
+ sw.Write(",");
+ // Lane ExNgPercentage
+ sw.Write(datas[i].ExNgPercentage);
+ sw.Write(",");
+
+ // Lane TotalCount
+ sw.Write(datas[i].TotalCount);
+ sw.Write(",");
+ // Lane TotalNgCount
+ sw.Write(datas[i].TotalNGCount);
+
+ sw.WriteLine();
+ #endregion
+ }
+
+ sw.Close();
+ }
private bool CheckUSBMemory()
{
bool ret = false;
@@ -1026,47 +1068,23 @@ namespace INT69DB_2A.Forms
}
}
- public void DisplayRefresh()
+ private void CreateScreenCapture(string path, DateTime time)
{
- this.ParentForm.SystemConfig.CurrentForm = DataStore.FormStore.FormDataStatistics;
+ string filePath = "";
+ Bitmap bitMap = new Bitmap(800, 600);
- this.ClearData();
- this.buttonSave.Enabled = false;
+ bitMap = IntechGraphics.CopyFromScreen();
+ filePath = string.Format("{0}S{1:yyyyMMdd-HHmmss}.jpg", path, time);
- this.FlagInforUp = true;
- this.smartGroupBox1.BringToFront();
+ bitMap.Save(filePath, ImageFormat.Jpeg);
}
- #endregion
- #region Override Member
- protected override void OnLoad(EventArgs e)
+ private int Backup1()
{
- base.OnLoad(e);
- }
- #endregion
-
- #region Event Handler
- private void buttonBack_Click(object sender, EventArgs e)
- {
- this.ParentForm.ChildFormMenu.DisplayRefresh();
- ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormMenu);
- }
- private void buttonFileSelect_Click(object sender, EventArgs e)
- {
- this.SelectNodeIndex = -1;
-
- DialogFormDataStatistics form = new DialogFormDataStatistics(this);
- if (form.ShowDialog() == DialogResult.OK)
- this.buttonSave.Enabled = true;
- else
- this.buttonSave.Enabled = false;
- }
- private void buttonSave_Click(object sender, EventArgs e)
- {
- this.buttonSave.Enabled = false;
-
+ int ret = 0;
string filePath = "";
bool directoryCheck = false;
+ DateTime time = DateTime.Now;
// 메모리 장착 체크
if (this.CheckUSBMemory() == false)
@@ -1075,11 +1093,15 @@ namespace INT69DB_2A.Forms
msg.ShowDialog();
this.buttonSave.Enabled = true;
- return;
+ ret = -1;
+ return ret;
}
#region 통계 데이터 생성
- this.FileBackup(this.CurrentDataCommonList, this.CollectionLaneData);
+ // ScreenCapture
+ this.CreateScreenCapture(this.ParentForm.PathDataStatisticsFolder, time);
+ // csv File
+ this.FileBackup1(this.ParentForm.PathDataStatisticsFolder, time, this.CurrentDataCommonList, this.CollectionLaneData);
#endregion
#region 메모리로 파일 복사
@@ -1107,10 +1129,71 @@ namespace INT69DB_2A.Forms
{
DialogFormMessage msg = new DialogFormMessage(6, this.ParentForm.SystemConfig.Language);
msg.ShowDialog();
- return;
+ ret = -1;
+ return ret;
}
#endregion
+ return ret;
+ }
+ private int Backup2()
+ {
+ int ret = 0;
+ DateTime time = DateTime.Now;
+
+ // csv File
+ this.FileBackup2(this.ParentForm.PathDataBackupFolder, time, this.CurrentDataCommonList, this.CollectionLaneData);
+
+ return ret;
+ }
+
+ public void DisplayRefresh()
+ {
+ this.ParentForm.SystemConfig.CurrentForm = DataStore.FormStore.FormDataStatistics;
+
+ this.ClearData();
+ this.buttonSave.Enabled = false;
+
+ this.FlagInforUp = true;
+ this.smartGroupBox1.BringToFront();
+ }
+ #endregion
+
+ #region Override Member
+ protected override void OnLoad(EventArgs e)
+ {
+ base.OnLoad(e);
+ }
+ #endregion
+
+ #region Event Handler
+ private void buttonBack_Click(object sender, EventArgs e)
+ {
+ this.ParentForm.ChildFormMenu.DisplayRefresh();
+ ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormMenu);
+ }
+ private void buttonFileSelect_Click(object sender, EventArgs e)
+ {
+ this.SelectFilePath = "";
+
+ DialogFormDataStatistics form = new DialogFormDataStatistics(this);
+ if (form.ShowDialog() == DialogResult.OK)
+ this.buttonSave.Enabled = true;
+ else
+ this.buttonSave.Enabled = false;
+ }
+ private void buttonSave_Click(object sender, EventArgs e)
+ {
+ if (this.SelectFilePath == "")
+ return;
+
+ this.buttonSave.Enabled = false;
+
+ if (this.ParentForm.SystemConfig.IsPart11 == false)
+ this.Backup1();
+ else
+ this.Backup2();
+
this.buttonSave.Enabled = true;
}
private void buttonDisplay_Click(object sender, EventArgs e)
diff --git a/INT69DB_2A/Forms/FormDataViewer.Designer.cs b/INT69DB_2A/Forms/FormDataViewer.Designer.cs
index 9523429..56462be 100644
--- a/INT69DB_2A/Forms/FormDataViewer.Designer.cs
+++ b/INT69DB_2A/Forms/FormDataViewer.Designer.cs
@@ -34,6 +34,9 @@
this.labelTitle = new SmartX.SmartLabel();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.panel1 = new System.Windows.Forms.Panel();
+ this.labelCurrentIndex = new SmartX.SmartLabel();
+ this.smartSeparatorLine1 = new SmartX.SmartSeparatorLine();
+ this.labelTotalIndex = new SmartX.SmartLabel();
this.listBoxEvent = new SmartX.SmartListBox();
this.labelItemCount = new SmartX.SmartLabel();
this.listBoxType = new SmartX.SmartListBox();
@@ -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);
@@ -131,6 +137,62 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(800, 451);
//
+ // 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, 225);
+ this.labelCurrentIndex.Name = "labelCurrentIndex";
+ this.labelCurrentIndex.Size = new System.Drawing.Size(70, 15);
+ this.labelCurrentIndex.TabIndex = 242;
+ this.labelCurrentIndex.Text = "0";
+ this.labelCurrentIndex.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelCurrentIndex.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelCurrentIndex.Visible = false;
+ 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, 246);
+ this.smartSeparatorLine1.Name = "smartSeparatorLine1";
+ this.smartSeparatorLine1.Size = new System.Drawing.Size(70, 2);
+ this.smartSeparatorLine1.TabIndex = 241;
+ this.smartSeparatorLine1.Text = "smartSeparatorLine1";
+ this.smartSeparatorLine1.Visible = false;
+ //
+ // 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(726, 254);
+ this.labelTotalIndex.Name = "labelTotalIndex";
+ this.labelTotalIndex.Size = new System.Drawing.Size(70, 15);
+ this.labelTotalIndex.TabIndex = 240;
+ this.labelTotalIndex.Text = "0";
+ this.labelTotalIndex.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelTotalIndex.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelTotalIndex.Visible = false;
+ this.labelTotalIndex.Wordwrap = false;
+ //
// listBoxEvent
//
this.listBoxEvent.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(228)))), ((int)(((byte)(180)))));
@@ -140,13 +202,14 @@
this.listBoxEvent.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxEvent.ColumnDelimiter = '\0';
this.listBoxEvent.ColumnOffsets = null;
+ this.listBoxEvent.Enabled = false;
this.listBoxEvent.FontColor = System.Drawing.Color.Black;
this.listBoxEvent.InitVisible = true;
this.listBoxEvent.ItemAddOrder = SmartX.SmartListBox.ITEMADDORDERS.BOTTOMADD;
this.listBoxEvent.ItemOffsetGap = 5;
this.listBoxEvent.ItemOffsetX = 5;
this.listBoxEvent.ItemOffsetY = 0;
- this.listBoxEvent.Location = new System.Drawing.Point(165, 39);
+ this.listBoxEvent.Location = new System.Drawing.Point(160, 45);
this.listBoxEvent.MouseMoveEventSpace = 3;
this.listBoxEvent.MouseMoveSpace = 10;
this.listBoxEvent.Name = "listBoxEvent";
@@ -155,12 +218,12 @@
this.listBoxEvent.SelectFilled = true;
this.listBoxEvent.SelectFontColor = System.Drawing.Color.DarkBlue;
this.listBoxEvent.SelectItemIndex = -1;
- this.listBoxEvent.SeparationlineColor1 = System.Drawing.Color.Gray;
+ this.listBoxEvent.SeparationlineColor1 = System.Drawing.Color.Silver;
this.listBoxEvent.SeparationlineColor2 = System.Drawing.Color.LightGray;
- this.listBoxEvent.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.None;
+ this.listBoxEvent.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxEvent.SeparationlineVisibleBottom = false;
this.listBoxEvent.SeparationlineVisibleTop = false;
- this.listBoxEvent.Size = new System.Drawing.Size(135, 408);
+ this.listBoxEvent.Size = new System.Drawing.Size(135, 398);
this.listBoxEvent.TabIndex = 28;
this.listBoxEvent.Text = "smartListBox1";
this.listBoxEvent.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged);
@@ -175,13 +238,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, 229);
+ this.labelItemCount.Location = new System.Drawing.Point(725, 7);
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
@@ -193,13 +257,14 @@
this.listBoxType.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxType.ColumnDelimiter = '\0';
this.listBoxType.ColumnOffsets = null;
+ this.listBoxType.Enabled = false;
this.listBoxType.FontColor = System.Drawing.Color.Black;
this.listBoxType.InitVisible = true;
this.listBoxType.ItemAddOrder = SmartX.SmartListBox.ITEMADDORDERS.BOTTOMADD;
this.listBoxType.ItemOffsetGap = 5;
this.listBoxType.ItemOffsetX = 5;
this.listBoxType.ItemOffsetY = 0;
- this.listBoxType.Location = new System.Drawing.Point(645, 39);
+ this.listBoxType.Location = new System.Drawing.Point(645, 45);
this.listBoxType.MouseMoveEventSpace = 3;
this.listBoxType.MouseMoveSpace = 10;
this.listBoxType.Name = "listBoxType";
@@ -208,12 +273,12 @@
this.listBoxType.SelectFilled = true;
this.listBoxType.SelectFontColor = System.Drawing.Color.DarkBlue;
this.listBoxType.SelectItemIndex = -1;
- this.listBoxType.SeparationlineColor1 = System.Drawing.Color.Gray;
+ this.listBoxType.SeparationlineColor1 = System.Drawing.Color.Silver;
this.listBoxType.SeparationlineColor2 = System.Drawing.Color.LightGray;
- this.listBoxType.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.None;
+ this.listBoxType.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxType.SeparationlineVisibleBottom = false;
this.listBoxType.SeparationlineVisibleTop = false;
- this.listBoxType.Size = new System.Drawing.Size(75, 408);
+ this.listBoxType.Size = new System.Drawing.Size(75, 398);
this.listBoxType.TabIndex = 28;
this.listBoxType.Text = "smartListBox1";
this.listBoxType.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged);
@@ -227,13 +292,14 @@
this.listBoxAfter.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxAfter.ColumnDelimiter = '\0';
this.listBoxAfter.ColumnOffsets = null;
+ this.listBoxAfter.Enabled = false;
this.listBoxAfter.FontColor = System.Drawing.Color.Black;
this.listBoxAfter.InitVisible = true;
this.listBoxAfter.ItemAddOrder = SmartX.SmartListBox.ITEMADDORDERS.BOTTOMADD;
this.listBoxAfter.ItemOffsetGap = 5;
this.listBoxAfter.ItemOffsetX = 5;
this.listBoxAfter.ItemOffsetY = 0;
- this.listBoxAfter.Location = new System.Drawing.Point(564, 39);
+ this.listBoxAfter.Location = new System.Drawing.Point(551, 45);
this.listBoxAfter.MouseMoveEventSpace = 3;
this.listBoxAfter.MouseMoveSpace = 10;
this.listBoxAfter.Name = "listBoxAfter";
@@ -242,12 +308,12 @@
this.listBoxAfter.SelectFilled = true;
this.listBoxAfter.SelectFontColor = System.Drawing.Color.DarkBlue;
this.listBoxAfter.SelectItemIndex = -1;
- this.listBoxAfter.SeparationlineColor1 = System.Drawing.Color.Gray;
+ this.listBoxAfter.SeparationlineColor1 = System.Drawing.Color.Silver;
this.listBoxAfter.SeparationlineColor2 = System.Drawing.Color.LightGray;
- this.listBoxAfter.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.None;
+ this.listBoxAfter.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxAfter.SeparationlineVisibleBottom = false;
this.listBoxAfter.SeparationlineVisibleTop = false;
- this.listBoxAfter.Size = new System.Drawing.Size(75, 408);
+ this.listBoxAfter.Size = new System.Drawing.Size(88, 398);
this.listBoxAfter.TabIndex = 28;
this.listBoxAfter.Text = "smartListBox1";
this.listBoxAfter.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged);
@@ -261,13 +327,14 @@
this.listBoxBefore.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxBefore.ColumnDelimiter = '\0';
this.listBoxBefore.ColumnOffsets = null;
+ this.listBoxBefore.Enabled = false;
this.listBoxBefore.FontColor = System.Drawing.Color.Black;
this.listBoxBefore.InitVisible = true;
this.listBoxBefore.ItemAddOrder = SmartX.SmartListBox.ITEMADDORDERS.BOTTOMADD;
this.listBoxBefore.ItemOffsetGap = 5;
this.listBoxBefore.ItemOffsetX = 5;
this.listBoxBefore.ItemOffsetY = 0;
- this.listBoxBefore.Location = new System.Drawing.Point(483, 39);
+ this.listBoxBefore.Location = new System.Drawing.Point(457, 45);
this.listBoxBefore.MouseMoveEventSpace = 3;
this.listBoxBefore.MouseMoveSpace = 10;
this.listBoxBefore.Name = "listBoxBefore";
@@ -276,12 +343,12 @@
this.listBoxBefore.SelectFilled = true;
this.listBoxBefore.SelectFontColor = System.Drawing.Color.DarkBlue;
this.listBoxBefore.SelectItemIndex = -1;
- this.listBoxBefore.SeparationlineColor1 = System.Drawing.Color.Gray;
+ this.listBoxBefore.SeparationlineColor1 = System.Drawing.Color.Silver;
this.listBoxBefore.SeparationlineColor2 = System.Drawing.Color.LightGray;
- this.listBoxBefore.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.None;
+ this.listBoxBefore.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxBefore.SeparationlineVisibleBottom = false;
this.listBoxBefore.SeparationlineVisibleTop = false;
- this.listBoxBefore.Size = new System.Drawing.Size(75, 408);
+ this.listBoxBefore.Size = new System.Drawing.Size(88, 398);
this.listBoxBefore.TabIndex = 28;
this.listBoxBefore.Text = "smartListBox1";
this.listBoxBefore.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged);
@@ -295,13 +362,14 @@
this.listBoxDetail.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxDetail.ColumnDelimiter = '\0';
this.listBoxDetail.ColumnOffsets = null;
+ this.listBoxDetail.Enabled = false;
this.listBoxDetail.FontColor = System.Drawing.Color.Black;
this.listBoxDetail.InitVisible = true;
this.listBoxDetail.ItemAddOrder = SmartX.SmartListBox.ITEMADDORDERS.BOTTOMADD;
this.listBoxDetail.ItemOffsetGap = 5;
this.listBoxDetail.ItemOffsetX = 5;
this.listBoxDetail.ItemOffsetY = 0;
- this.listBoxDetail.Location = new System.Drawing.Point(306, 39);
+ this.listBoxDetail.Location = new System.Drawing.Point(301, 45);
this.listBoxDetail.MouseMoveEventSpace = 3;
this.listBoxDetail.MouseMoveSpace = 10;
this.listBoxDetail.Name = "listBoxDetail";
@@ -310,12 +378,12 @@
this.listBoxDetail.SelectFilled = true;
this.listBoxDetail.SelectFontColor = System.Drawing.Color.DarkBlue;
this.listBoxDetail.SelectItemIndex = -1;
- this.listBoxDetail.SeparationlineColor1 = System.Drawing.Color.Gray;
+ this.listBoxDetail.SeparationlineColor1 = System.Drawing.Color.Silver;
this.listBoxDetail.SeparationlineColor2 = System.Drawing.Color.LightGray;
- this.listBoxDetail.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.None;
+ this.listBoxDetail.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxDetail.SeparationlineVisibleBottom = false;
this.listBoxDetail.SeparationlineVisibleTop = false;
- this.listBoxDetail.Size = new System.Drawing.Size(171, 408);
+ this.listBoxDetail.Size = new System.Drawing.Size(150, 398);
this.listBoxDetail.TabIndex = 28;
this.listBoxDetail.Text = "smartListBox1";
this.listBoxDetail.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged);
@@ -329,13 +397,14 @@
this.listBoxLoginID.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxLoginID.ColumnDelimiter = '\0';
this.listBoxLoginID.ColumnOffsets = null;
+ this.listBoxLoginID.Enabled = false;
this.listBoxLoginID.FontColor = System.Drawing.Color.Black;
this.listBoxLoginID.InitVisible = true;
this.listBoxLoginID.ItemAddOrder = SmartX.SmartListBox.ITEMADDORDERS.BOTTOMADD;
this.listBoxLoginID.ItemOffsetGap = 5;
this.listBoxLoginID.ItemOffsetX = 5;
this.listBoxLoginID.ItemOffsetY = 0;
- this.listBoxLoginID.Location = new System.Drawing.Point(79, 39);
+ this.listBoxLoginID.Location = new System.Drawing.Point(74, 45);
this.listBoxLoginID.MouseMoveEventSpace = 3;
this.listBoxLoginID.MouseMoveSpace = 10;
this.listBoxLoginID.Name = "listBoxLoginID";
@@ -344,12 +413,12 @@
this.listBoxLoginID.SelectFilled = true;
this.listBoxLoginID.SelectFontColor = System.Drawing.Color.DarkBlue;
this.listBoxLoginID.SelectItemIndex = -1;
- this.listBoxLoginID.SeparationlineColor1 = System.Drawing.Color.Gray;
+ this.listBoxLoginID.SeparationlineColor1 = System.Drawing.Color.Silver;
this.listBoxLoginID.SeparationlineColor2 = System.Drawing.Color.LightGray;
- this.listBoxLoginID.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.None;
+ this.listBoxLoginID.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxLoginID.SeparationlineVisibleBottom = false;
this.listBoxLoginID.SeparationlineVisibleTop = false;
- this.listBoxLoginID.Size = new System.Drawing.Size(80, 408);
+ this.listBoxLoginID.Size = new System.Drawing.Size(80, 398);
this.listBoxLoginID.TabIndex = 28;
this.listBoxLoginID.Text = "smartListBox1";
this.listBoxLoginID.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged);
@@ -363,13 +432,14 @@
this.listBoxTime.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxTime.ColumnDelimiter = '\0';
this.listBoxTime.ColumnOffsets = null;
+ this.listBoxTime.Enabled = false;
this.listBoxTime.FontColor = System.Drawing.Color.Black;
this.listBoxTime.InitVisible = true;
this.listBoxTime.ItemAddOrder = SmartX.SmartListBox.ITEMADDORDERS.BOTTOMADD;
this.listBoxTime.ItemOffsetGap = 5;
this.listBoxTime.ItemOffsetX = 5;
this.listBoxTime.ItemOffsetY = 0;
- this.listBoxTime.Location = new System.Drawing.Point(3, 39);
+ this.listBoxTime.Location = new System.Drawing.Point(3, 45);
this.listBoxTime.MouseMoveEventSpace = 3;
this.listBoxTime.MouseMoveSpace = 10;
this.listBoxTime.Name = "listBoxTime";
@@ -378,12 +448,12 @@
this.listBoxTime.SelectFilled = true;
this.listBoxTime.SelectFontColor = System.Drawing.Color.DarkBlue;
this.listBoxTime.SelectItemIndex = -1;
- this.listBoxTime.SeparationlineColor1 = System.Drawing.Color.Gray;
+ this.listBoxTime.SeparationlineColor1 = System.Drawing.Color.Silver;
this.listBoxTime.SeparationlineColor2 = System.Drawing.Color.LightGray;
- this.listBoxTime.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.None;
+ this.listBoxTime.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle;
this.listBoxTime.SeparationlineVisibleBottom = false;
this.listBoxTime.SeparationlineVisibleTop = false;
- this.listBoxTime.Size = new System.Drawing.Size(70, 408);
+ this.listBoxTime.Size = new System.Drawing.Size(65, 398);
this.listBoxTime.TabIndex = 28;
this.listBoxTime.Text = "smartListBox1";
this.listBoxTime.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged);
@@ -401,7 +471,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, 297);
+ this.buttonDown.Location = new System.Drawing.Point(725, 273);
this.buttonDown.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonDown.Name = "buttonDown";
this.buttonDown.NestedClickEventPrevent = false;
@@ -409,7 +479,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, 170);
this.buttonDown.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonDown.TabIndex = 30;
this.buttonDown.Text = "▼";
@@ -434,7 +504,7 @@
this.buttonUp.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Regular);
this.buttonUp.GroupID = 0;
this.buttonUp.InitVisible = true;
- this.buttonUp.Location = new System.Drawing.Point(725, 39);
+ this.buttonUp.Location = new System.Drawing.Point(725, 43);
this.buttonUp.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonUp.Name = "buttonUp";
this.buttonUp.NestedClickEventPrevent = false;
@@ -442,7 +512,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, 170);
this.buttonUp.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonUp.TabIndex = 29;
this.buttonUp.Text = "▲";
@@ -465,7 +535,7 @@
this.smartLabel8.ForeColor = System.Drawing.Color.White;
this.smartLabel8.InitVisible = true;
this.smartLabel8.LineSpacing = 0F;
- this.smartLabel8.Location = new System.Drawing.Point(645, 3);
+ this.smartLabel8.Location = new System.Drawing.Point(645, 9);
this.smartLabel8.Name = "smartLabel8";
this.smartLabel8.Size = new System.Drawing.Size(75, 30);
this.smartLabel8.TabIndex = 28;
@@ -485,9 +555,9 @@
this.smartLabel7.ForeColor = System.Drawing.Color.White;
this.smartLabel7.InitVisible = true;
this.smartLabel7.LineSpacing = 0F;
- this.smartLabel7.Location = new System.Drawing.Point(564, 3);
+ this.smartLabel7.Location = new System.Drawing.Point(551, 9);
this.smartLabel7.Name = "smartLabel7";
- this.smartLabel7.Size = new System.Drawing.Size(75, 30);
+ this.smartLabel7.Size = new System.Drawing.Size(88, 30);
this.smartLabel7.TabIndex = 28;
this.smartLabel7.Text = "After";
this.smartLabel7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@@ -505,9 +575,9 @@
this.smartLabel6.ForeColor = System.Drawing.Color.White;
this.smartLabel6.InitVisible = true;
this.smartLabel6.LineSpacing = 0F;
- this.smartLabel6.Location = new System.Drawing.Point(483, 3);
+ this.smartLabel6.Location = new System.Drawing.Point(457, 9);
this.smartLabel6.Name = "smartLabel6";
- this.smartLabel6.Size = new System.Drawing.Size(75, 30);
+ this.smartLabel6.Size = new System.Drawing.Size(88, 30);
this.smartLabel6.TabIndex = 28;
this.smartLabel6.Text = "Before";
this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@@ -525,9 +595,9 @@
this.smartLabel5.ForeColor = System.Drawing.Color.White;
this.smartLabel5.InitVisible = true;
this.smartLabel5.LineSpacing = 0F;
- this.smartLabel5.Location = new System.Drawing.Point(306, 3);
+ this.smartLabel5.Location = new System.Drawing.Point(301, 9);
this.smartLabel5.Name = "smartLabel5";
- this.smartLabel5.Size = new System.Drawing.Size(171, 30);
+ this.smartLabel5.Size = new System.Drawing.Size(150, 30);
this.smartLabel5.TabIndex = 28;
this.smartLabel5.Text = "Detail";
this.smartLabel5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@@ -545,7 +615,7 @@
this.smartLabel4.ForeColor = System.Drawing.Color.White;
this.smartLabel4.InitVisible = true;
this.smartLabel4.LineSpacing = 0F;
- this.smartLabel4.Location = new System.Drawing.Point(165, 3);
+ this.smartLabel4.Location = new System.Drawing.Point(160, 9);
this.smartLabel4.Name = "smartLabel4";
this.smartLabel4.Size = new System.Drawing.Size(135, 30);
this.smartLabel4.TabIndex = 28;
@@ -565,7 +635,7 @@
this.smartLabel3.ForeColor = System.Drawing.Color.White;
this.smartLabel3.InitVisible = true;
this.smartLabel3.LineSpacing = 0F;
- this.smartLabel3.Location = new System.Drawing.Point(79, 3);
+ this.smartLabel3.Location = new System.Drawing.Point(74, 9);
this.smartLabel3.Name = "smartLabel3";
this.smartLabel3.Size = new System.Drawing.Size(80, 30);
this.smartLabel3.TabIndex = 28;
@@ -585,9 +655,9 @@
this.smartLabel2.ForeColor = System.Drawing.Color.White;
this.smartLabel2.InitVisible = true;
this.smartLabel2.LineSpacing = 0F;
- this.smartLabel2.Location = new System.Drawing.Point(3, 3);
+ this.smartLabel2.Location = new System.Drawing.Point(3, 9);
this.smartLabel2.Name = "smartLabel2";
- this.smartLabel2.Size = new System.Drawing.Size(70, 30);
+ this.smartLabel2.Size = new System.Drawing.Size(65, 30);
this.smartLabel2.TabIndex = 28;
this.smartLabel2.Text = "Time";
this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@@ -654,6 +724,7 @@
this.buttonFilter.TextLocation = new System.Drawing.Point(0, 0);
this.buttonFilter.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonFilter.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonFilter.UpImage")));
+ this.buttonFilter.Visible = false;
this.buttonFilter.Click += new System.EventHandler(this.buttonFilter_Click);
//
// buttonBack
@@ -694,13 +765,13 @@
this.labelFileName.BackPictureBox2 = null;
this.labelFileName.BorderColor = System.Drawing.Color.Black;
this.labelFileName.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.labelFileName.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold);
+ this.labelFileName.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold);
this.labelFileName.ForeColor = System.Drawing.Color.White;
this.labelFileName.InitVisible = true;
this.labelFileName.LineSpacing = 0F;
- this.labelFileName.Location = new System.Drawing.Point(457, 33);
+ this.labelFileName.Location = new System.Drawing.Point(457, 35);
this.labelFileName.Name = "labelFileName";
- this.labelFileName.Size = new System.Drawing.Size(180, 25);
+ this.labelFileName.Size = new System.Drawing.Size(263, 25);
this.labelFileName.TabIndex = 169;
this.labelFileName.Text = "FileName";
this.labelFileName.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@@ -717,7 +788,7 @@
this.smartLabel9.ForeColor = System.Drawing.Color.White;
this.smartLabel9.InitVisible = true;
this.smartLabel9.LineSpacing = 0F;
- this.smartLabel9.Location = new System.Drawing.Point(457, 12);
+ this.smartLabel9.Location = new System.Drawing.Point(457, 9);
this.smartLabel9.Name = "smartLabel9";
this.smartLabel9.Size = new System.Drawing.Size(180, 20);
this.smartLabel9.TabIndex = 168;
@@ -874,5 +945,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 2613dfc..36296ee 100644
--- a/INT69DB_2A/Forms/FormDataViewer.cs
+++ b/INT69DB_2A/Forms/FormDataViewer.cs
@@ -23,11 +23,11 @@ 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; // 파일에서 읽은 데이터
- private List ListDate;
private List ListTime;
private List ListLoginID;
private List ListEvent;
@@ -108,7 +108,6 @@ namespace INT69DB_2A.Forms
this.CollectionHistoryData = new Collection();
//this.CollectionFileClassification = new Collection>();
- this.ListDate = new List();
this.ListTime = new List();
this.ListLoginID = new List();
this.ListEvent = new List();
@@ -203,7 +202,7 @@ namespace INT69DB_2A.Forms
switch (this.CollectionHistoryData[i][7])
{
case "Alarm":
- enable = filter.TpyeAlarm;
+ enable = filter.TypeAlarm;
break;
case "Operation":
enable = filter.TypeOperation;
@@ -218,7 +217,6 @@ namespace INT69DB_2A.Forms
if (enable == true)
{
- this.ListDate.Add(this.CollectionHistoryData[i][0]);
this.ListTime.Add(this.CollectionHistoryData[i][1]);
this.ListLoginID.Add(this.CollectionHistoryData[i][2]);
this.ListEvent.Add(this.CollectionHistoryData[i][3]);
@@ -232,13 +230,13 @@ namespace INT69DB_2A.Forms
private void UpdateDisplay()
{
int cnt = 0;
- if (this.ListDate.Count > 50)
+ if (this.ListTime.Count > ViewerDataCount)
{
- cnt = 50;
- this.DataRemainCNT = this.ListDate.Count - 50;
+ cnt = ViewerDataCount;
+ this.DataRemainCNT = this.ListTime.Count - ViewerDataCount;
}
else
- cnt = this.ListDate.Count;
+ cnt = this.ListTime.Count;
for (int i = 0; i < cnt; i++)
{
@@ -268,11 +266,11 @@ namespace INT69DB_2A.Forms
splash.LoadingImagePathname = "SmartLoading4";
splash.Start();
- index = this.ListDate.Count - this.DataRemainCNT;
+ 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]);
@@ -285,11 +283,11 @@ namespace INT69DB_2A.Forms
this.listBoxType.AddItem(this.ListType[i]);
}
- this.DataRemainCNT = this.DataRemainCNT - 50;
+ this.DataRemainCNT = this.DataRemainCNT - ViewerDataCount;
}
else
{
- for (int i = index; i < this.ListDate.Count; i++)
+ for (int i = index; i < this.ListTime.Count; i++)
{
//this.listBoxDate.AddItem(this.ListDate[i]);
this.listBoxTime.AddItem(this.ListTime[i]);
@@ -397,7 +395,6 @@ namespace INT69DB_2A.Forms
{
this.CollectionHistoryData.Clear();
- //this.listBoxDate.ClearAll();
this.listBoxTime.ClearAll();
this.listBoxLoginID.ClearAll();
this.listBoxEvent.ClearAll();
@@ -406,7 +403,6 @@ namespace INT69DB_2A.Forms
this.listBoxAfter.ClearAll();
this.listBoxType.ClearAll();
- this.ListDate.Clear();
this.ListTime.Clear();
this.ListLoginID.Clear();
this.ListEvent.Clear();
@@ -434,6 +430,9 @@ namespace INT69DB_2A.Forms
private void buttonFileSelect_Click(object sender, EventArgs e)
{
this.SelectNodeIndex = -1;
+
+ DialogFormHistoryData form = new DialogFormHistoryData(this);
+ form.ShowDialog();
}
private void buttonFilter_Click(object sender, EventArgs e)
{
@@ -454,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)
{
@@ -470,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/FormDataViewer.resx b/INT69DB_2A/Forms/FormDataViewer.resx
index 748bcb6..b8ce0ff 100644
--- a/INT69DB_2A/Forms/FormDataViewer.resx
+++ b/INT69DB_2A/Forms/FormDataViewer.resx
@@ -1122,7 +1122,7 @@
- 17, 17
+ 17, 8
WEBPAD
@@ -1130,4 +1130,7 @@
False
+
+ 34
+
\ No newline at end of file
diff --git a/INT69DB_2A/Forms/FormEquipmentSetting.Designer.cs b/INT69DB_2A/Forms/FormEquipmentSetting.Designer.cs
index ffe2222..2879014 100644
--- a/INT69DB_2A/Forms/FormEquipmentSetting.Designer.cs
+++ b/INT69DB_2A/Forms/FormEquipmentSetting.Designer.cs
@@ -44,38 +44,36 @@
this.comboBoxEquipmentColumn = new System.Windows.Forms.ComboBox();
this.comboBoxInputSensorSelect = new System.Windows.Forms.ComboBox();
this.panel1 = new System.Windows.Forms.Panel();
- this.radioButtonEquipmentModeStick1 = new System.Windows.Forms.RadioButton();
- this.radioButtonEquipmentModeStick2 = new System.Windows.Forms.RadioButton();
this.radioButtonEquipmentModeStick3 = new System.Windows.Forms.RadioButton();
+ this.radioButtonEquipmentModeStick2 = new System.Windows.Forms.RadioButton();
+ this.radioButtonEquipmentModeStick1 = new System.Windows.Forms.RadioButton();
this.labelStaticEquipmentType = new SmartX.SmartLabel();
this.panel3 = new System.Windows.Forms.Panel();
- this.radioButtonDischargeConveyorDirectionCW = new System.Windows.Forms.RadioButton();
- this.radioButtonDischargeConveyorDirectionCCW = new System.Windows.Forms.RadioButton();
this.radioButtonDischargeConveyorDirectionCWCCW = new System.Windows.Forms.RadioButton();
+ this.radioButtonDischargeConveyorDirectionCCW = new System.Windows.Forms.RadioButton();
+ this.radioButtonDischargeConveyorDirectionCW = new System.Windows.Forms.RadioButton();
this.panel6 = new System.Windows.Forms.Panel();
- this.radioButtonImpellerMotorDirectionCW = new System.Windows.Forms.RadioButton();
this.radioButtonImpellerMotorDirectionCCW = new System.Windows.Forms.RadioButton();
+ this.radioButtonImpellerMotorDirectionCW = new System.Windows.Forms.RadioButton();
this.panel7 = new System.Windows.Forms.Panel();
- this.radioButtonFeedingConveyorRunPass = new System.Windows.Forms.RadioButton();
this.radioButtonFeedingConveyorRunNg = new System.Windows.Forms.RadioButton();
- this.labelStaticRCRotationDirection = new SmartX.SmartLabel();
- this.labelStaticFeedingCVRun = new SmartX.SmartLabel();
+ this.radioButtonFeedingConveyorRunPass = new System.Windows.Forms.RadioButton();
this.labelStaticImpellerRotationDirection = new SmartX.SmartLabel();
this.labelStaticImpellerBaudrate = new SmartX.SmartLabel();
this.panel5 = new System.Windows.Forms.Panel();
- this.radioButtonImpellerMotorBaudrate9600 = new System.Windows.Forms.RadioButton();
- this.radioButtonImpellerMotorBaudrate19200 = new System.Windows.Forms.RadioButton();
- this.radioButtonImpellerMotorBaudrate38400 = new System.Windows.Forms.RadioButton();
this.radioButtonImpellerMotorBaudrate115200 = new System.Windows.Forms.RadioButton();
+ this.radioButtonImpellerMotorBaudrate38400 = new System.Windows.Forms.RadioButton();
+ this.radioButtonImpellerMotorBaudrate19200 = new System.Windows.Forms.RadioButton();
+ this.radioButtonImpellerMotorBaudrate9600 = new System.Windows.Forms.RadioButton();
this.panel2 = new System.Windows.Forms.Panel();
- this.radioButtonWeightViewForward = new System.Windows.Forms.RadioButton();
this.radioButtonWeightViewReverse = new System.Windows.Forms.RadioButton();
+ this.radioButtonWeightViewForward = new System.Windows.Forms.RadioButton();
this.smartLabel12 = new SmartX.SmartLabel();
this.smartLabel14 = new SmartX.SmartLabel();
this.panel8 = new System.Windows.Forms.Panel();
- this.radioButtonKorean = new System.Windows.Forms.RadioButton();
- this.radioButtonEnglish = new System.Windows.Forms.RadioButton();
this.radioButtonChinese = new System.Windows.Forms.RadioButton();
+ this.radioButtonEnglish = new System.Windows.Forms.RadioButton();
+ this.radioButtonKorean = new System.Windows.Forms.RadioButton();
this.labelBuadrateWarning = new SmartX.SmartLabel();
this.labelStaticLanguage = new SmartX.SmartLabel();
this.labelBuadrateWarning2 = new SmartX.SmartLabel();
@@ -85,13 +83,17 @@
this.comboBoxStepMotorType = new System.Windows.Forms.ComboBox();
this.labelStaticPingTimer = new SmartX.SmartLabel();
this.buttonPingTimer = new SmartX.SmartButton();
- this.smartLabel2 = new SmartX.SmartLabel();
- this.buttonPart11 = new SmartX.SmartButton();
this.groupBoxSpecialMenu = new SmartX.SmartGroupBox();
- this.buttonSave = new SmartX.SmartButton();
- this.buttonBack = new SmartX.SmartButton();
+ this.smartLabel6 = new SmartX.SmartLabel();
+ this.labelDataStoragePeriod = new SmartX.SmartLabel();
+ this.labelStaticDataStoragePeriod = new SmartX.SmartLabel();
+ 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();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.panel1.SuspendLayout();
this.panel3.SuspendLayout();
@@ -128,9 +130,9 @@
this.labelStaticEquipmentID.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticEquipmentID.InitVisible = true;
this.labelStaticEquipmentID.LineSpacing = 0F;
- this.labelStaticEquipmentID.Location = new System.Drawing.Point(12, 327);
+ this.labelStaticEquipmentID.Location = new System.Drawing.Point(318, 423);
this.labelStaticEquipmentID.Name = "labelStaticEquipmentID";
- this.labelStaticEquipmentID.Size = new System.Drawing.Size(208, 25);
+ this.labelStaticEquipmentID.Size = new System.Drawing.Size(108, 25);
this.labelStaticEquipmentID.TabIndex = 119;
this.labelStaticEquipmentID.Text = "장비 ID";
this.labelStaticEquipmentID.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -147,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(12, 110);
+ this.labelStaticEquipmentLine.Location = new System.Drawing.Point(16, 112);
this.labelStaticEquipmentLine.Name = "labelStaticEquipmentLine";
- this.labelStaticEquipmentLine.Size = new System.Drawing.Size(208, 25);
+ this.labelStaticEquipmentLine.Size = new System.Drawing.Size(204, 25);
this.labelStaticEquipmentLine.TabIndex = 119;
this.labelStaticEquipmentLine.Text = "장비 열";
this.labelStaticEquipmentLine.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -166,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, 141);
+ this.labelStaticWeightCheck.Location = new System.Drawing.Point(12, 485);
this.labelStaticWeightCheck.Name = "labelStaticWeightCheck";
this.labelStaticWeightCheck.Size = new System.Drawing.Size(208, 25);
this.labelStaticWeightCheck.TabIndex = 119;
@@ -186,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, 206);
this.labelStaticSelectSensor.Name = "labelStaticSelectSensor";
this.labelStaticSelectSensor.Size = new System.Drawing.Size(208, 25);
this.labelStaticSelectSensor.TabIndex = 119;
@@ -206,9 +208,9 @@
this.labelEquipmentID.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Bold);
this.labelEquipmentID.InitVisible = true;
this.labelEquipmentID.LineSpacing = 0F;
- this.labelEquipmentID.Location = new System.Drawing.Point(226, 327);
+ this.labelEquipmentID.Location = new System.Drawing.Point(432, 423);
this.labelEquipmentID.Name = "labelEquipmentID";
- this.labelEquipmentID.Size = new System.Drawing.Size(100, 25);
+ this.labelEquipmentID.Size = new System.Drawing.Size(72, 25);
this.labelEquipmentID.TabIndex = 120;
this.labelEquipmentID.Text = "100";
this.labelEquipmentID.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -226,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, 175);
this.labelStaticIndividualNG.Name = "labelStaticIndividualNG";
this.labelStaticIndividualNG.Size = new System.Drawing.Size(208, 25);
this.labelStaticIndividualNG.TabIndex = 125;
@@ -247,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, 175);
this.buttonEachNG.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonEachNG.Name = "buttonEachNG";
this.buttonEachNG.NestedClickEventPrevent = false;
@@ -276,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, 237);
this.labelStaticRejectConveyor.Name = "labelStaticRejectConveyor";
this.labelStaticRejectConveyor.Size = new System.Drawing.Size(208, 25);
this.labelStaticRejectConveyor.TabIndex = 125;
@@ -297,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, 237);
this.buttonDischargeConveyor.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonDischargeConveyor.Name = "buttonDischargeConveyor";
this.buttonDischargeConveyor.NestedClickEventPrevent = false;
@@ -326,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, 268);
this.labelStaticFeedingConveyor.Name = "labelStaticFeedingConveyor";
this.labelStaticFeedingConveyor.Size = new System.Drawing.Size(208, 25);
this.labelStaticFeedingConveyor.TabIndex = 125;
@@ -347,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, 268);
this.buttonFeedingConveyor.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonFeedingConveyor.Name = "buttonFeedingConveyor";
this.buttonFeedingConveyor.NestedClickEventPrevent = false;
@@ -369,16 +371,16 @@
// comboBoxEquipmentColumn
//
this.comboBoxEquipmentColumn.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold);
- this.comboBoxEquipmentColumn.Location = new System.Drawing.Point(226, 106);
+ this.comboBoxEquipmentColumn.Location = new System.Drawing.Point(226, 109);
this.comboBoxEquipmentColumn.Name = "comboBoxEquipmentColumn";
- this.comboBoxEquipmentColumn.Size = new System.Drawing.Size(165, 29);
+ this.comboBoxEquipmentColumn.Size = new System.Drawing.Size(104, 29);
this.comboBoxEquipmentColumn.TabIndex = 127;
this.comboBoxEquipmentColumn.SelectedIndexChanged += new System.EventHandler(this.control_Click);
//
// 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, 202);
this.comboBoxInputSensorSelect.Name = "comboBoxInputSensorSelect";
this.comboBoxInputSensorSelect.Size = new System.Drawing.Size(165, 29);
this.comboBoxInputSensorSelect.TabIndex = 127;
@@ -390,29 +392,9 @@
this.panel1.Controls.Add(this.radioButtonEquipmentModeStick3);
this.panel1.Controls.Add(this.radioButtonEquipmentModeStick2);
this.panel1.Controls.Add(this.radioButtonEquipmentModeStick1);
- this.panel1.Location = new System.Drawing.Point(226, 79);
+ this.panel1.Location = new System.Drawing.Point(226, 81);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(500, 25);
- //
- // radioButtonEquipmentModeStick1
- //
- this.radioButtonEquipmentModeStick1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
- this.radioButtonEquipmentModeStick1.Location = new System.Drawing.Point(10, 3);
- this.radioButtonEquipmentModeStick1.Name = "radioButtonEquipmentModeStick1";
- this.radioButtonEquipmentModeStick1.Size = new System.Drawing.Size(90, 20);
- this.radioButtonEquipmentModeStick1.TabIndex = 1;
- this.radioButtonEquipmentModeStick1.Text = "스틱-I";
- this.radioButtonEquipmentModeStick1.Click += new System.EventHandler(this.control_Click);
- //
- // radioButtonEquipmentModeStick2
- //
- this.radioButtonEquipmentModeStick2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
- this.radioButtonEquipmentModeStick2.Location = new System.Drawing.Point(106, 3);
- this.radioButtonEquipmentModeStick2.Name = "radioButtonEquipmentModeStick2";
- this.radioButtonEquipmentModeStick2.Size = new System.Drawing.Size(90, 20);
- this.radioButtonEquipmentModeStick2.TabIndex = 2;
- this.radioButtonEquipmentModeStick2.Text = "스틱-II";
- this.radioButtonEquipmentModeStick2.Click += new System.EventHandler(this.control_Click);
+ this.panel1.Size = new System.Drawing.Size(298, 25);
//
// radioButtonEquipmentModeStick3
//
@@ -424,6 +406,26 @@
this.radioButtonEquipmentModeStick3.Text = "스틱-III";
this.radioButtonEquipmentModeStick3.Click += new System.EventHandler(this.control_Click);
//
+ // radioButtonEquipmentModeStick2
+ //
+ this.radioButtonEquipmentModeStick2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
+ this.radioButtonEquipmentModeStick2.Location = new System.Drawing.Point(106, 3);
+ this.radioButtonEquipmentModeStick2.Name = "radioButtonEquipmentModeStick2";
+ this.radioButtonEquipmentModeStick2.Size = new System.Drawing.Size(90, 20);
+ this.radioButtonEquipmentModeStick2.TabIndex = 2;
+ this.radioButtonEquipmentModeStick2.Text = "스틱-II";
+ this.radioButtonEquipmentModeStick2.Click += new System.EventHandler(this.control_Click);
+ //
+ // radioButtonEquipmentModeStick1
+ //
+ this.radioButtonEquipmentModeStick1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
+ this.radioButtonEquipmentModeStick1.Location = new System.Drawing.Point(10, 3);
+ this.radioButtonEquipmentModeStick1.Name = "radioButtonEquipmentModeStick1";
+ this.radioButtonEquipmentModeStick1.Size = new System.Drawing.Size(90, 20);
+ this.radioButtonEquipmentModeStick1.TabIndex = 1;
+ this.radioButtonEquipmentModeStick1.Text = "스틱-I";
+ this.radioButtonEquipmentModeStick1.Click += new System.EventHandler(this.control_Click);
+ //
// labelStaticEquipmentType
//
this.labelStaticEquipmentType.BackPictureBox = this.smartForm1;
@@ -434,7 +436,7 @@
this.labelStaticEquipmentType.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticEquipmentType.InitVisible = true;
this.labelStaticEquipmentType.LineSpacing = 0F;
- this.labelStaticEquipmentType.Location = new System.Drawing.Point(12, 79);
+ this.labelStaticEquipmentType.Location = new System.Drawing.Point(12, 81);
this.labelStaticEquipmentType.Name = "labelStaticEquipmentType";
this.labelStaticEquipmentType.Size = new System.Drawing.Size(208, 25);
this.labelStaticEquipmentType.TabIndex = 129;
@@ -449,9 +451,29 @@
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, 237);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(500, 25);
+ this.panel3.Size = new System.Drawing.Size(410, 25);
+ //
+ // radioButtonDischargeConveyorDirectionCWCCW
+ //
+ this.radioButtonDischargeConveyorDirectionCWCCW.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.radioButtonDischargeConveyorDirectionCWCCW.Location = new System.Drawing.Point(272, 3);
+ this.radioButtonDischargeConveyorDirectionCWCCW.Name = "radioButtonDischargeConveyorDirectionCWCCW";
+ this.radioButtonDischargeConveyorDirectionCWCCW.Size = new System.Drawing.Size(120, 20);
+ this.radioButtonDischargeConveyorDirectionCWCCW.TabIndex = 2;
+ this.radioButtonDischargeConveyorDirectionCWCCW.Text = "CW/CCW";
+ this.radioButtonDischargeConveyorDirectionCWCCW.Click += new System.EventHandler(this.control_Click);
+ //
+ // radioButtonDischargeConveyorDirectionCCW
+ //
+ this.radioButtonDischargeConveyorDirectionCCW.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.radioButtonDischargeConveyorDirectionCCW.Location = new System.Drawing.Point(146, 3);
+ this.radioButtonDischargeConveyorDirectionCCW.Name = "radioButtonDischargeConveyorDirectionCCW";
+ this.radioButtonDischargeConveyorDirectionCCW.Size = new System.Drawing.Size(120, 20);
+ this.radioButtonDischargeConveyorDirectionCCW.TabIndex = 1;
+ this.radioButtonDischargeConveyorDirectionCCW.Text = "CCW";
+ this.radioButtonDischargeConveyorDirectionCCW.Click += new System.EventHandler(this.control_Click);
//
// radioButtonDischargeConveyorDirectionCW
//
@@ -464,35 +486,25 @@
this.radioButtonDischargeConveyorDirectionCW.Text = "CW";
this.radioButtonDischargeConveyorDirectionCW.Click += new System.EventHandler(this.control_Click);
//
- // radioButtonDischargeConveyorDirectionCCW
- //
- this.radioButtonDischargeConveyorDirectionCCW.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
- this.radioButtonDischargeConveyorDirectionCCW.Location = new System.Drawing.Point(146, 3);
- this.radioButtonDischargeConveyorDirectionCCW.Name = "radioButtonDischargeConveyorDirectionCCW";
- this.radioButtonDischargeConveyorDirectionCCW.Size = new System.Drawing.Size(120, 20);
- this.radioButtonDischargeConveyorDirectionCCW.TabIndex = 1;
- this.radioButtonDischargeConveyorDirectionCCW.Text = "CCW";
- this.radioButtonDischargeConveyorDirectionCCW.Click += new System.EventHandler(this.control_Click);
- //
- // radioButtonDischargeConveyorDirectionCWCCW
- //
- this.radioButtonDischargeConveyorDirectionCWCCW.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
- this.radioButtonDischargeConveyorDirectionCWCCW.Location = new System.Drawing.Point(272, 3);
- this.radioButtonDischargeConveyorDirectionCWCCW.Name = "radioButtonDischargeConveyorDirectionCWCCW";
- this.radioButtonDischargeConveyorDirectionCWCCW.Size = new System.Drawing.Size(120, 20);
- this.radioButtonDischargeConveyorDirectionCWCCW.TabIndex = 2;
- this.radioButtonDischargeConveyorDirectionCWCCW.Text = "CW/CCW";
- this.radioButtonDischargeConveyorDirectionCWCCW.Click += new System.EventHandler(this.control_Click);
- //
// panel6
//
this.panel6.BackColor = System.Drawing.SystemColors.ControlLight;
this.panel6.Controls.Add(this.radioButtonImpellerMotorDirectionCCW);
this.panel6.Controls.Add(this.radioButtonImpellerMotorDirectionCW);
- this.panel6.Location = new System.Drawing.Point(226, 389);
+ this.panel6.Location = new System.Drawing.Point(226, 361);
this.panel6.Name = "panel6";
this.panel6.Size = new System.Drawing.Size(500, 25);
//
+ // radioButtonImpellerMotorDirectionCCW
+ //
+ this.radioButtonImpellerMotorDirectionCCW.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold);
+ this.radioButtonImpellerMotorDirectionCCW.Location = new System.Drawing.Point(232, 3);
+ this.radioButtonImpellerMotorDirectionCCW.Name = "radioButtonImpellerMotorDirectionCCW";
+ this.radioButtonImpellerMotorDirectionCCW.Size = new System.Drawing.Size(180, 20);
+ this.radioButtonImpellerMotorDirectionCCW.TabIndex = 1;
+ this.radioButtonImpellerMotorDirectionCCW.Text = "CCW";
+ this.radioButtonImpellerMotorDirectionCCW.Click += new System.EventHandler(this.control_Click);
+ //
// radioButtonImpellerMotorDirectionCW
//
this.radioButtonImpellerMotorDirectionCW.Checked = true;
@@ -504,24 +516,24 @@
this.radioButtonImpellerMotorDirectionCW.Text = "CW";
this.radioButtonImpellerMotorDirectionCW.Click += new System.EventHandler(this.control_Click);
//
- // radioButtonImpellerMotorDirectionCCW
- //
- this.radioButtonImpellerMotorDirectionCCW.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold);
- this.radioButtonImpellerMotorDirectionCCW.Location = new System.Drawing.Point(232, 3);
- this.radioButtonImpellerMotorDirectionCCW.Name = "radioButtonImpellerMotorDirectionCCW";
- this.radioButtonImpellerMotorDirectionCCW.Size = new System.Drawing.Size(180, 20);
- this.radioButtonImpellerMotorDirectionCCW.TabIndex = 1;
- this.radioButtonImpellerMotorDirectionCCW.Text = "CCW";
- this.radioButtonImpellerMotorDirectionCCW.Click += new System.EventHandler(this.control_Click);
- //
// panel7
//
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, 268);
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(146, 3);
+ this.radioButtonFeedingConveyorRunNg.Name = "radioButtonFeedingConveyorRunNg";
+ 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);
//
// radioButtonFeedingConveyorRunPass
//
@@ -529,59 +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);
//
- // radioButtonFeedingConveyorRunNg
- //
- this.radioButtonFeedingConveyorRunNg.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
- this.radioButtonFeedingConveyorRunNg.Location = new System.Drawing.Point(232, 3);
- this.radioButtonFeedingConveyorRunNg.Name = "radioButtonFeedingConveyorRunNg";
- this.radioButtonFeedingConveyorRunNg.Size = new System.Drawing.Size(180, 20);
- this.radioButtonFeedingConveyorRunNg.TabIndex = 1;
- this.radioButtonFeedingConveyorRunNg.Text = "NG";
- this.radioButtonFeedingConveyorRunNg.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;
@@ -592,7 +556,7 @@
this.labelStaticImpellerRotationDirection.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticImpellerRotationDirection.InitVisible = true;
this.labelStaticImpellerRotationDirection.LineSpacing = 0F;
- this.labelStaticImpellerRotationDirection.Location = new System.Drawing.Point(12, 389);
+ this.labelStaticImpellerRotationDirection.Location = new System.Drawing.Point(12, 361);
this.labelStaticImpellerRotationDirection.Name = "labelStaticImpellerRotationDirection";
this.labelStaticImpellerRotationDirection.Size = new System.Drawing.Size(208, 25);
this.labelStaticImpellerRotationDirection.TabIndex = 129;
@@ -611,7 +575,7 @@
this.labelStaticImpellerBaudrate.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticImpellerBaudrate.InitVisible = true;
this.labelStaticImpellerBaudrate.LineSpacing = 0F;
- this.labelStaticImpellerBaudrate.Location = new System.Drawing.Point(12, 358);
+ this.labelStaticImpellerBaudrate.Location = new System.Drawing.Point(12, 330);
this.labelStaticImpellerBaudrate.Name = "labelStaticImpellerBaudrate";
this.labelStaticImpellerBaudrate.Size = new System.Drawing.Size(208, 25);
this.labelStaticImpellerBaudrate.TabIndex = 135;
@@ -627,46 +591,10 @@
this.panel5.Controls.Add(this.radioButtonImpellerMotorBaudrate38400);
this.panel5.Controls.Add(this.radioButtonImpellerMotorBaudrate19200);
this.panel5.Controls.Add(this.radioButtonImpellerMotorBaudrate9600);
- this.panel5.Location = new System.Drawing.Point(226, 358);
+ this.panel5.Location = new System.Drawing.Point(226, 330);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(500, 25);
//
- // radioButtonImpellerMotorBaudrate9600
- //
- this.radioButtonImpellerMotorBaudrate9600.Checked = true;
- this.radioButtonImpellerMotorBaudrate9600.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold);
- this.radioButtonImpellerMotorBaudrate9600.ForeColor = System.Drawing.Color.Black;
- this.radioButtonImpellerMotorBaudrate9600.Location = new System.Drawing.Point(20, 3);
- this.radioButtonImpellerMotorBaudrate9600.Name = "radioButtonImpellerMotorBaudrate9600";
- this.radioButtonImpellerMotorBaudrate9600.Size = new System.Drawing.Size(100, 20);
- this.radioButtonImpellerMotorBaudrate9600.TabIndex = 105;
- this.radioButtonImpellerMotorBaudrate9600.Text = "9600";
- this.radioButtonImpellerMotorBaudrate9600.Click += new System.EventHandler(this.control_Click);
- //
- // radioButtonImpellerMotorBaudrate19200
- //
- this.radioButtonImpellerMotorBaudrate19200.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold);
- this.radioButtonImpellerMotorBaudrate19200.ForeColor = System.Drawing.Color.Black;
- this.radioButtonImpellerMotorBaudrate19200.Location = new System.Drawing.Point(126, 3);
- this.radioButtonImpellerMotorBaudrate19200.Name = "radioButtonImpellerMotorBaudrate19200";
- this.radioButtonImpellerMotorBaudrate19200.Size = new System.Drawing.Size(100, 20);
- this.radioButtonImpellerMotorBaudrate19200.TabIndex = 106;
- this.radioButtonImpellerMotorBaudrate19200.TabStop = false;
- this.radioButtonImpellerMotorBaudrate19200.Text = "19200";
- this.radioButtonImpellerMotorBaudrate19200.Click += new System.EventHandler(this.control_Click);
- //
- // radioButtonImpellerMotorBaudrate38400
- //
- this.radioButtonImpellerMotorBaudrate38400.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold);
- this.radioButtonImpellerMotorBaudrate38400.ForeColor = System.Drawing.Color.Black;
- this.radioButtonImpellerMotorBaudrate38400.Location = new System.Drawing.Point(232, 3);
- this.radioButtonImpellerMotorBaudrate38400.Name = "radioButtonImpellerMotorBaudrate38400";
- this.radioButtonImpellerMotorBaudrate38400.Size = new System.Drawing.Size(100, 20);
- this.radioButtonImpellerMotorBaudrate38400.TabIndex = 107;
- this.radioButtonImpellerMotorBaudrate38400.TabStop = false;
- this.radioButtonImpellerMotorBaudrate38400.Text = "38400";
- this.radioButtonImpellerMotorBaudrate38400.Click += new System.EventHandler(this.control_Click);
- //
// radioButtonImpellerMotorBaudrate115200
//
this.radioButtonImpellerMotorBaudrate115200.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold);
@@ -679,16 +607,62 @@
this.radioButtonImpellerMotorBaudrate115200.Text = "115200";
this.radioButtonImpellerMotorBaudrate115200.Click += new System.EventHandler(this.control_Click);
//
+ // radioButtonImpellerMotorBaudrate38400
+ //
+ this.radioButtonImpellerMotorBaudrate38400.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold);
+ this.radioButtonImpellerMotorBaudrate38400.ForeColor = System.Drawing.Color.Black;
+ this.radioButtonImpellerMotorBaudrate38400.Location = new System.Drawing.Point(232, 3);
+ this.radioButtonImpellerMotorBaudrate38400.Name = "radioButtonImpellerMotorBaudrate38400";
+ this.radioButtonImpellerMotorBaudrate38400.Size = new System.Drawing.Size(100, 20);
+ this.radioButtonImpellerMotorBaudrate38400.TabIndex = 107;
+ this.radioButtonImpellerMotorBaudrate38400.TabStop = false;
+ this.radioButtonImpellerMotorBaudrate38400.Text = "38400";
+ this.radioButtonImpellerMotorBaudrate38400.Click += new System.EventHandler(this.control_Click);
+ //
+ // radioButtonImpellerMotorBaudrate19200
+ //
+ this.radioButtonImpellerMotorBaudrate19200.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold);
+ this.radioButtonImpellerMotorBaudrate19200.ForeColor = System.Drawing.Color.Black;
+ this.radioButtonImpellerMotorBaudrate19200.Location = new System.Drawing.Point(126, 3);
+ this.radioButtonImpellerMotorBaudrate19200.Name = "radioButtonImpellerMotorBaudrate19200";
+ this.radioButtonImpellerMotorBaudrate19200.Size = new System.Drawing.Size(100, 20);
+ this.radioButtonImpellerMotorBaudrate19200.TabIndex = 106;
+ this.radioButtonImpellerMotorBaudrate19200.TabStop = false;
+ this.radioButtonImpellerMotorBaudrate19200.Text = "19200";
+ this.radioButtonImpellerMotorBaudrate19200.Click += new System.EventHandler(this.control_Click);
+ //
+ // radioButtonImpellerMotorBaudrate9600
+ //
+ this.radioButtonImpellerMotorBaudrate9600.Checked = true;
+ this.radioButtonImpellerMotorBaudrate9600.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold);
+ this.radioButtonImpellerMotorBaudrate9600.ForeColor = System.Drawing.Color.Black;
+ this.radioButtonImpellerMotorBaudrate9600.Location = new System.Drawing.Point(20, 3);
+ this.radioButtonImpellerMotorBaudrate9600.Name = "radioButtonImpellerMotorBaudrate9600";
+ this.radioButtonImpellerMotorBaudrate9600.Size = new System.Drawing.Size(100, 20);
+ this.radioButtonImpellerMotorBaudrate9600.TabIndex = 105;
+ this.radioButtonImpellerMotorBaudrate9600.Text = "9600";
+ this.radioButtonImpellerMotorBaudrate9600.Click += new System.EventHandler(this.control_Click);
+ //
// panel2
//
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, 141);
+ this.panel2.Location = new System.Drawing.Point(226, 485);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(500, 25);
this.panel2.Visible = false;
//
+ // radioButtonWeightViewReverse
+ //
+ this.radioButtonWeightViewReverse.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.radioButtonWeightViewReverse.Location = new System.Drawing.Point(232, 3);
+ this.radioButtonWeightViewReverse.Name = "radioButtonWeightViewReverse";
+ this.radioButtonWeightViewReverse.Size = new System.Drawing.Size(180, 20);
+ this.radioButtonWeightViewReverse.TabIndex = 1;
+ this.radioButtonWeightViewReverse.Text = "Reverse(10~1)";
+ this.radioButtonWeightViewReverse.Click += new System.EventHandler(this.control_Click);
+ //
// radioButtonWeightViewForward
//
this.radioButtonWeightViewForward.Checked = true;
@@ -700,16 +674,6 @@
this.radioButtonWeightViewForward.Text = "Forward(1~10)";
this.radioButtonWeightViewForward.Click += new System.EventHandler(this.control_Click);
//
- // radioButtonWeightViewReverse
- //
- this.radioButtonWeightViewReverse.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
- this.radioButtonWeightViewReverse.Location = new System.Drawing.Point(232, 3);
- this.radioButtonWeightViewReverse.Name = "radioButtonWeightViewReverse";
- this.radioButtonWeightViewReverse.Size = new System.Drawing.Size(180, 20);
- this.radioButtonWeightViewReverse.TabIndex = 1;
- this.radioButtonWeightViewReverse.Text = "Reverse(10~1)";
- this.radioButtonWeightViewReverse.Click += new System.EventHandler(this.control_Click);
- //
// smartLabel12
//
this.smartLabel12.BackColor = System.Drawing.Color.Silver;
@@ -718,16 +682,16 @@
this.smartLabel12.BackPictureBox2 = null;
this.smartLabel12.BorderColor = System.Drawing.Color.Black;
this.smartLabel12.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.smartLabel12.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
+ this.smartLabel12.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
this.smartLabel12.ForeColor = System.Drawing.Color.Red;
this.smartLabel12.InitVisible = true;
this.smartLabel12.LineSpacing = 0F;
- this.smartLabel12.Location = new System.Drawing.Point(397, 173);
+ this.smartLabel12.Location = new System.Drawing.Point(428, 176);
this.smartLabel12.Name = "smartLabel12";
this.smartLabel12.Size = new System.Drawing.Size(267, 23);
this.smartLabel12.TabIndex = 145;
this.smartLabel12.Text = "Active Only Stick I";
- this.smartLabel12.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.smartLabel12.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
this.smartLabel12.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.smartLabel12.Wordwrap = false;
//
@@ -739,16 +703,16 @@
this.smartLabel14.BackPictureBox2 = null;
this.smartLabel14.BorderColor = System.Drawing.Color.Black;
this.smartLabel14.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.smartLabel14.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
+ this.smartLabel14.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
this.smartLabel14.ForeColor = System.Drawing.Color.Red;
this.smartLabel14.InitVisible = true;
this.smartLabel14.LineSpacing = 0F;
- this.smartLabel14.Location = new System.Drawing.Point(397, 204);
+ this.smartLabel14.Location = new System.Drawing.Point(428, 207);
this.smartLabel14.Name = "smartLabel14";
this.smartLabel14.Size = new System.Drawing.Size(267, 23);
this.smartLabel14.TabIndex = 145;
this.smartLabel14.Text = "Active Only Stick I";
- this.smartLabel14.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.smartLabel14.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
this.smartLabel14.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.smartLabel14.Wordwrap = false;
//
@@ -758,10 +722,30 @@
this.panel8.Controls.Add(this.radioButtonChinese);
this.panel8.Controls.Add(this.radioButtonEnglish);
this.panel8.Controls.Add(this.radioButtonKorean);
- this.panel8.Location = new System.Drawing.Point(226, 420);
+ this.panel8.Location = new System.Drawing.Point(226, 392);
this.panel8.Name = "panel8";
this.panel8.Size = new System.Drawing.Size(500, 25);
//
+ // radioButtonChinese
+ //
+ this.radioButtonChinese.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.radioButtonChinese.Location = new System.Drawing.Point(232, 3);
+ this.radioButtonChinese.Name = "radioButtonChinese";
+ this.radioButtonChinese.Size = new System.Drawing.Size(100, 20);
+ this.radioButtonChinese.TabIndex = 2;
+ this.radioButtonChinese.Text = "汉语";
+ this.radioButtonChinese.Click += new System.EventHandler(this.control_Click);
+ //
+ // radioButtonEnglish
+ //
+ this.radioButtonEnglish.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.radioButtonEnglish.Location = new System.Drawing.Point(126, 3);
+ this.radioButtonEnglish.Name = "radioButtonEnglish";
+ this.radioButtonEnglish.Size = new System.Drawing.Size(100, 20);
+ this.radioButtonEnglish.TabIndex = 1;
+ this.radioButtonEnglish.Text = "English";
+ this.radioButtonEnglish.Click += new System.EventHandler(this.control_Click);
+ //
// radioButtonKorean
//
this.radioButtonKorean.Checked = true;
@@ -773,26 +757,6 @@
this.radioButtonKorean.Text = "한글";
this.radioButtonKorean.Click += new System.EventHandler(this.control_Click);
//
- // radioButtonEnglish
- //
- this.radioButtonEnglish.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
- this.radioButtonEnglish.Location = new System.Drawing.Point(126, 3);
- this.radioButtonEnglish.Name = "radioButtonEnglish";
- this.radioButtonEnglish.Size = new System.Drawing.Size(100, 20);
- this.radioButtonEnglish.TabIndex = 1;
- this.radioButtonEnglish.Text = "English";
- this.radioButtonEnglish.Click += new System.EventHandler(this.control_Click);
- //
- // radioButtonChinese
- //
- this.radioButtonChinese.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
- this.radioButtonChinese.Location = new System.Drawing.Point(232, 3);
- this.radioButtonChinese.Name = "radioButtonChinese";
- this.radioButtonChinese.Size = new System.Drawing.Size(100, 20);
- this.radioButtonChinese.TabIndex = 2;
- this.radioButtonChinese.Text = "汉语";
- this.radioButtonChinese.Click += new System.EventHandler(this.control_Click);
- //
// labelBuadrateWarning
//
this.labelBuadrateWarning.BackColor = System.Drawing.Color.Silver;
@@ -802,7 +766,7 @@
this.labelBuadrateWarning.BorderColor = System.Drawing.Color.Black;
this.labelBuadrateWarning.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelBuadrateWarning.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
- this.labelBuadrateWarning.ForeColor = System.Drawing.Color.Red;
+ this.labelBuadrateWarning.ForeColor = System.Drawing.Color.Gold;
this.labelBuadrateWarning.InitVisible = true;
this.labelBuadrateWarning.LineSpacing = 0F;
this.labelBuadrateWarning.Location = new System.Drawing.Point(41, 539);
@@ -824,7 +788,7 @@
this.labelStaticLanguage.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticLanguage.InitVisible = true;
this.labelStaticLanguage.LineSpacing = 0F;
- this.labelStaticLanguage.Location = new System.Drawing.Point(12, 420);
+ this.labelStaticLanguage.Location = new System.Drawing.Point(12, 392);
this.labelStaticLanguage.Name = "labelStaticLanguage";
this.labelStaticLanguage.Size = new System.Drawing.Size(208, 25);
this.labelStaticLanguage.TabIndex = 156;
@@ -842,7 +806,7 @@
this.labelBuadrateWarning2.BorderColor = System.Drawing.Color.Black;
this.labelBuadrateWarning2.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelBuadrateWarning2.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
- this.labelBuadrateWarning2.ForeColor = System.Drawing.Color.Red;
+ this.labelBuadrateWarning2.ForeColor = System.Drawing.Color.Gold;
this.labelBuadrateWarning2.InitVisible = true;
this.labelBuadrateWarning2.LineSpacing = 0F;
this.labelBuadrateWarning2.Location = new System.Drawing.Point(41, 565);
@@ -864,7 +828,7 @@
this.labelStaticLogin.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticLogin.InitVisible = true;
this.labelStaticLogin.LineSpacing = 0F;
- this.labelStaticLogin.Location = new System.Drawing.Point(12, 451);
+ this.labelStaticLogin.Location = new System.Drawing.Point(12, 423);
this.labelStaticLogin.Name = "labelStaticLogin";
this.labelStaticLogin.Size = new System.Drawing.Size(208, 25);
this.labelStaticLogin.TabIndex = 181;
@@ -885,7 +849,7 @@
this.buttonLogin.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLogin.DownImage")));
this.buttonLogin.GroupID = 0;
this.buttonLogin.InitVisible = true;
- this.buttonLogin.Location = new System.Drawing.Point(226, 451);
+ this.buttonLogin.Location = new System.Drawing.Point(226, 423);
this.buttonLogin.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonLogin.Name = "buttonLogin";
this.buttonLogin.NestedClickEventPrevent = false;
@@ -914,7 +878,7 @@
this.labelTitleStepMotorType.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelTitleStepMotorType.InitVisible = true;
this.labelTitleStepMotorType.LineSpacing = 0F;
- this.labelTitleStepMotorType.Location = new System.Drawing.Point(12, 482);
+ this.labelTitleStepMotorType.Location = new System.Drawing.Point(12, 454);
this.labelTitleStepMotorType.Name = "labelTitleStepMotorType";
this.labelTitleStepMotorType.Size = new System.Drawing.Size(208, 25);
this.labelTitleStepMotorType.TabIndex = 190;
@@ -926,7 +890,7 @@
// comboBoxStepMotorType
//
this.comboBoxStepMotorType.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
- this.comboBoxStepMotorType.Location = new System.Drawing.Point(226, 482);
+ this.comboBoxStepMotorType.Location = new System.Drawing.Point(226, 454);
this.comboBoxStepMotorType.Name = "comboBoxStepMotorType";
this.comboBoxStepMotorType.Size = new System.Drawing.Size(165, 25);
this.comboBoxStepMotorType.TabIndex = 191;
@@ -942,9 +906,9 @@
this.labelStaticPingTimer.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelStaticPingTimer.InitVisible = true;
this.labelStaticPingTimer.LineSpacing = 0F;
- this.labelStaticPingTimer.Location = new System.Drawing.Point(428, 482);
+ this.labelStaticPingTimer.Location = new System.Drawing.Point(532, 423);
this.labelStaticPingTimer.Name = "labelStaticPingTimer";
- this.labelStaticPingTimer.Size = new System.Drawing.Size(208, 25);
+ this.labelStaticPingTimer.Size = new System.Drawing.Size(104, 25);
this.labelStaticPingTimer.TabIndex = 199;
this.labelStaticPingTimer.Text = "Ping Timer";
this.labelStaticPingTimer.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
@@ -963,7 +927,7 @@
this.buttonPingTimer.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonPingTimer.DownImage")));
this.buttonPingTimer.GroupID = 0;
this.buttonPingTimer.InitVisible = true;
- this.buttonPingTimer.Location = new System.Drawing.Point(642, 482);
+ this.buttonPingTimer.Location = new System.Drawing.Point(642, 423);
this.buttonPingTimer.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
this.buttonPingTimer.Name = "buttonPingTimer";
this.buttonPingTimer.NestedClickEventPrevent = false;
@@ -982,66 +946,20 @@
this.buttonPingTimer.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonPingTimer.UpImage")));
this.buttonPingTimer.Click += new System.EventHandler(this.buttonPingTimer_Click);
//
- // smartLabel2
- //
- 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("새굴림", 11F, System.Drawing.FontStyle.Bold);
- this.smartLabel2.InitVisible = true;
- this.smartLabel2.LineSpacing = 0F;
- this.smartLabel2.Location = new System.Drawing.Point(428, 451);
- this.smartLabel2.Name = "smartLabel2";
- this.smartLabel2.Size = new System.Drawing.Size(208, 25);
- this.smartLabel2.TabIndex = 208;
- this.smartLabel2.Text = "Part11";
- this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
- this.smartLabel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.smartLabel2.Wordwrap = false;
- //
- // buttonPart11
- //
- this.buttonPart11.BackPictureBox = null;
- this.buttonPart11.BackPictureBox1 = null;
- this.buttonPart11.BackPictureBox2 = null;
- this.buttonPart11.ButtonColor = System.Drawing.Color.Gray;
- this.buttonPart11.ButtonImageAutoSize = true;
- this.buttonPart11.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonPart11.DisableImage = null;
- this.buttonPart11.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonPart11.DownImage")));
- this.buttonPart11.GroupID = 0;
- this.buttonPart11.InitVisible = true;
- this.buttonPart11.Location = new System.Drawing.Point(642, 451);
- this.buttonPart11.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
- this.buttonPart11.Name = "buttonPart11";
- this.buttonPart11.NestedClickEventPrevent = false;
- this.buttonPart11.OutlinePixel = 1;
- this.buttonPart11.RepeatInterval = 200;
- this.buttonPart11.RepeatIntervalAccelerate = null;
- this.buttonPart11.SafeInterval = 200;
- this.buttonPart11.Size = new System.Drawing.Size(84, 25);
- this.buttonPart11.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
- this.buttonPart11.TabIndex = 209;
- this.buttonPart11.TextColor = System.Drawing.Color.Black;
- this.buttonPart11.TextDownColor = System.Drawing.Color.White;
- this.buttonPart11.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
- this.buttonPart11.TextLocation = new System.Drawing.Point(0, 0);
- this.buttonPart11.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
- this.buttonPart11.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonPart11.UpImage")));
- this.buttonPart11.Click += new System.EventHandler(this.control_Click);
- //
// groupBoxSpecialMenu
//
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);
this.groupBoxSpecialMenu.Controls.Add(this.labelTitle);
this.groupBoxSpecialMenu.Controls.Add(this.pictureBoxFormIcon);
this.groupBoxSpecialMenu.Controls.Add(this.buttonSave);
this.groupBoxSpecialMenu.Controls.Add(this.buttonBack);
- this.groupBoxSpecialMenu.Controls.Add(this.buttonPart11);
- this.groupBoxSpecialMenu.Controls.Add(this.smartLabel2);
this.groupBoxSpecialMenu.Controls.Add(this.buttonPingTimer);
this.groupBoxSpecialMenu.Controls.Add(this.labelStaticPingTimer);
this.groupBoxSpecialMenu.Controls.Add(this.comboBoxStepMotorType);
@@ -1058,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);
@@ -1092,6 +1008,163 @@
this.groupBoxSpecialMenu.TabIndex = 144;
this.groupBoxSpecialMenu.TextColor = System.Drawing.Color.Black;
//
+ // smartLabel6
+ //
+ 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, 299);
+ 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;
+ //
+ // labelDataStoragePeriod
+ //
+ 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, 299);
+ 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);
+ //
+ // labelStaticDataStoragePeriod
+ //
+ 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, 299);
+ 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
+ //
+ 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, 144);
+ 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, 144);
+ 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, 144);
+ 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;
+ this.labelTitle.BackPictureBox1 = null;
+ this.labelTitle.BackPictureBox2 = null;
+ this.labelTitle.BorderColor = System.Drawing.Color.Black;
+ this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelTitle.Font = new System.Drawing.Font("새굴림", 23F, System.Drawing.FontStyle.Bold);
+ this.labelTitle.ForeColor = System.Drawing.Color.White;
+ this.labelTitle.InitVisible = true;
+ this.labelTitle.LineSpacing = 0F;
+ this.labelTitle.Location = new System.Drawing.Point(69, 11);
+ this.labelTitle.Name = "labelTitle";
+ this.labelTitle.Size = new System.Drawing.Size(382, 45);
+ this.labelTitle.TabIndex = 237;
+ this.labelTitle.Text = "장비 설정";
+ this.labelTitle.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+ this.labelTitle.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelTitle.Wordwrap = false;
+ //
+ // pictureBoxFormIcon
+ //
+ this.pictureBoxFormIcon.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxFormIcon.Image")));
+ this.pictureBoxFormIcon.Location = new System.Drawing.Point(16, 11);
+ this.pictureBoxFormIcon.Name = "pictureBoxFormIcon";
+ this.pictureBoxFormIcon.Size = new System.Drawing.Size(47, 45);
+ //
// buttonSave
//
this.buttonSave.BackPictureBox = null;
@@ -1155,33 +1228,6 @@
this.buttonBack.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonBack.UpImage")));
this.buttonBack.Click += new System.EventHandler(this.buttonBack_Click);
//
- // labelTitle
- //
- this.labelTitle.BackPictureBox = this.smartForm1;
- this.labelTitle.BackPictureBox1 = null;
- this.labelTitle.BackPictureBox2 = null;
- this.labelTitle.BorderColor = System.Drawing.Color.Black;
- this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.labelTitle.Font = new System.Drawing.Font("새굴림", 23F, System.Drawing.FontStyle.Bold);
- this.labelTitle.ForeColor = System.Drawing.Color.White;
- this.labelTitle.InitVisible = true;
- this.labelTitle.LineSpacing = 0F;
- this.labelTitle.Location = new System.Drawing.Point(69, 11);
- this.labelTitle.Name = "labelTitle";
- this.labelTitle.Size = new System.Drawing.Size(382, 45);
- this.labelTitle.TabIndex = 237;
- this.labelTitle.Text = "장비 설정";
- this.labelTitle.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
- this.labelTitle.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelTitle.Wordwrap = false;
- //
- // pictureBoxFormIcon
- //
- this.pictureBoxFormIcon.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxFormIcon.Image")));
- this.pictureBoxFormIcon.Location = new System.Drawing.Point(16, 11);
- this.pictureBoxFormIcon.Name = "pictureBoxFormIcon";
- this.pictureBoxFormIcon.Size = new System.Drawing.Size(47, 45);
- //
// FormEquipmentSetting
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -1236,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;
@@ -1263,12 +1307,16 @@
private System.Windows.Forms.ComboBox comboBoxStepMotorType;
private SmartX.SmartLabel labelStaticPingTimer;
private SmartX.SmartButton buttonPingTimer;
- private SmartX.SmartLabel smartLabel2;
- private SmartX.SmartButton buttonPart11;
private SmartX.SmartGroupBox groupBoxSpecialMenu;
private SmartX.SmartButton buttonSave;
private SmartX.SmartButton buttonBack;
private SmartX.SmartLabel labelTitle;
private System.Windows.Forms.PictureBox pictureBoxFormIcon;
+ 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 e3cae7a..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)
@@ -166,6 +164,18 @@ namespace INT69DB_2A.Forms
// 장비 열
this.comboBoxEquipmentColumn.SelectedItem = this.ParentForm.SystemConfig.EquipmentColumns;
+ // 중량표시
+ if (this.ParentForm.SystemConfig.IsWeightViewForward == true)
+ this.radioButtonWeightViewForward.Checked = true;
+ else
+ this.radioButtonWeightViewReverse.Checked = true;
+
+ // 통합 전송
+ if (this.ParentForm.SystemConfig.IsIntegratedTransmission == true)
+ this.buttonIntegratedTransmission.ButtonDown();
+ else
+ this.buttonIntegratedTransmission.ButtonUp();
+
// 개별 NG
if (this.ParentForm.SystemConfig.IsEachNG == true)
this.buttonEachNG.ButtonDown();
@@ -205,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;
@@ -249,23 +263,26 @@ namespace INT69DB_2A.Forms
else
this.buttonPingTimer.ButtonUp();
- // Part11
- if (this.ParentForm.SystemConfig.IsPart11 == true)
- this.buttonPart11.ButtonDown();
- else
- this.buttonPart11.ButtonUp();
-
this.buttonSave.Visible = false;
}
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)
{
@@ -277,25 +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.buttonPart11)
- {
- if (button.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
- this.buttonLogin.ButtonDown();
- else
- this.buttonLogin.ButtonUp();
- }
- else if (button == this.buttonLogin)
- {
- if (this.buttonPart11.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
- this.buttonLogin.ButtonDown();
- }
- }
private void labelEquipmentID_Click(object sender, EventArgs e)
{
@@ -312,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)
{
@@ -341,6 +372,12 @@ namespace INT69DB_2A.Forms
else
this.ParentForm.SystemConfig.EquipmentColumns = 10;
+ // 통합 전송
+ if (this.buttonIntegratedTransmission.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN)
+ this.ParentForm.SystemConfig.IsIntegratedTransmission = true;
+ else
+ this.ParentForm.SystemConfig.IsIntegratedTransmission = false;
+
// 중량표시
if (this.radioButtonWeightViewForward.Checked == true)
this.ParentForm.SystemConfig.IsWeightViewForward = true;
@@ -384,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)
@@ -425,18 +462,6 @@ namespace INT69DB_2A.Forms
else
this.ParentForm.SystemConfig.StepMotorType = (int)DataStore.StepMotorType.MDrive;
- // Part11
- if (this.buttonPart11.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN)
- {
- this.ParentForm.SystemConfig.IsPart11 = true;
- this.ParentForm.SystemConfig.IsLogin = true;
- }
- else
- {
- this.ParentForm.SystemConfig.IsPart11 = false;
- this.ParentForm.SystemConfig.IsLogin = false;
- }
-
// SystemConfig 파일 저장
this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
@@ -447,7 +472,6 @@ namespace INT69DB_2A.Forms
this.buttonBack.Visible = false;
this.buttonSave.Visible = false;
}
-
private void buttonBack_Click(object sender, EventArgs e)
{
this.ParentForm.ChildFormMenu.DisplayRefresh();
diff --git a/INT69DB_2A/Forms/FormEquipmentSetting.resx b/INT69DB_2A/Forms/FormEquipmentSetting.resx
index 26234d7..2ca6e33 100644
--- a/INT69DB_2A/Forms/FormEquipmentSetting.resx
+++ b/INT69DB_2A/Forms/FormEquipmentSetting.resx
@@ -853,7 +853,7 @@
SWh8deTn56t/1Hw+EoUp6PoPBG3lC8cKurQAAAAASUVORK5CYII=
-
+
iVBORw0KGgoAAAANSUhEUgAAAFQAAAAZCAIAAAAgz54kAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -916,7 +916,7 @@
O5j2adVgU944aMysy0g9oUnRJSdrk1YbbdJP8wLA5c8re3QAAAAASUVORK5CYII=
-
+
iVBORw0KGgoAAAANSUhEUgAAAFQAAAAZCAIAAAAgz54kAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
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/FormFactoryReset.Designer.cs b/INT69DB_2A/Forms/FormInitialization.Designer.cs
similarity index 99%
rename from INT69DB_2A/Forms/FormFactoryReset.Designer.cs
rename to INT69DB_2A/Forms/FormInitialization.Designer.cs
index 31cf023..78a0807 100644
--- a/INT69DB_2A/Forms/FormFactoryReset.Designer.cs
+++ b/INT69DB_2A/Forms/FormInitialization.Designer.cs
@@ -1,6 +1,6 @@
namespace INT69DB_2A.Forms
{
- partial class FormFactoryReset
+ partial class FormInitialization
{
///
/// Required designer variable.
@@ -28,7 +28,7 @@
///
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormFactoryReset));
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormInitialization));
this.smartForm1 = new SmartX.SmartForm();
this.labelResetFail = new SmartX.SmartLabel();
this.labelResetRestart = new SmartX.SmartLabel();
diff --git a/INT69DB_2A/Forms/FormFactoryReset.cs b/INT69DB_2A/Forms/FormInitialization.cs
similarity index 68%
rename from INT69DB_2A/Forms/FormFactoryReset.cs
rename to INT69DB_2A/Forms/FormInitialization.cs
index 499cb9f..64dec60 100644
--- a/INT69DB_2A/Forms/FormFactoryReset.cs
+++ b/INT69DB_2A/Forms/FormInitialization.cs
@@ -12,7 +12,7 @@ using INT69DB_2A_ImageDll;
namespace INT69DB_2A.Forms
{
- public partial class FormFactoryReset : Form
+ public partial class FormInitialization : Form
{
#region Field
private FormMain m_ParentForm;
@@ -21,7 +21,7 @@ namespace INT69DB_2A.Forms
#endregion
#region Constructor
- public FormFactoryReset(FormMain parent)
+ public FormInitialization(FormMain parent)
{
InitializeComponent();
@@ -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 = false;
- 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.AutomaticLogout = 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.DummyBool2 = false;
- 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 = "";
- structItem.User_Level2_Name = "";
- structItem.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/FormFactoryReset.resx b/INT69DB_2A/Forms/FormInitialization.resx
similarity index 100%
rename from INT69DB_2A/Forms/FormFactoryReset.resx
rename to INT69DB_2A/Forms/FormInitialization.resx
diff --git a/INT69DB_2A/Forms/FormMain.Designer.cs b/INT69DB_2A/Forms/FormMain.Designer.cs
index 52e9755..b1a7795 100644
--- a/INT69DB_2A/Forms/FormMain.Designer.cs
+++ b/INT69DB_2A/Forms/FormMain.Designer.cs
@@ -41,6 +41,8 @@
this.timerEthernetPing = new System.Windows.Forms.Timer();
this.timerWaitResponse = new System.Windows.Forms.Timer();
this.timerUserList = new System.Windows.Forms.Timer();
+ this.timerTimeOutTransmission = new System.Windows.Forms.Timer();
+ this.smartSerialPortCom3 = new SmartX.SmartSerialPort();
((System.ComponentModel.ISupportInitialize)(this.smartForm)).BeginInit();
this.SuspendLayout();
//
@@ -123,6 +125,31 @@
this.timerUserList.Interval = 1000;
this.timerUserList.Tick += new System.EventHandler(this.timerUserList_Tick);
//
+ // timerTimeOutTransmission
+ //
+ this.timerTimeOutTransmission.Interval = 300;
+ this.timerTimeOutTransmission.Tick += new System.EventHandler(this.timerTimeOutTransmission_Tick);
+ //
+ // smartSerialPortCom3
+ //
+ this.smartSerialPortCom3.Baud_Rate = SmartX.SmartSerialPort.BAUDRATE._9600bps;
+ this.smartSerialPortCom3.ErrorCheckCodeType = SmartX.SmartSerialPort.ERRORCHECKCODETYPES.ASCIICODE;
+ this.smartSerialPortCom3.ErrorCheckMode = SmartX.SmartSerialPort.ERRORCHECK.NONE;
+ this.smartSerialPortCom3.ErrorCode_Location = SmartX.SmartSerialPort.ERRORCODELOCATION.HEADER;
+ this.smartSerialPortCom3.ETXCode = ((byte)(3));
+ this.smartSerialPortCom3.ETXCodes = null;
+ this.smartSerialPortCom3.FrameBufferSize = ((uint)(1024u));
+ this.smartSerialPortCom3.FrameSeparationType = SmartX.SmartSerialPort.FRAMESEPARATIONTYPES.STXANDETX;
+ this.smartSerialPortCom3.HeadErrorCodeOffset = 0;
+ this.smartSerialPortCom3.PortNo = SmartX.SmartSerialPort.COMPORTNO.COM3;
+ this.smartSerialPortCom3.ReadTimeout = -1;
+ this.smartSerialPortCom3.ReceiveDetect = SmartX.SmartSerialPort.RECEIVEDETECTTYPE.EVENT_QUEUE;
+ this.smartSerialPortCom3.ReceiveFrameDebugMode = false;
+ this.smartSerialPortCom3.RS485SoftwareDetection = false;
+ this.smartSerialPortCom3.STXCode = ((byte)(2));
+ this.smartSerialPortCom3.STXCodes = null;
+ this.smartSerialPortCom3.TailErrorCodeOffset = 0;
+ //
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -151,6 +178,8 @@
private System.Windows.Forms.Timer timerEthernetPing;
private System.Windows.Forms.Timer timerWaitResponse;
private System.Windows.Forms.Timer timerUserList;
+ public System.Windows.Forms.Timer timerTimeOutTransmission;
+ public SmartX.SmartSerialPort smartSerialPortCom3;
}
}
\ No newline at end of file
diff --git a/INT69DB_2A/Forms/FormMain.cs b/INT69DB_2A/Forms/FormMain.cs
index bef8dc8..847b160 100644
--- a/INT69DB_2A/Forms/FormMain.cs
+++ b/INT69DB_2A/Forms/FormMain.cs
@@ -59,6 +59,8 @@ namespace INT69DB_2A.Forms
private string m_PathDataFolder;
private string m_PathDataHistoryFolder;
private string m_PathDataInspectionFolder;
+ private string m_PathDataInspectionStick1Folder;
+ private string m_PathDataInspectionStick2Folder;
private string m_PathDataOthersFolder;
private string m_PathEncryptionFolder;
private string m_PathHeaderFolder;
@@ -81,7 +83,7 @@ namespace INT69DB_2A.Forms
public FormMotorSetting ChildFormMotorSetting;
public FormTimeSetting ChildFormTimeSetting;
public FormInformation ChildFormInformation;
- public FormFactoryReset ChildFormFactoryInitialize;
+ public FormInitialization ChildFormFactoryInitialize;
public FormProgramUpdate ChildFormProgramUpdate;
public FormEquipmentTest ChildFormEquipmentTest;
public FormUserEditor ChildFormUserEditor;
@@ -89,6 +91,7 @@ namespace INT69DB_2A.Forms
public FormDataBackup_Part11 ChildFormDataBackup_Part11;
public FormDataStatistics ChildFormDataStatistics;
public FormDataViewer ChildFormDataViewer;
+ public FormOption ChildFormOption;
// 장비 구동 상태
private DataStore.EquipmentStatus m_EquipmentStatus;
@@ -222,6 +225,16 @@ namespace INT69DB_2A.Forms
get { return this.m_PathDataInspectionFolder; }
private set { this.m_PathDataInspectionFolder = value; }
}
+ public string PathDataInspectionStick1Folder
+ {
+ get { return this.m_PathDataInspectionStick1Folder; }
+ private set { this.m_PathDataInspectionStick1Folder = value; }
+ }
+ public string PathDataInspectionStick2Folder
+ {
+ get { return this.m_PathDataInspectionStick2Folder; }
+ private set { this.m_PathDataInspectionStick2Folder = value; }
+ }
public string PathDataOthersFolder
{
get { return this.m_PathDataOthersFolder; }
@@ -251,6 +264,32 @@ namespace INT69DB_2A.Forms
#endregion
#region Method
+ public static void Exception(Exception ex)
+ {
+ try
+ {
+ string fileName = "SD Card\\Data\\Others\\" + string.Format("{0:yyyyMMdd_HHmmss}_Exception.txt", DateTime.Now);
+ FileStream fs = new FileStream(fileName, FileMode.OpenOrCreate);
+ StreamWriter sw = new StreamWriter(fs);
+
+ sw.Write(ex.ToString());
+
+ sw.Close();
+ fs.Close();
+ }
+ catch
+ {
+ string fileName = "Flash Disk\\" + string.Format("{0:yyyyMMdd_HHmmss}_Exception.txt", DateTime.Now);
+ FileStream fs = new FileStream(fileName, FileMode.OpenOrCreate);
+ StreamWriter sw = new StreamWriter(fs);
+
+ sw.Write(ex.ToString());
+
+ sw.Close();
+ fs.Close();
+ }
+ }
+
private void CreateForm()
{
this.ChildFormMainDisplay = new FormMainDisplay(this);
@@ -261,7 +300,7 @@ namespace INT69DB_2A.Forms
this.ChildFormConfiguration = new FormConfiguration(this);
this.ChildFormInformation = new FormInformation(this);
this.ChildFormEquipmentSetting = new FormEquipmentSetting(this);
- this.ChildFormFactoryInitialize = new FormFactoryReset(this);
+ this.ChildFormFactoryInitialize = new FormInitialization(this);
this.ChildFormCalibration = new FormCalibration(this);
this.ChildFormSystemSetting = new FormSystemSetting(this);
this.ChildFormIOTest = new FormIOTest(this);
@@ -269,13 +308,14 @@ namespace INT69DB_2A.Forms
this.ChildFormEquipmentTest = new FormEquipmentTest(this);
this.ChildFormUserEditor = new FormUserEditor(this);
this.ChildFormUserGroupEditor = new FormUserGroupEditor(this);
+ this.ChildFormOption = new FormOption(this);
// Part11
if (this.SystemConfig.IsPart11 == false)
this.ChildFormDataBackup = new FormDataBackup(this);
else
{
- this.ChildFormDataBackup_Part11 = new FormDataBackup_Part11(this);
this.ChildFormDataStatistics = new FormDataStatistics(this);
+ this.ChildFormDataBackup_Part11 = new FormDataBackup_Part11(this);
this.ChildFormDataViewer = new FormDataViewer(this);
}
@@ -297,13 +337,14 @@ namespace INT69DB_2A.Forms
this.smartForm.AddChildForm(this.ChildFormEquipmentTest);
this.smartForm.AddChildForm(this.ChildFormUserEditor);
this.smartForm.AddChildForm(this.ChildFormUserGroupEditor);
+ this.smartForm.AddChildForm(this.ChildFormOption);
// Part11
if (this.SystemConfig.IsPart11 == false)
this.smartForm.AddChildForm(this.ChildFormDataBackup);
else
{
- this.smartForm.AddChildForm(this.ChildFormDataBackup_Part11);
this.smartForm.AddChildForm(this.ChildFormDataStatistics);
+ this.smartForm.AddChildForm(this.ChildFormDataBackup_Part11);
this.smartForm.AddChildForm(this.ChildFormDataViewer);
}
}
@@ -405,6 +446,8 @@ namespace INT69DB_2A.Forms
this.PathDataFolder = this.PathLaunchFolder + "Data\\";
this.PathDataHistoryFolder = this.PathDataFolder + "History\\";
this.PathDataInspectionFolder = this.PathDataFolder + "Inspection\\";
+ this.PathDataInspectionStick1Folder = this.PathDataInspectionFolder + "Stick1\\";
+ this.PathDataInspectionStick2Folder = this.PathDataInspectionFolder + "Stick2\\";
this.PathDataOthersFolder = this.PathDataFolder + "Others\\";
this.PathEncryptionFolder = this.PathLaunchFolder + "Encryption\\";
this.PathHeaderFolder = this.PathLaunchFolder + "Header\\";
@@ -458,6 +501,14 @@ namespace INT69DB_2A.Forms
if (Directory.Exists(this.PathDataInspectionFolder) == false)
Directory.CreateDirectory(this.PathDataInspectionFolder);
+ //// Inspection\\Stick1 폴더 생성
+ //if (Directory.Exists(this.PathDataInspectionStick1Folder) == false)
+ // Directory.CreateDirectory(this.PathDataInspectionStick1Folder);
+
+ //// Inspection\\Stick2 폴더 생성
+ //if (Directory.Exists(this.PathDataInspectionStick2Folder) == false)
+ // Directory.CreateDirectory(this.PathDataInspectionStick2Folder);
+
// Encryption 폴더 생성
if (Directory.Exists(this.PathEncryptionFolder) == false)
Directory.CreateDirectory(this.PathEncryptionFolder);
@@ -645,535 +696,7 @@ namespace INT69DB_2A.Forms
this.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._9016_ParameterProduct, sb.ToString());
}
-
- #region Serial CH3
- private void SerialUart3Open()
- {
- if (this.serialPort3.IsOpen == true)
- this.serialPort3.Close();
-
- if (this.SystemConfig.Serial3Mode != 0)
- {
- this.serialPort3.BaudRate = this.SystemConfig.Serial3BaudRate;
- this.serialPort3.Open();
- }
- }
- private void TreatSerialCommunication(Collection datas)
- {
- if (this.SystemConfig.Serial3Mode == 0)
- return;
-
- // CH3
- if (this.SystemConfig.Serial3Mode == 1) // OPT1
- this.SerialUart3Send(this.OPT1(this.CollectionWeightData));
- else if (this.SystemConfig.Serial3Mode == 2) // OPT2
- this.SerialUart3Send(this.OPT2(this.CollectionWeightData));
- else if (this.SystemConfig.Serial3Mode == 3) // OPT3
- this.SerialUart3Send(this.OPT3(this.CollectionWeightData));
- else if (this.SystemConfig.Serial3Mode == 4) // Printer
- {
- if (this.SystemConfig.IsPrintPerProductEnable == true)
- this.SerialUart3Send(this.Printer(this.CollectionWeightData));
- }
- else if (this.SystemConfig.Serial3Mode == 5) // OPT4
- this.SerialUart3Send(this.OPT4(this.CollectionWeightData));
- }
- private void TreatSerialCommunication(int lane, WeightData data)
- {
- if (this.SystemConfig.Serial3Mode == 0)
- return;
-
- // CH3
- if (this.SystemConfig.Serial3Mode == 1) // OPT1
- this.SerialUart3Send(this.OPT1(lane, data));
- else if (this.SystemConfig.Serial3Mode == 2) // OPT2
- this.SerialUart3Send(this.OPT2(lane, data));
- else if (this.SystemConfig.Serial3Mode == 3) // OPT3
- this.SerialUart3Send(this.OPT3(lane, data));
- else if (this.SystemConfig.Serial3Mode == 4) // Printer
- {
- if (this.SystemConfig.IsPrintPerProductEnable == true)
- this.SerialUart3Send(this.Printer(lane, data));
- }
- else if (this.SystemConfig.Serial3Mode == 5) // OPT4
- this.SerialUart3Send(this.OPT4(lane, data));
- }
- public void SerialUart3Send(string data)
- {
- try
- {
- this.serialPort3.Write(data);
- }
- catch
- {
- }
- }
- #endregion
-
- #region Ethernet
- private void TreatEthernetCommunication(Collection datas)
- {
- if (this.SystemConfig.IsEthernetEnable == false)
- return;
-
- string sendData = "";
-
- if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f1_OPT1)
- {
- sendData = this.OPT1(this.CollectionWeightData);
- this.SendEthernetData(sendData);
- }
- else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f2_OPT2)
- {
- sendData = this.OPT2(this.CollectionWeightData);
- this.SendEthernetData(sendData);
- }
- else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f3_OPT3)
- {
- sendData = this.OPT3(this.CollectionWeightData);
- this.SendEthernetData(sendData);
- }
- else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f4_Modbus) // Modbus
- {
- if (this.SystemConfig.EthernetOperationMode == 2) // Client
- {
- for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
- {
- this.ClientSendDatabyteArray = this.Modbus.WriteMultipleRegisterTCP(
- this.Protocol_Modbus_Client_Write_Lane_Data(i), this.SystemConfig.ModbusTcpStartAddress + ((i + 1) * 50) + 140);
- this.EthernetWeightDataForModbus(this.ClientSendDatabyteArray);
- }
- }
- }
- else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f5_OPT4)
- {
- sendData = this.OPT4(this.CollectionWeightData);
- this.SendEthernetData(sendData);
- }
- }
- private void TreatEthernetCommunication(int lane, WeightData data)
- {
- if (this.SystemConfig.IsEthernetEnable == false)
- return;
-
- string sendData = "";
-
- if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f1_OPT1)
- {
- sendData = this.OPT1(lane, data);
- this.SendEthernetData(sendData);
- }
- else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f2_OPT2)
- {
- sendData = this.OPT2(lane, data);
- this.SendEthernetData(sendData);
- }
- else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f3_OPT3)
- {
- sendData = this.OPT3(lane, data);
- this.SendEthernetData(sendData);
- }
- else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f4_Modbus) // Modbus
- {
- if (this.SystemConfig.EthernetOperationMode == 2) // Client
- {
- this.ClientSendDatabyteArray = this.Modbus.WriteMultipleRegisterTCP(
- this.Protocol_Modbus_Client_Write_Lane_Data(lane - 1), this.SystemConfig.ModbusTcpStartAddress + (lane * 50) + 140);
- this.EthernetWeightDataForModbus(this.ClientSendDatabyteArray);
- }
- }
- else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f5_OPT4)
- {
- sendData = this.OPT4(lane, data);
- this.SendEthernetData(sendData);
- }
- }
- private void SendEthernetData(string etherData)
- {
- if (this.SystemConfig.EthernetOperationMode == 1)
- {
- if (this.smartTCPMultiServer.ClientInfoList != null)
- {
- foreach (SmartTCPMultiServer.CLIENTSINFOS client in this.smartTCPMultiServer.ClientInfoList)
- this.EthernetServerSendMessage(client, etherData);
- }
- }
- else
- this.EthernetWeightData(etherData);
- }
-
- public void ThreadCloseClientIP(string address)
- {
- this.smartTCPMultiServer.CloseClientIP(address);
- }
- public void TimerPingEnabled(int interval, bool bValue)
- {
- if (this.SystemConfig.IsPingTimer == false)
- return;
-
- if (bValue == true)
- {
- if (this.IsTimerPingEnableTrue == false)
- {
- this.timerEthernetPing.Enabled = false;
- this.timerEthernetPing.Interval = interval;
- this.timerEthernetPing.Enabled = true;
- this.IsTimerPingEnableTrue = true;
- }
- }
- else
- {
- this.timerEthernetPing.Enabled = false;
- this.IsTimerPingEnableTrue = false;
- }
- }
- public void TimerPingEnabled(bool bValue)
- {
- if (this.SystemConfig.IsPingTimer == false)
- return;
-
- if (bValue == true)
- {
- if (this.IsTimerPingEnableTrue == false)
- {
- this.timerEthernetPing.Enabled = false;
- this.timerEthernetPing.Enabled = true;
- this.IsTimerPingEnableTrue = true;
- }
- }
- else
- {
- this.timerEthernetPing.Enabled = false;
- this.IsTimerPingEnableTrue = false;
- }
- }
- public void TimerWaitResponseEnabled(bool bValue)
- {
- if (this.SystemConfig.IsPingTimer == false)
- return;
-
- if (bValue == true)
- {
- if (this.IsTimerWaitResponseEnableTrue == false)
- {
- this.timerWaitResponse.Enabled = false;
- this.timerWaitResponse.Enabled = true;
- this.IsTimerWaitResponseEnableTrue = true;
- }
- }
- else
- {
- this.timerWaitResponse.Enabled = false;
- this.IsTimerWaitResponseEnableTrue = false;
- }
- }
-
- #region Server
- public void EthernetServerStart()
- {
- if (this.smartTCPMultiServer.IsStart == false)
- {
- this.ChildFormCommunication.DisplayLabelLocalPort(false);
- this.smartTCPMultiServer.Port = this.SystemConfig.EthernetLocalPort;
- this.smartTCPMultiServer.Start();
- }
- }
- public void EthernetServerStop()
- {
- if (this.smartTCPMultiServer.IsStart == true)
- {
- this.ChildFormCommunication.DisplayLabelLocalPort(true);
- this.smartTCPMultiServer.Stop();
- }
- }
- public void EthernetServerSendMessage(SmartTCPMultiServer.CLIENTSINFOS client, string msg)
- {
- this.smartTCPMultiServer.SendStringASCIIID(client.strID, msg);
- }
- public void EthernetServerSendMessage(SmartTCPMultiServer.CLIENTSINFOS client, byte[] bytes)
- {
- this.smartTCPMultiServer.SendByteByClientID(client.strID, bytes);
- }
- #endregion
-
- #region Client
- Thread cpClientThread;
-
- public void EthernetClientConnect()
- {
- if (this.IsEthernetThreadStop == false)
- return; // Online 경우
- if (this.SystemConfig.IsEthernetEnable == false)
- {
- this.TextStatusOut("Thread Error");
- }
- }
- public void EthernetClientDisconnect()
- {
- this.IsEthernetThreadStop = true;
- this.IsModbusCommonDataSend = false;
- this.DelegateUISeverStatus(false);
- if (null != this.EthernetStmReader)
- this.EthernetStmReader.Close();
-
- if (null != this.EthernetStmWriter)
- this.EthernetStmWriter.Close();
-
- if (null != this.EthernetNetStream)
- this.EthernetNetStream.Close();
-
- if (null != this.EthernetTcpClient)
- this.EthernetTcpClient.Close();
-
- if (this.IsCommunicationLogOpen == true)
- this.smartFileCommunicationLog.WriteString(string.Format("Client ({0:yyyy-MM-dd HH:mm:ss}): Disconnect", DateTime.Now));
- }
-
- private void EthernetClientReceiveThread()
- {
- //this.cpClientThread.Abort();
-
- int nConnectPort = Convert.ToInt32(this.SystemConfig.EthernetServerPort);
- try
- {
- this.DelegateTextStatusOut(">Now Connecting..");
- this.EthernetTcpClient = new TcpClient(this.SystemConfig.EthernetServerAddress, nConnectPort);
-
- this.EthernetNetStream = EthernetTcpClient.GetStream();
- this.EthernetStmReader = new StreamReader(EthernetNetStream);
- this.EthernetStmWriter = new StreamWriter(EthernetNetStream);
-
- this.DelegateUISeverStatus(true);
- this.DelegateTextStatusOut(">Connected Server");
-
- if (this.IsCommunicationLogOpen == true)
- this.smartFileCommunicationLog.WriteString(string.Format("Client ({0:yyyy-MM-dd HH:mm:ss}): Connect", DateTime.Now));
-
- this.IsEthernetThreadStop = false;
-
- // 판정 데이터 전송
- if (this.IsEthernetTransferData == true)
- {
- this.IsEthernetTransferData = false;
- Type type = this.EthernetTransferData.GetType();
- if (type == typeof(string))
- this.DelegateTransferData((string)this.EthernetTransferData);
- else if (type == typeof(byte[]))
- this.DelegateTransferData((byte[])this.EthernetTransferData);
- else if (type == typeof(byte))
- this.DelegateTransferData((byte)this.EthernetTransferData);
- }
-
- while (this.IsEthernetThreadStop == false)
- {
- string strRecvMsg = "";
- char[] datas = new char[12];
- int sum = 0;
-
- this.TimerWaitResponseEnabled(false);
- this.TimerPingEnabled(false);
-
- if (this.ResponseFailCount > 0)
- this.ResponseFailCount = 0;
-
- try
- {
- //strRecvMsg = this.EthernetStmReader.ReadLine();
- this.EthernetStmReader.Read(datas, 0, datas.Length);
- for (int i = 0; i < datas.Length; i++)
- sum += datas[i];
- if (sum == 0)
- return;
-
- strRecvMsg = BitConverter.ToString(Encoding.UTF8.GetBytes(datas));
-
- if (this.IsCommunicationLogOpen == true)
- this.smartFileCommunicationLog.WriteString(string.Format("Client Receive ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, strRecvMsg));
-
- if (null == strRecvMsg)
- {
- this.DelegateTextStatusOut(">Server Out");
- this.IsEthernetThreadStop = true;
- break;
- }
-
- this.DelegateTextStatusOut(strRecvMsg);
- }
- catch
- {
- this.DelegateTextStatusOut(">Server Out");
- this.IsEthernetThreadStop = true;
- }
- }
- }
- catch
- {
- this.DelegateTextStatusOut(">Connect Fail !");
- }
- finally
- {
- this.IsEthernetThreadStop = true;
- this.DelegateUISeverStatus(false);
- this.DelegateTextStatusOut(">Disconnected Server");
- if (null != this.EthernetStmReader)
- this.EthernetStmReader.Close();
-
- if (null != this.EthernetStmWriter)
- this.EthernetStmWriter.Close();
-
- if (null != this.EthernetNetStream)
- this.EthernetNetStream.Close();
-
- if (null != this.EthernetTcpClient)
- this.EthernetTcpClient.Close();
-
- if (this.IsCommunicationLogOpen == true)
- this.smartFileCommunicationLog.WriteString(string.Format("Client ({0:yyyy-MM-dd HH:mm:ss}): Disconnect", DateTime.Now));
- }
-
- return;
- }
-
- private void UIServerStatus(bool status)
- {
- if (this.ChildFormMainDisplay != null)
- this.ChildFormMainDisplay.UpdateEthernetStatusDisplay(status);
- }
- private void DelegateUISeverStatus(bool status)
- {
- this.Invoke(new UIServerStatusCallback(this.UIServerStatus), status);
- }
-
- private void TextStatusOut(string value)
- {
- if (this.ChildFormCommunication != null)
- this.ChildFormCommunication.UpdateEthernetStatusDisplay(value);
- }
- private void DelegateTextStatusOut(string value)
- {
- this.Invoke(new TextStatusCallback(this.TextStatusOut), value);
- }
-
- private void DelegateTransferData(string data)
- {
- this.Invoke(new TransferDataStringCallback(this.EthernetSendMessage), data);
- }
- private void DelegateTransferData(byte[] data)
- {
- this.Invoke(new TransferDataByteArrayCallback(this.EthernetSendMessage), data);
- }
- private void DelegateTransferData(byte data)
- {
- this.Invoke(new TransferDataStringCallback(this.EthernetSendMessage), data);
- }
- public void EthernetSendMessage(string msg)
- {
- try
- {
- this.EthernetStmWriter.Write(msg);
- this.EthernetStmWriter.Flush();
-
- // 로그
- if (this.IsCommunicationLogOpen == true)
- this.smartFileCommunicationLog.WriteString(string.Format("Client Send ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, msg));
- }
- catch
- {
- this.DelegateUISeverStatus(false);
- this.DelegateTextStatusOut("> Disconnect");
- }
- }
- public void EthernetSendMessage(byte[] msg)
- {
- try
- {
- this.EthernetStmWriter.BaseStream.Write(msg, 0, msg.Length);
- this.EthernetStmWriter.Flush();
-
- // 로그
- if (this.IsCommunicationLogOpen == true)
- this.smartFileCommunicationLog.WriteString(string.Format("Client Send ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, BitConverter.ToString(msg)));
- }
- catch
- {
- this.DelegateUISeverStatus(false);
- this.DelegateTextStatusOut("> Disconnect");
- }
- }
- public void EthernetSendMessage(byte msg)
- {
- try
- {
- this.EthernetStmWriter.WriteLine(msg);
- this.EthernetStmWriter.Flush();
-
- // 로그
- if (this.IsCommunicationLogOpen == true)
- this.smartFileCommunicationLog.WriteString(string.Format("Client Send ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, msg));
- }
- catch
- {
- this.DelegateUISeverStatus(false);
- this.DelegateTextStatusOut("> Disconnect");
- }
- }
- public void EthernetWeightData(string strTemp)
- {
- this.IsEthernetTransferData = true;
- this.EthernetTransferData = strTemp;
-
- if (this.IsEthernetThreadStop == true)
- this.EthernetClientConnect();
- else
- this.EthernetSendMessage((string)this.EthernetTransferData);
- }
- public void EthernetWeightData(byte temp)
- {
- this.IsEthernetTransferData = true;
- this.EthernetTransferData = temp;
-
- if (this.IsEthernetThreadStop == true)
- this.EthernetClientConnect();
- else
- this.EthernetSendMessage((byte)this.EthernetTransferData);
- }
- public void EthernetWeightDataForModbus(byte[] bytes)
- {
- this.IsEthernetTransferData = true;
- this.EthernetTransferData = bytes;
-
- if (this.IsEthernetThreadStop == true)
- this.EthernetClientConnect();
- else
- {
- this.EthernetSendMessage(bytes);
- this.TimerWaitResponseEnabled(true);
- }
- }
- #endregion
-
- #endregion
-
+
#region Communication Protocol
public void PrintingHeadLine()
{
@@ -1183,7 +706,7 @@ namespace INT69DB_2A.Forms
this.serialPort3.Write("\n");
}
- public string OPT1(Collection datas)
+ public string Protocol_OPT1(Collection datas)
{
string value = "";
StringBuilder sb = new StringBuilder();
@@ -1192,28 +715,50 @@ namespace INT69DB_2A.Forms
sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID));
sb.Append(string.Format("{0:D4}", this.SystemConfig.ProductNumber));
- for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
+ if (this.SystemConfig.IsWeightViewForward == true)
{
+ for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
+ {
- if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Under)
- sb.Append("U");
- else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
- sb.Append("P");
- else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Over)
- sb.Append("O");
- else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double)
- sb.Append("D");
- else
- sb.Append("E");
+ if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Under)
+ sb.Append("U");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
+ sb.Append("P");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Over)
+ sb.Append("O");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double)
+ sb.Append("D");
+ else
+ sb.Append("E");
- value = Helper.DoubleToString(datas[i].Weight, this.SystemConfig.DecimalPlaces);
- sb.Append(value.PadLeft(6, ' '));
+ value = Helper.DoubleToString(datas[i].Weight, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ }
+ }
+ else
+ {
+ for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++)
+ {
+ if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Under)
+ sb.Append("U");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
+ sb.Append("P");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Over)
+ sb.Append("O");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Double)
+ sb.Append("D");
+ else
+ sb.Append("E");
+
+ value = Helper.DoubleToString(datas[datas.Count - i].Weight, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ }
}
sb.Append((char)0x03);
return sb.ToString();
}
- public string OPT1(int lane, WeightData data)
+ public string Protocol_OPT1(int lane, WeightData data)
{
string value = "";
StringBuilder sb = new StringBuilder();
@@ -1240,7 +785,83 @@ namespace INT69DB_2A.Forms
return sb.ToString();
}
- public string OPT2(Collection datas)
+ public string Protocol_OPT1_NotStxEtx(Collection datas)
+ {
+ string value = "";
+ StringBuilder sb = new StringBuilder();
+
+ sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID));
+ sb.Append(string.Format("{0:D4}", this.SystemConfig.ProductNumber));
+
+ if (this.SystemConfig.IsWeightViewForward == true)
+ {
+ for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
+ {
+
+ if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Under)
+ sb.Append("U");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
+ sb.Append("P");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Over)
+ sb.Append("O");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double)
+ sb.Append("D");
+ else
+ sb.Append("E");
+
+ value = Helper.DoubleToString(datas[i].Weight, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ }
+ }
+ else
+ {
+ for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++)
+ {
+ if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Under)
+ sb.Append("U");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
+ sb.Append("P");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Over)
+ sb.Append("O");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Double)
+ sb.Append("D");
+ else
+ sb.Append("E");
+
+ value = Helper.DoubleToString(datas[datas.Count - i].Weight, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ }
+ }
+
+ return sb.ToString();
+ }
+ public string Protocol_OPT1_NotStxEtx(int lane, WeightData data)
+ {
+ string value = "";
+ StringBuilder sb = new StringBuilder();
+
+ sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID));
+ sb.Append(string.Format("{0:D4}", this.SystemConfig.ProductNumber));
+ sb.Append(string.Format("{0:D2}", lane));
+
+ if (data.JudgmentStatus == DataStore.JudgmentStatus.Under)
+ sb.Append("U");
+ else if (data.JudgmentStatus == DataStore.JudgmentStatus.Pass)
+ sb.Append("P");
+ else if (data.JudgmentStatus == DataStore.JudgmentStatus.Over)
+ sb.Append("O");
+ else if (data.JudgmentStatus == DataStore.JudgmentStatus.Double)
+ sb.Append("D");
+ else
+ sb.Append("E");
+
+ value = Helper.DoubleToString(data.Weight, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+
+ return sb.ToString();
+ }
+
+ public string Protocol_OPT2(Collection datas)
{
int value = 0, passWeight = 0, weight = 0;
string value2 = "";
@@ -1252,27 +873,49 @@ namespace INT69DB_2A.Forms
sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID));
sb.Append(string.Format("{0:D4}", this.SystemConfig.ProductNumber));
- for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
+ if (this.SystemConfig.IsWeightViewForward == true)
{
- weight = int.Parse(datas[i].WeightString.Trim());
- value = weight - passWeight;
+ for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
+ {
+ weight = int.Parse(datas[i].WeightString.Trim());
+ value = weight - passWeight;
- // SIGN
- if (value < 0)
- sb.Append("-");
- else
- sb.Append("+");
+ // SIGN
+ if (value < 0)
+ sb.Append("-");
+ else
+ sb.Append("+");
- // WEIGHT
- value = Math.Abs(value);
- value2 = Helper.StringToDecimalPlaces(value.ToString(), this.SystemConfig.DecimalPlaces);
- sb.Append(value2.PadLeft(6, ' '));
+ // WEIGHT
+ value = Math.Abs(value);
+ value2 = Helper.StringToDecimalPlaces(value.ToString(), this.SystemConfig.DecimalPlaces);
+ sb.Append(value2.PadLeft(6, ' '));
+ }
+ }
+ else
+ {
+ for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++)
+ {
+ weight = int.Parse(datas[datas.Count - i].WeightString.Trim());
+ value = weight - passWeight;
+
+ // SIGN
+ if (value < 0)
+ sb.Append("-");
+ else
+ sb.Append("+");
+
+ // WEIGHT
+ value = Math.Abs(value);
+ value2 = Helper.StringToDecimalPlaces(value.ToString(), this.SystemConfig.DecimalPlaces);
+ sb.Append(value2.PadLeft(6, ' '));
+ }
}
sb.Append((char)0x03);
return sb.ToString();
}
- public string OPT2(int lane, WeightData data)
+ public string Protocol_OPT2(int lane, WeightData data)
{
int value = 0, passWeight = 0, weight = 0;
string value2 = "";
@@ -1302,7 +945,87 @@ namespace INT69DB_2A.Forms
return sb.ToString();
}
- public string OPT3(Collection datas)
+ public string Protocol_OPT2_NotStxEtx(Collection datas)
+ {
+ int value = 0, passWeight = 0, weight = 0;
+ string value2 = "";
+ passWeight = int.Parse(this.CurrentProductItem.PassRange.Trim());
+
+ StringBuilder sb = new StringBuilder();
+
+ sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID));
+ sb.Append(string.Format("{0:D4}", this.SystemConfig.ProductNumber));
+
+ if (this.SystemConfig.IsWeightViewForward == true)
+ {
+ for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
+ {
+ weight = int.Parse(datas[i].WeightString.Trim());
+ value = weight - passWeight;
+
+ // SIGN
+ if (value < 0)
+ sb.Append("-");
+ else
+ sb.Append("+");
+
+ // WEIGHT
+ value = Math.Abs(value);
+ value2 = Helper.StringToDecimalPlaces(value.ToString(), this.SystemConfig.DecimalPlaces);
+ sb.Append(value2.PadLeft(6, ' '));
+ }
+ }
+ else
+ {
+ for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++)
+ {
+ weight = int.Parse(datas[datas.Count - i].WeightString.Trim());
+ value = weight - passWeight;
+
+ // SIGN
+ if (value < 0)
+ sb.Append("-");
+ else
+ sb.Append("+");
+
+ // WEIGHT
+ value = Math.Abs(value);
+ value2 = Helper.StringToDecimalPlaces(value.ToString(), this.SystemConfig.DecimalPlaces);
+ sb.Append(value2.PadLeft(6, ' '));
+ }
+ }
+
+ return sb.ToString();
+ }
+ public string Protocol_OPT2_NotStxEtx(int lane, WeightData data)
+ {
+ int value = 0, passWeight = 0, weight = 0;
+ string value2 = "";
+ StringBuilder sb = new StringBuilder();
+
+ sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID));
+ sb.Append(string.Format("{0:D4}", this.SystemConfig.ProductNumber));
+ sb.Append(string.Format("{0:D2}", lane));
+
+ passWeight = int.Parse(this.CurrentProductItem.PassRange.Trim());
+ weight = int.Parse(data.WeightString.Trim());
+ value = weight - passWeight;
+
+ // SIGN
+ if (value < 0)
+ sb.Append("-");
+ else
+ sb.Append("+");
+
+ // WEIGHT
+ value = Math.Abs(value);
+ value2 = Helper.StringToDecimalPlaces(value.ToString(), this.SystemConfig.DecimalPlaces);
+ sb.Append(value2.PadLeft(6, ' '));
+
+ return sb.ToString();
+ }
+
+ public string Protocol_OPT3(Collection datas)
{
string value = "";
StringBuilder sb = new StringBuilder();
@@ -1314,27 +1037,49 @@ namespace INT69DB_2A.Forms
value = Helper.StringToDecimalPlaces(this.CurrentProductItem.PassRange, this.SystemConfig.DecimalPlaces);
sb.Append(value.PadLeft(6, ' '));
- for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
+ if (this.SystemConfig.IsWeightViewForward == true)
{
- if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Under)
- sb.Append("U");
- else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
- sb.Append("P");
- else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Over)
- sb.Append("O");
- else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double)
- sb.Append("D");
- else
- sb.Append("E");
+ for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
+ {
+ if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Under)
+ sb.Append("U");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
+ sb.Append("P");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Over)
+ sb.Append("O");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double)
+ sb.Append("D");
+ else
+ sb.Append("E");
- value = Helper.DoubleToString(datas[i].Weight, this.SystemConfig.DecimalPlaces);
- sb.Append(value.PadLeft(6, ' '));
+ value = Helper.DoubleToString(datas[i].Weight, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ }
+ }
+ else
+ {
+ for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++)
+ {
+ if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Under)
+ sb.Append("U");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
+ sb.Append("P");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Over)
+ sb.Append("O");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Double)
+ sb.Append("D");
+ else
+ sb.Append("E");
+
+ value = Helper.DoubleToString(datas[datas.Count - i].Weight, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ }
}
sb.Append((char)0x03);
return sb.ToString();
}
- public string OPT3(int lane, WeightData data)
+ public string Protocol_OPT3(int lane, WeightData data)
{
string value = "";
StringBuilder sb = new StringBuilder();
@@ -1364,36 +1109,145 @@ namespace INT69DB_2A.Forms
return sb.ToString();
}
- public string Printer(Collection datas)
+ public string Protocol_OPT3_NotStxEtx(Collection datas)
{
string value = "";
StringBuilder sb = new StringBuilder();
- for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
+ sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID));
+ sb.Append(string.Format("{0:D4}", this.SystemConfig.ProductNumber));
+
+ value = Helper.StringToDecimalPlaces(this.CurrentProductItem.PassRange, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+
+ if (this.SystemConfig.IsWeightViewForward == true)
{
- sb.Append(string.Format("{0, 4}", this.SystemConfig.ProductNumber));
- sb.Append(string.Format("{0, 3}", i + 1));
+ for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
+ {
+ if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Under)
+ sb.Append("U");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
+ sb.Append("P");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Over)
+ sb.Append("O");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double)
+ sb.Append("D");
+ else
+ sb.Append("E");
- if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Under)
- sb.Append(" U");
- else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
- sb.Append(" P");
- else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Over)
- sb.Append(" O");
- else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double)
- sb.Append(" D");
- else
- sb.Append(" E");
+ value = Helper.DoubleToString(datas[i].Weight, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ }
+ }
+ else
+ {
+ for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++)
+ {
+ if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Under)
+ sb.Append("U");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
+ sb.Append("P");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Over)
+ sb.Append("O");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Double)
+ sb.Append("D");
+ else
+ sb.Append("E");
- value = Helper.DoubleToString(datas[i].Weight, this.SystemConfig.DecimalPlaces);
- sb.Append(value.PadLeft(9, ' '));
- value = datas[i].TotalCount.ToString();
- sb.Append(value.PadLeft(11, ' '));
- sb.Append("\n");
+ value = Helper.DoubleToString(datas[datas.Count - i].Weight, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ }
+ }
+
+ return sb.ToString();
+ }
+ public string Protocol_OPT3_NotStxEtx(int lane, WeightData data)
+ {
+ string value = "";
+ StringBuilder sb = new StringBuilder();
+
+ sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID));
+ sb.Append(string.Format("{0:D4}", this.SystemConfig.ProductNumber));
+
+ value = Helper.StringToDecimalPlaces(this.CurrentProductItem.PassRange, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ sb.Append(string.Format("{0:D2}", lane));
+
+ if (data.JudgmentStatus == DataStore.JudgmentStatus.Under)
+ sb.Append("U");
+ else if (data.JudgmentStatus == DataStore.JudgmentStatus.Pass)
+ sb.Append("P");
+ else if (data.JudgmentStatus == DataStore.JudgmentStatus.Over)
+ sb.Append("O");
+ else if (data.JudgmentStatus == DataStore.JudgmentStatus.Double)
+ sb.Append("D");
+ else
+ sb.Append("E");
+
+ value = Helper.DoubleToString(data.Weight, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+
+ return sb.ToString();
+ }
+
+ public string Protocol_Printer(Collection datas)
+ {
+ string value = "";
+ StringBuilder sb = new StringBuilder();
+
+ sb.Append(string.Format("{0, 4}", this.SystemConfig.ProductNumber));
+
+ if (this.SystemConfig.IsWeightViewForward == true)
+ {
+ for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
+ {
+ sb.Append(string.Format("{0, 3}", i + 1));
+
+ if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Under)
+ sb.Append(" U");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
+ sb.Append(" P");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Over)
+ sb.Append(" O");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double)
+ sb.Append(" D");
+ else
+ sb.Append(" E");
+
+ value = Helper.DoubleToString(datas[i].Weight, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(9, ' '));
+ value = datas[i].TotalCount.ToString();
+ sb.Append(value.PadLeft(11, ' '));
+ sb.Append("\n");
+ }
+ }
+ else
+ {
+ for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++)
+ {
+ sb.Append(string.Format("{0, 3}", datas.Count - i + 1));
+
+ if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Under)
+ sb.Append(" U");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
+ sb.Append(" P");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Over)
+ sb.Append(" O");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Double)
+ sb.Append(" D");
+ else
+ sb.Append(" E");
+
+ value = Helper.DoubleToString(datas[datas.Count - i].Weight, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(9, ' '));
+ value = datas[datas.Count - i].TotalCount.ToString();
+ sb.Append(value.PadLeft(11, ' '));
+ sb.Append("\n");
+ }
}
return sb.ToString();
}
- public string Printer(int lane, WeightData data)
+ public string Protocol_Printer(int lane, WeightData data)
{
string value = "";
StringBuilder sb = new StringBuilder();
@@ -1419,7 +1273,8 @@ namespace INT69DB_2A.Forms
return sb.ToString();
}
- public string OPT4(Collection datas)
+
+ public string Protocol_OPT4(Collection datas)
{
string value = "";
StringBuilder sb = new StringBuilder();
@@ -1437,27 +1292,49 @@ namespace INT69DB_2A.Forms
value = Helper.StringToDecimalPlaces(this.CurrentProductItem.TareRange, this.SystemConfig.DecimalPlaces);
sb.Append(value.PadLeft(6, ' '));
- for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
+ if (this.SystemConfig.IsWeightViewForward == true)
{
- if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Under)
- sb.Append("U");
- else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Over)
- sb.Append("O");
- else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double)
- sb.Append("D");
- else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
- sb.Append("P");
- else
- sb.Append("E");
+ for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
+ {
+ if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Under)
+ sb.Append("U");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Over)
+ sb.Append("O");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double)
+ sb.Append("D");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
+ sb.Append("P");
+ else
+ sb.Append("E");
- value = Helper.DoubleToString(datas[i].Weight, this.SystemConfig.DecimalPlaces);
- sb.Append(value.PadLeft(6, ' '));
+ value = Helper.DoubleToString(datas[i].Weight, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ }
+ }
+ else
+ {
+ for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++)
+ {
+ if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Under)
+ sb.Append("U");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
+ sb.Append("P");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Over)
+ sb.Append("O");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Double)
+ sb.Append("D");
+ else
+ sb.Append("E");
+
+ value = Helper.DoubleToString(datas[datas.Count - i].Weight, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ }
}
sb.Append((char)0x03);
return sb.ToString();
}
- public string OPT4(int lane, WeightData data)
+ public string Protocol_OPT4(int lane, WeightData data)
{
string value = "";
StringBuilder sb = new StringBuilder();
@@ -1493,6 +1370,98 @@ namespace INT69DB_2A.Forms
return sb.ToString();
}
+ public string Protocol_OPT4_NotStxEtx(Collection datas)
+ {
+ string value = "";
+ StringBuilder sb = new StringBuilder();
+
+ sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID));
+ sb.Append(string.Format("{0:D4}", this.SystemConfig.ProductNumber));
+
+ value = Helper.StringToDecimalPlaces(this.CurrentProductItem.UnderRange, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ value = Helper.StringToDecimalPlaces(this.CurrentProductItem.PassRange, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ value = Helper.StringToDecimalPlaces(this.CurrentProductItem.OverRange, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ value = Helper.StringToDecimalPlaces(this.CurrentProductItem.TareRange, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+
+ if (this.SystemConfig.IsWeightViewForward == true)
+ {
+ for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
+ {
+ if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Under)
+ sb.Append("U");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Over)
+ sb.Append("O");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Double)
+ sb.Append("D");
+ else if (datas[i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
+ sb.Append("P");
+ else
+ sb.Append("E");
+
+ value = Helper.DoubleToString(datas[i].Weight, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ }
+ }
+ else
+ {
+ for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++)
+ {
+ if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Under)
+ sb.Append("U");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Pass)
+ sb.Append("P");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Over)
+ sb.Append("O");
+ else if (datas[datas.Count - i].JudgmentStatus == DataStore.JudgmentStatus.Double)
+ sb.Append("D");
+ else
+ sb.Append("E");
+
+ value = Helper.DoubleToString(datas[datas.Count - i].Weight, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ }
+ }
+
+ return sb.ToString();
+ }
+ public string Protocol_OPT4_NotStxEtx(int lane, WeightData data)
+ {
+ string value = "";
+ StringBuilder sb = new StringBuilder();
+
+ sb.Append(string.Format("IN{0:D3}", this.SystemConfig.EquipmentID));
+ sb.Append(string.Format("{0:D4}", this.SystemConfig.ProductNumber));
+
+ value = Helper.StringToDecimalPlaces(this.CurrentProductItem.UnderRange, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ value = Helper.StringToDecimalPlaces(this.CurrentProductItem.PassRange, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ value = Helper.StringToDecimalPlaces(this.CurrentProductItem.OverRange, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ value = Helper.StringToDecimalPlaces(this.CurrentProductItem.TareRange, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+ sb.Append(string.Format("{0:D2}", lane));
+
+ if (data.JudgmentStatus == DataStore.JudgmentStatus.Under)
+ sb.Append("U");
+ else if (data.JudgmentStatus == DataStore.JudgmentStatus.Over)
+ sb.Append("O");
+ else if (data.JudgmentStatus == DataStore.JudgmentStatus.Double)
+ sb.Append("D");
+ else if (data.JudgmentStatus == DataStore.JudgmentStatus.Pass)
+ sb.Append("P");
+ else
+ sb.Append("E");
+
+ value = Helper.DoubleToString(data.Weight, this.SystemConfig.DecimalPlaces);
+ sb.Append(value.PadLeft(6, ' '));
+
+ return sb.ToString();
+ }
public byte[] Protocol_Modbus_Client_Write_Common_Data()
{
@@ -2941,6 +2910,652 @@ namespace INT69DB_2A.Forms
return madeData;
}
+ #endregion
+ #region Integrated Transmission
+ public void IntegratedTransmission(Collection datas)
+ {
+ #region COM3
+ switch (this.SystemConfig.Serial3Mode)
+ {
+ case 1:
+ this.UartCom3Write(this.Protocol_OPT1_NotStxEtx(datas));
+ break;
+ case 2:
+ this.UartCom3Write(this.Protocol_OPT2_NotStxEtx(datas));
+ break;
+ case 3:
+ this.UartCom3Write(this.Protocol_OPT3_NotStxEtx(datas));
+ break;
+ case 4:
+ this.UartCom3Write(this.Protocol_Printer(datas));
+ break;
+ case 5:
+ this.UartCom3Write(this.Protocol_OPT4_NotStxEtx(datas));
+ break;
+ default:
+ break;
+ }
+ #endregion
+
+ #region Ethernet
+ switch (this.SystemConfig.EthernetMode)
+ {
+ case 1:
+ this.SendEthernetData(this.Protocol_OPT1_NotStxEtx(datas));
+ break;
+ case 2:
+ this.SendEthernetData(this.Protocol_OPT2_NotStxEtx(datas));
+ break;
+ case 3:
+ this.SendEthernetData(this.Protocol_OPT3_NotStxEtx(datas));
+ break;
+ case 5:
+ this.SendEthernetData(this.Protocol_OPT4_NotStxEtx(datas));
+ break;
+ default:
+ break;
+ }
+ #endregion
+
+ // DataBackup
+ this.TrackingInspectionData(this.CollectionWeightData);
+ }
+ public void IntegratedTransmissionCheck(Collection datas)
+ {
+ int value = 0;
+
+ for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
+ {
+ if (datas[i].IsUpdate == true)
+ value++;
+ }
+
+ if (value == this.SystemConfig.EquipmentColumns)
+ {
+ this.timerTimeOutTransmission.Enabled = false;
+ this.IntegratedTransmission(datas);
+
+ foreach (WeightData data in this.CollectionWeightData)
+ data.IsUpdate = false;
+ }
+ }
+ #endregion
+ #region Serial CH3
+ public void UartCom3Open()
+ {
+ string fullPath = "";
+
+ this.smartSerialPortCom3.ErrorCheckMode = SmartSerialPort.ERRORCHECK.NONE;
+
+ if (this.SystemConfig.Serial3Mode != 0)
+ {
+ try
+ {
+ switch (this.SystemConfig.Serial3BaudRate)
+ {
+ case 0:
+ this.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._9600bps;
+ break;
+ case 1:
+ this.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._19200bps;
+ break;
+ case 2:
+ this.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._38400bps;
+ break;
+ case 3:
+ this.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._115200bps;
+ break;
+ default:
+ this.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._9600bps;
+ break;
+ }
+ if (this.smartSerialPortCom3.IsOpen == false)
+ this.smartSerialPortCom3.Open();
+ }
+ catch
+ {
+ }
+ }
+
+ #region Test 용 통신 로그
+ //fullPath = this.PathDataBackupFolder + "COM3log.txt";
+ //this.smartFileCom3Log.FilePathName = fullPath;
+ //this.IsCom3LogOpen = true;
+ //this.smartFileCom3Log.Open();
+ #endregion
+ }
+
+ public void UartCom3Write(string data)
+ {
+ this.smartSerialPortCom3.WriteFrame(data, SmartSerialPort.CODETYPES.ASCIICODE);
+ }
+ private int UartCom3Write(string command, string id, string address, string data)
+ {
+ int ret = 0;
+ string chkSum = "cc";
+ StringBuilder sb = new StringBuilder();
+
+ sb.Append(command);
+ sb.Append(id);
+ sb.Append(Helper.StringZeroFillDigits4(data.Length.ToString()));
+ sb.Append(address);
+ sb.Append(data);
+
+ chkSum = Helper.Checksumcalculator(sb.ToString());
+
+ sb.Append(chkSum);
+
+ if (this.smartSerialPortCom3.IsReadStart == true)
+ this.smartSerialPortCom3.WriteFrame(sb.ToString(), SmartSerialPort.CODETYPES.ASCIICODE);
+
+ return ret;
+ }
+
+ private void TreatSerialCommunication(Collection datas)
+ {
+ if (this.SystemConfig.Serial3Mode == 0)
+ return;
+
+ // CH3
+ if (this.SystemConfig.Serial3Mode == 1) // OPT1
+ this.UartCom3Write(this.Protocol_OPT1(this.CollectionWeightData));
+ else if (this.SystemConfig.Serial3Mode == 2) // OPT2
+ this.UartCom3Write(this.Protocol_OPT2(this.CollectionWeightData));
+ else if (this.SystemConfig.Serial3Mode == 3) // OPT3
+ this.UartCom3Write(this.Protocol_OPT3(this.CollectionWeightData));
+ else if (this.SystemConfig.Serial3Mode == 4) // Printer
+ {
+ if (this.SystemConfig.IsPrintPerProductEnable == true)
+ this.UartCom3Write(this.Protocol_Printer(this.CollectionWeightData));
+ }
+ else if (this.SystemConfig.Serial3Mode == 5) // OPT4
+ this.UartCom3Write(this.Protocol_OPT4(this.CollectionWeightData));
+ }
+ private void TreatSerialCommunication(int lane, WeightData data)
+ {
+ if (this.SystemConfig.Serial3Mode == 0)
+ return;
+
+ // CH3
+ if (this.SystemConfig.Serial3Mode == 1) // OPT1
+ this.UartCom3Write(this.Protocol_OPT1(lane, data));
+ else if (this.SystemConfig.Serial3Mode == 2) // OPT2
+ this.UartCom3Write(this.Protocol_OPT2(lane, data));
+ else if (this.SystemConfig.Serial3Mode == 3) // OPT3
+ this.UartCom3Write(this.Protocol_OPT3(lane, data));
+ else if (this.SystemConfig.Serial3Mode == 4) // Printer
+ {
+ if (this.SystemConfig.IsPrintPerProductEnable == true)
+ this.UartCom3Write(this.Protocol_Printer(lane, data));
+ }
+ else if (this.SystemConfig.Serial3Mode == 5) // OPT4
+ this.UartCom3Write(this.Protocol_OPT4(lane, data));
+ }
+ #endregion
+ #region Ethernet
+ private void TreatEthernetCommunication(Collection datas)
+ {
+ if (this.SystemConfig.IsEthernetEnable == false)
+ return;
+
+ string sendData = "";
+
+ if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f1_OPT1)
+ {
+ sendData = this.Protocol_OPT1(this.CollectionWeightData);
+ this.SendEthernetData(sendData);
+ }
+ else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f2_OPT2)
+ {
+ sendData = this.Protocol_OPT2(this.CollectionWeightData);
+ this.SendEthernetData(sendData);
+ }
+ else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f3_OPT3)
+ {
+ sendData = this.Protocol_OPT3(this.CollectionWeightData);
+ this.SendEthernetData(sendData);
+ }
+ else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f4_Modbus) // Modbus
+ {
+ if (this.SystemConfig.EthernetOperationMode == 2) // Client
+ {
+ for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
+ {
+ this.ClientSendDatabyteArray = this.Modbus.WriteMultipleRegisterTCP(
+ this.Protocol_Modbus_Client_Write_Lane_Data(i), this.SystemConfig.ModbusTcpStartAddress + ((i + 1) * 50) + 140);
+ this.EthernetWeightDataForModbus(this.ClientSendDatabyteArray);
+ }
+ }
+ }
+ else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f5_OPT4)
+ {
+ sendData = this.Protocol_OPT4(this.CollectionWeightData);
+ this.SendEthernetData(sendData);
+ }
+ }
+ private void TreatEthernetCommunication(int lane, WeightData data)
+ {
+ if (this.SystemConfig.IsEthernetEnable == false)
+ return;
+
+ string sendData = "";
+
+ if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f1_OPT1)
+ {
+ sendData = this.Protocol_OPT1(lane, data);
+ this.SendEthernetData(sendData);
+ }
+ else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f2_OPT2)
+ {
+ sendData = this.Protocol_OPT2(lane, data);
+ this.SendEthernetData(sendData);
+ }
+ else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f3_OPT3)
+ {
+ sendData = this.Protocol_OPT3(lane, data);
+ this.SendEthernetData(sendData);
+ }
+ else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f4_Modbus) // Modbus
+ {
+ if (this.SystemConfig.EthernetOperationMode == 2) // Client
+ {
+ this.ClientSendDatabyteArray = this.Modbus.WriteMultipleRegisterTCP(
+ this.Protocol_Modbus_Client_Write_Lane_Data(lane - 1), this.SystemConfig.ModbusTcpStartAddress + (lane * 50) + 140);
+ this.EthernetWeightDataForModbus(this.ClientSendDatabyteArray);
+ }
+ }
+ else if (this.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f5_OPT4)
+ {
+ sendData = this.Protocol_OPT4(lane, data);
+ this.SendEthernetData(sendData);
+ }
+ }
+ private void SendEthernetData(string etherData)
+ {
+ if (this.SystemConfig.EthernetOperationMode == 1)
+ {
+ if (this.smartTCPMultiServer.ClientInfoList != null)
+ {
+ foreach (SmartTCPMultiServer.CLIENTSINFOS client in this.smartTCPMultiServer.ClientInfoList)
+ this.EthernetServerSendMessage(client, etherData);
+ }
+ }
+ else
+ this.EthernetWeightData(etherData);
+ }
+
+ public void ThreadCloseClientIP(string address)
+ {
+ this.smartTCPMultiServer.CloseClientIP(address);
+ }
+ public void TimerPingEnabled(int interval, bool bValue)
+ {
+ if (this.SystemConfig.IsPingTimer == false)
+ return;
+
+ if (bValue == true)
+ {
+ if (this.IsTimerPingEnableTrue == false)
+ {
+ this.timerEthernetPing.Enabled = false;
+ this.timerEthernetPing.Interval = interval;
+ this.timerEthernetPing.Enabled = true;
+ this.IsTimerPingEnableTrue = true;
+ }
+ }
+ else
+ {
+ this.timerEthernetPing.Enabled = false;
+ this.IsTimerPingEnableTrue = false;
+ }
+ }
+ public void TimerPingEnabled(bool bValue)
+ {
+ if (this.SystemConfig.IsPingTimer == false)
+ return;
+
+ if (bValue == true)
+ {
+ if (this.IsTimerPingEnableTrue == false)
+ {
+ this.timerEthernetPing.Enabled = false;
+ this.timerEthernetPing.Enabled = true;
+ this.IsTimerPingEnableTrue = true;
+ }
+ }
+ else
+ {
+ this.timerEthernetPing.Enabled = false;
+ this.IsTimerPingEnableTrue = false;
+ }
+ }
+ public void TimerWaitResponseEnabled(bool bValue)
+ {
+ if (this.SystemConfig.IsPingTimer == false)
+ return;
+
+ if (bValue == true)
+ {
+ if (this.IsTimerWaitResponseEnableTrue == false)
+ {
+ this.timerWaitResponse.Enabled = false;
+ this.timerWaitResponse.Enabled = true;
+ this.IsTimerWaitResponseEnableTrue = true;
+ }
+ }
+ else
+ {
+ this.timerWaitResponse.Enabled = false;
+ this.IsTimerWaitResponseEnableTrue = false;
+ }
+ }
+
+ #region Server
+ public void EthernetServerStart()
+ {
+ if (this.smartTCPMultiServer.IsStart == false)
+ {
+ this.ChildFormCommunication.DisplayLabelLocalPort(false);
+ this.smartTCPMultiServer.Port = this.SystemConfig.EthernetLocalPort;
+ this.smartTCPMultiServer.Start();
+ }
+ }
+ public void EthernetServerStop()
+ {
+ if (this.smartTCPMultiServer.IsStart == true)
+ {
+ this.ChildFormCommunication.DisplayLabelLocalPort(true);
+ this.smartTCPMultiServer.Stop();
+ }
+ }
+ public void EthernetServerSendMessage(SmartTCPMultiServer.CLIENTSINFOS client, string msg)
+ {
+ this.smartTCPMultiServer.SendStringASCIIID(client.strID, msg);
+ }
+ public void EthernetServerSendMessage(SmartTCPMultiServer.CLIENTSINFOS client, byte[] bytes)
+ {
+ this.smartTCPMultiServer.SendByteByClientID(client.strID, bytes);
+ }
+ #endregion
+
+ #region Client
+ Thread cpClientThread;
+
+ public void EthernetClientConnect()
+ {
+ if (this.IsEthernetThreadStop == false)
+ return; // Online 경우
+ if (this.SystemConfig.IsEthernetEnable == false)
+ {
+ this.TextStatusOut("Thread Error");
+ }
+ }
+ public void EthernetClientDisconnect()
+ {
+ this.IsEthernetThreadStop = true;
+ this.IsModbusCommonDataSend = false;
+ this.DelegateUISeverStatus(false);
+ if (null != this.EthernetStmReader)
+ this.EthernetStmReader.Close();
+
+ if (null != this.EthernetStmWriter)
+ this.EthernetStmWriter.Close();
+
+ if (null != this.EthernetNetStream)
+ this.EthernetNetStream.Close();
+
+ if (null != this.EthernetTcpClient)
+ this.EthernetTcpClient.Close();
+
+ if (this.IsCommunicationLogOpen == true)
+ this.smartFileCommunicationLog.WriteString(string.Format("Client ({0:yyyy-MM-dd HH:mm:ss}): Disconnect", DateTime.Now));
+ }
+
+ private void EthernetClientReceiveThread()
+ {
+ //this.cpClientThread.Abort();
+
+ int nConnectPort = Convert.ToInt32(this.SystemConfig.EthernetServerPort);
+ try
+ {
+ this.DelegateTextStatusOut(">Now Connecting..");
+ this.EthernetTcpClient = new TcpClient(this.SystemConfig.EthernetServerAddress, nConnectPort);
+
+ this.EthernetNetStream = EthernetTcpClient.GetStream();
+ this.EthernetStmReader = new StreamReader(EthernetNetStream);
+ this.EthernetStmWriter = new StreamWriter(EthernetNetStream);
+
+ 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));
+
+ this.IsEthernetThreadStop = false;
+
+ // 판정 데이터 전송
+ if (this.IsEthernetTransferData == true)
+ {
+ this.IsEthernetTransferData = false;
+ Type type = this.EthernetTransferData.GetType();
+ if (type == typeof(string))
+ this.DelegateTransferData((string)this.EthernetTransferData);
+ else if (type == typeof(byte[]))
+ this.DelegateTransferData((byte[])this.EthernetTransferData);
+ else if (type == typeof(byte))
+ this.DelegateTransferData((byte)this.EthernetTransferData);
+ }
+
+ while (this.IsEthernetThreadStop == false)
+ {
+ string strRecvMsg = "";
+ char[] datas = new char[12];
+ int sum = 0;
+
+ this.TimerWaitResponseEnabled(false);
+ this.TimerPingEnabled(false);
+
+ if (this.ResponseFailCount > 0)
+ this.ResponseFailCount = 0;
+
+ try
+ {
+ //strRecvMsg = this.EthernetStmReader.ReadLine();
+ this.EthernetStmReader.Read(datas, 0, datas.Length);
+ for (int i = 0; i < datas.Length; i++)
+ sum += datas[i];
+ if (sum == 0)
+ return;
+
+ strRecvMsg = BitConverter.ToString(Encoding.UTF8.GetBytes(datas));
+
+ if (this.IsCommunicationLogOpen == true)
+ this.smartFileCommunicationLog.WriteString(string.Format("Client Receive ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, strRecvMsg));
+
+ if (null == strRecvMsg)
+ {
+ this.DelegateTextStatusOut(">Server Out");
+ this.IsEthernetThreadStop = true;
+ break;
+ }
+
+ this.DelegateTextStatusOut(strRecvMsg);
+ }
+ catch
+ {
+ this.DelegateTextStatusOut(">Server Out");
+ this.IsEthernetThreadStop = true;
+ }
+ }
+ }
+ catch
+ {
+ this.DelegateTextStatusOut(">Connect Fail !");
+ }
+ finally
+ {
+ this.IsEthernetThreadStop = true;
+ this.DelegateUISeverStatus(false);
+ this.DelegateTextStatusOut(">Disconnected Server");
+ this.SetTrackingHistoryData(DataStore.TrackingOperation.EthernetDisconnect, "Client");
+ if (null != this.EthernetStmReader)
+ this.EthernetStmReader.Close();
+
+ if (null != this.EthernetStmWriter)
+ this.EthernetStmWriter.Close();
+
+ if (null != this.EthernetNetStream)
+ this.EthernetNetStream.Close();
+
+ if (null != this.EthernetTcpClient)
+ this.EthernetTcpClient.Close();
+
+ if (this.IsCommunicationLogOpen == true)
+ this.smartFileCommunicationLog.WriteString(string.Format("Client ({0:yyyy-MM-dd HH:mm:ss}): Disconnect", DateTime.Now));
+ }
+
+ return;
+ }
+
+ private void UIServerStatus(bool status)
+ {
+ if (this.ChildFormMainDisplay != null)
+ this.ChildFormMainDisplay.UpdateEthernetStatusDisplay(status);
+ }
+ private void DelegateUISeverStatus(bool status)
+ {
+ this.Invoke(new UIServerStatusCallback(this.UIServerStatus), status);
+ }
+
+ private void TextStatusOut(string value)
+ {
+ if (this.ChildFormCommunication != null)
+ this.ChildFormCommunication.UpdateEthernetStatusDisplay(value);
+ }
+ private void DelegateTextStatusOut(string value)
+ {
+ this.Invoke(new TextStatusCallback(this.TextStatusOut), value);
+ }
+
+ private void DelegateTransferData(string data)
+ {
+ this.Invoke(new TransferDataStringCallback(this.EthernetSendMessage), data);
+ }
+ private void DelegateTransferData(byte[] data)
+ {
+ this.Invoke(new TransferDataByteArrayCallback(this.EthernetSendMessage), data);
+ }
+ private void DelegateTransferData(byte data)
+ {
+ this.Invoke(new TransferDataStringCallback(this.EthernetSendMessage), data);
+ }
+ public void EthernetSendMessage(string msg)
+ {
+ try
+ {
+ this.EthernetStmWriter.Write(msg);
+ this.EthernetStmWriter.Flush();
+
+ // 로그
+ if (this.IsCommunicationLogOpen == true)
+ this.smartFileCommunicationLog.WriteString(string.Format("Client Send ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, msg));
+ }
+ catch
+ {
+ this.DelegateUISeverStatus(false);
+ this.DelegateTextStatusOut("> Disconnect");
+ }
+ }
+ public void EthernetSendMessage(byte[] msg)
+ {
+ try
+ {
+ this.EthernetStmWriter.BaseStream.Write(msg, 0, msg.Length);
+ this.EthernetStmWriter.Flush();
+
+ // 로그
+ if (this.IsCommunicationLogOpen == true)
+ this.smartFileCommunicationLog.WriteString(string.Format("Client Send ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, BitConverter.ToString(msg)));
+ }
+ catch
+ {
+ this.DelegateUISeverStatus(false);
+ this.DelegateTextStatusOut("> Disconnect");
+ }
+ }
+ public void EthernetSendMessage(byte msg)
+ {
+ try
+ {
+ this.EthernetStmWriter.WriteLine(msg);
+ this.EthernetStmWriter.Flush();
+
+ // 로그
+ if (this.IsCommunicationLogOpen == true)
+ this.smartFileCommunicationLog.WriteString(string.Format("Client Send ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, msg));
+ }
+ catch
+ {
+ this.DelegateUISeverStatus(false);
+ this.DelegateTextStatusOut("> Disconnect");
+ }
+ }
+ public void EthernetWeightData(string strTemp)
+ {
+ this.IsEthernetTransferData = true;
+ this.EthernetTransferData = strTemp;
+
+ if (this.IsEthernetThreadStop == true)
+ this.EthernetClientConnect();
+ else
+ this.EthernetSendMessage((string)this.EthernetTransferData);
+ }
+ public void EthernetWeightData(byte temp)
+ {
+ this.IsEthernetTransferData = true;
+ this.EthernetTransferData = temp;
+
+ if (this.IsEthernetThreadStop == true)
+ this.EthernetClientConnect();
+ else
+ this.EthernetSendMessage((byte)this.EthernetTransferData);
+ }
+ public void EthernetWeightDataForModbus(byte[] bytes)
+ {
+ this.IsEthernetTransferData = true;
+ this.EthernetTransferData = bytes;
+
+ if (this.IsEthernetThreadStop == true)
+ this.EthernetClientConnect();
+ else
+ {
+ this.EthernetSendMessage(bytes);
+ this.TimerWaitResponseEnabled(true);
+ }
+ }
+ #endregion
+
#endregion
#region Uart Communication
@@ -3119,6 +3734,50 @@ namespace INT69DB_2A.Forms
for (int i = 0; i < byteData.Length; i++)
collection.Add(byteData[i]);
}
+ private void UpdateWeightData(int index, string receiveData)
+ {
+ int index2 = 0;
+
+ if (this.SystemConfig.IsWeightViewForward == true)
+ {
+ this.CollectionWeightData[index].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
+ this.CollectionWeightData[index].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
+ this.CollectionWeightData[index].WeightString = receiveData.Substring(2, 5);
+ this.CollectionWeightData[index].ADCValue = receiveData.Substring(7, 5);
+
+ this.Update30000ModbusData(index);
+ }
+ else
+ {
+ index2 = this.CollectionWeightData.Count - (index + 1);
+
+ this.CollectionWeightData[index2].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
+ this.CollectionWeightData[index2].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
+ this.CollectionWeightData[index2].WeightString = receiveData.Substring(2, 5);
+ this.CollectionWeightData[index2].ADCValue = receiveData.Substring(7, 5);
+
+ this.Update30000ModbusData(index2);
+ }
+ }
+ private void UpdateWeightDataTest(int index, string receiveData)
+ {
+ int index2 = 0;
+
+ if (this.SystemConfig.IsWeightViewForward == true)
+ {
+ this.CollectionWeightDataTest[index].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
+ this.CollectionWeightDataTest[index].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
+ this.CollectionWeightDataTest[index].ADCValue = receiveData.Substring(7, 5);
+ }
+ else
+ {
+ index2 = this.CollectionWeightDataTest.Count - (index + 1);
+
+ this.CollectionWeightDataTest[index2].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
+ this.CollectionWeightDataTest[index2].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
+ this.CollectionWeightDataTest[index2].ADCValue = receiveData.Substring(7, 5);
+ }
+ }
public int TransferData(string command, string id)
{
@@ -3894,364 +4553,796 @@ namespace INT69DB_2A.Forms
switch (lane)
{
case "A":
+ #region 1열
#region Value Assign
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
- {
- this.CollectionWeightData[0].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightData[0].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightData[0].WeightString = receiveData.Substring(2, 5);
- this.CollectionWeightData[0].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightData(0, receiveData);
else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest)
- {
- this.CollectionWeightDataTest[0].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightDataTest[0].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightDataTest[0].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightDataTest(0, receiveData);
#endregion
+
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
{
- if(this.SystemConfig.IsPart11 == true)
- this.TrackingInspectionData(this.CollectionWeightData[0], 1);
- else
- this.DataBackup(this.CollectionWeightData[0], 1);
- this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay1(this.EquipmentStatus, this.CollectionWeightData[0]);
+ #region FormMainDisplay
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 통합 전송
+ 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)
{
this.ChildFormEquipmentTest.UpdateUpdateStartWeightDisplay1(this.EquipmentStatus, this.CollectionWeightDataTest[0]);
}
+ #endregion
break;
case "B":
+ #region 2열
#region Value Assign
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
- {
- this.CollectionWeightData[1].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightData[1].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightData[1].WeightString = receiveData.Substring(2, 5);
- this.CollectionWeightData[1].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightData(1, receiveData);
else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest)
- {
- this.CollectionWeightDataTest[1].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightDataTest[1].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightDataTest[1].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightDataTest(1, receiveData);
#endregion
+
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
{
- if (this.SystemConfig.IsPart11 == true)
- this.TrackingInspectionData(this.CollectionWeightData[1], 2);
- else
- this.DataBackup(this.CollectionWeightData[1], 2);
- this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay2(this.EquipmentStatus, this.CollectionWeightData[1]);
+ #region FormMainDisplay
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)
{
this.ChildFormEquipmentTest.UpdateUpdateStartWeightDisplay2(this.EquipmentStatus, this.CollectionWeightDataTest[1]);
}
+ #endregion
break;
case "C":
+ #region 3열
#region Value Assign
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
- {
- this.CollectionWeightData[2].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightData[2].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightData[2].WeightString = receiveData.Substring(2, 5);
- this.CollectionWeightData[2].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightData(2, receiveData);
else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest)
- {
- this.CollectionWeightDataTest[2].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightDataTest[2].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightDataTest[2].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightDataTest(2, receiveData);
#endregion
+
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
{
- if (this.SystemConfig.IsPart11 == true)
- this.TrackingInspectionData(this.CollectionWeightData[2], 3);
- else
- this.DataBackup(this.CollectionWeightData[2], 3);
- this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay3(this.EquipmentStatus, this.CollectionWeightData[2]);
+ #region FormMainDisplay
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)
{
this.ChildFormEquipmentTest.UpdateUpdateStartWeightDisplay3(this.EquipmentStatus, this.CollectionWeightDataTest[2]);
}
+ #endregion
break;
case "D":
+ #region 4열
#region Value Assign
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
- {
- this.CollectionWeightData[3].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightData[3].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightData[3].WeightString = receiveData.Substring(2, 5);
- this.CollectionWeightData[3].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightData(3, receiveData);
else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest)
- {
- this.CollectionWeightDataTest[3].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightDataTest[3].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightDataTest[3].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightDataTest(3, receiveData);
#endregion
+
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
{
- if (this.SystemConfig.IsPart11 == true)
- this.TrackingInspectionData(this.CollectionWeightData[3], 4);
- else
- this.DataBackup(this.CollectionWeightData[3], 4);
- this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay4(this.EquipmentStatus, this.CollectionWeightData[3]);
+ #region FormMainDisplay
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)
{
this.ChildFormEquipmentTest.UpdateUpdateStartWeightDisplay4(this.EquipmentStatus, this.CollectionWeightDataTest[3]);
}
+ #endregion
break;
case "E":
+ #region 5열
#region Value Assign
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
- {
- this.CollectionWeightData[4].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightData[4].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightData[4].WeightString = receiveData.Substring(2, 5);
- this.CollectionWeightData[4].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightData(4, receiveData);
else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest)
- {
- this.CollectionWeightDataTest[4].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightDataTest[4].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightDataTest[4].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightDataTest(4, receiveData);
#endregion
+
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
{
- if (this.SystemConfig.IsPart11 == true)
- this.TrackingInspectionData(this.CollectionWeightData[4], 5);
- else
- this.DataBackup(this.CollectionWeightData[4], 5);
- this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightData[4]);
+ #region FormMainDisplay
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)
{
this.ChildFormEquipmentTest.UpdateUpdateStartWeightDisplay5(this.EquipmentStatus, this.CollectionWeightDataTest[4]);
}
+ #endregion
break;
case "F":
+ #region 6열
#region Value Assign
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
- {
- this.CollectionWeightData[5].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightData[5].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightData[5].WeightString = receiveData.Substring(2, 5);
- this.CollectionWeightData[5].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightData(5, receiveData);
else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest)
- {
- this.CollectionWeightDataTest[5].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightDataTest[5].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightDataTest[5].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightDataTest(5, receiveData);
#endregion
+
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
{
- if (this.SystemConfig.IsPart11 == true)
- this.TrackingInspectionData(this.CollectionWeightData[5], 6);
- else
- this.DataBackup(this.CollectionWeightData[5], 6);
- this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightData[5]);
+ #region FormMainDisplay
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)
{
this.ChildFormEquipmentTest.UpdateUpdateStartWeightDisplay6(this.EquipmentStatus, this.CollectionWeightDataTest[5]);
}
+ #endregion
break;
case "G":
+ #region 7열
#region Value Assign
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
- {
- this.CollectionWeightData[6].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightData[6].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightData[6].WeightString = receiveData.Substring(2, 5);
- this.CollectionWeightData[6].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightData(6, receiveData);
else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest)
- {
- this.CollectionWeightDataTest[6].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightDataTest[6].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightDataTest[6].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightDataTest(6, receiveData);
#endregion
+
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
{
- if (this.SystemConfig.IsPart11 == true)
- this.TrackingInspectionData(this.CollectionWeightData[6], 7);
- else
- this.DataBackup(this.CollectionWeightData[6], 7);
- this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightData[6]);
+ #region FormMainDisplay
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)
{
this.ChildFormEquipmentTest.UpdateUpdateStartWeightDisplay7(this.EquipmentStatus, this.CollectionWeightDataTest[6]);
}
+ #endregion
break;
case "H":
+ #region 8열
#region Value Assign
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
- {
- this.CollectionWeightData[7].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightData[7].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightData[7].WeightString = receiveData.Substring(2, 5);
- this.CollectionWeightData[7].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightData(7, receiveData);
else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest)
- {
- this.CollectionWeightDataTest[7].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightDataTest[7].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightDataTest[7].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightDataTest(7, receiveData);
#endregion
+
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
{
- if (this.SystemConfig.IsPart11 == true)
- this.TrackingInspectionData(this.CollectionWeightData[7], 8);
- else
- this.DataBackup(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)
{
this.ChildFormEquipmentTest.UpdateUpdateStartWeightDisplay8(this.EquipmentStatus, this.CollectionWeightDataTest[7]);
}
+ #endregion
break;
case "I":
+ #region 9열
#region Value Assign
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
- {
- this.CollectionWeightData[8].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightData[8].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightData[8].WeightString = receiveData.Substring(2, 5);
- this.CollectionWeightData[8].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightData(8, receiveData);
else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest)
- {
- this.CollectionWeightDataTest[8].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightDataTest[8].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightDataTest[8].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightDataTest(8, receiveData);
#endregion
+
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
{
- if (this.SystemConfig.IsPart11 == true)
- this.TrackingInspectionData(this.CollectionWeightData[8], 9);
- else
- this.DataBackup(this.CollectionWeightData[8], 9);
- this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightData[8]);
+ #region FormMainDisplay
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)
{
this.ChildFormEquipmentTest.UpdateUpdateStartWeightDisplay9(this.EquipmentStatus, this.CollectionWeightDataTest[8]);
}
+ #endregion
break;
case "J":
+ #region 10열
#region Value Assign
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
- {
- this.CollectionWeightData[9].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightData[9].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightData[9].WeightString = receiveData.Substring(2, 5);
- this.CollectionWeightData[9].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightData(9, receiveData);
else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormEquipmentTest)
- {
- this.CollectionWeightDataTest[9].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(0, 2));
- this.CollectionWeightDataTest[9].Weight = Helper.StringToWeight(receiveData.Substring(2, 5), this.SystemConfig.DecimalPlaces);
- this.CollectionWeightDataTest[9].ADCValue = receiveData.Substring(7, 5);
- }
+ this.UpdateWeightDataTest(9, receiveData);
#endregion
+
if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
{
- if (this.SystemConfig.IsPart11 == true)
- this.TrackingInspectionData(this.CollectionWeightData[9], 10);
- else
- this.DataBackup(this.CollectionWeightData[9], 10);
- this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightData[9]);
+ #region FormMainDisplay
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)
{
this.ChildFormEquipmentTest.UpdateUpdateStartWeightDisplay10(this.EquipmentStatus, this.CollectionWeightDataTest[9]);
}
+ #endregion
break;
case "Z":
#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)
{
- if (this.SystemConfig.IsPart11 == true)
- this.TrackingInspectionData(this.CollectionWeightData);
- else
- this.DataBackup(this.CollectionWeightData);
- this.ChildFormMainDisplay.UpdateUpdateStartWeightDisplay(this.EquipmentStatus, this.CollectionWeightData);
+ this.TrackingInspectionData(this.CollectionWeightData);
+ this.ChildFormMainDisplay.UpdateStartWeightDisplay(this.EquipmentStatus, this.CollectionWeightData);
for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
this.Update30000ModbusData(i);
@@ -4997,7 +6088,7 @@ namespace INT69DB_2A.Forms
structItem.EquipmentID = this.SystemConfig.EquipmentID;
structItem.EquipmentMode = this.SystemConfig.EquipmentMode;
structItem.ProductNumber = this.SystemConfig.ProductNumber;
- structItem.AutomaticLogout = this.SystemConfig.AutomaticLogout;
+ structItem.DummyInt1 = 0;
structItem.DischargeConveyorDirectionCW = (int)this.SystemConfig.DischargeConveyorDirectionCW;
structItem.UsbID = this.SystemConfig.UsbID;
structItem.DummyString6 = "";
@@ -5010,7 +6101,7 @@ namespace INT69DB_2A.Forms
structItem.Serial3Mode = this.SystemConfig.Serial3Mode;
structItem.DummyBool1 = false;
- structItem.DummyBool2 = false;
+ structItem.IsIntegratedTransmission = this.SystemConfig.IsIntegratedTransmission;
structItem.IsLogin = this.SystemConfig.IsLogin;
structItem.IsFeedingConveyorRunPass = this.SystemConfig.IsFeedingConveyorRunPass;
structItem.StepMotorType = this.SystemConfig.StepMotorType;
@@ -5064,8 +6155,8 @@ namespace INT69DB_2A.Forms
structItem2.EthernetMode = this.SystemConfig.EthernetMode;
structItem2.EthernetServerPort = this.SystemConfig.EthernetServerPort;
structItem2.DummyInt10 = 0;
- structItem2.UserAutomaticLogout = this.SystemConfig.UserAutomaticLogout;
- structItem2.StoragePeriod = this.SystemConfig.StoragePeriod;
+ structItem2.AutomaticLogout = this.SystemConfig.AutomaticLogout;
+ structItem2.DataStoragePeriod = this.SystemConfig.DataStoragePeriod;
structItem2.DummyString1 = "";
structItem2.DummyString2 = "";
@@ -5119,7 +6210,7 @@ namespace INT69DB_2A.Forms
structItem1.EquipmentID = item.EquipmentID;
structItem1.EquipmentMode = item.EquipmentMode;
structItem1.ProductNumber = item.ProductNumber;
- structItem1.AutomaticLogout = item.AutomaticLogout;
+ structItem1.DummyInt1 = 0;
structItem1.DischargeConveyorDirectionCW = (int)item.DischargeConveyorDirectionCW;
structItem1.UsbID = item.UsbID;
structItem1.DummyString6 = "";
@@ -5132,7 +6223,7 @@ namespace INT69DB_2A.Forms
structItem1.Serial3Mode = item.Serial3Mode;
structItem1.DummyBool1 = false;
- structItem1.DummyBool2 = false;
+ structItem1.IsIntegratedTransmission = item.IsIntegratedTransmission;
structItem1.IsLogin = item.IsLogin;
structItem1.IsFeedingConveyorRunPass = item.IsFeedingConveyorRunPass;
structItem1.StepMotorType = item.StepMotorType;
@@ -5187,8 +6278,8 @@ namespace INT69DB_2A.Forms
structItem2.EthernetMode = item.EthernetMode;
structItem2.EthernetServerPort = item.EthernetServerPort;
structItem2.DummyInt10 = 0;
- structItem2.UserAutomaticLogout = item.UserAutomaticLogout;
- structItem2.StoragePeriod = item.StoragePeriod;
+ structItem2.AutomaticLogout = item.AutomaticLogout;
+ structItem2.DataStoragePeriod = item.DataStoragePeriod;
structItem2.DummyString1 = "";
structItem2.DummyString2 = "";
@@ -5241,6 +6332,9 @@ namespace INT69DB_2A.Forms
this.SystemConfig.IsWeightViewForward = structItem1.IsWeightViewForward;
this.SystemConfig.IsFeedingConveyorRunPass = structItem1.IsFeedingConveyorRunPass;
this.SystemConfig.IsPingTimer = structItem1.IsPingTimer;
+ this.SystemConfig.IsLogin = structItem1.IsLogin;
+ this.SystemConfig.IsIntegratedTransmission = structItem1.IsIntegratedTransmission;
+
this.SystemConfig.DecimalPlaces = structItem1.DecimalPlaces;
this.SystemConfig.EthernetPort = structItem1.EthernetPort;
this.SystemConfig.EquipmentColumns = structItem1.EquipmentColumns;
@@ -5256,14 +6350,11 @@ namespace INT69DB_2A.Forms
this.SystemConfig.Serial3BaudRate = structItem1.Serial3BaudRate;
this.SystemConfig.Serial3Mode = structItem1.Serial3Mode;
this.SystemConfig.InputSensorSelect = structItem1.InputSensorSelect;
- this.SystemConfig.IsLogin = structItem1.IsLogin;
this.SystemConfig.ImpellerMotorAngleNG = structItem1.ImpellerMotorAngleNG;
this.SystemConfig.StepMotorType = structItem1.StepMotorType;
this.SystemConfig.DischargeConveyorDirectionCW = (DataStore.DischargeConveyorDirection)structItem1.DischargeConveyorDirectionCW;
// Part11
this.SystemConfig.IsPart11 = structItem1.IsPart11;
- // AutomaticLogout
- this.SystemConfig.AutomaticLogout = structItem1.AutomaticLogout;
// User_Level1_Name
if (structItem1.User_Level1_Name == "")
{
@@ -5300,8 +6391,8 @@ 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.UserAutomaticLogout = structItem2.UserAutomaticLogout;
+ this.SystemConfig.DataStoragePeriod = structItem2.DataStoragePeriod;
+ this.SystemConfig.AutomaticLogout = structItem2.AutomaticLogout;
}
catch
{
@@ -5809,104 +6900,202 @@ namespace INT69DB_2A.Forms
StructUserGroupItem structItem;
UserGroupItem item = new UserGroupItem();
- for (int i = 0; i < 2; i++)
- {
- #region StructItem
- structItem.IsMainDisplayProductNo = item.IsMainDisplayProductNo;
- structItem.IsMainDisplayWeightSetting = item.IsMainDisplayWeightSetting;
- structItem.IsMainDisplayClear = item.IsMainDisplayClear;
- structItem.IsMainDispalySubMenu = item.IsMainDisplaySubMenu;
+ #region Level1
+ #region StructItem
+ structItem.IsMainDisplayProductNo = true;
+ structItem.IsMainDisplayWeightSetting = false;
+ structItem.IsMainDisplayClear = true;
+ structItem.IsMainDispalySubMenu = false;
- structItem.IsMenuTime = item.IsMenuTime;
- structItem.IsMenuInformation = item.IsMenuInformation;
- structItem.IsMenuDataBackup = item.IsMenuDataBackup;
- structItem.IsMenuCalibration = item.IsMenuCalibration;
- structItem.IsMenuCommunication = item.IsMenuCommunication;
- structItem.IsMenuConfiguration = item.IsMenuConfiguration;
- structItem.IsMenuSystem = item.IsMenuSystem;
- structItem.IsMenuMotor = item.IsMenuMotor;
- structItem.IsMenuUpdate = item.IsMenuUpdate;
- structItem.IsMenuInitialization = item.IsMenuInitialization;
- structItem.IsMenuEquipment = item.IsMenuEquipment;
- structItem.IsMenuIOTest = item.IsMenuIOTest;
- structItem.IsMenuStatistics = item.IsMenuStatistics;
- structItem.IsMenuUser = item.IsMenuUser;
- structItem.IsMenuUserGroupEditor = item.IsMenuUserGroupEditor;
- structItem.IsMenuViewer = item.IsMenuViewer;
+ structItem.IsMenuTime = false;
+ structItem.IsMenuInformation = true;
+ structItem.IsMenuDataBackup = true;
+ structItem.IsMenuCalibration = false;
+ structItem.IsMenuCommunication = false;
+ structItem.IsMenuConfiguration = false;
+ structItem.IsMenuSystem = false;
+ structItem.IsMenuMotor = false;
+ structItem.IsMenuUpdate = false;
+ structItem.IsMenuInitialization = false;
+ structItem.IsMenuEquipment = false;
+ structItem.IsMenuIOTest = false;
+ structItem.IsMenuStatistics = true;
+ structItem.IsMenuUser = true;
+ structItem.IsMenuUserGroupEditor = false;
+ structItem.IsMenuViewer = false;
- structItem.Dummy1 = false;
- structItem.Dummy2 = false;
- structItem.Dummy3 = false;
- structItem.Dummy4 = false;
- structItem.Dummy5 = false;
- structItem.Dummy6 = false;
- structItem.Dummy7 = false;
- structItem.Dummy8 = false;
- structItem.Dummy9 = false;
- structItem.Dummy10 = false;
- structItem.Dummy11 = false;
- structItem.Dummy12 = false;
- structItem.Dummy13 = false;
- structItem.Dummy14 = false;
- structItem.Dummy15 = false;
- structItem.Dummy16 = false;
- structItem.Dummy17 = false;
- structItem.Dummy18 = false;
- structItem.Dummy19 = false;
- structItem.Dummy20 = false;
- #endregion
+ structItem.Dummy1 = false;
+ structItem.Dummy2 = false;
+ structItem.Dummy3 = false;
+ structItem.Dummy4 = false;
+ structItem.Dummy5 = false;
+ structItem.Dummy6 = false;
+ structItem.Dummy7 = false;
+ structItem.Dummy8 = false;
+ structItem.Dummy9 = false;
+ structItem.Dummy10 = false;
+ structItem.Dummy11 = false;
+ structItem.Dummy12 = false;
+ structItem.Dummy13 = false;
+ structItem.Dummy14 = false;
+ structItem.Dummy15 = false;
+ structItem.Dummy16 = false;
+ structItem.Dummy17 = false;
+ structItem.Dummy18 = false;
+ structItem.Dummy19 = false;
+ structItem.Dummy20 = false;
+ #endregion
- this.smartFileIO.WriteStructure_Begin(structItem, i);
- }
- for (int i = 2; i < 4; i++)
- {
- #region StructItem
- structItem.IsMainDisplayProductNo = true;
- structItem.IsMainDisplayWeightSetting = true;
- structItem.IsMainDisplayClear = true;
- structItem.IsMainDispalySubMenu = true;
+ this.smartFileIO.WriteStructure_Begin(structItem, 0);
+ #endregion
- structItem.IsMenuTime = true;
- structItem.IsMenuInformation = true;
- structItem.IsMenuDataBackup = true;
- structItem.IsMenuCalibration = true;
- structItem.IsMenuCommunication = true;
- structItem.IsMenuConfiguration = true;
- structItem.IsMenuSystem = true;
- structItem.IsMenuMotor = true;
- structItem.IsMenuUpdate = true;
- structItem.IsMenuInitialization = true;
- structItem.IsMenuEquipment = true;
- structItem.IsMenuIOTest = true;
- structItem.IsMenuStatistics = true;
- structItem.IsMenuUser = true;
- structItem.IsMenuUserGroupEditor = true;
- structItem.IsMenuViewer = true;
+ #region Level2
+ #region StructItem
+ structItem.IsMainDisplayProductNo = true;
+ structItem.IsMainDisplayWeightSetting = true;
+ structItem.IsMainDisplayClear = true;
+ structItem.IsMainDispalySubMenu = true;
- structItem.Dummy1 = false;
- structItem.Dummy2 = false;
- structItem.Dummy3 = false;
- structItem.Dummy4 = false;
- structItem.Dummy5 = false;
- structItem.Dummy6 = false;
- structItem.Dummy7 = false;
- structItem.Dummy8 = false;
- structItem.Dummy9 = false;
- structItem.Dummy10 = false;
- structItem.Dummy11 = false;
- structItem.Dummy12 = false;
- structItem.Dummy13 = false;
- structItem.Dummy14 = false;
- structItem.Dummy15 = false;
- structItem.Dummy16 = false;
- structItem.Dummy17 = false;
- structItem.Dummy18 = false;
- structItem.Dummy19 = false;
- structItem.Dummy20 = false;
- #endregion
+ structItem.IsMenuTime = false;
+ structItem.IsMenuInformation = true;
+ structItem.IsMenuDataBackup = true;
+ structItem.IsMenuCalibration = true;
+ structItem.IsMenuCommunication = false;
+ structItem.IsMenuConfiguration = false;
+ structItem.IsMenuSystem = true;
+ structItem.IsMenuMotor = false;
+ structItem.IsMenuUpdate = false;
+ structItem.IsMenuInitialization = false;
+ structItem.IsMenuEquipment = false;
+ structItem.IsMenuIOTest = false;
+ structItem.IsMenuStatistics = true;
+ structItem.IsMenuUser = true;
+ structItem.IsMenuUserGroupEditor = false;
+ structItem.IsMenuViewer = true;
+
+ structItem.Dummy1 = false;
+ structItem.Dummy2 = false;
+ structItem.Dummy3 = false;
+ structItem.Dummy4 = false;
+ structItem.Dummy5 = false;
+ structItem.Dummy6 = false;
+ structItem.Dummy7 = false;
+ structItem.Dummy8 = false;
+ structItem.Dummy9 = false;
+ structItem.Dummy10 = false;
+ structItem.Dummy11 = false;
+ structItem.Dummy12 = false;
+ structItem.Dummy13 = false;
+ structItem.Dummy14 = false;
+ structItem.Dummy15 = false;
+ structItem.Dummy16 = false;
+ structItem.Dummy17 = false;
+ structItem.Dummy18 = false;
+ structItem.Dummy19 = false;
+ structItem.Dummy20 = false;
+ #endregion
+
+ this.smartFileIO.WriteStructure_Begin(structItem, 1);
+ #endregion
+
+ #region Level3
+ #region StructItem
+ structItem.IsMainDisplayProductNo = true;
+ structItem.IsMainDisplayWeightSetting = true;
+ structItem.IsMainDisplayClear = true;
+ structItem.IsMainDispalySubMenu = true;
+
+ structItem.IsMenuTime = true;
+ structItem.IsMenuInformation = true;
+ structItem.IsMenuDataBackup = true;
+ structItem.IsMenuCalibration = true;
+ structItem.IsMenuCommunication = true;
+ structItem.IsMenuConfiguration = true;
+ structItem.IsMenuSystem = true;
+ structItem.IsMenuMotor = true;
+ structItem.IsMenuUpdate = true;
+ structItem.IsMenuInitialization = true;
+ structItem.IsMenuEquipment = true;
+ structItem.IsMenuIOTest = true;
+ structItem.IsMenuStatistics = true;
+ structItem.IsMenuUser = true;
+ structItem.IsMenuUserGroupEditor = true;
+ structItem.IsMenuViewer = true;
+
+ structItem.Dummy1 = false;
+ structItem.Dummy2 = false;
+ structItem.Dummy3 = false;
+ structItem.Dummy4 = false;
+ structItem.Dummy5 = false;
+ structItem.Dummy6 = false;
+ structItem.Dummy7 = false;
+ structItem.Dummy8 = false;
+ structItem.Dummy9 = false;
+ structItem.Dummy10 = false;
+ structItem.Dummy11 = false;
+ structItem.Dummy12 = false;
+ structItem.Dummy13 = false;
+ structItem.Dummy14 = false;
+ structItem.Dummy15 = false;
+ structItem.Dummy16 = false;
+ structItem.Dummy17 = false;
+ structItem.Dummy18 = false;
+ structItem.Dummy19 = false;
+ structItem.Dummy20 = false;
+ #endregion
+
+ this.smartFileIO.WriteStructure_Begin(structItem, 2);
+ #endregion
+
+ #region Not Login
+ #region StructItem
+ structItem.IsMainDisplayProductNo = true;
+ structItem.IsMainDisplayWeightSetting = true;
+ structItem.IsMainDisplayClear = true;
+ structItem.IsMainDispalySubMenu = true;
+
+ structItem.IsMenuTime = true;
+ structItem.IsMenuInformation = true;
+ structItem.IsMenuDataBackup = true;
+ structItem.IsMenuCalibration = true;
+ structItem.IsMenuCommunication = true;
+ structItem.IsMenuConfiguration = true;
+ structItem.IsMenuSystem = true;
+ structItem.IsMenuMotor = true;
+ structItem.IsMenuUpdate = true;
+ structItem.IsMenuInitialization = true;
+ structItem.IsMenuEquipment = true;
+ structItem.IsMenuIOTest = true;
+ structItem.IsMenuStatistics = false;
+ structItem.IsMenuUser = false;
+ structItem.IsMenuUserGroupEditor = false;
+ structItem.IsMenuViewer = false;
+
+ structItem.Dummy1 = false;
+ structItem.Dummy2 = false;
+ structItem.Dummy3 = false;
+ structItem.Dummy4 = false;
+ structItem.Dummy5 = false;
+ structItem.Dummy6 = false;
+ structItem.Dummy7 = false;
+ structItem.Dummy8 = false;
+ structItem.Dummy9 = false;
+ structItem.Dummy10 = false;
+ structItem.Dummy11 = false;
+ structItem.Dummy12 = false;
+ structItem.Dummy13 = false;
+ structItem.Dummy14 = false;
+ structItem.Dummy15 = false;
+ structItem.Dummy16 = false;
+ structItem.Dummy17 = false;
+ structItem.Dummy18 = false;
+ structItem.Dummy19 = false;
+ structItem.Dummy20 = false;
+ #endregion
+
+ this.smartFileIO.WriteStructure_Begin(structItem, 3);
+ #endregion
- this.smartFileIO.WriteStructure_Begin(structItem, i);
- }
this.smartFileIO.WriteStructure_End();
}
public void SaveUserGroupFile(UserGroup item)
@@ -6167,7 +7356,7 @@ namespace INT69DB_2A.Forms
item.Level1.IsMenuEquipment = structItem.IsMenuEquipment;
item.Level1.IsMenuIOTest = structItem.IsMenuIOTest;
item.Level1.IsMenuStatistics = structItem.IsMenuStatistics;
- item.Level1.IsMenuUser = structItem.IsMenuUser;
+ item.Level1.IsMenuUser = true;
item.Level1.IsMenuUserGroupEditor = structItem.IsMenuUserGroupEditor;
item.Level1.IsMenuViewer = structItem.IsMenuViewer;
#endregion
@@ -6193,7 +7382,7 @@ namespace INT69DB_2A.Forms
item.Level2.IsMenuEquipment = structItem.IsMenuEquipment;
item.Level2.IsMenuIOTest = structItem.IsMenuIOTest;
item.Level2.IsMenuStatistics = structItem.IsMenuStatistics;
- item.Level2.IsMenuUser = structItem.IsMenuUser;
+ item.Level2.IsMenuUser = true;
item.Level2.IsMenuUserGroupEditor = structItem.IsMenuUserGroupEditor;
item.Level2.IsMenuViewer = structItem.IsMenuViewer;
#endregion
@@ -6216,10 +7405,10 @@ namespace INT69DB_2A.Forms
item.Level3.IsMenuMotor = structItem.IsMenuMotor;
item.Level3.IsMenuUpdate = structItem.IsMenuUpdate;
item.Level3.IsMenuInitialization = structItem.IsMenuInitialization;
- item.Level3.IsMenuEquipment = structItem.IsMenuEquipment;
+ item.Level3.IsMenuEquipment = true;
item.Level3.IsMenuIOTest = structItem.IsMenuIOTest;
item.Level3.IsMenuStatistics = structItem.IsMenuStatistics;
- item.Level3.IsMenuUser = structItem.IsMenuUser;
+ item.Level3.IsMenuUser = true;
item.Level3.IsMenuUserGroupEditor = structItem.IsMenuUserGroupEditor;
item.Level3.IsMenuViewer = structItem.IsMenuViewer;
#endregion
@@ -6245,7 +7434,7 @@ namespace INT69DB_2A.Forms
item.NotLogin.IsMenuEquipment = structItem.IsMenuEquipment;
item.NotLogin.IsMenuIOTest = structItem.IsMenuIOTest;
item.NotLogin.IsMenuStatistics = structItem.IsMenuStatistics;
- item.NotLogin.IsMenuUser = structItem.IsMenuUser;
+ item.NotLogin.IsMenuUser = false;
item.NotLogin.IsMenuUserGroupEditor = structItem.IsMenuUserGroupEditor;
item.NotLogin.IsMenuViewer = structItem.IsMenuViewer;
#endregion
@@ -6262,166 +7451,6 @@ namespace INT69DB_2A.Forms
}
#endregion
- #region Data Backup
- private void DataBackup(Collection items)
- {
- bool fileCheck = false, directoryCheck = false;
- string fullFilePath = "";
- StreamWriter sw;
-
- this.RemoveUsbBackupFile();
-
- if (this.SystemConfig.IsDataBackup == true)
- {
- fullFilePath = string.Format("{0}{1:yyyyMMdd}_{2}.csv", this.PathDataBackupFolder, DateTime.Now, this.SystemConfig.UsbID);
-
- DirectoryInfo di = new DirectoryInfo(this.PathDataBackupFolder);
- directoryCheck = di.Exists;
- // 폴더 체크
- if (directoryCheck == false)
- di.Create();
-
- FileInfo fileInfo = new FileInfo(fullFilePath);
- fileCheck = fileInfo.Exists;
-
- sw = new StreamWriter(fullFilePath, true, Encoding.UTF8);
-
- if (fileCheck == false)
- {
- sw.Write("Date");
- sw.Write(",");
- sw.Write("Time");
- sw.Write(",");
- sw.Write("P_No");
- sw.Write(",");
- sw.Write("Name");
- sw.Write(",");
- sw.Write("Lot");
-
- for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
- {
- sw.Write(",");
- sw.Write(string.Format("#{0}_Weight", i + 1));
- sw.Write(",");
- sw.Write("Grade");
- }
- sw.WriteLine();
- }
-
- sw.Write(string.Format("{0:yyyy-MM-dd}", DateTime.Now));
- sw.Write(",");
- sw.Write(string.Format("{0:HH:mm:ss}", DateTime.Now));
- sw.Write(",");
- sw.Write(this.CurrentProductItem.Number);
- sw.Write(",");
- sw.Write(this.CurrentProductItem.Name);
- sw.Write(",");
- sw.Write(this.CurrentProductItem.LotNo);
-
- 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);
- }
- sw.WriteLine();
- sw.Close();
- }
- }
- private void DataBackup(WeightData item, int line)
- {
- bool fileCheck = false, directoryCheck = false;
- string fullFilePath = "";
- StreamWriter sw;
-
- this.RemoveUsbBackupFile();
-
- if (this.SystemConfig.IsDataBackup == true)
- {
- fullFilePath = string.Format("{0}{1:yyyyMMdd}_{2}_{3}Line.csv", this.PathDataBackupFolder, DateTime.Now, this.SystemConfig.UsbID, line);
-
- DirectoryInfo di = new DirectoryInfo(this.PathDataBackupFolder);
- directoryCheck = di.Exists;
- // 폴더 체크
- if (directoryCheck == false)
- di.Create();
-
- FileInfo fileInfo = new FileInfo(fullFilePath);
- fileCheck = fileInfo.Exists;
-
- sw = new StreamWriter(fullFilePath, true, Encoding.UTF8);
-
- if (fileCheck == false)
- {
- sw.Write("Date");
- sw.Write(",");
- sw.Write("Time");
- sw.Write(",");
- sw.Write("P_No");
- sw.Write(",");
- sw.Write("Name");
- sw.Write(",");
- sw.Write("Lot");
- sw.Write(",");
- sw.Write("Weight");
- sw.Write(",");
- sw.Write("Grade");
- sw.WriteLine();
- }
-
- sw.Write(string.Format("{0:yyyy-MM-dd}", DateTime.Now));
- sw.Write(",");
- sw.Write(string.Format("{0:HH:mm:ss}", DateTime.Now));
- sw.Write(",");
- sw.Write(this.CurrentProductItem.Number);
- sw.Write(",");
- sw.Write(this.CurrentProductItem.Name);
- sw.Write(",");
- sw.Write(this.CurrentProductItem.LotNo);
- sw.Write(",");
- sw.Write(Helper.DoubleToString(item.Weight, this.SystemConfig.DecimalPlaces));
- sw.Write(",");
- sw.Write(item.JudgmentStatus);
- sw.WriteLine();
- sw.Close();
- }
- }
-
- private void RemoveUsbBackupFile()
- {
- bool directoryCheck = false;
-
- try
- {
- string dday = string.Format("{0:yyyyMMdd}", DateTime.Now.AddDays(-180)) + ".csv";
-
- DirectoryInfo dir = new DirectoryInfo(this.PathDataBackupFolder);
-
- directoryCheck = dir.Exists;
- // 폴더 체크
- if (directoryCheck == false)
- dir.Create();
-
- FileInfo[] files = dir.GetFiles();
- foreach (FileInfo subfile in files)
- {
- if (subfile.Name.StartsWith("20")) // 날짜 비교하여 180일 지난화일은 삭제함
- {
- if (subfile.Name.CompareTo(dday) < 0)
- {
- subfile.Delete();
- }
- }
- }
- }
- catch
- {
-
- }
-
- }
- #endregion
#region Backup
public List GetSeletedNodeList(TreeView tree)
{
@@ -6489,7 +7518,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();
}
}
@@ -6499,142 +7528,255 @@ namespace INT69DB_2A.Forms
{
DateTime time = DateTime.Now;
- folder = string.Format("{0}{1}\\{2}\\", this.PathDataInspectionFolder, time.Year, time.Month);
- if (Directory.Exists(folder) == false)
- Directory.CreateDirectory(folder);
- fileName = string.Format("I{0:yyyyMMdd}-{1}.csv", time, this.CurrentProductItem.Number);
+ if (this.SystemConfig.IsPart11 == false)
+ {
+ folder = this.PathDataBackupFolder;
+ fileName = string.Format("{0:yyyyMMdd}_{1}", time, this.SystemConfig.ProductNumber);
+ }
+ else
+ {
+ folder = string.Format("{0}{1}\\{2}\\", this.PathDataInspectionFolder, time.Year, time.Month);
+ fileName = string.Format("I{0:yyyyMMdd}_{1}.csv", time, this.SystemConfig.ProductNumber);
+ }
}
+ private void GetTrackingInspectionFolderPath(ref string folder, ref string fileName, int lane)
+ {
+ string ret = "";
+ DateTime time = DateTime.Now;
+ if (this.SystemConfig.IsPart11 == false)
+ {
+ ret = string.Format("{0}{1:yyyyMMdd}_{2}_{3}Lane.csv", this.PathDataBackupFolder, DateTime.Now, this.SystemConfig.ProductNumber, lane);
+ folder = this.PathDataBackupFolder;
+ fileName = string.Format("{0:yyyyMMdd}_{1}_{2}Lane.csv", time, this.SystemConfig.ProductNumber, lane);
+ }
+ else
+ {
+ folder = string.Format("{0}{1}\\{2}\\", this.PathDataInspectionFolder, time.Year, time.Month);
+ fileName = string.Format("I{0:yyyyMMdd}_{1}_{2}Lane.csv", time, this.SystemConfig.ProductNumber, lane);
+ }
+ }
///
- /// 스틱1
+ /// 스틱1, 스틱2 통합백업
///
///
- public void TrackingInspectionData(Collection items)
+ private void TrackingInspectionData(Collection items)
{
bool fileCheck = false, directoryCheck = false;
string fullFilePath = "", folderPath = "", fileName = "";
- string filePathExtension = "";
StreamWriter sw;
- DateTime time = DateTime.Now;
- filePathExtension = ".csv";
-
- this.GetTrackingInspectionFolderPath(ref folderPath, ref fileName);
- fullFilePath = string.Format("{0}{1}", folderPath, fileName);
-
- FileInfo fileInfo = new FileInfo(fullFilePath);
- fileCheck = fileInfo.Exists;
-
- sw = new StreamWriter(fullFilePath, true, Encoding.UTF8);
-
- if (fileCheck == false)
+ if (this.SystemConfig.IsDataBackup == true)
{
- this.RemoveInspectionDataFile();
+ this.GetTrackingInspectionFolderPath(ref folderPath, ref fileName);
+ fullFilePath = string.Format("{0}{1}", folderPath, fileName);
- sw.Write("Date");
+ DirectoryInfo di = new DirectoryInfo(folderPath);
+ directoryCheck = di.Exists;
+ // 폴더 체크
+ if (directoryCheck == false)
+ di.Create();
+
+ FileInfo fileInfo = new FileInfo(fullFilePath);
+ fileCheck = fileInfo.Exists;
+
+ sw = new StreamWriter(fullFilePath, true, Encoding.UTF8);
+
+ if (fileCheck == false)
+ {
+ this.RemoveInspectionDataFile();
+
+ sw.Write("Date");
+ sw.Write(",");
+ sw.Write("Time");
+ sw.Write(",");
+ sw.Write("P_No");
+ sw.Write(",");
+ sw.Write("Name");
+ sw.Write(",");
+ sw.Write("Lot");
+ sw.Write(",");
+ sw.Write("UnderRange");
+ sw.Write(",");
+ sw.Write("PassRange");
+ sw.Write(",");
+ sw.Write("OverRange");
+ sw.Write(",");
+ sw.Write("TareRange");
+
+ for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
+ {
+ sw.Write(",");
+ sw.Write(string.Format("#{0}_Weight", i + 1));
+ sw.Write(",");
+ sw.Write(string.Format("#{0}_Grade", i + 1));
+ }
+
+ sw.WriteLine();
+ }
+
+ sw.Write(string.Format("{0:yyyy-MM-dd}", DateTime.Now));
sw.Write(",");
- sw.Write("Time");
+ sw.Write(string.Format("{0:HH:mm:ss}", DateTime.Now));
sw.Write(",");
- sw.Write("P_No");
+ sw.Write(this.CurrentProductItem.Number);
sw.Write(",");
- sw.Write("Name");
+ sw.Write(this.CurrentProductItem.Name);
sw.Write(",");
- sw.Write("Lot");
+ sw.Write(this.CurrentProductItem.LotNo);
+ sw.Write(",");
+ sw.Write(Helper.StringToDecimalPlaces(this.CurrentProductItem.UnderRange, this.SystemConfig.DecimalPlaces));
+ sw.Write(",");
+ sw.Write(Helper.StringToDecimalPlaces(this.CurrentProductItem.PassRange, this.SystemConfig.DecimalPlaces));
+ sw.Write(",");
+ sw.Write(Helper.StringToDecimalPlaces(this.CurrentProductItem.OverRange, this.SystemConfig.DecimalPlaces));
+ sw.Write(",");
+ sw.Write(Helper.StringToDecimalPlaces(this.CurrentProductItem.TareRange, this.SystemConfig.DecimalPlaces));
for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++)
{
- sw.Write(",");
- sw.Write(string.Format("#{0}_Weight", i + 1));
- sw.Write(",");
- sw.Write(string.Format("#{0}_Grade", i + 1));
+ 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();
}
-
- sw.Write(string.Format("{0:yyyy-MM-dd}", time));
- sw.Write(",");
- sw.Write(string.Format("{0:HH:mm:ss}", time));
- sw.Write(",");
- sw.Write(this.CurrentProductItem.Number);
- sw.Write(",");
- sw.Write(this.CurrentProductItem.Name);
- sw.Write(",");
- sw.Write(this.CurrentProductItem.LotNo);
-
- 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);
- }
- sw.WriteLine();
- sw.Close();
}
///
- /// 스틱2
+ /// 스틱2 -> 사용X
///
///
- public void TrackingInspectionData(WeightData item, int line)
+ private void TrackingInspectionData(WeightData item, int lane)
{
bool fileCheck = false, directoryCheck = false;
string fullFilePath = "", folderPath = "", fileName = "";
- string filePathExtension = "";
StreamWriter sw;
- DateTime time = DateTime.Now;
- filePathExtension = ".csv";
-
- this.GetTrackingInspectionFolderPath(ref folderPath, ref fileName);
- fullFilePath = string.Format("{0}{1}", folderPath, fileName);
-
- FileInfo fileInfo = new FileInfo(fullFilePath);
- fileCheck = fileInfo.Exists;
-
- sw = new StreamWriter(fullFilePath, true, Encoding.UTF8);
-
- if (fileCheck == false)
+ if (this.SystemConfig.IsDataBackup == true)
{
- this.RemoveInspectionDataFile();
+ this.GetTrackingInspectionFolderPath(ref folderPath, ref fileName);
+ fullFilePath = string.Format("{0}{1}", folderPath, fileName);
- sw.Write("Date");
+ DirectoryInfo di = new DirectoryInfo(folderPath);
+ directoryCheck = di.Exists;
+ // 폴더 체크
+ if (directoryCheck == false)
+ di.Create();
+
+ FileInfo fileInfo = new FileInfo(fullFilePath);
+ fileCheck = fileInfo.Exists;
+
+ sw = new StreamWriter(fullFilePath, true, Encoding.UTF8);
+
+ if (fileCheck == false)
+ {
+ this.RemoveInspectionDataFile();
+
+ sw.Write("Date");
+ sw.Write(",");
+ sw.Write("Time");
+ sw.Write(",");
+ sw.Write("P_No");
+ sw.Write(",");
+ sw.Write("Name");
+ sw.Write(",");
+ sw.Write("Lot");
+ sw.Write(",");
+ sw.Write("UnderRange");
+ sw.Write(",");
+ sw.Write("PassRange");
+ sw.Write(",");
+ sw.Write("OverRange");
+ sw.Write(",");
+ sw.Write("TareRange");
+ sw.Write(",");
+ sw.Write("Weight");
+ sw.Write(",");
+ sw.Write("Grade");
+
+ sw.WriteLine();
+ }
+
+ sw.Write(string.Format("{0:yyyy-MM-dd}", DateTime.Now));
sw.Write(",");
- sw.Write("Time");
+ sw.Write(string.Format("{0:HH:mm:ss}", DateTime.Now));
sw.Write(",");
- sw.Write("P_No");
+ sw.Write(this.CurrentProductItem.Number);
sw.Write(",");
- sw.Write("Name");
+ sw.Write(this.CurrentProductItem.Name);
sw.Write(",");
- sw.Write("Lot");
+ sw.Write(this.CurrentProductItem.LotNo);
sw.Write(",");
- sw.Write("Weight");
+ sw.Write(Helper.StringToDecimalPlaces(this.CurrentProductItem.UnderRange, this.SystemConfig.DecimalPlaces));
sw.Write(",");
- sw.Write("Grade");
+ sw.Write(Helper.StringToDecimalPlaces(this.CurrentProductItem.PassRange, this.SystemConfig.DecimalPlaces));
+ sw.Write(",");
+ sw.Write(Helper.StringToDecimalPlaces(this.CurrentProductItem.OverRange, this.SystemConfig.DecimalPlaces));
+ sw.Write(",");
+ sw.Write(Helper.StringToDecimalPlaces(this.CurrentProductItem.TareRange, this.SystemConfig.DecimalPlaces));
+ sw.Write(",");
+ sw.Write(Helper.DoubleToString(item.Weight, this.SystemConfig.DecimalPlaces));
+ sw.Write(",");
+ sw.Write(item.JudgmentStatus);
sw.WriteLine();
- }
- sw.Write(string.Format("{0:yyyy-MM-dd}", time));
- sw.Write(",");
- sw.Write(string.Format("{0:HH:mm:ss}", time));
- sw.Write(",");
- sw.Write(this.CurrentProductItem.Number);
- sw.Write(",");
- sw.Write(this.CurrentProductItem.Name);
- sw.Write(",");
- sw.Write(this.CurrentProductItem.LotNo);
- sw.Write(",");
- sw.Write(Helper.DoubleToString(item.Weight, this.SystemConfig.DecimalPlaces));
- sw.Write(",");
- sw.Write(item.JudgmentStatus);
- sw.WriteLine();
- sw.Close();
+ sw.Close();
+ }
}
private void RemoveInspectionDataFile()
{
+ bool directoryCheck = false;
+
try
{
- this.DeleteLogFile(this.PathDataInspectionFolder, DataStore.E_DataType.Inspection);
+ if (this.SystemConfig.IsPart11 == true)
+ this.DeleteLogFile(this.PathDataInspectionFolder, DataStore.E_DataType.Inspection);
+ else
+ {
+ string dday = string.Format("{0:yyyyMMdd}", DateTime.Now.AddDays(-180)) + ".csv";
+
+ DirectoryInfo dir = new DirectoryInfo(this.PathDataInspectionFolder);
+
+ directoryCheck = dir.Exists;
+ // 폴더 체크
+ if (directoryCheck == false)
+ dir.Create();
+
+ FileInfo[] files = dir.GetFiles();
+ foreach (FileInfo subfile in files)
+ {
+ if (subfile.Name.StartsWith("20")) // 날짜 비교하여 10일 지난화일은 삭제함
+ {
+ if (subfile.Name.CompareTo(dday) < 0)
+ {
+ subfile.Delete();
+ }
+ }
+ }
+ }
}
catch
{
@@ -6683,6 +7825,9 @@ namespace INT69DB_2A.Forms
}
public void SetTrackingHistoryData(DataStore.TrackingParameter eventType, string detail, string before, string after)
{
+ if (before == after)
+ return;
+
HistoryData data = new HistoryData();
data.Type = "Parameter";
@@ -6816,6 +7961,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;
@@ -6835,8 +7983,9 @@ namespace INT69DB_2A.Forms
// 통신 OPEN
this.OpenSmartUartLink();
- // Serial3 Open
- this.SerialUart3Open();
+ // Serial3 통신 Open
+ //this.SerialUart3Open();
+ this.UartCom3Open();
// 변수 초기 셋팅
this.DefaultSetting2();
@@ -7159,6 +8308,59 @@ namespace INT69DB_2A.Forms
this.timerUserList.Enabled = false;
UserManager.UserManager_GetUserListName();
}
+ private void timerTimeOutTransmission_Tick(object sender, EventArgs e)
+ {
+ this.timerTimeOutTransmission.Enabled = false;
+
+ #region COM3
+ switch (this.SystemConfig.Serial3Mode)
+ {
+ case 1:
+ this.UartCom3Write(this.Protocol_OPT1_NotStxEtx(this.CollectionWeightData));
+ break;
+ case 2:
+ this.UartCom3Write(this.Protocol_OPT2_NotStxEtx(this.CollectionWeightData));
+ break;
+ case 3:
+ this.UartCom3Write(this.Protocol_OPT3_NotStxEtx(this.CollectionWeightData));
+ break;
+ case 4:
+ this.UartCom3Write(this.Protocol_Printer(this.CollectionWeightData));
+ break;
+ case 5:
+ this.UartCom3Write(this.Protocol_OPT4_NotStxEtx(this.CollectionWeightData));
+ break;
+ default:
+ break;
+ }
+ #endregion
+
+ #region Ethernet
+ switch (this.SystemConfig.EthernetMode)
+ {
+ case 1:
+ this.SendEthernetData(this.Protocol_OPT1_NotStxEtx(this.CollectionWeightData));
+ break;
+ case 2:
+ this.SendEthernetData(this.Protocol_OPT2_NotStxEtx(this.CollectionWeightData));
+ break;
+ case 3:
+ this.SendEthernetData(this.Protocol_OPT3_NotStxEtx(this.CollectionWeightData));
+ break;
+ case 5:
+ this.SendEthernetData(this.Protocol_OPT4_NotStxEtx(this.CollectionWeightData));
+ break;
+ default:
+ break;
+ }
+ #endregion
+
+ // DataBackup
+ this.TrackingInspectionData(this.CollectionWeightData);
+
+ foreach (WeightData data in this.CollectionWeightData)
+ data.IsUpdate = false;
+ }
#region UserManagerEvent
private void UserManager_UserListLogoutDataEvent(int status)
@@ -7287,7 +8489,10 @@ namespace INT69DB_2A.Forms
{
UserManager.UserMgr_user_info_t user = (UserManager.UserMgr_user_info_t)data;
- this.ChildFormUserEditor.CallBackUserListModifyInfoDataEvent(user);
+ if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormUserEditor)
+ this.ChildFormUserEditor.CallBackUserListModifyInfoDataEvent(user);
+ //else if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)
+ // this.ChildFormMainDisplay.CallBackUserListModifyInfoDataEvent(user);
}
catch
{
diff --git a/INT69DB_2A/Forms/FormMain.resx b/INT69DB_2A/Forms/FormMain.resx
index 4edb31b..5221b95 100644
--- a/INT69DB_2A/Forms/FormMain.resx
+++ b/INT69DB_2A/Forms/FormMain.resx
@@ -118,37 +118,43 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- 17, 17
+ 12, 8
- 888, 17
+ 883, 8
- 533, 17
+ 528, 8
- 300, 17
+ 295, 8
- 744, 17
+ 739, 8
- 410, 17
+ 405, 8
- 142, 17
+ 137, 8
- 1003, 17
+ 998, 8
- 1171, 17
+ 301, 49
- 17, 56
+ 12, 47
- 177, 56
+ 172, 47
+
+
+ 442, 49
+
+
+ 643, 49
WEBPAD
@@ -157,6 +163,6 @@
False
- 85
+ 108
\ No newline at end of file
diff --git a/INT69DB_2A/Forms/FormMainDisplay.cs b/INT69DB_2A/Forms/FormMainDisplay.cs
index 2744063..10e43f7 100644
--- a/INT69DB_2A/Forms/FormMainDisplay.cs
+++ b/INT69DB_2A/Forms/FormMainDisplay.cs
@@ -14,18 +14,22 @@ using INT69DB_2A_ImageDll;
using INT69DB_2A.Controls;
using INT69DB_2A.DialogForms;
using INT69DB_2A.Part11_UserManager;
+using System.Text.RegularExpressions;
namespace INT69DB_2A.Forms
{
public partial class FormMainDisplay : Form
{
#region Field
+ UserManager.UserMgr_user_info_t UserInfo = new UserManager.UserMgr_user_info_t();
+ public string ChangeID;
+
private FormMain m_ParentForm;
private Color ColorButtonAccessTrue;
private Color ColorButtonAccessFalse;
- private DataStore.FormMainDisplayStore MainDisplay;
+ private DataStore.MainDisplayStore MainDisplay;
private ControlMainDisplayDotGraph2 MainDisplayDotGraph2;
private ControlMainDisplayDotGraph3 MainDisplayDotGraph3;
@@ -249,7 +253,7 @@ namespace INT69DB_2A.Forms
this.Controls.Add(this.MainDisplayEachBarGraph2);
this.MainDisplayEachBarGraph2.BringToFront();
this.MainDisplayEachBarGraph2.Location = new Point(0, 63);
- this.MainDisplay = DataStore.FormMainDisplayStore.FormMainDisplayBarGraph;
+ this.MainDisplay = DataStore.MainDisplayStore.BarGraph;
this.MainDisplayDotGraph2 = new ControlMainDisplayDotGraph2(this);
this.Controls.Add(this.MainDisplayDotGraph2);
@@ -266,7 +270,7 @@ namespace INT69DB_2A.Forms
this.Controls.Add(this.MainDisplayEachBarGraph3);
this.MainDisplayEachBarGraph3.BringToFront();
this.MainDisplayEachBarGraph3.Location = new Point(0, 63);
- this.MainDisplay = DataStore.FormMainDisplayStore.FormMainDisplayBarGraph;
+ this.MainDisplay = DataStore.MainDisplayStore.BarGraph;
this.MainDisplayDotGraph3 = new ControlMainDisplayDotGraph3(this);
this.Controls.Add(this.MainDisplayDotGraph3);
@@ -283,7 +287,7 @@ namespace INT69DB_2A.Forms
this.Controls.Add(this.MainDisplayEachBarGraph4);
this.MainDisplayEachBarGraph4.BringToFront();
this.MainDisplayEachBarGraph4.Location = new Point(0, 63);
- this.MainDisplay = DataStore.FormMainDisplayStore.FormMainDisplayBarGraph;
+ this.MainDisplay = DataStore.MainDisplayStore.BarGraph;
this.MainDisplayDotGraph4 = new ControlMainDisplayDotGraph4(this);
this.Controls.Add(this.MainDisplayDotGraph4);
@@ -300,7 +304,7 @@ namespace INT69DB_2A.Forms
this.Controls.Add(this.MainDisplayEachBarGraph5);
this.MainDisplayEachBarGraph5.BringToFront();
this.MainDisplayEachBarGraph5.Location = new Point(0, 63);
- this.MainDisplay = DataStore.FormMainDisplayStore.FormMainDisplayBarGraph;
+ this.MainDisplay = DataStore.MainDisplayStore.BarGraph;
this.MainDisplayDotGraph5 = new ControlMainDisplayDotGraph5(this);
this.Controls.Add(this.MainDisplayDotGraph5);
@@ -317,7 +321,7 @@ namespace INT69DB_2A.Forms
this.Controls.Add(this.MainDisplayEachBarGraph6);
this.MainDisplayEachBarGraph6.BringToFront();
this.MainDisplayEachBarGraph6.Location = new Point(0, 63);
- this.MainDisplay = DataStore.FormMainDisplayStore.FormMainDisplayBarGraph;
+ this.MainDisplay = DataStore.MainDisplayStore.BarGraph;
this.MainDisplayDotGraph6 = new ControlMainDisplayDotGraph6(this);
this.Controls.Add(this.MainDisplayDotGraph6);
@@ -334,7 +338,7 @@ namespace INT69DB_2A.Forms
this.Controls.Add(this.MainDisplayEachBarGraph7);
this.MainDisplayEachBarGraph7.BringToFront();
this.MainDisplayEachBarGraph7.Location = new Point(0, 63);
- this.MainDisplay = DataStore.FormMainDisplayStore.FormMainDisplayBarGraph;
+ this.MainDisplay = DataStore.MainDisplayStore.BarGraph;
this.MainDisplayDotGraph7 = new ControlMainDisplayDotGraph7(this);
this.Controls.Add(this.MainDisplayDotGraph7);
@@ -351,7 +355,7 @@ namespace INT69DB_2A.Forms
this.Controls.Add(this.MainDisplayEachBarGraph8);
this.MainDisplayEachBarGraph8.BringToFront();
this.MainDisplayEachBarGraph8.Location = new Point(0, 63);
- this.MainDisplay = DataStore.FormMainDisplayStore.FormMainDisplayBarGraph;
+ this.MainDisplay = DataStore.MainDisplayStore.BarGraph;
this.MainDisplayDotGraph8 = new ControlMainDisplayDotGraph8(this);
this.Controls.Add(this.MainDisplayDotGraph8);
@@ -368,7 +372,7 @@ namespace INT69DB_2A.Forms
this.Controls.Add(this.MainDisplayEachBarGraph10);
this.MainDisplayEachBarGraph10.BringToFront();
this.MainDisplayEachBarGraph10.Location = new Point(0, 63);
- this.MainDisplay = DataStore.FormMainDisplayStore.FormMainDisplayBarGraph;
+ this.MainDisplay = DataStore.MainDisplayStore.BarGraph;
this.MainDisplayDotGraph10 = new ControlMainDisplayDotGraph10(this);
this.Controls.Add(this.MainDisplayDotGraph10);
@@ -388,6 +392,7 @@ namespace INT69DB_2A.Forms
private void DefaultSetting()
{
this.RescaleControl();
+ this.ChangeID = "";
this.ColorButtonAccessTrue = Color.Black;
this.ColorButtonAccessFalse = Color.DimGray;
@@ -448,19 +453,116 @@ namespace INT69DB_2A.Forms
}
}
+ private void PasswordExpirationCheck(UserItem user)
+ {
+ int expiryDay = 0;
+
+ // 만료일 -10 일때 메시지 띄우기
+ expiryDay = user.GetPasswordExpiryDday();
+ if (expiryDay >= -10)
+ {
+ Console.WriteLine("password : " + expiryDay.ToString());
+ DialogFormYesNo myDlg = new DialogFormYesNo(this.ParentForm.SystemConfig.Language, 2, expiryDay.ToString());
+ if (myDlg.ShowDialog() == DialogResult.Yes)
+ {
+ // 비밀 번호 변경 띄우기
+ DialogFormLogOn logOn = new DialogFormLogOn(this.ParentForm, true, true);
+ if (logOn.ShowDialog() == DialogResult.OK)
+ {
+
+ }
+ }
+ }
+ }
+ private void DirectLogin(string id, string pass)
+ {
+ UserManager.UserMgr_user_info_t userInfo = new UserManager.UserMgr_user_info_t();
+
+ UserManager.UserManager_UserLoginDirect(id, pass, ref userInfo);
+ Console.WriteLine(string.Format("status : {0}", userInfo.status));
+ Console.WriteLine("ID : " + id);
+ Console.WriteLine("pass : " + pass);
+
+ if (userInfo.status == 0)
+ {
+ #region 로그인 성공
+ if (userInfo.active_level == 1)
+ this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Level1;
+ else if (userInfo.active_level == 2)
+ this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Level2;
+ else if (userInfo.active_level == 3)
+ this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Level3;
+ else if (userInfo.active_level == 9)
+ this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Admin;
+ else if (userInfo.active_level == 10)
+ this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Developer;
+
+ this.ParentForm.SystemConfig.CurrentUser.ID = userInfo.user_id;
+ this.ParentForm.SystemConfig.CurrentUser.Password = userInfo.user_pw;
+
+ this.ParentForm.SystemConfig.CurrentUser.ExpireId = userInfo.id_expire_period;
+ this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = userInfo.password_expire_period;
+
+ DateTime time = DateTime.ParseExact(userInfo.password_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.ParentForm.SystemConfig.CurrentUser.DatePasswordRegister = time;
+ time = DateTime.ParseExact(userInfo.id_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.ParentForm.SystemConfig.CurrentUser.DateIdLogin = time;
+ time = DateTime.ParseExact(userInfo.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.ParentForm.SystemConfig.CurrentUser.DatePasswordExpire = time;
+ time = DateTime.ParseExact(userInfo.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.ParentForm.SystemConfig.CurrentUser.DateIdExpire = time;
+
+ this.ParentForm.SystemConfig.CurrentUser.IsLockAccount = userInfo.id_flock_status == 0 ? false : true;
+ 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;
+ #endregion
+
+ this.UI_Invoke(delegate
+ {
+ this.UpdateDisplayUser(this.ParentForm.SystemConfig.CurrentUser);
+ });
+ }
+ }
private void Login()
{
- DialogFormLogOn logOn = new DialogFormLogOn(this.ParentForm);
- if (logOn.ShowDialog() == DialogResult.OK)
+ DialogResult result;
+
+ DialogFormLogOn logOn = new DialogFormLogOn(this.ParentForm, false, false);
+ result = logOn.ShowDialog();
+
+ if (result == DialogResult.OK)
{
- this.DisplayRefresh();
+ if (this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Level1 ||
+ this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Level2 ||
+ this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Level3)
+ {
+ // 비밀번호 만료일 10일 미만 체크 후 비밀번호 변경
+ this.PasswordExpirationCheck(this.ParentForm.SystemConfig.CurrentUser);
+ }
+
this.buttonUser.ButtonDown();
- //this.ParentForm.TimerAutomaticLogout(true, this.ParentForm.SystemConfig.AutomaticLogout);
+ this.UpdateDisplayUser(this.ParentForm.SystemConfig.CurrentUser);
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Login, "");
}
+ else if (result == DialogResult.Abort)
+ {
+
+ // 비밀 번호 변경 띄우기
+ DialogFormLogOn logOn1 = new DialogFormLogOn(this.ParentForm, false, true);
+ if (logOn1.ShowDialog() == DialogResult.OK)
+ {
+ this.buttonUser.ButtonDown();
+ this.UpdateDisplayUser(this.ParentForm.SystemConfig.CurrentUser);
+ }
+ else
+ this.buttonUser.ButtonUp();
+ }
else
{
this.buttonUser.ButtonUp();
@@ -471,6 +573,7 @@ namespace INT69DB_2A.Forms
this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.LogOut;
this.buttonUser.ButtonUp();
this.DisplayRefresh();
+ this.ChangeID = "";
// Part 11
if (this.ParentForm.SystemConfig.IsPart11 == true)
@@ -480,6 +583,7 @@ namespace INT69DB_2A.Forms
{
UserManager.UserManager_AutoLogoutTimeoutReset();
}
+
public string DisplayExpireOfPassword(DataStore.UserGroup group)
{
string ret = "";
@@ -489,7 +593,7 @@ namespace INT69DB_2A.Forms
else
{
//TimeSpan resultTime = DateTime.Now - this.ParentForm.CurrentSystemStatus.CurrentUser.DateExpireRegister;
- TimeSpan dayDiff = DateTime.Now.Date - this.ParentForm.SystemConfig.CurrentUser.DateExpireRegister.Date;
+ TimeSpan dayDiff = DateTime.Now.Date - this.ParentForm.SystemConfig.CurrentUser.DatePasswordExpire.Date;
ret = dayDiff.Days.ToString();
}
@@ -522,9 +626,9 @@ namespace INT69DB_2A.Forms
}
- private void UpdateDisplay(DataStore.FormMainDisplayStore displayForm)
+ private void UpdateDisplay(DataStore.MainDisplayStore displayForm)
{
- if (displayForm == DataStore.FormMainDisplayStore.FormMainDisplayBarGraph)
+ if (displayForm == DataStore.MainDisplayStore.BarGraph)
{
#region BarGraph
switch (this.ParentForm.SystemConfig.EquipmentColumns)
@@ -599,7 +703,7 @@ namespace INT69DB_2A.Forms
this.UpdateDisplayButton(SmartButton.BUTSTATUS.DOWN, SmartButton.BUTSTATUS.UP, SmartButton.BUTSTATUS.UP);
#endregion
}
- else if (displayForm == DataStore.FormMainDisplayStore.FormMainDisplayDotGraph)
+ else if (displayForm == DataStore.MainDisplayStore.LineGraph)
{
#region DotGraph
switch (this.ParentForm.SystemConfig.EquipmentColumns)
@@ -674,7 +778,7 @@ namespace INT69DB_2A.Forms
this.UpdateDisplayButton(SmartButton.BUTSTATUS.UP, SmartButton.BUTSTATUS.DOWN, SmartButton.BUTSTATUS.UP);
#endregion
}
- else if (displayForm == DataStore.FormMainDisplayStore.FormMainDisplayTable)
+ else if (displayForm == DataStore.MainDisplayStore.Table)
{
#region Table
switch (this.ParentForm.SystemConfig.EquipmentColumns)
@@ -769,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)
{
@@ -856,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;
@@ -924,7 +1030,7 @@ namespace INT69DB_2A.Forms
this.labelExpireOfPassword.Visible = false;
- if (this.labelUserLevel.ForeColor != this.ParentForm.ColorLogOn)
+ if (this.labelUserLevel.ForeColor != this.ParentForm.ColorLogOff)
this.labelUserLevel.ForeColor = this.labelUserID.ForeColor = this.ParentForm.ColorLogOff;
this.buttonUser.ButtonUp();
@@ -946,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 = "-";
}
}
@@ -992,8 +1096,84 @@ 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()
+ {
+ switch (this.ParentForm.SystemConfig.EquipmentColumns)
+ {
+ case 2:
+ if (this.MainDisplayEachBarGraph2 != null)
+ this.MainDisplayEachBarGraph2.Clear();
+ if (this.MainDisplayDotGraph2 != null)
+ this.MainDisplayDotGraph2.Clear();
+ if (this.MainDisplayTable2 != null)
+ this.MainDisplayTable2.Clear();
+ break;
+ case 3:
+ if (this.MainDisplayEachBarGraph3 != null)
+ this.MainDisplayEachBarGraph3.Clear();
+ if (this.MainDisplayDotGraph3 != null)
+ this.MainDisplayDotGraph3.Clear();
+ if (this.MainDisplayTable3 != null)
+ this.MainDisplayTable3.Clear();
+ break;
+ case 4:
+ if (this.MainDisplayEachBarGraph4 != null)
+ this.MainDisplayEachBarGraph4.Clear();
+ if (this.MainDisplayDotGraph4 != null)
+ this.MainDisplayDotGraph4.Clear();
+ if (this.MainDisplayTable4 != null)
+ this.MainDisplayTable4.Clear();
+ break;
+ case 5:
+ if (this.MainDisplayEachBarGraph5 != null)
+ this.MainDisplayEachBarGraph5.Clear();
+ if (this.MainDisplayDotGraph5 != null)
+ this.MainDisplayDotGraph5.Clear();
+ if (this.MainDisplayTable5 != null)
+ this.MainDisplayTable5.Clear();
+ break;
+ case 6:
+ if (this.MainDisplayEachBarGraph6 != null)
+ this.MainDisplayEachBarGraph6.Clear();
+ if (this.MainDisplayDotGraph6 != null)
+ this.MainDisplayDotGraph6.Clear();
+ if (this.MainDisplayTable6 != null)
+ this.MainDisplayTable6.Clear();
+ break;
+ case 7:
+ if (this.MainDisplayEachBarGraph7 != null)
+ this.MainDisplayEachBarGraph7.Clear();
+ if (this.MainDisplayDotGraph7 != null)
+ this.MainDisplayDotGraph7.Clear();
+ if (this.MainDisplayTable7 != null)
+ this.MainDisplayTable7.Clear();
+ break;
+ case 8:
+ if (this.MainDisplayEachBarGraph8 != null)
+ this.MainDisplayEachBarGraph8.Clear();
+ if (this.MainDisplayDotGraph8 != null)
+ this.MainDisplayDotGraph8.Clear();
+ if (this.MainDisplayTable8 != null)
+ this.MainDisplayTable8.Clear();
+ break;
+ case 10:
+ if (this.MainDisplayEachBarGraph10 != null)
+ this.MainDisplayEachBarGraph10.Clear();
+ if (this.MainDisplayDotGraph10 != null)
+ this.MainDisplayDotGraph10.Clear();
+ if (this.MainDisplayTable10 != null)
+ this.MainDisplayTable10.Clear();
+ break;
+ default:
+ break;
+ }
}
-
public void RescaleControl()
{
switch (this.ParentForm.SystemConfig.EquipmentColumns)
@@ -1067,78 +1247,6 @@ namespace INT69DB_2A.Forms
this.ParentForm.TransferProductParameter(productNumber);
}
- public void Clear()
- {
- switch (this.ParentForm.SystemConfig.EquipmentColumns)
- {
- case 2:
- if (this.MainDisplayEachBarGraph2 != null)
- this.MainDisplayEachBarGraph2.Clear();
- if (this.MainDisplayDotGraph2 != null)
- this.MainDisplayDotGraph2.Clear();
- if (this.MainDisplayTable2 != null)
- this.MainDisplayTable2.Clear();
- break;
- case 3:
- if (this.MainDisplayEachBarGraph3 != null)
- this.MainDisplayEachBarGraph3.Clear();
- if (this.MainDisplayDotGraph3 != null)
- this.MainDisplayDotGraph3.Clear();
- if (this.MainDisplayTable3 != null)
- this.MainDisplayTable3.Clear();
- break;
- case 4:
- if (this.MainDisplayEachBarGraph4 != null)
- this.MainDisplayEachBarGraph4.Clear();
- if (this.MainDisplayDotGraph4 != null)
- this.MainDisplayDotGraph4.Clear();
- if (this.MainDisplayTable4 != null)
- this.MainDisplayTable4.Clear();
- break;
- case 5:
- if (this.MainDisplayEachBarGraph5 != null)
- this.MainDisplayEachBarGraph5.Clear();
- if (this.MainDisplayDotGraph5 != null)
- this.MainDisplayDotGraph5.Clear();
- if (this.MainDisplayTable5 != null)
- this.MainDisplayTable5.Clear();
- break;
- case 6:
- if (this.MainDisplayEachBarGraph6 != null)
- this.MainDisplayEachBarGraph6.Clear();
- if (this.MainDisplayDotGraph6 != null)
- this.MainDisplayDotGraph6.Clear();
- if (this.MainDisplayTable6 != null)
- this.MainDisplayTable6.Clear();
- break;
- case 7:
- if (this.MainDisplayEachBarGraph7 != null)
- this.MainDisplayEachBarGraph7.Clear();
- if (this.MainDisplayDotGraph7 != null)
- this.MainDisplayDotGraph7.Clear();
- if (this.MainDisplayTable7 != null)
- this.MainDisplayTable7.Clear();
- break;
- case 8:
- if (this.MainDisplayEachBarGraph8 != null)
- this.MainDisplayEachBarGraph8.Clear();
- if (this.MainDisplayDotGraph8 != null)
- this.MainDisplayDotGraph8.Clear();
- if (this.MainDisplayTable8 != null)
- this.MainDisplayTable8.Clear();
- break;
- case 10:
- if (this.MainDisplayEachBarGraph10 != null)
- this.MainDisplayEachBarGraph10.Clear();
- if (this.MainDisplayDotGraph10 != null)
- this.MainDisplayDotGraph10.Clear();
- if (this.MainDisplayTable10 != null)
- this.MainDisplayTable10.Clear();
- break;
- default:
- break;
- }
- }
public void IconEthernetVisible(bool enable)
{
this.pictureBoxEthernetConnection.Visible = enable;
@@ -1279,6 +1387,56 @@ namespace INT69DB_2A.Forms
});
}
}
+ public void CallBackUserListModifyInfoDataEvent(UserManager.UserMgr_user_info_t userInfo)
+ {
+ Console.WriteLine("status : " + userInfo.status.ToString());
+ Console.WriteLine("ID : " + userInfo.user_id);
+ Console.WriteLine("pass : " + userInfo.user_pw);
+ if (userInfo.status == 0)
+ {
+ Console.WriteLine("Group : " + this.ParentForm.SystemConfig.CurrentUser.Group.ToString());
+ if (this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.LogOut)
+ {
+ Console.WriteLine("DirectLogin");
+ this.DirectLogin(userInfo.user_id, userInfo.user_pw);
+ }
+ else
+ {
+ if (userInfo.active_level == 1)
+ this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Level1;
+ else if (userInfo.active_level == 2)
+ this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Level2;
+ else if (userInfo.active_level == 3)
+ this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Level3;
+ else if (userInfo.active_level == 9)
+ this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Admin;
+ else if (userInfo.active_level == 10)
+ this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Developer;
+
+ this.ParentForm.SystemConfig.CurrentUser.ID = userInfo.user_id;
+ this.ParentForm.SystemConfig.CurrentUser.Password = userInfo.user_pw;
+
+ this.ParentForm.SystemConfig.CurrentUser.ExpireId = userInfo.id_expire_period;
+ this.ParentForm.SystemConfig.CurrentUser.ExpirePassword = userInfo.password_expire_period;
+
+ DateTime time = DateTime.ParseExact(userInfo.password_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.ParentForm.SystemConfig.CurrentUser.DatePasswordRegister = time;
+ time = DateTime.ParseExact(userInfo.id_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.ParentForm.SystemConfig.CurrentUser.DateIdLogin = time;
+ time = DateTime.ParseExact(userInfo.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.ParentForm.SystemConfig.CurrentUser.DateIdExpire = time;
+ time = DateTime.ParseExact(userInfo.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.ParentForm.SystemConfig.CurrentUser.DatePasswordExpire = time;
+
+ this.ParentForm.SystemConfig.CurrentUser.IsLockAccount = userInfo.id_flock_status == 0 ? false : true;
+ 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;
+ }
+ }
+ }
public void UpdateCurrentProductDisplay(DataStore.EquipmentStatus status, ProductItem pItem, JudgmentSetItem jItem,Collection weightDatas)
{
@@ -1576,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 = "";
@@ -1656,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 = "";
@@ -1739,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)
{
@@ -1813,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)
{
@@ -1881,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)
{
@@ -1943,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)
{
@@ -1999,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)
{
@@ -2049,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)
{
@@ -2093,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)
{
@@ -2131,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)
{
@@ -2163,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)
{
@@ -2299,7 +2457,7 @@ namespace INT69DB_2A.Forms
private void buttonProductNo_Click(object sender, EventArgs e)
{
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonProductNo.Text, 4, 0, false, this.ParentForm.SystemConfig.Language);
@@ -2325,7 +2483,7 @@ namespace INT69DB_2A.Forms
string value = "";
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
before = this.buttonUnder.Text;
@@ -2370,7 +2528,7 @@ namespace INT69DB_2A.Forms
string value = "";
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
before = this.buttonPass.Text;
@@ -2412,7 +2570,7 @@ namespace INT69DB_2A.Forms
string value = "";
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
before = this.buttonOver.Text;
@@ -2457,7 +2615,7 @@ namespace INT69DB_2A.Forms
string value = "";
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
before = this.buttonTare.Text;
@@ -2493,7 +2651,7 @@ namespace INT69DB_2A.Forms
private void buttonScaleZero_Click(object sender, EventArgs e)
{
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
this.ParentForm.TransferData(CommunicationCommand.Zero, CommunicationID.SubBoardAll);
@@ -2502,7 +2660,7 @@ namespace INT69DB_2A.Forms
private void buttonClear_Click(object sender, EventArgs e)
{
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
DialogFormYesNo myDlg = new DialogFormYesNo(this.ParentForm.SystemConfig.Language, 8);
@@ -2517,7 +2675,7 @@ namespace INT69DB_2A.Forms
if (this.ParentForm.EquipmentStatus == DataStore.EquipmentStatus.Stop)
{
// Automatic Logout Pause
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
UserManager.UserManager_AutoLogoutTimeoutPause();
this.ParentForm.ChildFormMenu.DisplayRefresh();
@@ -2526,7 +2684,7 @@ namespace INT69DB_2A.Forms
else
{
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
this.panelSetting.BringToFront();
@@ -2536,7 +2694,7 @@ namespace INT69DB_2A.Forms
private void buttonDisplay_Click(object sender, EventArgs e)
{
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
SmartButton button = sender as SmartButton;
@@ -2545,13 +2703,13 @@ namespace INT69DB_2A.Forms
return;
if (button == this.buttonBarGraphForm)
- this.MainDisplay = DataStore.FormMainDisplayStore.FormMainDisplayBarGraph;
+ this.MainDisplay = DataStore.MainDisplayStore.BarGraph;
else if (button == this.buttonDotGraphForm)
- this.MainDisplay = DataStore.FormMainDisplayStore.FormMainDisplayDotGraph;
+ this.MainDisplay = DataStore.MainDisplayStore.LineGraph;
else if (button == this.buttonTableForm)
- this.MainDisplay = DataStore.FormMainDisplayStore.FormMainDisplayTable;
+ this.MainDisplay = DataStore.MainDisplayStore.Table;
else
- this.MainDisplay = DataStore.FormMainDisplayStore.FormMainDisplayBarGraph;
+ this.MainDisplay = DataStore.MainDisplayStore.BarGraph;
this.UpdateDisplay(this.MainDisplay);
}
@@ -2561,7 +2719,7 @@ namespace INT69DB_2A.Forms
// 관리자 : admin00 / admin12!
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
if (this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.LogOut)
@@ -2584,7 +2742,7 @@ namespace INT69DB_2A.Forms
string value = "";
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
before = this.labelSorterDelayTime.Text;
@@ -2620,7 +2778,7 @@ namespace INT69DB_2A.Forms
string value = "";
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
before = this.labelSorterRunTime.Text;
@@ -2657,7 +2815,7 @@ namespace INT69DB_2A.Forms
string value = "";
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
before = this.labelDischargeConveyorDelayTime.Text;
@@ -2693,7 +2851,7 @@ namespace INT69DB_2A.Forms
string value = "";
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
before = this.labelDischargeConveyorOperatingTime.Text;
@@ -2729,7 +2887,7 @@ namespace INT69DB_2A.Forms
string value = "";
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
before = this.labelFeedingConveyorDelayTime.Text;
@@ -2765,7 +2923,7 @@ namespace INT69DB_2A.Forms
string value = "";
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
before = this.labelFeedingConveyorOperatingTime.Text;
@@ -2798,7 +2956,7 @@ namespace INT69DB_2A.Forms
private void labelTotalCount_Click(object sender, EventArgs e)
{
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
lock (this)
@@ -2815,7 +2973,7 @@ namespace INT69DB_2A.Forms
private void buttonSubMenu_Click(object sender, EventArgs e)
{
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
if (this.buttonSubMenu.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
@@ -2829,7 +2987,7 @@ namespace INT69DB_2A.Forms
private void buttonBypassDirection_Click(object sender, EventArgs e)
{
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
if (this.buttonBypassDirection.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
@@ -2840,7 +2998,7 @@ namespace INT69DB_2A.Forms
private void buttonBypassOnce_Click(object sender, EventArgs e)
{
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
if (this.buttonBypassOnce.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
@@ -2857,7 +3015,7 @@ namespace INT69DB_2A.Forms
private void buttonBypassRun_Click(object sender, EventArgs e)
{
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
if (this.ParentForm.SystemConfig.IsBypassOnce == true)
@@ -2913,7 +3071,7 @@ namespace INT69DB_2A.Forms
private void buttonPrint_Click(object sender, EventArgs e)
{
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
if (this.buttonPrint.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
@@ -2935,7 +3093,7 @@ namespace INT69DB_2A.Forms
private void buttonClose_Click(object sender, EventArgs e)
{
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
this.Part11AutomaticLogoutReset();
this.panelSetting.Visible = false;
@@ -2943,10 +3101,10 @@ namespace INT69DB_2A.Forms
private void buttonCut_Click(object sender, EventArgs e)
{
// Automatic Logout Reset
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ 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/Forms/FormMenu.Designer.cs b/INT69DB_2A/Forms/FormMenu.Designer.cs
index 7930286..9417122 100644
--- a/INT69DB_2A/Forms/FormMenu.Designer.cs
+++ b/INT69DB_2A/Forms/FormMenu.Designer.cs
@@ -48,11 +48,12 @@
this.labelUserLevel = new SmartX.SmartLabel();
this.labelUserID = new SmartX.SmartLabel();
this.buttonUser = new SmartX.SmartButton();
- this.buttonFunction = new SmartX.SmartButton();
+ this.buttonHidden = new SmartX.SmartButton();
this.buttonCommunication = new SmartX.SmartButton();
this.buttonDataStatistics = new SmartX.SmartButton();
this.buttonDataViewer = new SmartX.SmartButton();
this.labelExpireOfPassword = new SmartX.SmartLabel();
+ this.buttonOption = new SmartX.SmartButton();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.SuspendLayout();
//
@@ -114,7 +115,7 @@
this.buttonTime.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonTime.DownImage")));
this.buttonTime.GroupID = 0;
this.buttonTime.InitVisible = true;
- this.buttonTime.Location = new System.Drawing.Point(87, 349);
+ this.buttonTime.Location = new System.Drawing.Point(213, 349);
this.buttonTime.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonTime.Name = "buttonTime";
this.buttonTime.NestedClickEventPrevent = false;
@@ -421,7 +422,7 @@
this.buttonEquipment.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEquipment.DownImage")));
this.buttonEquipment.GroupID = 0;
this.buttonEquipment.InitVisible = true;
- this.buttonEquipment.Location = new System.Drawing.Point(87, 475);
+ this.buttonEquipment.Location = new System.Drawing.Point(87, 349);
this.buttonEquipment.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonEquipment.Name = "buttonEquipment";
this.buttonEquipment.NestedClickEventPrevent = false;
@@ -438,7 +439,6 @@
this.buttonEquipment.TextLocation = new System.Drawing.Point(0, 0);
this.buttonEquipment.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonEquipment.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonEquipment.UpImage")));
- this.buttonEquipment.Visible = false;
this.buttonEquipment.Click += new System.EventHandler(this.buttonMenu_Click);
//
// buttonIOTest
@@ -484,7 +484,7 @@
this.buttonTest.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonTest.DownImage")));
this.buttonTest.GroupID = 0;
this.buttonTest.InitVisible = true;
- this.buttonTest.Location = new System.Drawing.Point(591, 349);
+ this.buttonTest.Location = new System.Drawing.Point(87, 475);
this.buttonTest.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonTest.Name = "buttonTest";
this.buttonTest.NestedClickEventPrevent = false;
@@ -501,6 +501,7 @@
this.buttonTest.TextLocation = new System.Drawing.Point(0, 0);
this.buttonTest.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonTest.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonTest.UpImage")));
+ this.buttonTest.Visible = false;
this.buttonTest.Click += new System.EventHandler(this.buttonMenu_Click);
//
// labelUserLevel
@@ -557,7 +558,7 @@
this.buttonUser.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonUser.DownImage")));
this.buttonUser.GroupID = 0;
this.buttonUser.InitVisible = true;
- this.buttonUser.Location = new System.Drawing.Point(213, 349);
+ this.buttonUser.Location = new System.Drawing.Point(591, 349);
this.buttonUser.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonUser.Name = "buttonUser";
this.buttonUser.NestedClickEventPrevent = false;
@@ -576,37 +577,37 @@
this.buttonUser.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonUser.UpImage")));
this.buttonUser.Click += new System.EventHandler(this.buttonMenu_Click);
//
- // buttonFunction
+ // buttonHidden
//
- this.buttonFunction.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(65)))), ((int)(((byte)(41)))));
- this.buttonFunction.BackPictureBox = null;
- this.buttonFunction.BackPictureBox1 = null;
- this.buttonFunction.BackPictureBox2 = null;
- this.buttonFunction.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(65)))), ((int)(((byte)(41)))));
- this.buttonFunction.ButtonImageAutoSize = true;
- this.buttonFunction.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonFunction.DisableImage = null;
- this.buttonFunction.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonFunction.DownImage")));
- this.buttonFunction.GroupID = 0;
- this.buttonFunction.InitVisible = true;
- this.buttonFunction.Location = new System.Drawing.Point(719, 449);
- this.buttonFunction.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
- this.buttonFunction.Name = "buttonFunction";
- this.buttonFunction.NestedClickEventPrevent = false;
- this.buttonFunction.OutlinePixel = 1;
- this.buttonFunction.RepeatInterval = 200;
- this.buttonFunction.RepeatIntervalAccelerate = null;
- this.buttonFunction.SafeInterval = 200;
- this.buttonFunction.Size = new System.Drawing.Size(70, 70);
- this.buttonFunction.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.SAFE;
- this.buttonFunction.TabIndex = 162;
- this.buttonFunction.TextColor = System.Drawing.Color.Black;
- this.buttonFunction.TextDownColor = System.Drawing.Color.White;
- this.buttonFunction.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
- this.buttonFunction.TextLocation = new System.Drawing.Point(0, 0);
- this.buttonFunction.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
- this.buttonFunction.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonFunction.UpImage")));
- this.buttonFunction.Click += new System.EventHandler(this.buttonFunction_Click);
+ this.buttonHidden.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(65)))), ((int)(((byte)(41)))));
+ this.buttonHidden.BackPictureBox = null;
+ this.buttonHidden.BackPictureBox1 = null;
+ this.buttonHidden.BackPictureBox2 = null;
+ this.buttonHidden.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(65)))), ((int)(((byte)(41)))));
+ this.buttonHidden.ButtonImageAutoSize = true;
+ this.buttonHidden.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonHidden.DisableImage = null;
+ this.buttonHidden.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonHidden.DownImage")));
+ this.buttonHidden.GroupID = 0;
+ this.buttonHidden.InitVisible = true;
+ this.buttonHidden.Location = new System.Drawing.Point(719, 449);
+ this.buttonHidden.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
+ this.buttonHidden.Name = "buttonHidden";
+ this.buttonHidden.NestedClickEventPrevent = false;
+ this.buttonHidden.OutlinePixel = 1;
+ this.buttonHidden.RepeatInterval = 200;
+ this.buttonHidden.RepeatIntervalAccelerate = null;
+ this.buttonHidden.SafeInterval = 200;
+ this.buttonHidden.Size = new System.Drawing.Size(70, 70);
+ this.buttonHidden.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.SAFE;
+ this.buttonHidden.TabIndex = 162;
+ this.buttonHidden.TextColor = System.Drawing.Color.Black;
+ this.buttonHidden.TextDownColor = System.Drawing.Color.White;
+ this.buttonHidden.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonHidden.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonHidden.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonHidden.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonHidden.UpImage")));
+ this.buttonHidden.Click += new System.EventHandler(this.buttonHidden_Click);
//
// buttonCommunication
//
@@ -668,6 +669,7 @@
this.buttonDataStatistics.TextLocation = new System.Drawing.Point(0, 0);
this.buttonDataStatistics.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonDataStatistics.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonDataStatistics.UpImage")));
+ this.buttonDataStatistics.Visible = false;
this.buttonDataStatistics.Click += new System.EventHandler(this.buttonMenu_Click);
//
// buttonDataViewer
@@ -699,6 +701,7 @@
this.buttonDataViewer.TextLocation = new System.Drawing.Point(0, 0);
this.buttonDataViewer.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonDataViewer.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonDataViewer.UpImage")));
+ this.buttonDataViewer.Visible = false;
this.buttonDataViewer.Click += new System.EventHandler(this.buttonMenu_Click);
//
// labelExpireOfPassword
@@ -722,17 +725,50 @@
this.labelExpireOfPassword.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelExpireOfPassword.Wordwrap = false;
//
+ // buttonOption
+ //
+ this.buttonOption.BackPictureBox = null;
+ this.buttonOption.BackPictureBox1 = null;
+ this.buttonOption.BackPictureBox2 = null;
+ this.buttonOption.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonOption.ButtonImageAutoSize = true;
+ this.buttonOption.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonOption.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonOption.DisableImage")));
+ this.buttonOption.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonOption.DownImage")));
+ this.buttonOption.GroupID = 0;
+ this.buttonOption.InitVisible = true;
+ this.buttonOption.Location = new System.Drawing.Point(213, 475);
+ this.buttonOption.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
+ this.buttonOption.Name = "buttonOption";
+ this.buttonOption.NestedClickEventPrevent = false;
+ this.buttonOption.OutlinePixel = 1;
+ this.buttonOption.RepeatInterval = 200;
+ this.buttonOption.RepeatIntervalAccelerate = null;
+ this.buttonOption.SafeInterval = 200;
+ this.buttonOption.Size = new System.Drawing.Size(120, 120);
+ this.buttonOption.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonOption.TabIndex = 175;
+ this.buttonOption.TextColor = System.Drawing.Color.Black;
+ this.buttonOption.TextDownColor = System.Drawing.Color.White;
+ this.buttonOption.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonOption.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonOption.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonOption.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonOption.UpImage")));
+ this.buttonOption.Visible = false;
+ this.buttonOption.Click += new System.EventHandler(this.buttonMenu_Click);
+ //
// FormMenu
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.AutoScroll = true;
this.ClientSize = new System.Drawing.Size(800, 600);
+ this.Controls.Add(this.buttonOption);
this.Controls.Add(this.labelExpireOfPassword);
this.Controls.Add(this.buttonDataViewer);
this.Controls.Add(this.buttonDataStatistics);
this.Controls.Add(this.buttonCommunication);
- this.Controls.Add(this.buttonFunction);
+ this.Controls.Add(this.buttonHidden);
this.Controls.Add(this.buttonUser);
this.Controls.Add(this.labelUserID);
this.Controls.Add(this.labelUserLevel);
@@ -780,10 +816,11 @@
private SmartX.SmartLabel labelUserLevel;
private SmartX.SmartLabel labelUserID;
private SmartX.SmartButton buttonUser;
- private SmartX.SmartButton buttonFunction;
+ private SmartX.SmartButton buttonHidden;
private SmartX.SmartButton buttonCommunication;
private SmartX.SmartButton buttonDataStatistics;
private SmartX.SmartButton buttonDataViewer;
private SmartX.SmartLabel labelExpireOfPassword;
+ private SmartX.SmartButton buttonOption;
}
}
\ No newline at end of file
diff --git a/INT69DB_2A/Forms/FormMenu.cs b/INT69DB_2A/Forms/FormMenu.cs
index 5520432..b08f120 100644
--- a/INT69DB_2A/Forms/FormMenu.cs
+++ b/INT69DB_2A/Forms/FormMenu.cs
@@ -100,6 +100,9 @@ namespace INT69DB_2A.Forms
this.buttonDataViewer.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engFormMenuDataViewerDisable));
this.buttonDataViewer.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engFormMenuDataViewerDown));
this.buttonDataViewer.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engFormMenuDataViewerUp));
+ this.buttonOption.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engFormMenuOptionDisable));
+ this.buttonOption.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engFormMenuOptionDown));
+ this.buttonOption.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engFormMenuOptionUp));
}
else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese)
{
@@ -153,6 +156,9 @@ namespace INT69DB_2A.Forms
this.buttonDataViewer.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnFormMenuDataViewerDisable));
this.buttonDataViewer.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnFormMenuDataViewerDown));
this.buttonDataViewer.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnFormMenuDataViewerUp));
+ this.buttonOption.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnFormMenuOptionDisable));
+ this.buttonOption.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnFormMenuOptionDown));
+ this.buttonOption.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnFormMenuOptionUp));
}
else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Czech)
{
@@ -171,12 +177,9 @@ namespace INT69DB_2A.Forms
this.labelUserLevel.Visible = false;
this.labelExpireOfPassword.Visible = false;
- this.buttonEquipment.Visible = false;
this.buttonUser.Visible = false;
this.buttonTest.Visible = false;
-
- this.buttonTest.Location = new Point(339, 349);
- this.buttonTest.BringToFront();
+ this.buttonOption.Visible = false;
if (this.ParentForm.SystemConfig.IsPart11 == false)
{
@@ -191,7 +194,31 @@ 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;
+
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
+ {
+ this.buttonDataStatistics.Visible = true;
+ this.buttonDataViewer.Visible = true;
+ this.buttonUser.Visible = true;
+ }
+ else
+ {
+ this.buttonDataStatistics.Visible = false;
+ this.buttonDataViewer.Visible = false;
+
+ if (this.ParentForm.SystemConfig.IsLogin == true)
+ {
+ this.buttonUser.Location = new Point(this.buttonDataStatistics.Location.X, this.buttonDataStatistics.Location.Y);
+ this.buttonUser.Visible = true;
+ }
+ else
+ {
+ this.buttonUser.Visible = false;
+ }
+ }
switch (user.Group)
{
@@ -202,7 +229,11 @@ namespace INT69DB_2A.Forms
group = this.ParentForm.SystemConfig.User_Level1_Name;
if (this.ParentForm.SystemConfig.IsPart11 == true)
+ {
this.labelExpireOfPassword.Visible = true;
+ this.buttonDataStatistics.Visible = true;
+ this.buttonDataViewer.Visible = true;
+ }
if (this.labelUserLevel.ForeColor != this.ParentForm.ColorLogOn)
this.labelUserLevel.ForeColor = this.labelUserID.ForeColor = this.ParentForm.ColorLogOn;
@@ -210,7 +241,7 @@ namespace INT69DB_2A.Forms
this.buttonInformation.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuInformation;
this.buttonDataBackup.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuDataBackup;
this.buttonConfiguration.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuConfiguration;
- this.buttonCommunication.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuStatistics;
+ this.buttonCommunication.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuCommunication;
this.buttonCalibration.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuCalibration;
this.buttonSystem.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuSystem;
@@ -219,20 +250,25 @@ namespace INT69DB_2A.Forms
this.buttonInitialization.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuInitialization;
this.buttonIOTest.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuIOTest;
+ this.buttonEquipment.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuEquipment;
this.buttonTime.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuTime;
this.buttonUser.Enabled = true;
this.buttonDataStatistics.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuStatistics;
this.buttonDataViewer.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMenuViewer;
- this.buttonEquipment.Visible = false;
this.buttonTest.Visible = false;
+ this.buttonOption.Visible = false;
break;
case DataStore.UserGroup.Level2:
id = user.ID;
group = this.ParentForm.SystemConfig.User_Level2_Name;
if (this.ParentForm.SystemConfig.IsPart11 == true)
+ {
this.labelExpireOfPassword.Visible = true;
+ this.buttonDataStatistics.Visible = true;
+ this.buttonDataViewer.Visible = true;
+ }
if (this.labelUserLevel.ForeColor != this.ParentForm.ColorLogOn)
this.labelUserLevel.ForeColor = this.labelUserID.ForeColor = this.ParentForm.ColorLogOn;
@@ -240,7 +276,7 @@ namespace INT69DB_2A.Forms
this.buttonInformation.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuInformation;
this.buttonDataBackup.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuDataBackup;
this.buttonConfiguration.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuConfiguration;
- this.buttonCommunication.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuStatistics;
+ this.buttonCommunication.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuCommunication;
this.buttonCalibration.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuCalibration;
this.buttonSystem.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuSystem;
@@ -249,20 +285,25 @@ namespace INT69DB_2A.Forms
this.buttonInitialization.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuInitialization;
this.buttonIOTest.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuIOTest;
+ this.buttonEquipment.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuEquipment;
this.buttonTime.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuTime;
this.buttonUser.Enabled = true;
this.buttonDataStatistics.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuStatistics;
this.buttonDataViewer.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMenuViewer;
- this.buttonEquipment.Visible = false;
this.buttonTest.Visible = false;
+ this.buttonOption.Visible = false;
break;
case DataStore.UserGroup.Level3:
id = user.ID;
group = this.ParentForm.SystemConfig.User_Level3_Name;
if (this.ParentForm.SystemConfig.IsPart11 == true)
+ {
this.labelExpireOfPassword.Visible = true;
+ this.buttonDataStatistics.Visible = true;
+ this.buttonDataViewer.Visible = true;
+ }
if (this.labelUserLevel.ForeColor != this.ParentForm.ColorLogOn)
this.labelUserLevel.ForeColor = this.labelUserID.ForeColor = this.ParentForm.ColorLogOn;
@@ -270,7 +311,7 @@ namespace INT69DB_2A.Forms
this.buttonInformation.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuInformation;
this.buttonDataBackup.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuDataBackup;
this.buttonConfiguration.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuConfiguration;
- this.buttonCommunication.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuStatistics;
+ this.buttonCommunication.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuCommunication;
this.buttonCalibration.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuCalibration;
this.buttonSystem.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuSystem;
@@ -279,13 +320,14 @@ namespace INT69DB_2A.Forms
this.buttonInitialization.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuInitialization;
this.buttonIOTest.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuIOTest;
+ this.buttonEquipment.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuEquipment;
this.buttonTime.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuTime;
this.buttonUser.Enabled = true;
this.buttonDataStatistics.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuStatistics;
this.buttonDataViewer.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuViewer;
- this.buttonEquipment.Visible = false;
this.buttonTest.Visible = false;
+ this.buttonOption.Visible = false;
break;
case DataStore.UserGroup.Admin:
id = user.ID;
@@ -299,30 +341,35 @@ namespace INT69DB_2A.Forms
group = "Administrator";
if (this.ParentForm.SystemConfig.IsPart11 == true)
+ {
this.labelExpireOfPassword.Visible = true;
+ this.buttonDataStatistics.Visible = true;
+ this.buttonDataViewer.Visible = true;
+ }
if (this.labelUserLevel.ForeColor != this.ParentForm.ColorLogOn)
this.labelUserLevel.ForeColor = this.labelUserID.ForeColor = this.ParentForm.ColorLogOn;
- this.buttonInformation.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuInformation;
- this.buttonDataBackup.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuDataBackup;
- this.buttonConfiguration.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuConfiguration;
- this.buttonCommunication.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuStatistics;
- this.buttonCalibration.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuCalibration;
+ this.buttonInformation.Enabled = true;
+ this.buttonDataBackup.Enabled = true;
+ this.buttonConfiguration.Enabled = true;
+ this.buttonCommunication.Enabled = true;
+ this.buttonCalibration.Enabled = true;
- this.buttonSystem.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuSystem;
- this.buttonMotor.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuMotor;
- this.buttonUpdate.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuUpdate;
- this.buttonInitialization.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuInitialization;
- this.buttonIOTest.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuIOTest;
+ this.buttonSystem.Enabled = true;
+ this.buttonMotor.Enabled = true;
+ this.buttonUpdate.Enabled = true;
+ this.buttonInitialization.Enabled = true;
+ this.buttonIOTest.Enabled = true;
- this.buttonTime.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuTime;
+ this.buttonEquipment.Enabled = true;
+ this.buttonTime.Enabled = true;
this.buttonUser.Enabled = true;
- this.buttonDataStatistics.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuStatistics;
- this.buttonDataViewer.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMenuViewer;
+ this.buttonDataStatistics.Enabled = true;
+ this.buttonDataViewer.Enabled = true;
- this.buttonEquipment.Visible = false;
this.buttonTest.Visible = false;
+ this.buttonOption.Visible = false;
break;
case DataStore.UserGroup.Developer:
id = user.ID;
@@ -355,12 +402,12 @@ namespace INT69DB_2A.Forms
this.buttonEquipment.Enabled = true;
this.buttonTime.Enabled = true;
- this.buttonUser.Enabled = true;
this.buttonDataStatistics.Enabled = true;
this.buttonDataViewer.Enabled = true;
+ this.buttonUser.Enabled = true;
- this.buttonEquipment.Visible = true;
this.buttonTest.Visible = true;
+ this.buttonOption.Visible = true;
break;
case DataStore.UserGroup.NotLogin:
this.buttonInformation.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuInformation;
@@ -375,13 +422,15 @@ namespace INT69DB_2A.Forms
this.buttonInitialization.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuInitialization;
this.buttonIOTest.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuIOTest;
+ this.buttonEquipment.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuEquipment;
this.buttonTime.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuTime;
- this.buttonDataViewer.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuViewer;
- this.buttonDataStatistics.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuStatistics;
- this.buttonEquipment.Visible = false;
+ this.buttonDataViewer.Visible = false;
+ this.buttonDataStatistics.Visible = false;
+
this.buttonTest.Visible = false;
this.buttonUser.Visible = false;
+ this.buttonOption.Visible = false;
break;
case DataStore.UserGroup.LogOut:
if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.German)
@@ -399,49 +448,30 @@ namespace INT69DB_2A.Forms
break;
}
- if (this.ParentForm.SystemConfig.IsLogin == true)
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
{
- if (this.ParentForm.SystemConfig.IsPart11 == true)
+ if (user.ExpirePassword != 0)
{
- expireDate = this.ParentForm.ChildFormMainDisplay.DisplayExpireOfPassword(user.Group);
- if (expireDate != "-")
+ expireDate = user.GetPasswordExpiryDday();
+ colorExpirePW = this.ParentForm.ColorLogOn;
+ expirePW = "-";
+
+ if (expireDate < 9999)
{
- int intExpireDate = int.Parse(expireDate);
-
- if (intExpireDate == 0)
+ if (expireDate >= -10)
{
- 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;
+ colorExpirePW = this.ParentForm.ColorLogOff;
+ if (expireDate > 0)
+ expirePW = string.Format("D+{0}", expireDate);
else
- this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOn;
+ expirePW = string.Format("D{0}", expireDate);
}
else
{
- this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOn;
- this.labelExpireOfPassword.Text = "D+" + expireDate;
+ colorExpirePW = this.ParentForm.ColorLogOn;
+ expirePW = string.Format("D{0}", expireDate);
}
}
- else
- {
- // Administrator or Developer
- this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOn;
- this.labelExpireOfPassword.Text = "-";
- }
- }
- else
- {
- // Part11 미사용
- this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOn;
- this.labelExpireOfPassword.Text = "-";
}
}
@@ -449,6 +479,10 @@ namespace INT69DB_2A.Forms
this.labelUserID.Text = id;
if (this.labelUserLevel.Text != group)
this.labelUserLevel.Text = group;
+ if (this.labelExpireOfPassword.ForeColor != colorExpirePW)
+ this.labelExpireOfPassword.ForeColor = colorExpirePW;
+ if (this.labelExpireOfPassword.Text != expirePW)
+ this.labelExpireOfPassword.Text = expirePW;
}
public void DisplayRefresh()
@@ -617,20 +651,43 @@ namespace INT69DB_2A.Forms
}
#endregion
}
+ else if (button == this.buttonOption)
+ {
+ #region 옵션설정
+ DialogFormPasswordKeyPad password = new DialogFormPasswordKeyPad(8, this.ParentForm.SystemConfig.Language);
+ DialogResult dialogResult = password.ShowDialog();
+ if (dialogResult == DialogResult.OK)
+ {
+ if (this.ParentForm.ChildFormOption != null)
+ {
+ ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormOption);
+ this.ParentForm.ChildFormOption.DisplayRefresh();
+ }
+ }
+ #endregion
+ }
}
private void buttonBack_Click(object sender, EventArgs e)
{
this.ParentForm.ChildFormMainDisplay.DisplayRefresh();
((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormMainDisplay);
}
- private void buttonFunction_Click(object sender, EventArgs e)
+ private void buttonHidden_Click(object sender, EventArgs e)
{
if (this.ParentForm.SystemConfig.IsLogin == false)
{
this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Developer;
-
this.UpdateDisplayUser(this.ParentForm.SystemConfig.CurrentUser);
}
+ else
+ {
+ if (this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Admin)
+ {
+ this.buttonEquipment.Visible = true;
+ this.buttonTest.Visible = true;
+ this.buttonOption.Visible = true;
+ }
+ }
}
#endregion
}
diff --git a/INT69DB_2A/Forms/FormMenu.resx b/INT69DB_2A/Forms/FormMenu.resx
index 2aa36d4..d87de4c 100644
--- a/INT69DB_2A/Forms/FormMenu.resx
+++ b/INT69DB_2A/Forms/FormMenu.resx
@@ -7163,7 +7163,7 @@
AElFTkSuQmCC
-
+
iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAIAAAD+THXTAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -7215,7 +7215,7 @@
kqCSoJKgkqCSoJKgkqCSoJKgkqCSoJKgkuC70s4DjamXckBbwmcAAAAASUVORK5CYII=
-
+
iVBORw0KGgoAAAANSUhEUgAAAEYAAABGCAIAAAD+THXTAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -8851,6 +8851,515 @@
xVSUNmbjx4ICx6Ggtwqg0CvQlIEY3O/cubP34M7Pf/gvBu8yaOIfXbfg2QjcqG7UNYhjJb4KsiEgwjYO
HSM1NdXf3x8v21v3bLQAawkaxj4Eez7sr096nPDy8sIyQW+Vp5fnCQ9318N7Nu5cb8HT5E2f/B8vsfiO
CBSRowAAAABJRU5ErkJggg==
+
+
+
+
+ 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
+ YII=
+
+
+
+
+ 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
+ EAAAAABJRU5ErkJggg==
diff --git a/INT69DB_2A/Forms/FormMotorSetting.cs b/INT69DB_2A/Forms/FormMotorSetting.cs
index 109645e..b7bcdc6 100644
--- a/INT69DB_2A/Forms/FormMotorSetting.cs
+++ b/INT69DB_2A/Forms/FormMotorSetting.cs
@@ -2151,19 +2151,19 @@ namespace INT69DB_2A.Forms
{
case (int)DataStore.StepMotorType.MDrive:
if (this.ParentForm.SystemConfig.IsImpellerMotorDirectionCW == true)
- value = this.DeviceName + "MR -" + this.CurrentAngle + "00";
+ value = "MR -" + this.CurrentAngle + "00";
else
- value = this.DeviceName + "MR " + this.CurrentAngle + "00";
+ value = "MR " + this.CurrentAngle + "00";
this.TransferDirectSTXETX0x0ACOM1(this.DeviceName + value);
break;
case (int)DataStore.StepMotorType.Moons:
if (this.ParentForm.SystemConfig.IsImpellerMotorDirectionCW == true)
- value = this.SelectImpellerTag + "FL-" + this.CurrentAngle + "00";
+ value = "FL-" + this.CurrentAngle + "00";
else
- value = this.SelectImpellerTag + "FL" + this.CurrentAngle + "00";
+ value = "FL" + this.CurrentAngle + "00";
- this.TransferDirectETX0x0DCOM1(value);
+ this.TransferDirectETX0x0DCOM1(this.SelectImpellerTag + value);
break;
default:
break;
@@ -2192,7 +2192,7 @@ namespace INT69DB_2A.Forms
else
value = "FL-" + this.CurrentAngle + "00";
- this.TransferDirectETX0x0D(value);
+ this.TransferDirectETX0x0D(this.SelectImpellerTag + value);
break;
default:
break;
diff --git a/INT69DB_2A/Forms/FormOption.Designer.cs b/INT69DB_2A/Forms/FormOption.Designer.cs
new file mode 100644
index 0000000..02b7141
--- /dev/null
+++ b/INT69DB_2A/Forms/FormOption.Designer.cs
@@ -0,0 +1,309 @@
+namespace INT69DB_2A.Forms
+{
+ partial class FormOption
+ {
+ ///
+ /// 필수 디자이너 변수입니다.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// 사용 중인 모든 리소스를 정리합니다.
+ ///
+ /// 관리되는 리소스를 삭제해야 하면 true이고, 그렇지 않으면 false입니다.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form 디자이너에서 생성한 코드
+
+ ///
+ /// 디자이너 지원에 필요한 메서드입니다.
+ /// 이 메서드의 내용을 코드 편집기로 수정하지 마십시오.
+ ///
+ private void InitializeComponent()
+ {
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormOption));
+ this.smartForm1 = new SmartX.SmartForm();
+ this.labelTitle = new SmartX.SmartLabel();
+ this.pictureBoxFormIcon = new System.Windows.Forms.PictureBox();
+ this.buttonSave = new SmartX.SmartButton();
+ this.buttonBack = new SmartX.SmartButton();
+ this.buttonStatistics = new SmartX.SmartButton();
+ this.labelTitleStatistics = new SmartX.SmartLabel();
+ this.buttonPart11 = new SmartX.SmartButton();
+ this.labelTitlePart11 = new SmartX.SmartLabel();
+ this.smartGroupBox1 = new SmartX.SmartGroupBox();
+ ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
+ this.smartGroupBox1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // smartForm1
+ //
+ this.smartForm1.CenterLocation = false;
+ this.smartForm1.Image = ((System.Drawing.Image)(resources.GetObject("smartForm1.Image")));
+ this.smartForm1.LCDDirection = SmartX.SmartForm.LCDDIRECTIONS.HORIZONTAL;
+ this.smartForm1.LCDSize = SmartX.SmartForm.LCDRESOLUTION.LCD800X600;
+ this.smartForm1.Location = new System.Drawing.Point(0, 0);
+ this.smartForm1.MainForm = null;
+ this.smartForm1.Mode = SmartX.SmartForm.RUNMODE.RUNTIME;
+ this.smartForm1.MouseCursor = SmartX.SmartForm.OnOff.OFF;
+ this.smartForm1.Name = "smartForm1";
+ this.smartForm1.Size = new System.Drawing.Size(800, 600);
+ this.smartForm1.SpecialFunctionClickPointSize = 100;
+ this.smartForm1.SuspendLayoutInterval = 0;
+ //
+ // labelTitle
+ //
+ this.labelTitle.BackPictureBox = this.smartForm1;
+ this.labelTitle.BackPictureBox1 = null;
+ this.labelTitle.BackPictureBox2 = null;
+ this.labelTitle.BorderColor = System.Drawing.Color.Black;
+ this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelTitle.Font = new System.Drawing.Font("새굴림", 23F, System.Drawing.FontStyle.Bold);
+ this.labelTitle.ForeColor = System.Drawing.Color.White;
+ this.labelTitle.InitVisible = true;
+ this.labelTitle.LineSpacing = 0F;
+ this.labelTitle.Location = new System.Drawing.Point(69, 11);
+ this.labelTitle.Name = "labelTitle";
+ this.labelTitle.Size = new System.Drawing.Size(382, 45);
+ this.labelTitle.TabIndex = 162;
+ this.labelTitle.Text = "옵션설정";
+ this.labelTitle.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+ this.labelTitle.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelTitle.Wordwrap = false;
+ //
+ // pictureBoxFormIcon
+ //
+ this.pictureBoxFormIcon.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxFormIcon.Image")));
+ this.pictureBoxFormIcon.Location = new System.Drawing.Point(16, 11);
+ this.pictureBoxFormIcon.Name = "pictureBoxFormIcon";
+ this.pictureBoxFormIcon.Size = new System.Drawing.Size(47, 45);
+ //
+ // buttonSave
+ //
+ this.buttonSave.BackPictureBox = null;
+ this.buttonSave.BackPictureBox1 = null;
+ this.buttonSave.BackPictureBox2 = null;
+ this.buttonSave.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonSave.ButtonImageAutoSize = true;
+ this.buttonSave.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonSave.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonSave.DisableImage")));
+ this.buttonSave.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonSave.DownImage")));
+ this.buttonSave.GroupID = 0;
+ this.buttonSave.InitVisible = true;
+ this.buttonSave.Location = new System.Drawing.Point(644, 525);
+ this.buttonSave.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
+ this.buttonSave.Name = "buttonSave";
+ this.buttonSave.NestedClickEventPrevent = false;
+ this.buttonSave.OutlinePixel = 1;
+ this.buttonSave.RepeatInterval = 200;
+ this.buttonSave.RepeatIntervalAccelerate = null;
+ this.buttonSave.SafeInterval = 200;
+ this.buttonSave.Size = new System.Drawing.Size(70, 70);
+ this.buttonSave.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonSave.TabIndex = 220;
+ this.buttonSave.TextColor = System.Drawing.Color.Black;
+ this.buttonSave.TextDownColor = System.Drawing.Color.White;
+ this.buttonSave.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonSave.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonSave.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonSave.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonSave.UpImage")));
+ this.buttonSave.Visible = false;
+ this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
+ //
+ // buttonBack
+ //
+ this.buttonBack.BackPictureBox = null;
+ this.buttonBack.BackPictureBox1 = null;
+ this.buttonBack.BackPictureBox2 = null;
+ this.buttonBack.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonBack.ButtonImageAutoSize = true;
+ this.buttonBack.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonBack.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonBack.DisableImage")));
+ this.buttonBack.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonBack.DownImage")));
+ this.buttonBack.GroupID = 0;
+ this.buttonBack.InitVisible = true;
+ this.buttonBack.Location = new System.Drawing.Point(720, 525);
+ this.buttonBack.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
+ this.buttonBack.Name = "buttonBack";
+ this.buttonBack.NestedClickEventPrevent = false;
+ this.buttonBack.OutlinePixel = 1;
+ this.buttonBack.RepeatInterval = 200;
+ this.buttonBack.RepeatIntervalAccelerate = null;
+ this.buttonBack.SafeInterval = 200;
+ this.buttonBack.Size = new System.Drawing.Size(70, 70);
+ this.buttonBack.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonBack.TabIndex = 219;
+ this.buttonBack.TextColor = System.Drawing.Color.Black;
+ this.buttonBack.TextDownColor = System.Drawing.Color.White;
+ this.buttonBack.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonBack.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonBack.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonBack.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonBack.UpImage")));
+ this.buttonBack.Click += new System.EventHandler(this.buttonBack_Click);
+ //
+ // buttonStatistics
+ //
+ this.buttonStatistics.BackPictureBox = null;
+ this.buttonStatistics.BackPictureBox1 = null;
+ this.buttonStatistics.BackPictureBox2 = null;
+ this.buttonStatistics.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonStatistics.ButtonImageAutoSize = true;
+ this.buttonStatistics.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonStatistics.DisableImage = null;
+ this.buttonStatistics.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonStatistics.DownImage")));
+ this.buttonStatistics.GroupID = 0;
+ this.buttonStatistics.InitVisible = true;
+ this.buttonStatistics.Location = new System.Drawing.Point(408, 214);
+ this.buttonStatistics.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+ this.buttonStatistics.Name = "buttonStatistics";
+ this.buttonStatistics.NestedClickEventPrevent = false;
+ this.buttonStatistics.OutlinePixel = 1;
+ this.buttonStatistics.RepeatInterval = 200;
+ this.buttonStatistics.RepeatIntervalAccelerate = null;
+ this.buttonStatistics.SafeInterval = 200;
+ this.buttonStatistics.Size = new System.Drawing.Size(84, 25);
+ this.buttonStatistics.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonStatistics.TabIndex = 224;
+ this.buttonStatistics.TextColor = System.Drawing.Color.Black;
+ this.buttonStatistics.TextDownColor = System.Drawing.Color.White;
+ this.buttonStatistics.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonStatistics.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonStatistics.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonStatistics.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonStatistics.UpImage")));
+ this.buttonStatistics.Visible = false;
+ this.buttonStatistics.Click += new System.EventHandler(this.Control_Click);
+ //
+ // labelTitleStatistics
+ //
+ this.labelTitleStatistics.BackPictureBox = this.smartForm1;
+ this.labelTitleStatistics.BackPictureBox1 = null;
+ this.labelTitleStatistics.BackPictureBox2 = null;
+ this.labelTitleStatistics.BorderColor = System.Drawing.Color.Black;
+ this.labelTitleStatistics.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelTitleStatistics.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.labelTitleStatistics.InitVisible = true;
+ this.labelTitleStatistics.LineSpacing = 0F;
+ this.labelTitleStatistics.Location = new System.Drawing.Point(202, 214);
+ this.labelTitleStatistics.Name = "labelTitleStatistics";
+ this.labelTitleStatistics.Size = new System.Drawing.Size(200, 25);
+ this.labelTitleStatistics.TabIndex = 223;
+ this.labelTitleStatistics.Text = "Data Statistics";
+ this.labelTitleStatistics.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
+ this.labelTitleStatistics.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelTitleStatistics.Visible = false;
+ this.labelTitleStatistics.Wordwrap = false;
+ //
+ // buttonPart11
+ //
+ this.buttonPart11.BackPictureBox = null;
+ this.buttonPart11.BackPictureBox1 = null;
+ this.buttonPart11.BackPictureBox2 = null;
+ this.buttonPart11.ButtonColor = System.Drawing.Color.Gray;
+ this.buttonPart11.ButtonImageAutoSize = true;
+ this.buttonPart11.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
+ this.buttonPart11.DisableImage = null;
+ this.buttonPart11.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonPart11.DownImage")));
+ this.buttonPart11.GroupID = 0;
+ this.buttonPart11.InitVisible = true;
+ this.buttonPart11.Location = new System.Drawing.Point(408, 183);
+ this.buttonPart11.Mode = SmartX.SmartButton.BUTTONMODE.PUSH;
+ this.buttonPart11.Name = "buttonPart11";
+ this.buttonPart11.NestedClickEventPrevent = false;
+ this.buttonPart11.OutlinePixel = 1;
+ this.buttonPart11.RepeatInterval = 200;
+ this.buttonPart11.RepeatIntervalAccelerate = null;
+ this.buttonPart11.SafeInterval = 200;
+ this.buttonPart11.Size = new System.Drawing.Size(84, 25);
+ this.buttonPart11.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
+ this.buttonPart11.TabIndex = 222;
+ this.buttonPart11.TextColor = System.Drawing.Color.Black;
+ this.buttonPart11.TextDownColor = System.Drawing.Color.White;
+ this.buttonPart11.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
+ this.buttonPart11.TextLocation = new System.Drawing.Point(0, 0);
+ this.buttonPart11.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
+ this.buttonPart11.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonPart11.UpImage")));
+ this.buttonPart11.Click += new System.EventHandler(this.Control_Click);
+ //
+ // labelTitlePart11
+ //
+ this.labelTitlePart11.BackPictureBox = this.smartForm1;
+ this.labelTitlePart11.BackPictureBox1 = null;
+ this.labelTitlePart11.BackPictureBox2 = null;
+ this.labelTitlePart11.BorderColor = System.Drawing.Color.Black;
+ this.labelTitlePart11.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelTitlePart11.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.labelTitlePart11.InitVisible = true;
+ this.labelTitlePart11.LineSpacing = 0F;
+ this.labelTitlePart11.Location = new System.Drawing.Point(202, 183);
+ this.labelTitlePart11.Name = "labelTitlePart11";
+ this.labelTitlePart11.Size = new System.Drawing.Size(200, 25);
+ this.labelTitlePart11.TabIndex = 221;
+ this.labelTitlePart11.Text = "Part11";
+ this.labelTitlePart11.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right;
+ this.labelTitlePart11.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelTitlePart11.Wordwrap = false;
+ //
+ // smartGroupBox1
+ //
+ this.smartGroupBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(228)))), ((int)(((byte)(180)))));
+ this.smartGroupBox1.BackPictureBox = null;
+ this.smartGroupBox1.BackPictureBox1 = null;
+ this.smartGroupBox1.Controls.Add(this.labelTitlePart11);
+ this.smartGroupBox1.Controls.Add(this.buttonStatistics);
+ this.smartGroupBox1.Controls.Add(this.buttonPart11);
+ this.smartGroupBox1.Controls.Add(this.labelTitleStatistics);
+ this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.Black;
+ this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.Black;
+ this.smartGroupBox1.FrameLineThickness = 1;
+ this.smartGroupBox1.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.None;
+ this.smartGroupBox1.Image = null;
+ this.smartGroupBox1.InitVisible = true;
+ this.smartGroupBox1.Location = new System.Drawing.Point(3, 70);
+ this.smartGroupBox1.Name = "smartGroupBox1";
+ this.smartGroupBox1.RoundRadius = 5;
+ this.smartGroupBox1.Size = new System.Drawing.Size(794, 448);
+ this.smartGroupBox1.TabIndex = 225;
+ this.smartGroupBox1.Text = "smartGroupBox1";
+ this.smartGroupBox1.TextColor = System.Drawing.Color.Black;
+ //
+ // FormOption
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+ this.AutoScroll = true;
+ this.ClientSize = new System.Drawing.Size(800, 600);
+ this.Controls.Add(this.smartGroupBox1);
+ this.Controls.Add(this.buttonSave);
+ this.Controls.Add(this.buttonBack);
+ this.Controls.Add(this.labelTitle);
+ this.Controls.Add(this.pictureBoxFormIcon);
+ this.Controls.Add(this.smartForm1);
+ this.Name = "FormOption";
+ this.Text = "FormOption";
+ ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).EndInit();
+ this.smartGroupBox1.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private SmartX.SmartForm smartForm1;
+ private SmartX.SmartLabel labelTitle;
+ private System.Windows.Forms.PictureBox pictureBoxFormIcon;
+ private SmartX.SmartButton buttonSave;
+ private SmartX.SmartButton buttonBack;
+ private SmartX.SmartButton buttonStatistics;
+ private SmartX.SmartLabel labelTitleStatistics;
+ private SmartX.SmartButton buttonPart11;
+ private SmartX.SmartLabel labelTitlePart11;
+ private SmartX.SmartGroupBox smartGroupBox1;
+ }
+}
\ No newline at end of file
diff --git a/INT69DB_2A/Forms/FormOption.cs b/INT69DB_2A/Forms/FormOption.cs
new file mode 100644
index 0000000..27f0846
--- /dev/null
+++ b/INT69DB_2A/Forms/FormOption.cs
@@ -0,0 +1,138 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+using INT69DB_2A_ImageDll;
+using INT69DB_2A.DialogForms;
+using SmartX;
+
+namespace INT69DB_2A.Forms
+{
+ public partial class FormOption : Form
+ {
+ #region Field
+ private FormMain m_ParentForm;
+ #endregion
+
+ #region Constructor
+ public FormOption(FormMain parent)
+ {
+ InitializeComponent();
+
+ this.ParentForm = parent;
+
+ this.InitializeDesign();
+ this.InitializeControl();
+ }
+ #endregion
+
+ #region Property
+ public FormMain ParentForm
+ {
+ get { return this.m_ParentForm; }
+ private set { this.m_ParentForm = value; }
+ }
+ #endregion
+
+ #region Method
+ private void InitializeDesign()
+ {
+ ImageDll images = new ImageDll();
+
+ if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.English)
+ {
+ this.labelTitle.Text = "Option Setting";
+ }
+ else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese)
+ {
+ this.labelTitle.Text = "选项设置";
+
+ this.buttonPart11.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnEnable));
+ this.buttonPart11.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnDisable));
+ this.buttonStatistics.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnEnable));
+ this.buttonStatistics.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnDisable));
+ }
+ else
+ {
+
+ }
+ }
+ private void InitializeControl()
+ {
+ }
+
+ private void UpdateParameter()
+ {
+ // Part11
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
+ this.buttonPart11.ButtonDown();
+ else
+ this.buttonPart11.ButtonUp();
+
+ // 데이터 통계 기능 사용 유무
+ if (this.ParentForm.SystemConfig.IsOptDataStatistics == true)
+ this.buttonStatistics.ButtonDown();
+ else
+ this.buttonStatistics.ButtonUp();
+
+ this.buttonSave.Visible = false;
+ }
+
+ public void DisplayRefresh()
+ {
+ this.UpdateParameter();
+
+ this.ParentForm.SystemConfig.CurrentForm = DataStore.FormStore.FormOption;
+ }
+ #endregion
+
+ #region Event Handler
+ private void Control_Click(object sender, EventArgs e)
+ {
+ if (this.buttonSave.Visible == false)
+ this.buttonSave.Visible = true;
+
+ if (this.buttonPart11.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN)
+ this.buttonStatistics.ButtonDown();
+ }
+
+ private void buttonSave_Click(object sender, EventArgs e)
+ {
+ // Part11
+ if (this.buttonPart11.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN)
+ {
+ this.ParentForm.SystemConfig.IsPart11 = true;
+ this.ParentForm.SystemConfig.IsDataBackup = true;
+ this.ParentForm.SystemConfig.IsLogin = true;
+ }
+ else
+ this.ParentForm.SystemConfig.IsPart11 = false;
+
+ // 데이터 통계 기능 사용 유무
+ if (this.buttonStatistics.ButtonStatus == SmartButton.BUTSTATUS.DOWN)
+ this.ParentForm.SystemConfig.IsOptDataStatistics = true;
+ else
+ this.ParentForm.SystemConfig.IsOptDataStatistics = false;
+
+ this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
+
+ DialogFormMessage myMsg = new DialogFormMessage(18, this.ParentForm.SystemConfig.Language);
+ myMsg.ShowDialog();
+
+ this.smartGroupBox1.Enabled = false;
+ this.buttonBack.Visible = false;
+ this.buttonSave.Visible = false;
+ }
+ private void buttonBack_Click(object sender, EventArgs e)
+ {
+ this.ParentForm.ChildFormMenu.DisplayRefresh();
+ ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormMenu);
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/INT69DB_2A/Forms/FormOption.resx b/INT69DB_2A/Forms/FormOption.resx
new file mode 100644
index 0000000..ad7dee0
--- /dev/null
+++ b/INT69DB_2A/Forms/FormOption.resx
@@ -0,0 +1,1132 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+
+ 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
+ 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOwwAADsMBx2+oZAAACmpJREFUeF7t1jERgEAQ
+ ALGz8yUSXjM4AgtQY2LLzERE5tgLAICQYAEAxAQLACAmWAAAMcECAIgJFgBATLAAAGKCBQAQEywAgJhg
+ AQDEBAsAICZYAAAxwQIAiAkWAEBMsAAAYoIFABATLACAmGABAMQECwAgJlgAADHBAgCICRYAQEywAABi
+ ggUAEBMsAICYYAEAxAQLACAmWAAAMcECAIgJFgBATLAAAGKCBQAQEywAgJhgAQDEBAsAICZYAAAxwQIA
+ iAkWAEBMsAAAYoIFABATLACAmGABAMQECwAgJlgAADHBAgCICRYAQEywAABiggUAEBMsAICYYAEAxAQL
+ ACAmWAAAMcECAIgJFgBATLAAAGKCBQAQEywAgJhgAQDEBAsAICZYAAAxwQIAiAkWAEBMsAAAYoIFABAT
+ LACAmGABAMQECwAgJlgAADHBAgCIzXufAACE5nsuAABCggUAEBMsAICYYAEAxAQLACAmWAAAMcECAIgJ
+ FgBATLAAAGKCBQAQEywAgJhgAQDEBAsAICZYAAAxwQIAiAkWAEBMsAAAYoIFABATLACAmGABAMQECwAg
+ JlgAADHBAgCICRYAQEywAABiggUAEBMsAICYYAEAxAQLACAmWAAAMcECAIgJFgBATLAAAGKCBQAQEywA
+ gJhgAQDEBAsAICZYAAAxwQIAiAkWAEBMsAAAYoIFABATLACAmGABAMQECwAgJlgAADHBAgCICRYAQEyw
+ AABiggUAEBMsAICYYAEAxAQLACAmWAAAMcECAIgJFgBATLAAAGKCBQAQEywAgJhgAQDEBAsAICZYAAAx
+ wQIAiAkWAEBMsAAAYoIFABATLACAmGABAMQECwAgJlgAADHBAgCICRYAQEywAABiggUAEBMsAICYYAEA
+ xAQLACAmWAAAMcECAIgJFgBATLAAAGKCBQAQEywAgJhgAQDEBAsAICZYAAAxwQIAiAkWAEBMsAAAYoIF
+ ABATLACAmGABAMQECwAgJlgAADHBAgCICRYAQEywAABiggUAEBMsAICYYAEAxAQLACAmWAAAMcECAIgJ
+ FgBATLAAAGKCBQAQEywAgJhgAQDEBAsAICZYAAAxwQIAiAkWAEBMsAAAYoIFABATLACAmGABAMQECwAg
+ JlgAADHBAgCICRYAQEywAABiggUAEBMsAICYYAEAxAQLACAmWAAAMcECAIgJFgBATLAAAGKCBQAQEywA
+ gJhgAQDEBAsAICZYAAAxwQIAiAkWAEBMsAAAYoIFABATLACAmGABAMQECwAgJlgAADHBAgCICRYAQEyw
+ AABiggUAEBMsAICYYAEAxAQLACAmWAAAMcECAIgJFgBATLAAAGKCBQAQEywAgJhgAQDEBAsAICZYAAAx
+ wQIAiAkWAEBMsAAAYoIFABATLACAmGABAMQECwAgJlgAADHBAgCICRYAQEywAABiggUAEBMsAICYYAEA
+ xAQLACAmWAAAMcECAIgJFgBATLAAAGKCBQAQEywAgJhgAQDEBAsAICZYAAAxwQIAiAkWAEBMsAAAYoIF
+ ABATLACAmGABAMQECwAgJlgAADHBAgCICRYAQEywAABiggUAEBMsAICYYAEAxAQLACAmWAAAMcECAIgJ
+ FgBATLAAAGKCBQAQEywAgJhgAQDEBAsAICZYAAAxwQIAiAkWAEBMsAAAYoIFABATLACAmGABAMQECwAg
+ JlgAADHBAgCICRYAQEywAABiggUAEBMsAICYYAEAxAQLACAmWAAAMcECAIgJFgBATLAAAGKCBQAQEywA
+ gJhgAQDEBAsAICZYAAAxwQIAiAkWAEBMsAAAYoIFABATLACAmGABAMQECwAgJlgAADHBAgCICRYAQEyw
+ AABiggUAEBMsAICYYAEAxAQLACAmWAAAMcECAIgJFgBATLAAAGKCBQAQEywAgJhgAQDEBAsAICZYAAAx
+ wQIAiAkWAEBMsAAAYoIFABATLACAmGABAMQECwAgJlgAADHBAgCICRYAQEywAABiggUAEBMsAICYYAEA
+ xAQLACAmWAAAMcECAIgJFgBATLAAAGKCBQAQEywAgJhgAQDEBAsAICZYAAAxwQIAiAkWAEBMsAAAYoIF
+ ABATLACAmGABAMQECwAgJlgAADHBAgCICRYAQEywAABiggUAEBMsAICYYAEAxAQLACAmWAAAMcECAIgJ
+ FgBATLAAAGKCBQAQEywAgJhgAQDEBAsAICZYAAAxwQIAiAkWAEBMsAAAYoIFABATLACAmGABAMQECwAg
+ JlgAADHBAgCICRYAQEywAABiggUAEBMsAICYYAEAxAQLACAmWAAAMcECAIgJFgBATLAAAGKCBQAQEywA
+ gJhgAQDEBAsAICZYAAAxwQIAiAkWAEBMsAAAYoIFABATLACAmGABAMQECwAgJlgAADHBAgCICRYAQEyw
+ AABiggUAEBMsAICYYAEAxAQLACAmWAAAMcECAIgJFgBATLAAAGKCBQAQEywAgJhgAQDEBAsAICZYAAAx
+ wQIAiAkWAEBMsAAAYoIFABATLACAmGABAMQECwAgJlgAADHBAgCICRYAQEywAABiggUAEBMsAICYYAEA
+ xAQLACAmWAAAMcECAIgJFgBATLAAAGKCBQAQEywAgJhgAQDEBAsAICZYAAAxwQIAiAkWAEBMsAAAYoIF
+ ABATLACAmGABAMQECwAgJlgAADHBAgCICRYAQEywAABiggUAEBMsAICYYAEAxAQLACAmWAAAMcECAIgJ
+ FgBATLAAAGKCBQAQEywAgJhgAQDEBAsAICZYAAAxwQIAiAkWAEBMsAAAYoIFABATLACAmGABAMQECwAg
+ JlgAADHBAgCICRYAQEywAABiggUAEBMsAICYYAEAxAQLACAmWAAAMcECAIgJFgBATLAAAGKCBQAQEywA
+ gJhgAQDEBAsAICZYAAAxwQIAiAkWAEBMsAAAYoIFABATLACAmGABAMQECwAgJlgAADHBAgCICRYAQEyw
+ AABiggUAEBMsAICYYAEAxAQLACAmWAAAMcECAIgJFgBATLAAAGKCBQAQEywAgJhgAQDEBAsAICZYAAAx
+ wQIAiAkWAEBs3vsEACA0x14AAIQECwAgJlgAADHBAgCICRYAQEywAABiggUAEBMsAICYYAEAxAQLACAm
+ WAAAMcECAIgJFgBATLAAAGKCBQAQEywAgJhgAQDEBAsAICZYAAAxwQIAiAkWAEBMsAAAYoIFABATLACA
+ mGABAMQECwAgJlgAADHBAgCICRYAQEywAABiggUAEBMsAICYYAEAxAQLACAmWAAAMcECAIgJFgBATLAA
+ AGKCBQAQEywAgJhgAQDEBAsAICZYAAAxwQIAiAkWAEBMsAAAYoIFABATLACAmGABAMQECwAgJlgAADHB
+ AgCICRYAQEywAABiggUAEBMsAICYYAEAxAQLACAmWAAAMcECAIgJFgBATLAAAGKCBQAQEywAgJhgAQDE
+ BAsAICZYAAAxwQIAiAkWAEBMsAAAYoIFABATLACAmGABAMQECwAgJlgAADHBAgCICRYAQEywAABiggUA
+ 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
+ dlfTVCQvUgAAAABJRU5ErkJggg==
+
+
+
+
+ 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
+ RYmCpO2S+eZ/bKN5gL5h+oUAAAAASUVORK5CYII=
+
+
+
+
+ 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
+ B8BJRi9/0SAYAAAAAElFTkSuQmCC
+
+
+
+
+ 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
+ Z/8BKGeNyS3v/jQAAAAASUVORK5CYII=
+
+
+
+
+ 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
+ EPAlSQAAAABJRU5ErkJggg==
+
+
+
+
+ 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
+ /75aOx5brnAAAAAASUVORK5CYII=
+
+
+
+
+ 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
+
+
+
+ WEBPAD
+
+
+ False
+
+
\ No newline at end of file
diff --git a/INT69DB_2A/Forms/FormUserEditor.Designer.cs b/INT69DB_2A/Forms/FormUserEditor.Designer.cs
index 369cb8c..f9069f8 100644
--- a/INT69DB_2A/Forms/FormUserEditor.Designer.cs
+++ b/INT69DB_2A/Forms/FormUserEditor.Designer.cs
@@ -43,8 +43,8 @@
this.labelTitleDayPassword = new SmartX.SmartLabel();
this.labelTitleDayAccount = new SmartX.SmartLabel();
this.labelTitleMin = new SmartX.SmartLabel();
- this.labelStatusExpirePassword = new SmartX.SmartLabel();
- this.labelStatusExpireAccount = new SmartX.SmartLabel();
+ this.labelStatusExpiryPassword = new SmartX.SmartLabel();
+ this.labelStatusExpiryAccount = new SmartX.SmartLabel();
this.labelAutomaticLogoutTime = new SmartX.SmartLabel();
this.labelTitleAutomaticLogoutTime = new SmartX.SmartLabel();
this.labelExpiryDateOfPassword2 = new SmartX.SmartLabel();
@@ -82,6 +82,7 @@
this.buttonNew = new SmartX.SmartButton();
this.buttonBack = new SmartX.SmartButton();
this.buttonGroupEditor = new SmartX.SmartButton();
+ this.labelEquipment = new SmartX.SmartLabel();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.smartGroupBox1.SuspendLayout();
this.smartGroupBox2.SuspendLayout();
@@ -172,8 +173,8 @@
this.smartGroupBox1.Controls.Add(this.labelTitleDayPassword);
this.smartGroupBox1.Controls.Add(this.labelTitleDayAccount);
this.smartGroupBox1.Controls.Add(this.labelTitleMin);
- this.smartGroupBox1.Controls.Add(this.labelStatusExpirePassword);
- this.smartGroupBox1.Controls.Add(this.labelStatusExpireAccount);
+ this.smartGroupBox1.Controls.Add(this.labelStatusExpiryPassword);
+ this.smartGroupBox1.Controls.Add(this.labelStatusExpiryAccount);
this.smartGroupBox1.Controls.Add(this.labelAutomaticLogoutTime);
this.smartGroupBox1.Controls.Add(this.labelTitleAutomaticLogoutTime);
this.smartGroupBox1.Controls.Add(this.labelExpiryDateOfPassword2);
@@ -381,6 +382,7 @@
this.labelTitleMin.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitleMin.Wordwrap = false;
//
+<<<<<<< HEAD
// labelStatusExpirePassword
//
this.labelStatusExpirePassword.BackPictureBox = this.smartForm1;
@@ -422,6 +424,49 @@
this.labelStatusExpireAccount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelStatusExpireAccount.Wordwrap = false;
this.labelStatusExpireAccount.Click += new System.EventHandler(this.labelStatusExpireAccount_Click);
+=======
+ // labelStatusExpiryPassword
+ //
+ this.labelStatusExpiryPassword.BackPictureBox = this.smartForm1;
+ this.labelStatusExpiryPassword.BackPictureBox1 = null;
+ this.labelStatusExpiryPassword.BackPictureBox2 = null;
+ this.labelStatusExpiryPassword.BorderColor = System.Drawing.Color.Black;
+ this.labelStatusExpiryPassword.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelStatusExpiryPassword.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
+ this.labelStatusExpiryPassword.ForeColor = System.Drawing.Color.DarkRed;
+ this.labelStatusExpiryPassword.InitVisible = true;
+ this.labelStatusExpiryPassword.LineSpacing = 0F;
+ this.labelStatusExpiryPassword.Location = new System.Drawing.Point(485, 332);
+ this.labelStatusExpiryPassword.Name = "labelStatusExpiryPassword";
+ this.labelStatusExpiryPassword.Size = new System.Drawing.Size(60, 26);
+ this.labelStatusExpiryPassword.TabIndex = 230;
+ this.labelStatusExpiryPassword.Text = "만료";
+ this.labelStatusExpiryPassword.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelStatusExpiryPassword.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelStatusExpiryPassword.Wordwrap = false;
+ this.labelStatusExpiryPassword.Click += new System.EventHandler(this.labelStatusExpirePassword_Click);
+ //
+ // labelStatusExpiryAccount
+ //
+ this.labelStatusExpiryAccount.BackPictureBox = this.smartForm1;
+ this.labelStatusExpiryAccount.BackPictureBox1 = null;
+ this.labelStatusExpiryAccount.BackPictureBox2 = null;
+ this.labelStatusExpiryAccount.BorderColor = System.Drawing.Color.Black;
+ this.labelStatusExpiryAccount.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelStatusExpiryAccount.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
+ this.labelStatusExpiryAccount.ForeColor = System.Drawing.Color.DarkRed;
+ this.labelStatusExpiryAccount.InitVisible = true;
+ this.labelStatusExpiryAccount.LineSpacing = 0F;
+ this.labelStatusExpiryAccount.Location = new System.Drawing.Point(485, 301);
+ this.labelStatusExpiryAccount.Name = "labelStatusExpiryAccount";
+ this.labelStatusExpiryAccount.Size = new System.Drawing.Size(60, 26);
+ this.labelStatusExpiryAccount.TabIndex = 229;
+ this.labelStatusExpiryAccount.Text = "만료";
+ this.labelStatusExpiryAccount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelStatusExpiryAccount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelStatusExpiryAccount.Wordwrap = false;
+ this.labelStatusExpiryAccount.Click += new System.EventHandler(this.labelStatusExpireAccount_Click);
+>>>>>>> d88b1aac3ab2ed3eef1ac2f12e1d7d6f19f8488c
//
// labelAutomaticLogoutTime
//
@@ -570,6 +615,7 @@
//
this.smartGroupBox2.BackPictureBox = this.smartForm1;
this.smartGroupBox2.BackPictureBox1 = null;
+ this.smartGroupBox2.Controls.Add(this.labelEquipment);
this.smartGroupBox2.Controls.Add(this.labelMenu);
this.smartGroupBox2.Controls.Add(this.labelMain);
this.smartGroupBox2.Controls.Add(this.labelViewer);
@@ -654,7 +700,7 @@
this.labelViewer.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelViewer.InitVisible = true;
this.labelViewer.LineSpacing = 0F;
- this.labelViewer.Location = new System.Drawing.Point(410, 94);
+ this.labelViewer.Location = new System.Drawing.Point(410, 118);
this.labelViewer.Name = "labelViewer";
this.labelViewer.Size = new System.Drawing.Size(125, 18);
this.labelViewer.TabIndex = 240;
@@ -672,7 +718,7 @@
this.labelStatistics.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelStatistics.InitVisible = true;
this.labelStatistics.LineSpacing = 0F;
- this.labelStatistics.Location = new System.Drawing.Point(410, 70);
+ this.labelStatistics.Location = new System.Drawing.Point(410, 94);
this.labelStatistics.Name = "labelStatistics";
this.labelStatistics.Size = new System.Drawing.Size(125, 18);
this.labelStatistics.TabIndex = 239;
@@ -1215,6 +1261,24 @@
this.buttonGroupEditor.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonGroupEditor.UpImage")));
this.buttonGroupEditor.Click += new System.EventHandler(this.buttonGroupEditor_Click);
//
+ // labelEquipment
+ //
+ this.labelEquipment.BackPictureBox = this.smartForm1;
+ this.labelEquipment.BackPictureBox1 = null;
+ this.labelEquipment.BackPictureBox2 = null;
+ this.labelEquipment.BorderColor = System.Drawing.Color.Black;
+ this.labelEquipment.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelEquipment.InitVisible = true;
+ this.labelEquipment.LineSpacing = 0F;
+ this.labelEquipment.Location = new System.Drawing.Point(410, 70);
+ this.labelEquipment.Name = "labelEquipment";
+ this.labelEquipment.Size = new System.Drawing.Size(125, 18);
+ this.labelEquipment.TabIndex = 243;
+ this.labelEquipment.Text = "Equipment";
+ this.labelEquipment.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
+ this.labelEquipment.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelEquipment.Wordwrap = false;
+ //
// FormUserEditor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -1283,8 +1347,8 @@
private SmartX.SmartLabel labelTitleDayPassword;
private SmartX.SmartLabel labelTitleDayAccount;
private SmartX.SmartLabel labelTitleMin;
- private SmartX.SmartLabel labelStatusExpirePassword;
- private SmartX.SmartLabel labelStatusExpireAccount;
+ private SmartX.SmartLabel labelStatusExpiryPassword;
+ private SmartX.SmartLabel labelStatusExpiryAccount;
private SmartX.SmartLabel labelAutomaticLogoutTime;
private SmartX.SmartLabel labelTitleAutomaticLogoutTime;
private SmartX.SmartLabel labelExpiryDateOfPassword2;
@@ -1295,5 +1359,6 @@
private SmartX.SmartSeparatorLine smartSeparatorLine1;
public SmartX.SmartLabel labelAccessRightAdmin;
public SmartX.SmartLabel labelAutoLogoutWarning;
+ private SmartX.SmartLabel labelEquipment;
}
}
\ No newline at end of file
diff --git a/INT69DB_2A/Forms/FormUserEditor.cs b/INT69DB_2A/Forms/FormUserEditor.cs
index 7ccd2d4..5b164f9 100644
--- a/INT69DB_2A/Forms/FormUserEditor.cs
+++ b/INT69DB_2A/Forms/FormUserEditor.cs
@@ -55,40 +55,41 @@ namespace INT69DB_2A.Forms
{
ImageDll images = new ImageDll();
- switch (this.ParentForm.SystemConfig.Language)
+ if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean)
{
- case DataStore.LanguageID.Korean:
- this.labelTitle.Text = "유저설정";
- this.labelStatusExpireAccount.Text = "만료";
- this.labelStatusExpirePassword.Text = "만료";
- break;
- case DataStore.LanguageID.English:
- this.labelTitle.Text = "User";
- this.labelStatusExpireAccount.Text = "Expiration";
- this.labelStatusExpirePassword.Text = "Expiration";
- break;
- case DataStore.LanguageID.Chinese:
- this.labelTitle.Text = "用户设置";
- this.labelStatusExpireAccount.Text = "过期";
- this.labelStatusExpirePassword.Text = "过期";
- break;
- case DataStore.LanguageID.Czech:
- this.labelTitle.Text = "Uživatelské nastavení";
- this.labelStatusExpireAccount.Text = "Vypršení";
- this.labelStatusExpirePassword.Text = "Vypršení";
- break;
- case DataStore.LanguageID.Russian:
- this.labelTitle.Text = "Пользователь";
- this.labelStatusExpireAccount.Text = "Истечение срока";
- this.labelStatusExpirePassword.Text = "Истечение срока";
- break;
- case DataStore.LanguageID.German:
- this.labelTitle.Text = "Benutzereinstellungen";
- this.labelStatusExpireAccount.Text = "Ablauf";
- this.labelStatusExpirePassword.Text = "Ablauf";
- break;
- default:
- break;
+
+ }
+ else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.English)
+ {
+ this.labelTitle.Text = "User settings";
+
+ this.labelStatusExpiryAccount.Text = "Expiry";
+ this.labelStatusExpiryPassword.Text = "Expiry";
+ }
+ else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese)
+ {
+ this.labelTitle.Text = "用户设置";
+
+ this.labelStatusExpiryAccount.Text = "过期";
+ this.labelStatusExpiryPassword.Text = "过期";
+ }
+ else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Czech)
+ {
+ this.labelTitle.Text = "uživatelské nastavení";
+
+ this.labelStatusExpiryAccount.Text = "Uplynutí";
+ this.labelStatusExpiryPassword.Text = "Uplynutí";
+ }
+ else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.German)
+ {
+ this.labelTitle.Text = "Benutzereinstellungen";
+
+ this.labelStatusExpiryAccount.Text = "Ablauf";
+ this.labelStatusExpiryPassword.Text = "Ablauf";
+ }
+ else
+ {
+
}
}
private void DefaultSetting()
@@ -97,21 +98,46 @@ namespace INT69DB_2A.Forms
this.PasswordChar = false;
this.BeforeID = "";
this.BeforePassword = "";
- this.DisplayOnlyPart11Item(this.ParentForm.SystemConfig.IsPart11);
- this.UpdateAccessRightComboBox();
+ this.UpdateAccessRightComboBoxDisplay();
this.comboBoxAccessRight.SelectedIndexChanged -= new EventHandler(this.comboBoxAccessRight_SelectedIndexChanged);
this.comboBoxAccessRight.SelectedIndex = 0;
this.comboBoxAccessRight.SelectedIndexChanged += new EventHandler(this.comboBoxAccessRight_SelectedIndexChanged);
this.ChildControlUserSet = new ControlUserSetting(this);
this.Controls.Add(this.ChildControlUserSet);
- this.ChildControlUserSet.Location = new Point(0, 69);
+ this.ChildControlUserSet.Location = new Point(0, 73);
this.ChildControlUserSet.Visible = false;
+
+ if (this.ParentForm.SystemConfig.IsPart11 == false)
+ {
+ // Expiry date(Account)
+ this.labelTitleExpiryDateOfAccount.Visible = false;
+ this.labelTitleDayAccount.Visible = false;
+ this.labelExpiryDateOfAccount.Visible = false;
+ this.labelExpiryDateOfAccount2.Visible = false;
+ this.labelStatusExpiryAccount.Visible = false;
+ // Expiry date(Password)
+ this.labelTitleExpiryDateOfPassword.Visible = false;
+ this.labelTitleDayPassword.Visible = false;
+ this.labelExpiryDateOfPassword.Visible = false;
+ this.labelExpiryDateOfPassword2.Visible = false;
+ this.labelStatusExpiryPassword.Visible = false;
+ // Auto logout time
+ this.labelTitleAutomaticLogoutTime.Visible = false;
+ this.labelAutomaticLogoutTime.Visible = false;
+ this.labelTitleMin.Visible = false;
+ this.labelAutoLogoutWarning.Visible = false;
+
+ this.smartSeparatorLine1.Visible = false;
+ this.smartSeparatorLine2.Visible = false;
+ }
}
private void SetEnableID(bool value)
{
+ this.labelID.Enabled = value;
+
if (value == true)
this.labelID.BackColor = Color.White;
else
@@ -119,47 +145,43 @@ namespace INT69DB_2A.Forms
}
private void SetEnablePassword(bool value)
{
+ this.labelPassword.Enabled = value;
+
if (value == true)
this.labelPassword.BackColor = Color.White;
else
this.labelPassword.BackColor = Color.Silver;
}
- private void SetEnableOnlyPart11Value(bool value)
+ private void SetEnableExpireAccount(bool value)
{
this.labelExpiryDateOfAccount.Enabled = value;
+
+ if (value == true)
+ this.labelExpiryDateOfAccount.BackColor = Color.White;
+ else
+ this.labelExpiryDateOfAccount.BackColor = Color.Silver;
+ }
+ private void SetEnableExpirePassword(bool value)
+ {
this.labelExpiryDateOfPassword.Enabled = value;
if (value == true)
- {
- this.labelExpiryDateOfAccount.BackColor = Color.White;
this.labelExpiryDateOfPassword.BackColor = Color.White;
- }
else
- {
- this.labelExpiryDateOfAccount.BackColor = Color.Silver;
this.labelExpiryDateOfPassword.BackColor = Color.Silver;
- }
- }
- private void SetEnableControl(bool value)
- {
- this.listBoxUserList.Enabled = value;
-
- this.buttonNew.Enabled = value;
- this.buttonDelete.Enabled = value;
- this.buttonSave.Enabled = value;
-
- this.buttonGroupEditor.Enabled = value;
-
- this.SetEnableOnlyPart11Value(value);
}
private void SaveUserDll()
{
- string code = "", message1 = "", message2 = "";
- string detail = "";
+ string code = "", message1 = "", message2 = "", detail = "";
+ bool isNewReg = false;
- #region listbox 미선택 시 신규 유저 등록, 선택 시 기존 유저 정보 수정
- if (this.IsNew == true)
+ if (this.listBoxUserList.SelectItemIndex == -1)
+ isNewReg = true;
+ else
+ isNewReg = false;
+
+ if (isNewReg == true)
{
switch (this.ParentForm.SystemConfig.Language)
{
@@ -225,7 +247,6 @@ namespace INT69DB_2A.Forms
break;
}
}
- #endregion
DialogFormYesNo dlg = new DialogFormYesNo(DataStore.MessageBoxIcon.Question, code, message1, message2);
if (dlg.ShowDialog() == DialogResult.Yes)
@@ -236,7 +257,7 @@ namespace INT69DB_2A.Forms
#region ID, Password 검사
// Chck ID
- if (this.IsNew == true)
+ if (isNewReg == true)
{
if (this.labelID.Text.Length < 6)
{
@@ -249,34 +270,18 @@ namespace INT69DB_2A.Forms
}
// Check Password
- if (this.labelPassword.Text.Length < 6)
+ if (this.labelPassword.Text.Length < 5)
{
// PASSWORD : 6~20자 입력하세요
DialogFormMessage msg = new DialogFormMessage(null, 9, this.ParentForm.SystemConfig.Language);
msg.ShowDialog();
return;
}
-
- if (this.labelExpiryDateOfAccount.Text == "000")
- {
- DialogFormMessage msg = new DialogFormMessage(null, 16, this.ParentForm.SystemConfig.Language);
- msg.ShowDialog();
-
- return;
- }
-
- if (this.labelExpiryDateOfPassword.Text == "00")
- {
- DialogFormMessage msg = new DialogFormMessage(null, 16, this.ParentForm.SystemConfig.Language);
- msg.ShowDialog();
-
- return;
- }
#endregion
item.ID = this.labelID.Text;
- item.SetPassword(this.labelPassword.Text);
- item.ExpireAccount = int.Parse(this.labelExpiryDateOfAccount.Text);
+ item.Password = this.labelPassword.Text;
+ item.ExpireId = int.Parse(this.labelExpiryDateOfAccount.Text);
item.ExpirePassword = int.Parse(this.labelExpiryDateOfPassword.Text);
//item.IsAdmin = this.cbAdministrator.Checked;
@@ -295,40 +300,16 @@ namespace INT69DB_2A.Forms
for (int i = 0; i < UserManager.USER_MENU_ID_MAX; i++)
menuId.fMenu[i] = false;
- if (this.IsNew == true)
+ if (isNewReg == true)
{
#region 신규 등록
- if (this.ParentForm.SystemConfig.IsPart11 == true)
- {
- if (item.ActiveLevel == 1 || item.ActiveLevel == 2 || item.ActiveLevel == 3)
- UserManager.UserManager_UserNew(item.ID, item.Password, 0, item.ExpirePassword, item.ExpireAccount, item.ActiveLevel, menuId);
- else
- UserManager.UserManager_UserNew(item.ID, item.Password, 1, item.ExpirePassword, item.ExpireAccount, item.ActiveLevel, menuId);
- }
- else // Part11 미사용, Login 사용 시, 항상 관리자로 지정
- UserManager.UserManager_UserNew(item.ID, item.Password, 1, item.ExpirePassword, item.ExpireAccount, item.ActiveLevel, menuId);
-
- // Part 11
- detail = string.Format("Add : {0}", item.ID);
- this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.UserEditor, detail);
+ UserManager.UserManager_UserNew(item.ID, item.Password, item.IsAdmin == false ? 0 : 1, item.ExpirePassword, item.ExpireId, item.ActiveLevel, menuId);
#endregion
}
else
{
#region 유저 수정
- if (this.ParentForm.SystemConfig.IsPart11 == true)
- {
- if (item.ActiveLevel == 1 || item.ActiveLevel == 2 || item.ActiveLevel == 3)
- UserManager.UserManager_UserModify(item.ID, item.Password, 0, item.ExpirePassword, item.ExpireAccount, item.ActiveLevel, menuId);
- else
- UserManager.UserManager_UserModify(item.ID, item.Password, 1, item.ExpirePassword, item.ExpireAccount, item.ActiveLevel, menuId);
- }
- else // Part11 미사용, Login 사용 시, 항상 관리자로 지정
- UserManager.UserManager_UserModify(item.ID, item.Password, 1, item.ExpirePassword, item.ExpireAccount, item.ActiveLevel, menuId);
-
- // Part 11
- detail = string.Format("Modify : {0}", item.ID);
- this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.UserEditor, detail);
+ UserManager.UserManager_UserModify(item.ID, item.Password, item.IsAdmin == false ? 0 : 1, item.ExpirePassword, item.ExpireId, item.ActiveLevel, menuId);
#endregion
}
@@ -344,16 +325,19 @@ namespace INT69DB_2A.Forms
#endregion
}
}
- private void ChangeUserControlEnable(bool enable)
- {
- this.listBoxUserList.Enabled = enable;
- this.smartGroupBox1.Enabled = enable;
- this.buttonGroupEditor.Enabled = enable;
- this.buttonBack.Enabled = enable;
- }
private void UserNew()
{
+ this.listBoxUserList.SelectedIndexChanged -= new EventHandler(this.listBoxUserList_SelectedIndexChanged);
+ this.listBoxUserList.SelectItemIndex = -1;
+ this.listBoxUserList.SelectedIndexChanged += new EventHandler(this.listBoxUserList_SelectedIndexChanged);
+
this.UpdateInitializeUserDisplay(this.ParentForm.SystemConfig);
+
+ this.buttonDelete.Visible = false;
+ this.buttonSave.Visible = false;
+ this.comboBoxAccessRight.Enabled = true;
+ this.SetEnableID(true);
+ this.SetEnablePassword(true);
}
private Color ReturnColor(bool bValue)
{
@@ -383,6 +367,7 @@ namespace INT69DB_2A.Forms
this.labelInitialization.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuInitialization);
this.labelTime.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuTime);
this.labelDataBackup.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuDataBackup);
+ this.labelEquipment.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuEquipment);
this.labelStatistics.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuStatistics);
this.labelViewer.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuViewer);
break;
@@ -403,6 +388,7 @@ namespace INT69DB_2A.Forms
this.labelInitialization.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuInitialization);
this.labelTime.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuTime);
this.labelDataBackup.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuDataBackup);
+ this.labelEquipment.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuEquipment);
this.labelStatistics.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuStatistics);
this.labelViewer.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuViewer);
break;
@@ -421,8 +407,9 @@ namespace INT69DB_2A.Forms
this.labelIOTest.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuIOTest);
this.labelUpdate.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuUpdate);
this.labelInitialization.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuInitialization);
- this.labelTime.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuTime);
+ this.labelTime.ForeColor = this.ReturnColor(true);
this.labelDataBackup.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuDataBackup);
+ this.labelEquipment.ForeColor = this.ReturnColor(true);
this.labelStatistics.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuStatistics);
this.labelViewer.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuViewer);
break;
@@ -444,6 +431,7 @@ namespace INT69DB_2A.Forms
this.labelInitialization.ForeColor = Color.Black;
this.labelTime.ForeColor = Color.Black;
this.labelDataBackup.ForeColor = Color.Black;
+ this.labelEquipment.ForeColor = Color.Black;
this.labelStatistics.ForeColor = Color.Black;
this.labelViewer.ForeColor = Color.Black;
break;
@@ -451,13 +439,42 @@ namespace INT69DB_2A.Forms
break;
}
}
+ private bool UI_Invoke(ThreadStart invoker)
+ {
+ try
+ {
+ if (this.InvokeRequired)
+ {
+ if (this.IsDisposed)
+ return true;
+
+ this.Invoke(invoker);
+ }
+ else
+ {
+ invoker();
+ }
+
+ return true;
+
+ }
+ catch (Exception e)
+ {
+ return false;
+ }
+ }
+ private void UpdateAccessRightComboBoxDisplay()
+ {
+ this.comboBoxAccessRight.Items.Clear();
+ this.comboBoxAccessRight.Items.Add(this.ParentForm.SystemConfig.User_Level1_Name);
+ this.comboBoxAccessRight.Items.Add(this.ParentForm.SystemConfig.User_Level2_Name);
+ this.comboBoxAccessRight.Items.Add(this.ParentForm.SystemConfig.User_Level3_Name);
+ }
private void UpdateInitializeUserDisplay(SystemConfigurationItem system)
{
this.SelectedUserItem = new UserItem();
- this.IsNew = true;
-
this.labelID.Text = "";
this.labelPassword.Text = "";
this.labelExpiryDateOfAccount.Text = "180";
@@ -467,16 +484,20 @@ namespace INT69DB_2A.Forms
this.comboBoxAccessRight.Visible = true;
this.comboBoxAccessRight.BringToFront();
- this.UpdateAccessRightComboBox();
+ this.UpdateAccessRightComboBoxDisplay();
this.comboBoxAccessRight.SelectedIndexChanged -= new EventHandler(this.comboBoxAccessRight_SelectedIndexChanged);
this.comboBoxAccessRight.SelectedIndex = 0;
this.comboBoxAccessRight.SelectedIndexChanged += new EventHandler(this.comboBoxAccessRight_SelectedIndexChanged);
- this.UpdateDefaultSetAccessRightDisplay(this.ParentForm.CurrentUserGroup.Level1);
-
- this.SetEnableID(true);
+ this.UpdateAccessRightDisplay(this.comboBoxAccessRight.SelectedIndex + 1);
this.buttonDelete.Visible = false;
this.buttonSave.Visible = false;
+ this.labelStatusExpiryAccount.Visible = false;
+ this.labelStatusExpiryPassword.Visible = false;
+ this.SetEnablePassword(true);
+ this.SetEnableID(true);
+ this.SetEnableExpireAccount(true);
+ this.SetEnableExpirePassword(true);
this.labelAutomaticLogoutTime.Text = system.AutomaticLogout.ToString();
@@ -490,24 +511,10 @@ namespace INT69DB_2A.Forms
this.SelectedUserItem.ID = item.user_id;
this.SelectedUserItem.Password = item.user_pw;
- this.SelectedUserItem.ExpireAccount = item.expire_period_account;
- this.SelectedUserItem.ExpirePassword = item.expire_period_pw;
+ this.SelectedUserItem.ExpireId = item.id_expire_period;
+ this.SelectedUserItem.ExpirePassword = item.password_expire_period;
- DateTime time = DateTime.ParseExact(item.register_date.GetDateTime(), "yyyyMMddHHmmss", null);
- this.SelectedUserItem.DateRegister = time;
- time = DateTime.ParseExact(item.login_date.GetDateTime(), "yyyyMMddHHmmss", null);
- this.SelectedUserItem.DateLogin = time;
- time = DateTime.ParseExact(item.expire_account_date.GetDateTime(), "yyyyMMddHHmmss", null);
- this.SelectedUserItem.DateExpireRegister = time;
- time = DateTime.ParseExact(item.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
- this.SelectedUserItem.DateExpireLogin = time;
-
- this.SelectedUserItem.IsLockAccount = item.flock_status_account == 0 ? false : true;
- this.SelectedUserItem.IsLockPassword = item.flock_status_password == 0 ? false : true;
-
- this.SelectedUserItem.IsAdmin = item.fadmin == 0 ? false : true;
this.SelectedUserItem.ActiveLevel = item.active_level;
-
if (this.SelectedUserItem.ActiveLevel == 1)
this.SelectedUserItem.Group = DataStore.UserGroup.Level1;
else if (this.SelectedUserItem.ActiveLevel == 2)
@@ -520,6 +527,27 @@ namespace INT69DB_2A.Forms
this.SelectedUserItem.Group = DataStore.UserGroup.Developer;
else
this.SelectedUserItem.Group = DataStore.UserGroup.None;
+
+ Console.WriteLine(item.password_register_date.GetDateTime());
+ Console.WriteLine(item.id_login_date.GetDateTime());
+ Console.WriteLine(item.id_expire_date.GetDateTime());
+ Console.WriteLine(item.password_expire_date.GetDateTime());
+
+ DateTime time = DateTime.ParseExact(item.password_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.SelectedUserItem.DatePasswordRegister = time;
+ time = DateTime.ParseExact(item.id_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.SelectedUserItem.DateIdLogin = time;
+ time = DateTime.ParseExact(item.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.SelectedUserItem.DateIdExpire = time;
+ time = DateTime.ParseExact(item.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.SelectedUserItem.DatePasswordExpire = time;
+
+ this.SelectedUserItem.IsLockAccount = item.id_flock_status == 0 ? false : true;
+ this.SelectedUserItem.IsLockPassword = item.flock_status_password == 0 ? false : true;
+
+ this.SelectedUserItem.IsAdmin = item.fadmin == 0 ? false : true;
+
+ this.SelectedUserItem.IsFirstPassword = item.fFirstPW;
}
private void UpdateCurrentUserItem(UserManager.UserMgr_user_info_t item)
{
@@ -527,24 +555,10 @@ namespace INT69DB_2A.Forms
this.SelectedUserItem.ID = item.user_id;
this.SelectedUserItem.Password = item.user_pw;
- this.SelectedUserItem.ExpireAccount = item.expire_period_account;
- this.SelectedUserItem.ExpirePassword = item.expire_period_pw;
+ this.SelectedUserItem.ExpireId = item.id_expire_period;
+ this.SelectedUserItem.ExpirePassword = item.password_expire_period;
- DateTime time = DateTime.ParseExact(item.register_date.GetDateTime(), "yyyyMMddHHmmss", null);
- this.SelectedUserItem.DateRegister = time;
- time = DateTime.ParseExact(item.login_date.GetDateTime(), "yyyyMMddHHmmss", null);
- this.SelectedUserItem.DateLogin = time;
- time = DateTime.ParseExact(item.expire_account_date.GetDateTime(), "yyyyMMddHHmmss", null);
- this.SelectedUserItem.DateExpireRegister = time;
- time = DateTime.ParseExact(item.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
- this.SelectedUserItem.DateExpireLogin = time;
-
- this.SelectedUserItem.IsLockAccount = item.flock_status_account == 0 ? false : true;
- this.SelectedUserItem.IsLockPassword = item.flock_status_password == 0 ? false : true;
-
- this.SelectedUserItem.IsAdmin = item.fadmin == 0 ? false : true;
this.SelectedUserItem.ActiveLevel = item.active_level;
-
if (item.active_level == 1)
this.SelectedUserItem.Group = DataStore.UserGroup.Level1;
else if (item.active_level == 2)
@@ -555,20 +569,38 @@ namespace INT69DB_2A.Forms
this.SelectedUserItem.Group = DataStore.UserGroup.Admin;
else if (item.active_level == 10)
this.SelectedUserItem.Group = DataStore.UserGroup.Developer;
+
+ Console.WriteLine(item.password_register_date.GetDateTime());
+ Console.WriteLine(item.id_login_date.GetDateTime());
+ Console.WriteLine(item.id_expire_date.GetDateTime());
+ Console.WriteLine(item.password_expire_date.GetDateTime());
+
+ DateTime time = DateTime.ParseExact(item.password_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.SelectedUserItem.DatePasswordRegister = time;
+ time = DateTime.ParseExact(item.id_login_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.SelectedUserItem.DateIdLogin = time;
+ time = DateTime.ParseExact(item.id_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.SelectedUserItem.DateIdExpire = time;
+ time = DateTime.ParseExact(item.password_expire_date.GetDateTime(), "yyyyMMddHHmmss", null);
+ this.SelectedUserItem.DatePasswordExpire = time;
+
+ this.SelectedUserItem.IsLockAccount = item.id_flock_status == 0 ? false : true;
+ this.SelectedUserItem.IsLockPassword = item.password_flock_status == 0 ? false : true;
+
+ this.SelectedUserItem.IsAdmin = item.fadmin == 0 ? false : true;
+
+ this.SelectedUserItem.IsFirstPassword = item.fFirstPW;
}
private void UpdateSelectUserDisplay(UserItem item)
{
this.SetEnableID(false);
- this.SetEnablePassword(true);
- this.SetEnableControl(true);
-
- // 화면 Enable 처리 추가할것
- this.ChangeUserControlEnable(true);
this.labelID.Text = item.ID;
this.labelPassword.Text = item.Password;
+ this.UpdateAccessRightDisplay(item.ActiveLevel);
+ this.buttonSave.Visible = false;
- if (this.listBoxUserList.SelectItemIndex == 0)
+ if (item.Group == DataStore.UserGroup.Admin)
{
this.labelExpiryDateOfAccount.Text = "0";
this.labelExpiryDateOfPassword.Text = "0";
@@ -577,7 +609,10 @@ namespace INT69DB_2A.Forms
this.buttonDelete.Visible = false;
this.comboBoxAccessRight.Visible = false;
- this.SetEnableOnlyPart11Value(false);
+ this.labelStatusExpiryAccount.Visible = false;
+ this.labelStatusExpiryPassword.Visible = false;
+ this.SetEnableExpireAccount(false);
+ this.SetEnableExpirePassword(false);
if (this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Admin
|| this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Developer)
@@ -587,13 +622,21 @@ namespace INT69DB_2A.Forms
}
else
{
- this.labelExpiryDateOfAccount.Text = item.ExpireAccount.ToString();
+ this.labelExpiryDateOfAccount.Text = item.ExpireId.ToString();
this.labelExpiryDateOfPassword.Text = item.ExpirePassword.ToString();
- this.labelExpiryDateOfAccount2.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DateRegister, item.DateExpireRegister);
- this.labelExpiryDateOfPassword2.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DateLogin, item.DateExpireLogin);
- this.labelStatusExpireAccount.Visible = item.IsLockAccount;
- this.labelStatusExpirePassword.Visible = item.IsLockPassword;
+ if (item.ExpireId != 0)
+ this.labelExpiryDateOfAccount2.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DateIdLogin, item.DateIdExpire);
+ else
+ this.labelExpiryDateOfAccount2.Text = "-";
+
+ if (item.ExpirePassword != 0)
+ this.labelExpiryDateOfPassword2.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DatePasswordRegister, item.DatePasswordExpire);
+ else
+ this.labelExpiryDateOfPassword2.Text = "-";
+
+ this.labelStatusExpiryAccount.Visible = item.IsLockAccount;
+ this.labelStatusExpiryPassword.Visible = item.IsLockPassword;
this.comboBoxAccessRight.Visible = true;
this.comboBoxAccessRight.BringToFront();
@@ -601,25 +644,28 @@ namespace INT69DB_2A.Forms
this.comboBoxAccessRight.SelectedIndex = item.ActiveLevel - 1;
this.comboBoxAccessRight.SelectedIndexChanged += new EventHandler(this.comboBoxAccessRight_SelectedIndexChanged);
+ this.SetEnableExpireAccount(true);
+ this.SetEnableExpirePassword(true);
+
if (this.ParentForm.SystemConfig.CurrentUser.ActiveLevel < item.ActiveLevel)
{
- this.SetEnablePassword(false);
this.buttonDelete.Visible = false;
-
- this.SetEnableOnlyPart11Value(false);
+ this.SetEnablePassword(false);
+ this.comboBoxAccessRight.Enabled = false;
+ }
+ else if (this.ParentForm.SystemConfig.CurrentUser.ActiveLevel == item.ActiveLevel)
+ {
+ this.buttonDelete.Visible = false;
+ this.SetEnablePassword(true);
this.comboBoxAccessRight.Enabled = false;
}
else
{
- this.SetEnableOnlyPart11Value(true);
+ this.buttonDelete.Visible = true;
+ this.SetEnablePassword(true);
this.comboBoxAccessRight.Enabled = true;
}
}
-
- //this.CheckBoxCheckedAsLevel(item.Group);
-
- //this.cbAdministrator.Visible = true;
- //this.cbAdministrator.Checked = item.IsAdmin;
}
private void UpdateUserListBoxDisplay(List items)
{
@@ -627,8 +673,26 @@ namespace INT69DB_2A.Forms
for (int i = 1; i < items.Count; i++)
this.listBoxUserList.AddItem(items[i]);
}
- private void UpdateDefaultSetAccessRightDisplay(UserGroupItem item)
+ private void UpdateAccessRightDisplay(int level)
{
+ UserGroupItem item;
+ switch (level)
+ {
+ case 1:
+ item = this.ParentForm.CurrentUserGroup.Level1;
+ break;
+ case 2:
+ item = this.ParentForm.CurrentUserGroup.Level2;
+ break;
+ case 3:
+ case 9:
+ item = this.ParentForm.CurrentUserGroup.Level3;
+ break;
+ default:
+ item = this.ParentForm.CurrentUserGroup.Level1;
+ break;
+ }
+
this.labelProductNo.ForeColor = this.ReturnColor(item.IsMainDisplayProductNo);
this.labelWeightSetting.ForeColor = this.ReturnColor(item.IsMainDisplayWeightSetting);
this.labelClear.ForeColor = this.ReturnColor(item.IsMainDisplayClear);
@@ -645,6 +709,7 @@ namespace INT69DB_2A.Forms
this.labelInitialization.ForeColor = this.ReturnColor(item.IsMenuInitialization);
this.labelTime.ForeColor = this.ReturnColor(item.IsMenuTime);
this.labelDataBackup.ForeColor = this.ReturnColor(item.IsMenuDataBackup);
+ this.labelEquipment.ForeColor = this.ReturnColor(item.IsMenuEquipment);
this.labelStatistics.ForeColor = this.ReturnColor(item.IsMenuStatistics);
this.labelViewer.ForeColor = this.ReturnColor(item.IsMenuViewer);
}
@@ -708,9 +773,9 @@ namespace INT69DB_2A.Forms
this.UpdateUserListBoxDisplay(this.ParentForm.ListDllUserName);
this.listBoxUserList.SelectItemIndex = this.listBoxUserList.ItemCount - 1;
- this.buttonDelete.Enabled = true;
- this.labelID.Enabled = false;
- this.labelID.BackColor = Color.LightGray;
+ this.buttonDelete.Visible = true;
+ this.buttonSave.Visible = false;
+ this.SetEnableID(false);
DialogFormMessage dlg = new DialogFormMessage(DataStore.MessageBoxIcon.Asterisk, code, message1, message2, 0);
dlg.ShowDialog();
@@ -866,113 +931,32 @@ namespace INT69DB_2A.Forms
//}
}
- private bool UI_Invoke(ThreadStart invoker)
- {
- try
- {
- if (this.InvokeRequired)
- {
- if (this.IsDisposed)
- return true;
-
- this.Invoke(invoker);
- }
- else
- {
- invoker();
- }
-
- return true;
-
- }
- catch (Exception e)
- {
- return false;
- }
- }
-
- public void DisplayOnlyPart11Item(bool bValue)
- {
- if (bValue == true)
- {
- this.labelTitleExpiryDateOfAccount.Visible = true;
- this.labelExpiryDateOfAccount.Visible = true;
- this.labelExpiryDateOfAccount2.Visible = true;
- this.labelTitleDayAccount.Visible = true;
-
- this.labelTitleExpiryDateOfPassword.Visible = true;
- this.labelExpiryDateOfPassword.Visible = true;
- this.labelExpiryDateOfPassword2.Visible = true;
- this.labelTitleDayPassword.Visible = true;
-
- this.labelTitleAutomaticLogoutTime.Visible = true;
- this.labelAutomaticLogoutTime.Visible = true;
- this.labelTitleMin.Visible = true;
- this.labelAutoLogoutWarning.Visible = true;
-
- this.smartSeparatorLine1.Visible = true;
- this.smartSeparatorLine2.Visible = true;
- }
- else
- {
- this.labelTitleExpiryDateOfAccount.Visible = false;
- this.labelExpiryDateOfAccount.Visible = false;
- this.labelExpiryDateOfAccount2.Visible = false;
- this.labelTitleDayAccount.Visible = false;
-
- this.labelTitleExpiryDateOfPassword.Visible = false;
- this.labelExpiryDateOfPassword.Visible = false;
- this.labelExpiryDateOfPassword2.Visible = false;
- this.labelTitleDayPassword.Visible = false;
-
- this.labelTitleAutomaticLogoutTime.Visible = false;
- this.labelAutomaticLogoutTime.Visible = false;
- this.labelTitleMin.Visible = false;
- this.labelAutoLogoutWarning.Visible = false;
-
- this.smartSeparatorLine1.Visible = false;
- this.smartSeparatorLine2.Visible = false;
- }
- }
- public void UpdateAccessRightComboBox()
- {
- this.comboBoxAccessRight.Items.Clear();
- this.comboBoxAccessRight.Items.Add(this.ParentForm.SystemConfig.User_Level1_Name);
- this.comboBoxAccessRight.Items.Add(this.ParentForm.SystemConfig.User_Level2_Name);
- this.comboBoxAccessRight.Items.Add(this.ParentForm.SystemConfig.User_Level3_Name);
- }
-
public void DisplayRefresh()
{
this.ParentForm.SystemConfig.CurrentForm = DataStore.FormStore.FormUserEditor;
- if (this.ParentForm.SystemConfig.CurrentUser.IsAdmin == true || this.ParentForm.SystemConfig.CurrentUser.ActiveLevel == 3)
+ if (this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Level3
+ || this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Admin
+ || this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Developer)
{
+ this.buttonNew.Visible = true;
this.buttonGroupEditor.Visible = true;
this.ChildControlUserSet.Visible = false;
- this.buttonNew.Visible = true;
+
+ this.UpdateInitializeUserDisplay(this.ParentForm.SystemConfig);
+ this.UpdateUserListBoxDisplay(this.ParentForm.ListDllUserName);
}
else
{
- this.buttonGroupEditor.Visible = false;
this.buttonNew.Visible = false;
this.buttonDelete.Visible = false;
+ this.buttonSave.Visible = false;
+ this.buttonGroupEditor.Visible = false;
this.ChildControlUserSet.Visible = true;
this.ChildControlUserSet.BringToFront();
this.ChildControlUserSet.DisplayRefresh();
}
-
- this.UpdateInitializeUserDisplay(this.ParentForm.SystemConfig);
- this.UpdateUserListBoxDisplay(this.ParentForm.ListDllUserName);
- this.listBoxUserList.SelectedIndexChanged -= new EventHandler(this.listBoxUserList_SelectedIndexChanged);
- this.listBoxUserList.SelectItemIndex = -1;
- this.listBoxUserList.SelectedIndexChanged += new EventHandler(this.listBoxUserList_SelectedIndexChanged);
-
- this.buttonNew.Visible = true;
- this.listBoxUserList.Enabled = true;
- this.SetEnablePassword(true);
- this.SetEnableID(true);
}
#endregion
@@ -981,14 +965,6 @@ namespace INT69DB_2A.Forms
{
this.ParentForm.ChildFormMenu.DisplayRefresh();
((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormMenu);
- }
- private void buttonExpireAccount_Click(object sender, EventArgs e)
- {
-
- }
- private void buttonExpirePassword_Click(object sender, EventArgs e)
- {
-
}
private void buttonNew_Click(object sender, EventArgs e)
{
@@ -1002,7 +978,7 @@ namespace INT69DB_2A.Forms
{
// 메시지 추가
// 사용자를 삭제 하시겠습니까?
- DialogFormYesNo dlg = new DialogFormYesNo(this.ParentForm.SystemConfig.Language, 16);
+ DialogFormYesNo dlg = new DialogFormYesNo(this.ParentForm.SystemConfig.Language, 14);
if (dlg.ShowDialog() == DialogResult.Yes)
{
if (this.listBoxUserList.Items.Count <= 1)
@@ -1021,14 +997,12 @@ namespace INT69DB_2A.Forms
{
this.ParentForm.ChildFormUserGroupEditor.DisplayRefresh();
((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormUserGroupEditor);
-
- //this.DisplayRefresh();
}
private void labelID_Click(object sender, EventArgs e)
{
string value = "";
- DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelID.Text, this.labelTitleID.Text);
+ DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelID.Text);
if (keyboard.ShowDialog() == DialogResult.OK)
{
@@ -1036,14 +1010,17 @@ namespace INT69DB_2A.Forms
this.labelID.Text = value;
- if (this.buttonSave.Visible == false)
- this.buttonSave.Visible = true;
+ if (this.labelID.Text != "")
+ {
+ if (this.buttonSave.Visible == false)
+ this.buttonSave.Visible = true;
+ }
}
}
private void labelPassword_Click(object sender, EventArgs e)
{
string value = "";
- DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelPassword.Text, this.labelTitlePassword.Text);
+ DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelPassword.Text);
if (keyboard.ShowDialog() == DialogResult.OK)
{
@@ -1051,12 +1028,12 @@ namespace INT69DB_2A.Forms
this.labelPassword.Text = value;
- if (this.buttonSave.Visible == false)
- this.buttonSave.Visible = true;
+ if (this.labelPassword.Text != "")
+ {
+ if (this.buttonSave.Visible == false)
+ this.buttonSave.Visible = true;
+ }
}
-
- if (this.IsNew == true)
- this.SetEnableID(true);
}
private void labelExpireAccount_Click(object sender, EventArgs e)
{
@@ -1064,24 +1041,17 @@ namespace INT69DB_2A.Forms
if (myKeyPad.ShowDialog() == DialogResult.OK)
{
- if (myKeyPad.IntValue <= 0)
+ if (myKeyPad.doubleValue < 0 || myKeyPad.doubleValue > 180)
{
// 입력범위를 확인하세요
DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.SystemConfig.Language);
myMsg.ShowDialog();
}
- else if (myKeyPad.IntValue > 180)
- {
- this.labelExpiryDateOfAccount.Text = "180";
-
- if (this.buttonSave.Visible == false)
- this.buttonSave.Visible = true;
- }
else
{
this.labelExpiryDateOfAccount.Text = myKeyPad.StringValue;
- if (this.buttonSave.Visible == false)
+ if (this.buttonSave.Visible != true)
this.buttonSave.Visible = true;
}
}
@@ -1092,59 +1062,55 @@ namespace INT69DB_2A.Forms
if (myKeyPad.ShowDialog() == DialogResult.OK)
{
- if (myKeyPad.IntValue <= 0)
+ if (myKeyPad.doubleValue < 0 || myKeyPad.doubleValue > 90)
{
// 입력범위를 확인하세요
DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.SystemConfig.Language);
myMsg.ShowDialog();
}
- else if (myKeyPad.IntValue > 90)
- {
- this.labelExpiryDateOfPassword.Text = "90";
-
- if (this.buttonSave.Visible == false)
- this.buttonSave.Visible = true;
- }
else
{
this.labelExpiryDateOfPassword.Text = myKeyPad.StringValue;
- if (this.buttonSave.Visible == false)
+ if (this.buttonSave.Visible != true)
this.buttonSave.Visible = true;
}
}
}
private void labelAutomaticLogout_Click(object sender, EventArgs e)
{
+ string before = "", after = "";
+
+ before = this.labelAutomaticLogoutTime.Text;
+
DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelAutomaticLogoutTime.Text, 2, 0, false, this.ParentForm.SystemConfig.Language);
if (myKeyPad.ShowDialog() == DialogResult.OK)
{
- if (myKeyPad.IntValue < 0)
+ if (myKeyPad.doubleValue < 0 || myKeyPad.doubleValue > 90)
{
// 입력범위를 확인하세요
DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.SystemConfig.Language);
myMsg.ShowDialog();
}
- else if (myKeyPad.IntValue > 90)
- {
- this.labelAutomaticLogoutTime.Text = "90";
- }
else
{
this.labelAutomaticLogoutTime.Text = myKeyPad.StringValue;
+ this.ParentForm.SystemConfig.AutomaticLogout = myKeyPad.IntValue;
+ this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
+ after = this.labelAutomaticLogoutTime.Text;
+
+ if (this.ParentForm.SystemConfig.AutomaticLogout == 1)
+ this.ParentForm.FlagAutomaticLogoutWarningTime = 30;
+ else
+ this.ParentForm.FlagAutomaticLogoutWarningTime = 60;
+
+ UserManager.UserManager_AutoLogoutSetTimeout(this.ParentForm.SystemConfig.AutomaticLogout, this.ParentForm.FlagAutomaticLogoutWarningTime);
+
+ // Part11
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
+ this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.AutoLogout, "", before, after);
}
-
- this.ParentForm.SystemConfig.UserAutomaticLogout = myKeyPad.IntValue;
-
- if (this.ParentForm.SystemConfig.UserAutomaticLogout == 1)
- this.ParentForm.FlagAutomaticLogoutWarningTime = 30;
- else
- this.ParentForm.FlagAutomaticLogoutWarningTime = 60;
-
- this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
-
- UserManager.UserManager_AutoLogoutSetTimeout(this.ParentForm.SystemConfig.UserAutomaticLogout, this.ParentForm.FlagAutomaticLogoutWarningTime);
}
}
private void labelStatusExpireAccount_Click(object sender, EventArgs e)
@@ -1228,21 +1194,22 @@ namespace INT69DB_2A.Forms
private void comboBoxAccessRight_SelectedIndexChanged(object sender, EventArgs e)
{
- switch (this.comboBoxAccessRight.SelectedIndex)
- {
- case 0:
- this.UpdateDefaultSetAccessRightDisplay(this.ParentForm.CurrentUserGroup.Level1);
- break;
- case 1:
- this.UpdateDefaultSetAccessRightDisplay(this.ParentForm.CurrentUserGroup.Level2);
- break;
- case 2:
- this.UpdateDefaultSetAccessRightDisplay(this.ParentForm.CurrentUserGroup.Level3);
- break;
- default:
- this.UpdateDefaultSetAccessRightDisplay(this.ParentForm.CurrentUserGroup.Level1);
- break;
- }
+ //switch (this.comboBoxAccessRight.SelectedIndex)
+ //{
+ // case 0:
+ // this.UpdateAccessRightDisplay(this.ParentForm.CurrentUserGroup.Level1);
+ // break;
+ // case 1:
+ // this.UpdateAccessRightDisplay(this.ParentForm.CurrentUserGroup.Level2);
+ // break;
+ // case 2:
+ // this.UpdateAccessRightDisplay(this.ParentForm.CurrentUserGroup.Level3);
+ // break;
+ // default:
+ // this.UpdateAccessRightDisplay(this.ParentForm.CurrentUserGroup.Level1);
+ // break;
+ //}
+ this.UpdateAccessRightDisplay(this.comboBoxAccessRight.SelectedIndex + 1);
if (this.buttonSave.Visible == false)
this.buttonSave.Visible = true;
@@ -1251,30 +1218,14 @@ namespace INT69DB_2A.Forms
private void listBoxUserList_SelectedIndexChanged(object sender, EventArgs e)
{
int index = this.listBoxUserList.SelectItemIndex;
- this.IsNew = false;
- this.SetEnablePassword(true);
- this.labelAutomaticLogoutTime.Enabled = true;
-
- if (index == 0)
- {
- UserManager.UserManager_GetUserListID(this.listBoxUserList.Items[index]);
- }
- else if (index < 0)
- {
- this.UpdateInitializeUserDisplay(this.ParentForm.SystemConfig);
- }
- else if (index > 0)
+ if (index != -1)
{
if (this.ParentForm.SystemConfig.CurrentUser.ID == this.listBoxUserList.Items[index])
this.buttonDelete.Visible = false;
else
this.buttonDelete.Visible = true;
- this.SetEnableID(false);
- this.SetEnableControl(true);
- this.SetEnablePassword(true);
-
UserManager.UserManager_GetUserListID(this.listBoxUserList.Items[index]);
}
}
diff --git a/INT69DB_2A/Forms/FormUserGroupEditor.Designer.cs b/INT69DB_2A/Forms/FormUserGroupEditor.Designer.cs
index 90ce863..905c3f3 100644
--- a/INT69DB_2A/Forms/FormUserGroupEditor.Designer.cs
+++ b/INT69DB_2A/Forms/FormUserGroupEditor.Designer.cs
@@ -141,16 +141,12 @@
this.smartLabel2 = new SmartX.SmartLabel();
this.smartLabel1 = new SmartX.SmartLabel();
this.pictureBoxFormIcon = new System.Windows.Forms.PictureBox();
- this.smartKeyboard = new SmartX.SmartKeyboard();
- this.buttonEditLevel3 = new SmartX.SmartButton();
this.smartLabel27 = new SmartX.SmartLabel();
- this.textBoxLevel3 = new System.Windows.Forms.TextBox();
- this.buttonEditLevel2 = new SmartX.SmartButton();
this.smartLabel25 = new SmartX.SmartLabel();
- this.textBoxLevel2 = new System.Windows.Forms.TextBox();
- this.buttonEditLevel1 = new SmartX.SmartButton();
this.smartLabel26 = new SmartX.SmartLabel();
- this.textBoxLevel1 = new System.Windows.Forms.TextBox();
+ this.labelLevel3Name = new SmartX.SmartLabel();
+ this.labelLevel2Name = new SmartX.SmartLabel();
+ this.labelLevel1Name = new SmartX.SmartLabel();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.smartGroupBox1.SuspendLayout();
this.SuspendLayout();
@@ -391,7 +387,7 @@
this.checkBoxNotLoginMenuViewer.ImageCheckBox = null;
this.checkBoxNotLoginMenuViewer.ImageUnCheckBox = null;
this.checkBoxNotLoginMenuViewer.InitVisible = true;
- this.checkBoxNotLoginMenuViewer.Location = new System.Drawing.Point(746, 323);
+ this.checkBoxNotLoginMenuViewer.Location = new System.Drawing.Point(746, 346);
this.checkBoxNotLoginMenuViewer.Name = "checkBoxNotLoginMenuViewer";
this.checkBoxNotLoginMenuViewer.Size = new System.Drawing.Size(20, 20);
this.checkBoxNotLoginMenuViewer.TabIndex = 852;
@@ -413,7 +409,7 @@
this.checkBoxL3MenuViewer.ImageCheckBox = null;
this.checkBoxL3MenuViewer.ImageUnCheckBox = null;
this.checkBoxL3MenuViewer.InitVisible = true;
- this.checkBoxL3MenuViewer.Location = new System.Drawing.Point(709, 323);
+ this.checkBoxL3MenuViewer.Location = new System.Drawing.Point(709, 346);
this.checkBoxL3MenuViewer.Name = "checkBoxL3MenuViewer";
this.checkBoxL3MenuViewer.Size = new System.Drawing.Size(20, 20);
this.checkBoxL3MenuViewer.TabIndex = 853;
@@ -435,7 +431,7 @@
this.checkBoxL2MenuViewer.ImageCheckBox = null;
this.checkBoxL2MenuViewer.ImageUnCheckBox = null;
this.checkBoxL2MenuViewer.InitVisible = true;
- this.checkBoxL2MenuViewer.Location = new System.Drawing.Point(673, 323);
+ this.checkBoxL2MenuViewer.Location = new System.Drawing.Point(673, 346);
this.checkBoxL2MenuViewer.Name = "checkBoxL2MenuViewer";
this.checkBoxL2MenuViewer.Size = new System.Drawing.Size(20, 20);
this.checkBoxL2MenuViewer.TabIndex = 854;
@@ -457,7 +453,7 @@
this.checkBoxL1MenuViewer.ImageCheckBox = null;
this.checkBoxL1MenuViewer.ImageUnCheckBox = null;
this.checkBoxL1MenuViewer.InitVisible = true;
- this.checkBoxL1MenuViewer.Location = new System.Drawing.Point(637, 323);
+ this.checkBoxL1MenuViewer.Location = new System.Drawing.Point(637, 346);
this.checkBoxL1MenuViewer.Name = "checkBoxL1MenuViewer";
this.checkBoxL1MenuViewer.Size = new System.Drawing.Size(20, 20);
this.checkBoxL1MenuViewer.TabIndex = 851;
@@ -476,7 +472,7 @@
this.labelTitleViewer.ForeColor = System.Drawing.Color.Black;
this.labelTitleViewer.InitVisible = true;
this.labelTitleViewer.LineSpacing = 0F;
- this.labelTitleViewer.Location = new System.Drawing.Point(427, 323);
+ this.labelTitleViewer.Location = new System.Drawing.Point(427, 346);
this.labelTitleViewer.Name = "labelTitleViewer";
this.labelTitleViewer.Size = new System.Drawing.Size(200, 20);
this.labelTitleViewer.TabIndex = 850;
@@ -625,6 +621,7 @@
this.labelTitleNotLogin2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitleNotLogin2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitleNotLogin2.Wordwrap = false;
+ this.labelTitleNotLogin2.Click += new System.EventHandler(this.labelTitle4_Click);
//
// smartLabel17
//
@@ -646,6 +643,7 @@
this.smartLabel17.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.smartLabel17.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.smartLabel17.Wordwrap = false;
+ this.smartLabel17.Click += new System.EventHandler(this.labelTitle3_Click);
//
// smartLabel22
//
@@ -667,6 +665,7 @@
this.smartLabel22.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.smartLabel22.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.smartLabel22.Wordwrap = false;
+ this.smartLabel22.Click += new System.EventHandler(this.labelTitle2_Click);
//
// smartLabel23
//
@@ -688,6 +687,7 @@
this.smartLabel23.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.smartLabel23.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.smartLabel23.Wordwrap = false;
+ this.smartLabel23.Click += new System.EventHandler(this.labelTitle1_Click);
//
// checkBoxNotLoginMenuStatistics
//
@@ -703,7 +703,7 @@
this.checkBoxNotLoginMenuStatistics.ImageCheckBox = null;
this.checkBoxNotLoginMenuStatistics.ImageUnCheckBox = null;
this.checkBoxNotLoginMenuStatistics.InitVisible = true;
- this.checkBoxNotLoginMenuStatistics.Location = new System.Drawing.Point(746, 300);
+ this.checkBoxNotLoginMenuStatistics.Location = new System.Drawing.Point(746, 323);
this.checkBoxNotLoginMenuStatistics.Name = "checkBoxNotLoginMenuStatistics";
this.checkBoxNotLoginMenuStatistics.Size = new System.Drawing.Size(20, 20);
this.checkBoxNotLoginMenuStatistics.TabIndex = 828;
@@ -725,7 +725,7 @@
this.checkBoxL3MenuStatistics.ImageCheckBox = null;
this.checkBoxL3MenuStatistics.ImageUnCheckBox = null;
this.checkBoxL3MenuStatistics.InitVisible = true;
- this.checkBoxL3MenuStatistics.Location = new System.Drawing.Point(709, 300);
+ this.checkBoxL3MenuStatistics.Location = new System.Drawing.Point(709, 323);
this.checkBoxL3MenuStatistics.Name = "checkBoxL3MenuStatistics";
this.checkBoxL3MenuStatistics.Size = new System.Drawing.Size(20, 20);
this.checkBoxL3MenuStatistics.TabIndex = 829;
@@ -747,7 +747,7 @@
this.checkBoxL2MenuStatistics.ImageCheckBox = null;
this.checkBoxL2MenuStatistics.ImageUnCheckBox = null;
this.checkBoxL2MenuStatistics.InitVisible = true;
- this.checkBoxL2MenuStatistics.Location = new System.Drawing.Point(673, 300);
+ this.checkBoxL2MenuStatistics.Location = new System.Drawing.Point(673, 323);
this.checkBoxL2MenuStatistics.Name = "checkBoxL2MenuStatistics";
this.checkBoxL2MenuStatistics.Size = new System.Drawing.Size(20, 20);
this.checkBoxL2MenuStatistics.TabIndex = 830;
@@ -769,7 +769,7 @@
this.checkBoxL1MenuStatistics.ImageCheckBox = null;
this.checkBoxL1MenuStatistics.ImageUnCheckBox = null;
this.checkBoxL1MenuStatistics.InitVisible = true;
- this.checkBoxL1MenuStatistics.Location = new System.Drawing.Point(637, 300);
+ this.checkBoxL1MenuStatistics.Location = new System.Drawing.Point(637, 323);
this.checkBoxL1MenuStatistics.Name = "checkBoxL1MenuStatistics";
this.checkBoxL1MenuStatistics.Size = new System.Drawing.Size(20, 20);
this.checkBoxL1MenuStatistics.TabIndex = 827;
@@ -788,7 +788,7 @@
this.labelTitleStatistics.ForeColor = System.Drawing.Color.Black;
this.labelTitleStatistics.InitVisible = true;
this.labelTitleStatistics.LineSpacing = 0F;
- this.labelTitleStatistics.Location = new System.Drawing.Point(427, 300);
+ this.labelTitleStatistics.Location = new System.Drawing.Point(427, 323);
this.labelTitleStatistics.Name = "labelTitleStatistics";
this.labelTitleStatistics.Size = new System.Drawing.Size(200, 20);
this.labelTitleStatistics.TabIndex = 826;
@@ -980,12 +980,11 @@
this.checkBoxNotLoginMenuEquipment.ImageCheckBox = null;
this.checkBoxNotLoginMenuEquipment.ImageUnCheckBox = null;
this.checkBoxNotLoginMenuEquipment.InitVisible = true;
- this.checkBoxNotLoginMenuEquipment.Location = new System.Drawing.Point(344, 369);
+ this.checkBoxNotLoginMenuEquipment.Location = new System.Drawing.Point(746, 300);
this.checkBoxNotLoginMenuEquipment.Name = "checkBoxNotLoginMenuEquipment";
this.checkBoxNotLoginMenuEquipment.Size = new System.Drawing.Size(20, 20);
this.checkBoxNotLoginMenuEquipment.TabIndex = 799;
this.checkBoxNotLoginMenuEquipment.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
- this.checkBoxNotLoginMenuEquipment.Visible = false;
this.checkBoxNotLoginMenuEquipment.Click += new System.EventHandler(this.checkBox_Click);
//
// checkBoxL3MenuEquipment
@@ -993,21 +992,21 @@
this.checkBoxL3MenuEquipment.BackPictureBox = this.smartForm1;
this.checkBoxL3MenuEquipment.BackPictureBox1 = null;
this.checkBoxL3MenuEquipment.BackPictureBox2 = null;
- this.checkBoxL3MenuEquipment.CheckBoxBackColor = System.Drawing.Color.White;
+ this.checkBoxL3MenuEquipment.CheckBoxBackColor = System.Drawing.Color.Silver;
this.checkBoxL3MenuEquipment.CheckBoxCheckColor = System.Drawing.Color.Green;
this.checkBoxL3MenuEquipment.CheckBoxForeColor = System.Drawing.Color.Black;
this.checkBoxL3MenuEquipment.CheckBoxSymbolSize = 25;
- this.checkBoxL3MenuEquipment.Checked = false;
+ this.checkBoxL3MenuEquipment.Checked = true;
this.checkBoxL3MenuEquipment.CheckLineWidth = 3;
+ this.checkBoxL3MenuEquipment.Enabled = false;
this.checkBoxL3MenuEquipment.ImageCheckBox = null;
this.checkBoxL3MenuEquipment.ImageUnCheckBox = null;
this.checkBoxL3MenuEquipment.InitVisible = true;
- this.checkBoxL3MenuEquipment.Location = new System.Drawing.Point(307, 369);
+ this.checkBoxL3MenuEquipment.Location = new System.Drawing.Point(709, 300);
this.checkBoxL3MenuEquipment.Name = "checkBoxL3MenuEquipment";
this.checkBoxL3MenuEquipment.Size = new System.Drawing.Size(20, 20);
this.checkBoxL3MenuEquipment.TabIndex = 800;
this.checkBoxL3MenuEquipment.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
- this.checkBoxL3MenuEquipment.Visible = false;
this.checkBoxL3MenuEquipment.Click += new System.EventHandler(this.checkBox_Click);
//
// checkBoxNotLoginMenuUpdate
@@ -1150,12 +1149,11 @@
this.checkBoxL2MenuEquipment.ImageCheckBox = null;
this.checkBoxL2MenuEquipment.ImageUnCheckBox = null;
this.checkBoxL2MenuEquipment.InitVisible = true;
- this.checkBoxL2MenuEquipment.Location = new System.Drawing.Point(271, 369);
+ this.checkBoxL2MenuEquipment.Location = new System.Drawing.Point(673, 300);
this.checkBoxL2MenuEquipment.Name = "checkBoxL2MenuEquipment";
this.checkBoxL2MenuEquipment.Size = new System.Drawing.Size(20, 20);
this.checkBoxL2MenuEquipment.TabIndex = 791;
this.checkBoxL2MenuEquipment.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
- this.checkBoxL2MenuEquipment.Visible = false;
this.checkBoxL2MenuEquipment.Click += new System.EventHandler(this.checkBox_Click);
//
// checkBoxL2MenuUpdate
@@ -1235,12 +1233,11 @@
this.checkBoxL1MenuEquipment.ImageCheckBox = null;
this.checkBoxL1MenuEquipment.ImageUnCheckBox = null;
this.checkBoxL1MenuEquipment.InitVisible = true;
- this.checkBoxL1MenuEquipment.Location = new System.Drawing.Point(235, 369);
+ this.checkBoxL1MenuEquipment.Location = new System.Drawing.Point(637, 300);
this.checkBoxL1MenuEquipment.Name = "checkBoxL1MenuEquipment";
this.checkBoxL1MenuEquipment.Size = new System.Drawing.Size(20, 20);
this.checkBoxL1MenuEquipment.TabIndex = 789;
this.checkBoxL1MenuEquipment.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
- this.checkBoxL1MenuEquipment.Visible = false;
this.checkBoxL1MenuEquipment.Click += new System.EventHandler(this.checkBox_Click);
//
// checkBoxL1MenuUpdate
@@ -1489,7 +1486,7 @@
this.checkBoxNotLoginMenuUser.ImageCheckBox = null;
this.checkBoxNotLoginMenuUser.ImageUnCheckBox = null;
this.checkBoxNotLoginMenuUser.InitVisible = true;
- this.checkBoxNotLoginMenuUser.Location = new System.Drawing.Point(746, 346);
+ this.checkBoxNotLoginMenuUser.Location = new System.Drawing.Point(746, 369);
this.checkBoxNotLoginMenuUser.Name = "checkBoxNotLoginMenuUser";
this.checkBoxNotLoginMenuUser.Size = new System.Drawing.Size(20, 20);
this.checkBoxNotLoginMenuUser.TabIndex = 805;
@@ -1512,7 +1509,7 @@
this.checkBoxL3MenuUser.ImageCheckBox = null;
this.checkBoxL3MenuUser.ImageUnCheckBox = null;
this.checkBoxL3MenuUser.InitVisible = true;
- this.checkBoxL3MenuUser.Location = new System.Drawing.Point(709, 346);
+ this.checkBoxL3MenuUser.Location = new System.Drawing.Point(709, 369);
this.checkBoxL3MenuUser.Name = "checkBoxL3MenuUser";
this.checkBoxL3MenuUser.Size = new System.Drawing.Size(20, 20);
this.checkBoxL3MenuUser.TabIndex = 806;
@@ -1660,7 +1657,7 @@
this.checkBoxL2MenuUser.ImageCheckBox = null;
this.checkBoxL2MenuUser.ImageUnCheckBox = null;
this.checkBoxL2MenuUser.InitVisible = true;
- this.checkBoxL2MenuUser.Location = new System.Drawing.Point(673, 346);
+ this.checkBoxL2MenuUser.Location = new System.Drawing.Point(673, 369);
this.checkBoxL2MenuUser.Name = "checkBoxL2MenuUser";
this.checkBoxL2MenuUser.Size = new System.Drawing.Size(20, 20);
this.checkBoxL2MenuUser.TabIndex = 765;
@@ -1745,7 +1742,7 @@
this.checkBoxL1MenuUser.ImageCheckBox = null;
this.checkBoxL1MenuUser.ImageUnCheckBox = null;
this.checkBoxL1MenuUser.InitVisible = true;
- this.checkBoxL1MenuUser.Location = new System.Drawing.Point(637, 346);
+ this.checkBoxL1MenuUser.Location = new System.Drawing.Point(637, 369);
this.checkBoxL1MenuUser.Name = "checkBoxL1MenuUser";
this.checkBoxL1MenuUser.Size = new System.Drawing.Size(20, 20);
this.checkBoxL1MenuUser.TabIndex = 767;
@@ -2173,6 +2170,7 @@
this.labelTitleNotLogin1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitleNotLogin1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitleNotLogin1.Wordwrap = false;
+ this.labelTitleNotLogin1.Click += new System.EventHandler(this.labelTitle4_Click);
//
// labelTitle3
//
@@ -2194,6 +2192,7 @@
this.labelTitle3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitle3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitle3.Wordwrap = false;
+ this.labelTitle3.Click += new System.EventHandler(this.labelTitle3_Click);
//
// labelTitle2
//
@@ -2215,6 +2214,7 @@
this.labelTitle2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitle2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitle2.Wordwrap = false;
+ this.labelTitle2.Click += new System.EventHandler(this.labelTitle2_Click);
//
// labelTitle1
//
@@ -2236,6 +2236,7 @@
this.labelTitle1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitle1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitle1.Wordwrap = false;
+ this.labelTitle1.Click += new System.EventHandler(this.labelTitle1_Click);
//
// labelTitleEquipment
//
@@ -2248,14 +2249,13 @@
this.labelTitleEquipment.ForeColor = System.Drawing.Color.Black;
this.labelTitleEquipment.InitVisible = true;
this.labelTitleEquipment.LineSpacing = 0F;
- this.labelTitleEquipment.Location = new System.Drawing.Point(25, 369);
+ this.labelTitleEquipment.Location = new System.Drawing.Point(427, 300);
this.labelTitleEquipment.Name = "labelTitleEquipment";
this.labelTitleEquipment.Size = new System.Drawing.Size(200, 20);
this.labelTitleEquipment.TabIndex = 753;
this.labelTitleEquipment.Text = "Equipment";
this.labelTitleEquipment.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitleEquipment.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
- this.labelTitleEquipment.Visible = false;
this.labelTitleEquipment.Wordwrap = false;
//
// labelTitleUser
@@ -2269,7 +2269,7 @@
this.labelTitleUser.ForeColor = System.Drawing.Color.Black;
this.labelTitleUser.InitVisible = true;
this.labelTitleUser.LineSpacing = 0F;
- this.labelTitleUser.Location = new System.Drawing.Point(427, 346);
+ this.labelTitleUser.Location = new System.Drawing.Point(427, 369);
this.labelTitleUser.Name = "labelTitleUser";
this.labelTitleUser.Size = new System.Drawing.Size(200, 20);
this.labelTitleUser.TabIndex = 751;
@@ -2608,73 +2608,6 @@
this.pictureBoxFormIcon.Name = "pictureBoxFormIcon";
this.pictureBoxFormIcon.Size = new System.Drawing.Size(47, 45);
//
- // smartKeyboard
- //
- this.smartKeyboard.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(198)))), ((int)(((byte)(195)))), ((int)(((byte)(198)))));
- this.smartKeyboard.ControlKeyDisable = true;
- this.smartKeyboard.DesignMinimize = true;
- this.smartKeyboard.FontColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.smartKeyboard.HanYoungKeyDisable = true;
- this.smartKeyboard.KeyboardType = SmartX.SmartKeyboard.KEYBOARDTYPES.NORMAL;
- this.smartKeyboard.KeyFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51)))));
- this.smartKeyboard.KeyOutLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(157)))), ((int)(((byte)(157)))));
- this.smartKeyboard.KeyOutLineWidth = 1;
- this.smartKeyboard.KeyPressImage1 = ((System.Drawing.Image)(resources.GetObject("smartKeyboard.KeyPressImage1")));
- this.smartKeyboard.KeyPressImage2 = ((System.Drawing.Image)(resources.GetObject("smartKeyboard.KeyPressImage2")));
- this.smartKeyboard.KeyPressImage3 = ((System.Drawing.Image)(resources.GetObject("smartKeyboard.KeyPressImage3")));
- this.smartKeyboard.KeyUpImage1 = ((System.Drawing.Image)(resources.GetObject("smartKeyboard.KeyUpImage1")));
- this.smartKeyboard.KeyUpImage2 = ((System.Drawing.Image)(resources.GetObject("smartKeyboard.KeyUpImage2")));
- this.smartKeyboard.KeyUpImage3 = ((System.Drawing.Image)(resources.GetObject("smartKeyboard.KeyUpImage3")));
- this.smartKeyboard.LeftMargin = 5;
- this.smartKeyboard.Location = new System.Drawing.Point(0, 111);
- this.smartKeyboard.Name = "smartKeyboard";
- this.smartKeyboard.PressFontColor = System.Drawing.Color.FromArgb(((int)(((byte)(37)))), ((int)(((byte)(37)))), ((int)(((byte)(37)))));
- this.smartKeyboard.PressKeyFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(146)))), ((int)(((byte)(146)))));
- this.smartKeyboard.PressKeyOutLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41)))));
- this.smartKeyboard.RoundedCorners = true;
- this.smartKeyboard.SetBackimage = null;
- this.smartKeyboard.Size = new System.Drawing.Size(16, 11);
- this.smartKeyboard.TabIndex = 743;
- this.smartKeyboard.TABKeyDisable = false;
- this.smartKeyboard.TargetInputObject = null;
- this.smartKeyboard.Text = "smartKeyboard1";
- this.smartKeyboard.ThemeStyle = SmartX.SmartKeyboard.KEYBOARDTHEMESTYLE.STANDARD8;
- this.smartKeyboard.TopMargin = 5;
- this.smartKeyboard.OnXKeyClick += new System.EventHandler(this.smartKeyboard_OnXKeyClick);
- //
- // buttonEditLevel3
- //
- this.buttonEditLevel3.BackPictureBox = null;
- this.buttonEditLevel3.BackPictureBox1 = null;
- this.buttonEditLevel3.BackPictureBox2 = null;
- this.buttonEditLevel3.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(65)))), ((int)(((byte)(41)))));
- this.buttonEditLevel3.ButtonImageAutoSize = true;
- this.buttonEditLevel3.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonEditLevel3.DisableImage = null;
- this.buttonEditLevel3.DownImage = null;
- this.buttonEditLevel3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
- this.buttonEditLevel3.GroupID = 0;
- this.buttonEditLevel3.InitVisible = true;
- this.buttonEditLevel3.Location = new System.Drawing.Point(745, 81);
- this.buttonEditLevel3.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
- this.buttonEditLevel3.Name = "buttonEditLevel3";
- this.buttonEditLevel3.NestedClickEventPrevent = false;
- this.buttonEditLevel3.OutlinePixel = 1;
- this.buttonEditLevel3.RepeatInterval = 200;
- this.buttonEditLevel3.RepeatIntervalAccelerate = null;
- this.buttonEditLevel3.SafeInterval = 200;
- this.buttonEditLevel3.Size = new System.Drawing.Size(40, 26);
- this.buttonEditLevel3.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
- this.buttonEditLevel3.TabIndex = 858;
- this.buttonEditLevel3.Text = "Edit";
- this.buttonEditLevel3.TextColor = System.Drawing.Color.White;
- this.buttonEditLevel3.TextDownColor = System.Drawing.Color.White;
- this.buttonEditLevel3.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
- this.buttonEditLevel3.TextLocation = new System.Drawing.Point(0, 0);
- this.buttonEditLevel3.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
- this.buttonEditLevel3.UpImage = null;
- this.buttonEditLevel3.Click += new System.EventHandler(this.buttonEdit_Click);
- //
// smartLabel27
//
this.smartLabel27.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(228)))), ((int)(((byte)(180)))));
@@ -2696,50 +2629,6 @@
this.smartLabel27.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.smartLabel27.Wordwrap = false;
//
- // textBoxLevel3
- //
- this.textBoxLevel3.Font = new System.Drawing.Font("Arial", 13F, System.Drawing.FontStyle.Regular);
- this.textBoxLevel3.Location = new System.Drawing.Point(568, 81);
- this.textBoxLevel3.MaxLength = 15;
- this.textBoxLevel3.Name = "textBoxLevel3";
- this.textBoxLevel3.Size = new System.Drawing.Size(171, 26);
- this.textBoxLevel3.TabIndex = 856;
- this.textBoxLevel3.GotFocus += new System.EventHandler(this.textBoxLevel3_GotFocus);
- this.textBoxLevel3.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBoxLevel3_KeyPress);
- //
- // buttonEditLevel2
- //
- this.buttonEditLevel2.BackPictureBox = null;
- this.buttonEditLevel2.BackPictureBox1 = null;
- this.buttonEditLevel2.BackPictureBox2 = null;
- this.buttonEditLevel2.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(65)))), ((int)(((byte)(41)))));
- this.buttonEditLevel2.ButtonImageAutoSize = true;
- this.buttonEditLevel2.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonEditLevel2.DisableImage = null;
- this.buttonEditLevel2.DownImage = null;
- this.buttonEditLevel2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
- this.buttonEditLevel2.GroupID = 0;
- this.buttonEditLevel2.InitVisible = true;
- this.buttonEditLevel2.Location = new System.Drawing.Point(488, 81);
- this.buttonEditLevel2.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
- this.buttonEditLevel2.Name = "buttonEditLevel2";
- this.buttonEditLevel2.NestedClickEventPrevent = false;
- this.buttonEditLevel2.OutlinePixel = 1;
- this.buttonEditLevel2.RepeatInterval = 200;
- this.buttonEditLevel2.RepeatIntervalAccelerate = null;
- this.buttonEditLevel2.SafeInterval = 200;
- this.buttonEditLevel2.Size = new System.Drawing.Size(40, 26);
- this.buttonEditLevel2.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
- this.buttonEditLevel2.TabIndex = 855;
- this.buttonEditLevel2.Text = "Edit";
- this.buttonEditLevel2.TextColor = System.Drawing.Color.White;
- this.buttonEditLevel2.TextDownColor = System.Drawing.Color.White;
- this.buttonEditLevel2.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
- this.buttonEditLevel2.TextLocation = new System.Drawing.Point(0, 0);
- this.buttonEditLevel2.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
- this.buttonEditLevel2.UpImage = null;
- this.buttonEditLevel2.Click += new System.EventHandler(this.buttonEdit_Click);
- //
// smartLabel25
//
this.smartLabel25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(228)))), ((int)(((byte)(180)))));
@@ -2761,50 +2650,6 @@
this.smartLabel25.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.smartLabel25.Wordwrap = false;
//
- // textBoxLevel2
- //
- this.textBoxLevel2.Font = new System.Drawing.Font("Arial", 13F, System.Drawing.FontStyle.Regular);
- this.textBoxLevel2.Location = new System.Drawing.Point(311, 81);
- this.textBoxLevel2.MaxLength = 15;
- this.textBoxLevel2.Name = "textBoxLevel2";
- this.textBoxLevel2.Size = new System.Drawing.Size(171, 26);
- this.textBoxLevel2.TabIndex = 853;
- this.textBoxLevel2.GotFocus += new System.EventHandler(this.textBoxLevel2_GotFocus);
- this.textBoxLevel2.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBoxLevel2_KeyPress);
- //
- // buttonEditLevel1
- //
- this.buttonEditLevel1.BackPictureBox = null;
- this.buttonEditLevel1.BackPictureBox1 = null;
- this.buttonEditLevel1.BackPictureBox2 = null;
- this.buttonEditLevel1.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(65)))), ((int)(((byte)(41)))));
- this.buttonEditLevel1.ButtonImageAutoSize = true;
- this.buttonEditLevel1.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
- this.buttonEditLevel1.DisableImage = null;
- this.buttonEditLevel1.DownImage = null;
- this.buttonEditLevel1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
- this.buttonEditLevel1.GroupID = 0;
- this.buttonEditLevel1.InitVisible = true;
- this.buttonEditLevel1.Location = new System.Drawing.Point(231, 81);
- this.buttonEditLevel1.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
- this.buttonEditLevel1.Name = "buttonEditLevel1";
- this.buttonEditLevel1.NestedClickEventPrevent = false;
- this.buttonEditLevel1.OutlinePixel = 1;
- this.buttonEditLevel1.RepeatInterval = 200;
- this.buttonEditLevel1.RepeatIntervalAccelerate = null;
- this.buttonEditLevel1.SafeInterval = 200;
- this.buttonEditLevel1.Size = new System.Drawing.Size(40, 26);
- this.buttonEditLevel1.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
- this.buttonEditLevel1.TabIndex = 852;
- this.buttonEditLevel1.Text = "Edit";
- this.buttonEditLevel1.TextColor = System.Drawing.Color.White;
- this.buttonEditLevel1.TextDownColor = System.Drawing.Color.White;
- this.buttonEditLevel1.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
- this.buttonEditLevel1.TextLocation = new System.Drawing.Point(0, 0);
- this.buttonEditLevel1.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
- this.buttonEditLevel1.UpImage = null;
- this.buttonEditLevel1.Click += new System.EventHandler(this.buttonEdit_Click);
- //
// smartLabel26
//
this.smartLabel26.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(228)))), ((int)(((byte)(180)))));
@@ -2826,16 +2671,71 @@
this.smartLabel26.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.smartLabel26.Wordwrap = false;
//
- // textBoxLevel1
+ // labelLevel3Name
//
- this.textBoxLevel1.Font = new System.Drawing.Font("Arial", 13F, System.Drawing.FontStyle.Regular);
- this.textBoxLevel1.Location = new System.Drawing.Point(54, 81);
- this.textBoxLevel1.MaxLength = 15;
- this.textBoxLevel1.Name = "textBoxLevel1";
- this.textBoxLevel1.Size = new System.Drawing.Size(171, 26);
- this.textBoxLevel1.TabIndex = 850;
- this.textBoxLevel1.GotFocus += new System.EventHandler(this.textBoxLevel1_GotFocus);
- this.textBoxLevel1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBoxLevel1_KeyPress);
+ this.labelLevel3Name.BackColor = System.Drawing.Color.White;
+ this.labelLevel3Name.BackPictureBox = null;
+ this.labelLevel3Name.BackPictureBox1 = null;
+ this.labelLevel3Name.BackPictureBox2 = null;
+ this.labelLevel3Name.BorderColor = System.Drawing.Color.Black;
+ this.labelLevel3Name.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelLevel3Name.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+ this.labelLevel3Name.ForeColor = System.Drawing.Color.Black;
+ this.labelLevel3Name.InitVisible = true;
+ this.labelLevel3Name.LineSpacing = 0F;
+ this.labelLevel3Name.Location = new System.Drawing.Point(570, 81);
+ this.labelLevel3Name.Name = "labelLevel3Name";
+ this.labelLevel3Name.Size = new System.Drawing.Size(200, 26);
+ this.labelLevel3Name.TabIndex = 864;
+ this.labelLevel3Name.Text = "L3";
+ this.labelLevel3Name.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelLevel3Name.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelLevel3Name.Wordwrap = false;
+ this.labelLevel3Name.Click += new System.EventHandler(this.labelLevel3Name_Click);
+ //
+ // labelLevel2Name
+ //
+ this.labelLevel2Name.BackColor = System.Drawing.Color.White;
+ this.labelLevel2Name.BackPictureBox = null;
+ this.labelLevel2Name.BackPictureBox1 = null;
+ this.labelLevel2Name.BackPictureBox2 = null;
+ this.labelLevel2Name.BorderColor = System.Drawing.Color.Black;
+ this.labelLevel2Name.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelLevel2Name.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+ this.labelLevel2Name.ForeColor = System.Drawing.Color.Black;
+ this.labelLevel2Name.InitVisible = true;
+ this.labelLevel2Name.LineSpacing = 0F;
+ this.labelLevel2Name.Location = new System.Drawing.Point(311, 81);
+ this.labelLevel2Name.Name = "labelLevel2Name";
+ this.labelLevel2Name.Size = new System.Drawing.Size(200, 26);
+ this.labelLevel2Name.TabIndex = 863;
+ this.labelLevel2Name.Text = "L2";
+ this.labelLevel2Name.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelLevel2Name.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelLevel2Name.Wordwrap = false;
+ this.labelLevel2Name.Click += new System.EventHandler(this.labelLevel2Name_Click);
+ //
+ // labelLevel1Name
+ //
+ this.labelLevel1Name.BackColor = System.Drawing.Color.White;
+ this.labelLevel1Name.BackPictureBox = null;
+ this.labelLevel1Name.BackPictureBox1 = null;
+ this.labelLevel1Name.BackPictureBox2 = null;
+ this.labelLevel1Name.BorderColor = System.Drawing.Color.Black;
+ this.labelLevel1Name.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.labelLevel1Name.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+ this.labelLevel1Name.ForeColor = System.Drawing.Color.Black;
+ this.labelLevel1Name.InitVisible = true;
+ this.labelLevel1Name.LineSpacing = 0F;
+ this.labelLevel1Name.Location = new System.Drawing.Point(54, 81);
+ this.labelLevel1Name.Name = "labelLevel1Name";
+ this.labelLevel1Name.Size = new System.Drawing.Size(200, 26);
+ this.labelLevel1Name.TabIndex = 862;
+ this.labelLevel1Name.Text = "L1";
+ this.labelLevel1Name.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
+ this.labelLevel1Name.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
+ this.labelLevel1Name.Wordwrap = false;
+ this.labelLevel1Name.Click += new System.EventHandler(this.labelLevel1Name_Click);
//
// FormUserGroupEditor
//
@@ -2843,16 +2743,12 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.AutoScroll = true;
this.ClientSize = new System.Drawing.Size(800, 600);
- this.Controls.Add(this.smartKeyboard);
- this.Controls.Add(this.buttonEditLevel3);
+ this.Controls.Add(this.labelLevel3Name);
+ this.Controls.Add(this.labelLevel2Name);
+ this.Controls.Add(this.labelLevel1Name);
this.Controls.Add(this.smartLabel27);
- this.Controls.Add(this.textBoxLevel3);
- this.Controls.Add(this.buttonEditLevel2);
this.Controls.Add(this.smartLabel25);
- this.Controls.Add(this.textBoxLevel2);
- this.Controls.Add(this.buttonEditLevel1);
this.Controls.Add(this.smartLabel26);
- this.Controls.Add(this.textBoxLevel1);
this.Controls.Add(this.pictureBoxFormIcon);
this.Controls.Add(this.smartGroupBox1);
this.Controls.Add(this.buttonSave);
@@ -2981,15 +2877,11 @@
private SmartX.SmartCheckBox checkBoxL2MenuViewer;
private SmartX.SmartCheckBox checkBoxL1MenuViewer;
private SmartX.SmartLabel labelTitleViewer;
- private SmartX.SmartKeyboard smartKeyboard;
- private SmartX.SmartButton buttonEditLevel3;
private SmartX.SmartLabel smartLabel27;
- private System.Windows.Forms.TextBox textBoxLevel3;
- private SmartX.SmartButton buttonEditLevel2;
private SmartX.SmartLabel smartLabel25;
- private System.Windows.Forms.TextBox textBoxLevel2;
- private SmartX.SmartButton buttonEditLevel1;
private SmartX.SmartLabel smartLabel26;
- private System.Windows.Forms.TextBox textBoxLevel1;
+ private SmartX.SmartLabel labelLevel3Name;
+ private SmartX.SmartLabel labelLevel2Name;
+ private SmartX.SmartLabel labelLevel1Name;
}
}
\ No newline at end of file
diff --git a/INT69DB_2A/Forms/FormUserGroupEditor.cs b/INT69DB_2A/Forms/FormUserGroupEditor.cs
index 5dd1a73..6e651b8 100644
--- a/INT69DB_2A/Forms/FormUserGroupEditor.cs
+++ b/INT69DB_2A/Forms/FormUserGroupEditor.cs
@@ -10,6 +10,7 @@ using System.Windows.Forms;
using INT69DB_2A.Part11_UserManager;
using SmartX;
+using INT69DB_2A.DialogForms;
namespace INT69DB_2A.Forms
{
@@ -18,10 +19,14 @@ namespace INT69DB_2A.Forms
#region Field
private FormMain m_ParentForm;
+ private Collection CollectionLevel1Location;
+ private Collection CollectionLevel2Location;
+ private Collection CollectionLevel3Location;
+
private Collection CollectionLevel1Control;
private Collection CollectionLevel2Control;
private Collection CollectionLevel3Control;
- private Collection CollectionNotLoginControl;
+ private Collection CollectionLevel4Control;
private string BeforeTextBox1;
private string BeforeTextBox2;
@@ -65,25 +70,90 @@ namespace INT69DB_2A.Forms
this.BeforeTextBox2 = "";
this.BeforeTextBox3 = "";
+ this.CollectionLevel1Location = new Collection();
+ this.CollectionLevel1Location.Add(this.labelTitle1.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MainProductNo.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MainWeightSet.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MainClear.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MainSubMenu.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MenuTime.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MenuInformation.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MenuDataBackup.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MenuCommunication.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MenuConfiguration.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MenuCalibration.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MenuSystem.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MenuMotor.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MenuIOTest.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MenuUpdate.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MenuInitialization.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MenuUser.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MenuEquipment.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MenuStatistics.Location);
+ this.CollectionLevel1Location.Add(this.checkBoxL1MenuViewer.Location);
+
+ this.CollectionLevel2Location = new Collection();
+ this.CollectionLevel2Location.Add(this.labelTitle2.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MainProductNo.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MainWeightSet.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MainClear.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MainSubMenu.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MenuTime.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MenuInformation.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MenuDataBackup.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MenuCommunication.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MenuConfiguration.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MenuCalibration.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MenuSystem.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MenuMotor.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MenuIOTest.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MenuUpdate.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MenuInitialization.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MenuUser.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MenuEquipment.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MenuStatistics.Location);
+ this.CollectionLevel2Location.Add(this.checkBoxL2MenuViewer.Location);
+
+ this.CollectionLevel3Location = new Collection();
+ this.CollectionLevel3Location.Add(this.labelTitle3.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MainProductNo.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MainWeightSet.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MainClear.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MainSubMenu.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MenuTime.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MenuInformation.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MenuDataBackup.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MenuConfiguration.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MenuCommunication.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MenuCalibration.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MenuSystem.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MenuMotor.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MenuIOTest.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MenuUpdate.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MenuInitialization.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MenuUser.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MenuEquipment.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MenuStatistics.Location);
+ this.CollectionLevel3Location.Add(this.checkBoxL3MenuViewer.Location);
+
this.CollectionLevel1Control = new Collection();
this.CollectionLevel1Control.Add(this.labelTitle1);
this.CollectionLevel1Control.Add(this.checkBoxL1MainProductNo);
this.CollectionLevel1Control.Add(this.checkBoxL1MainWeightSet);
this.CollectionLevel1Control.Add(this.checkBoxL1MainClear);
this.CollectionLevel1Control.Add(this.checkBoxL1MainSubMenu);
+ this.CollectionLevel1Control.Add(this.checkBoxL1MenuTime);
this.CollectionLevel1Control.Add(this.checkBoxL1MenuInformation);
+ this.CollectionLevel1Control.Add(this.checkBoxL1MenuDataBackup);
this.CollectionLevel1Control.Add(this.checkBoxL1MenuConfiguration);
this.CollectionLevel1Control.Add(this.checkBoxL1MenuCommunication);
this.CollectionLevel1Control.Add(this.checkBoxL1MenuCalibration);
this.CollectionLevel1Control.Add(this.checkBoxL1MenuSystem);
this.CollectionLevel1Control.Add(this.checkBoxL1MenuMotor);
this.CollectionLevel1Control.Add(this.checkBoxL1MenuIOTest);
- this.CollectionLevel1Control.Add(this.checkBoxL1MenuEquipment);
this.CollectionLevel1Control.Add(this.checkBoxL1MenuUpdate);
this.CollectionLevel1Control.Add(this.checkBoxL1MenuInitialization);
- this.CollectionLevel1Control.Add(this.checkBoxL1MenuTime);
- this.CollectionLevel1Control.Add(this.checkBoxL1MenuUser);
- this.CollectionLevel1Control.Add(this.checkBoxL1MenuDataBackup);
+ this.CollectionLevel1Control.Add(this.checkBoxL1MenuEquipment);
this.CollectionLevel1Control.Add(this.checkBoxL1MenuStatistics);
this.CollectionLevel1Control.Add(this.checkBoxL1MenuViewer);
@@ -93,19 +163,18 @@ namespace INT69DB_2A.Forms
this.CollectionLevel2Control.Add(this.checkBoxL2MainWeightSet);
this.CollectionLevel2Control.Add(this.checkBoxL2MainClear);
this.CollectionLevel2Control.Add(this.checkBoxL2MainSubMenu);
+ this.CollectionLevel2Control.Add(this.checkBoxL2MenuTime);
this.CollectionLevel2Control.Add(this.checkBoxL2MenuInformation);
+ this.CollectionLevel2Control.Add(this.checkBoxL2MenuDataBackup);
this.CollectionLevel2Control.Add(this.checkBoxL2MenuConfiguration);
this.CollectionLevel2Control.Add(this.checkBoxL2MenuCommunication);
this.CollectionLevel2Control.Add(this.checkBoxL2MenuCalibration);
this.CollectionLevel2Control.Add(this.checkBoxL2MenuSystem);
this.CollectionLevel2Control.Add(this.checkBoxL2MenuMotor);
this.CollectionLevel2Control.Add(this.checkBoxL2MenuIOTest);
- this.CollectionLevel2Control.Add(this.checkBoxL2MenuEquipment);
this.CollectionLevel2Control.Add(this.checkBoxL2MenuUpdate);
this.CollectionLevel2Control.Add(this.checkBoxL2MenuInitialization);
- this.CollectionLevel2Control.Add(this.checkBoxL2MenuTime);
- this.CollectionLevel2Control.Add(this.checkBoxL2MenuUser);
- this.CollectionLevel2Control.Add(this.checkBoxL2MenuDataBackup);
+ this.CollectionLevel2Control.Add(this.checkBoxL2MenuEquipment);
this.CollectionLevel2Control.Add(this.checkBoxL2MenuStatistics);
this.CollectionLevel2Control.Add(this.checkBoxL2MenuViewer);
@@ -115,62 +184,50 @@ namespace INT69DB_2A.Forms
this.CollectionLevel3Control.Add(this.checkBoxL3MainWeightSet);
this.CollectionLevel3Control.Add(this.checkBoxL3MainClear);
this.CollectionLevel3Control.Add(this.checkBoxL3MainSubMenu);
+ this.CollectionLevel3Control.Add(this.checkBoxL3MenuTime);
this.CollectionLevel3Control.Add(this.checkBoxL3MenuInformation);
+ this.CollectionLevel3Control.Add(this.checkBoxL3MenuDataBackup);
this.CollectionLevel3Control.Add(this.checkBoxL3MenuConfiguration);
this.CollectionLevel3Control.Add(this.checkBoxL3MenuCommunication);
this.CollectionLevel3Control.Add(this.checkBoxL3MenuCalibration);
this.CollectionLevel3Control.Add(this.checkBoxL3MenuSystem);
this.CollectionLevel3Control.Add(this.checkBoxL3MenuMotor);
this.CollectionLevel3Control.Add(this.checkBoxL3MenuIOTest);
- this.CollectionLevel3Control.Add(this.checkBoxL3MenuEquipment);
this.CollectionLevel3Control.Add(this.checkBoxL3MenuUpdate);
this.CollectionLevel3Control.Add(this.checkBoxL3MenuInitialization);
- this.CollectionLevel3Control.Add(this.checkBoxL3MenuTime);
- this.CollectionLevel3Control.Add(this.checkBoxL3MenuUser);
- this.CollectionLevel3Control.Add(this.checkBoxL3MenuDataBackup);
+ this.CollectionLevel3Control.Add(this.checkBoxL3MenuEquipment);
this.CollectionLevel3Control.Add(this.checkBoxL3MenuStatistics);
this.CollectionLevel3Control.Add(this.checkBoxL3MenuViewer);
- this.CollectionNotLoginControl = new Collection();
- this.CollectionNotLoginControl.Add(this.labelTitleNotLogin1);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMainProductNo);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMainWeightSet);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMainClear);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMainSubMenu);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMenuInformation);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMenuConfiguration);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMenuCommunication);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMenuCalibration);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMenuSystem);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMenuMotor);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMenuIOTest);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMenuEquipment);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMenuUpdate);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMenuInitialization);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMenuTime);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMenuUser);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMenuDataBackup);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMenuStatistics);
- this.CollectionNotLoginControl.Add(this.checkBoxNotLoginMenuViewer);
+ this.CollectionLevel4Control = new Collection();
+ this.CollectionLevel4Control.Add(this.labelTitleNotLogin1);
+ this.CollectionLevel4Control.Add(this.checkBoxNotLoginMainProductNo);
+ this.CollectionLevel4Control.Add(this.checkBoxNotLoginMainWeightSet);
+ this.CollectionLevel4Control.Add(this.checkBoxNotLoginMainClear);
+ this.CollectionLevel4Control.Add(this.checkBoxNotLoginMainSubMenu);
+ this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuTime);
+ this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuInformation);
+ this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuDataBackup);
+ this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuConfiguration);
+ this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuCommunication);
+ this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuCalibration);
+ this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuSystem);
+ this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuMotor);
+ this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuIOTest);
+ this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuUpdate);
+ this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuInitialization);
+ this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuEquipment);
+ this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuStatistics);
+ this.CollectionLevel4Control.Add(this.checkBoxNotLoginMenuViewer);
this.UpdateDisplay(this.ParentForm.CurrentUserGroup, this.ParentForm.SystemConfig);
- this.UpdatePart11Visible();
}
- private void EnableWhenUsingKeyboard(bool bValue)
- {
- this.smartGroupBox1.Enabled = bValue;
- this.buttonSave.Enabled = bValue;
- this.buttonBack.Enabled = bValue;
- this.buttonEditLevel1.Enabled = bValue;
- this.buttonEditLevel2.Enabled = bValue;
- this.buttonEditLevel3.Enabled = bValue;
- }
private void UpdateDisplay(UserGroup group, SystemConfigurationItem system)
{
- this.textBoxLevel1.Text = system.User_Level1_Name;
- this.textBoxLevel2.Text = system.User_Level2_Name;
- this.textBoxLevel3.Text = system.User_Level3_Name;
+ this.labelLevel1Name.Text = system.User_Level1_Name;
+ this.labelLevel2Name.Text = system.User_Level2_Name;
+ this.labelLevel3Name.Text = system.User_Level3_Name;
#region Level1
this.checkBoxL1MainProductNo.Checked = group.Level1.IsMainDisplayProductNo;
@@ -296,16 +353,10 @@ namespace INT69DB_2A.Forms
}
}
- public void UpdateLevelNameDisplay(SystemConfigurationItem system)
- {
- this.textBoxLevel1.Text = system.User_Level1_Name;
- this.textBoxLevel2.Text = system.User_Level2_Name;
- this.textBoxLevel3.Text = system.User_Level3_Name;
- }
-
public void DisplayRefresh()
{
this.UpdateDisplay(this.ParentForm.CurrentUserGroup, this.ParentForm.SystemConfig);
+ this.UpdatePart11Visible();
this.buttonSave.Visible = false;
if (this.ParentForm.SystemConfig.CurrentUser.Group != DataStore.UserGroup.Developer)
@@ -313,16 +364,28 @@ namespace INT69DB_2A.Forms
this.labelTitleNotLogin1.Visible = false;
this.labelTitleNotLogin2.Visible = false;
- for (int i = 0; i < this.CollectionLevel1Control.Count; i++)
- this.CollectionNotLoginControl[i].Visible = false;
+ for (int i = 0; i < this.CollectionLevel4Control.Count; i++)
+ {
+ //this.CollectionLevel1Control[i].Location = new Point(this.CollectionLevel2Location[i].X, this.CollectionLevel2Location[i].Y);
+ //this.CollectionLevel2Control[i].Location = new Point(this.CollectionLevel3Location[i].X, this.CollectionLevel3Location[i].Y);
+
+ //this.CollectionLevel3Control[i].Visible = false;
+ this.CollectionLevel4Control[i].Visible = false;
+ }
}
else
{
this.labelTitleNotLogin1.Visible = true;
this.labelTitleNotLogin2.Visible = true;
- for (int i = 0; i < this.CollectionLevel1Control.Count; i++)
- this.CollectionNotLoginControl[i].Visible = true;
+ for (int i = 0; i < this.CollectionLevel4Control.Count; i++)
+ {
+ //this.CollectionLevel1Control[i].Location = new Point(this.CollectionLevel1Location[i].X, this.CollectionLevel1Location[i].Y);
+ //this.CollectionLevel2Control[i].Location = new Point(this.CollectionLevel2Location[i].X, this.CollectionLevel2Location[i].Y);
+
+ //this.CollectionLevel3Control[i].Visible = true;
+ this.CollectionLevel4Control[i].Visible = true;
+ }
}
}
#endregion
@@ -354,11 +417,10 @@ namespace INT69DB_2A.Forms
this.ParentForm.CurrentUserGroup.Level1.IsMenuInitialization = this.checkBoxL1MenuInitialization.Checked;
this.ParentForm.CurrentUserGroup.Level1.IsMenuTime = this.checkBoxL1MenuTime.Checked;
this.ParentForm.CurrentUserGroup.Level1.IsMenuDataBackup = this.checkBoxL1MenuDataBackup.Checked;
+ this.ParentForm.CurrentUserGroup.Level1.IsMenuEquipment = this.checkBoxL1MenuEquipment.Checked;
this.ParentForm.CurrentUserGroup.Level1.IsMenuStatistics = this.checkBoxL1MenuStatistics.Checked;
this.ParentForm.CurrentUserGroup.Level1.IsMenuViewer = this.checkBoxL1MenuViewer.Checked;
this.ParentForm.CurrentUserGroup.Level1.IsMenuUser = true;
-
- this.ParentForm.CurrentUserGroup.Level1.IsMenuEquipment = false;
#endregion
#region Level2
@@ -378,11 +440,10 @@ namespace INT69DB_2A.Forms
this.ParentForm.CurrentUserGroup.Level2.IsMenuInitialization = this.checkBoxL2MenuInitialization.Checked;
this.ParentForm.CurrentUserGroup.Level2.IsMenuTime = this.checkBoxL2MenuTime.Checked;
this.ParentForm.CurrentUserGroup.Level2.IsMenuDataBackup = this.checkBoxL2MenuDataBackup.Checked;
+ this.ParentForm.CurrentUserGroup.Level2.IsMenuEquipment = this.checkBoxL2MenuEquipment.Checked;
this.ParentForm.CurrentUserGroup.Level2.IsMenuStatistics = this.checkBoxL2MenuStatistics.Checked;
this.ParentForm.CurrentUserGroup.Level2.IsMenuViewer = this.checkBoxL2MenuViewer.Checked;
this.ParentForm.CurrentUserGroup.Level2.IsMenuUser = true;
-
- this.ParentForm.CurrentUserGroup.Level2.IsMenuEquipment = false;
#endregion
#region Level3
@@ -400,13 +461,12 @@ namespace INT69DB_2A.Forms
this.ParentForm.CurrentUserGroup.Level3.IsMenuIOTest = this.checkBoxL3MenuIOTest.Checked;
this.ParentForm.CurrentUserGroup.Level3.IsMenuUpdate = this.checkBoxL3MenuUpdate.Checked;
this.ParentForm.CurrentUserGroup.Level3.IsMenuInitialization = this.checkBoxL3MenuInitialization.Checked;
- this.ParentForm.CurrentUserGroup.Level3.IsMenuTime = this.checkBoxL3MenuTime.Checked;
+ this.ParentForm.CurrentUserGroup.Level3.IsMenuTime = true;
this.ParentForm.CurrentUserGroup.Level3.IsMenuDataBackup = this.checkBoxL3MenuDataBackup.Checked;
+ this.ParentForm.CurrentUserGroup.Level3.IsMenuEquipment = true;
this.ParentForm.CurrentUserGroup.Level3.IsMenuStatistics = this.checkBoxL3MenuStatistics.Checked;
this.ParentForm.CurrentUserGroup.Level3.IsMenuViewer = this.checkBoxL3MenuViewer.Checked;
this.ParentForm.CurrentUserGroup.Level3.IsMenuUser = true;
-
- this.ParentForm.CurrentUserGroup.Level3.IsMenuEquipment = false;
#endregion
#region NotLogin
@@ -422,11 +482,12 @@ namespace INT69DB_2A.Forms
this.ParentForm.CurrentUserGroup.NotLogin.IsMenuSystem = this.checkBoxNotLoginMenuSystem.Checked;
this.ParentForm.CurrentUserGroup.NotLogin.IsMenuMotor = this.checkBoxNotLoginMenuMotor.Checked;
this.ParentForm.CurrentUserGroup.NotLogin.IsMenuIOTest = this.checkBoxNotLoginMenuIOTest.Checked;
- this.ParentForm.CurrentUserGroup.NotLogin.IsMenuEquipment = false;
+ this.ParentForm.CurrentUserGroup.NotLogin.IsMenuEquipment = this.checkBoxNotLoginMenuEquipment.Checked;
this.ParentForm.CurrentUserGroup.NotLogin.IsMenuUpdate = this.checkBoxNotLoginMenuUpdate.Checked;
this.ParentForm.CurrentUserGroup.NotLogin.IsMenuInitialization = this.checkBoxNotLoginMenuInitialization.Checked;
this.ParentForm.CurrentUserGroup.NotLogin.IsMenuTime = this.checkBoxNotLoginMenuTime.Checked;
this.ParentForm.CurrentUserGroup.NotLogin.IsMenuDataBackup = this.checkBoxNotLoginMenuDataBackup.Checked;
+ this.ParentForm.CurrentUserGroup.NotLogin.IsMenuEquipment = this.checkBoxNotLoginMenuEquipment.Checked;
this.ParentForm.CurrentUserGroup.NotLogin.IsMenuStatistics = this.checkBoxNotLoginMenuStatistics.Checked;
this.ParentForm.CurrentUserGroup.NotLogin.IsMenuViewer = this.checkBoxNotLoginMenuViewer.Checked;
this.ParentForm.CurrentUserGroup.NotLogin.IsMenuUser = false;
@@ -441,231 +502,6 @@ namespace INT69DB_2A.Forms
this.buttonSave.Visible = false;
}
- private void textBoxLevel1_GotFocus(object sender, EventArgs e)
- {
- this.smartKeyboard.TargetInputObject = this.textBoxLevel1;
- this.textBoxLevel1.Select(this.textBoxLevel1.Text.Length, 0);
- }
- private void textBoxLevel2_GotFocus(object sender, EventArgs e)
- {
- this.smartKeyboard.TargetInputObject = this.textBoxLevel2;
- this.textBoxLevel2.Select(this.textBoxLevel2.Text.Length, 0);
- }
- private void textBoxLevel3_GotFocus(object sender, EventArgs e)
- {
- this.smartKeyboard.TargetInputObject = this.textBoxLevel3;
- this.textBoxLevel3.Select(this.textBoxLevel3.Text.Length, 0);
- }
-
- private void buttonEdit_Click(object sender, EventArgs e)
- {
- SmartButton button = sender as SmartButton;
-
- this.EnableWhenUsingKeyboard(false);
-
- this.smartKeyboard.KeyboardType = SmartX.SmartKeyboard.KEYBOARDTYPES.NORMAL;
- this.smartKeyboard.Location = new Point(0, 111);
- this.smartKeyboard.Size = new Size(800, 313);
- this.smartKeyboard.KeyFillColor = Color.Black;
- this.smartKeyboard.BackColor = Color.FromArgb(255, 205, 51);
-
- if (button == this.buttonEditLevel1)
- {
- this.textBoxLevel2.Enabled = false;
- this.textBoxLevel3.Enabled = false;
-
- this.BeforeTextBox1 = this.textBoxLevel1.Text;
- this.smartKeyboard.TargetInputObject = this.textBoxLevel1;
- this.textBoxLevel1.Select(this.textBoxLevel1.Text.Length, 0);
- }
- else if (button == this.buttonEditLevel2)
- {
- this.textBoxLevel1.Enabled = false;
- this.textBoxLevel3.Enabled = false;
-
- this.BeforeTextBox2 = this.textBoxLevel2.Text;
- this.smartKeyboard.TargetInputObject = this.textBoxLevel2;
- this.textBoxLevel2.Select(this.textBoxLevel2.Text.Length, 0);
- }
- else if (button == this.buttonEditLevel3)
- {
- this.textBoxLevel1.Enabled = false;
- this.textBoxLevel2.Enabled = false;
-
- this.BeforeTextBox3 = this.textBoxLevel3.Text;
- this.smartKeyboard.TargetInputObject = this.textBoxLevel3;
- this.textBoxLevel3.Select(this.textBoxLevel3.Text.Length, 0);
- }
-
- this.smartKeyboard.Show();
- }
-
- private void textBoxLevel1_KeyPress(object sender, KeyPressEventArgs e)
- {
- string before = "", after = "";
-
- this.EnableWhenUsingKeyboard(true);
- this.textBoxLevel1.Enabled = true;
- this.textBoxLevel2.Enabled = true;
- this.textBoxLevel3.Enabled = true;
-
- if (e.KeyChar == '\r')
- {
- e.Handled = true;
-
- this.smartKeyboard.Hide();
-
- if (this.textBoxLevel1.Text == ""
- || this.textBoxLevel1.Text == this.ParentForm.SystemConfig.User_Level2_Name
- || this.textBoxLevel1.Text == this.ParentForm.SystemConfig.User_Level3_Name)
- {
- this.UpdateLevelNameDisplay(this.ParentForm.SystemConfig);
- }
- else
- {
- before = this.BeforeTextBox1;
- after = this.ParentForm.SystemConfig.User_Level1_Name = this.textBoxLevel1.Text;
- this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
-
- this.ParentForm.ChildFormUserEditor.UpdateAccessRightComboBox();
- this.ParentForm.ChildFormMainDisplay.UpdateDisplayUser(this.ParentForm.SystemConfig.CurrentUser);
- this.ParentForm.ChildFormMenu.UpdateDisplayUser(this.ParentForm.SystemConfig.CurrentUser);
-
- if (before != after)
- this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ChangeL1Name, "", before, after);
- }
- }
- else if (e.KeyChar == 27)
- {
- e.Handled = true;
-
- this.textBoxLevel1.Text = this.BeforeTextBox1;
- this.smartKeyboard.Hide();
- }
- else if (e.KeyChar == '<' || e.KeyChar == '>' || e.KeyChar == '|' || e.KeyChar == '"' || e.KeyChar == '?'
- || e.KeyChar == '*' || e.KeyChar == ':' || e.KeyChar == '/' || e.KeyChar == '\\')
- {
- e.Handled = true;
- }
- }
- private void textBoxLevel2_KeyPress(object sender, KeyPressEventArgs e)
- {
- string before = "", after = "";
-
- this.EnableWhenUsingKeyboard(true);
- this.textBoxLevel1.Enabled = true;
- this.textBoxLevel2.Enabled = true;
- this.textBoxLevel3.Enabled = true;
-
- if (e.KeyChar == '\r')
- {
- e.Handled = true;
- this.smartKeyboard.Hide();
-
- if (this.textBoxLevel2.Text == ""
- || this.textBoxLevel2.Text == this.ParentForm.SystemConfig.User_Level1_Name
- || this.textBoxLevel2.Text == this.ParentForm.SystemConfig.User_Level3_Name)
- {
- this.UpdateLevelNameDisplay(this.ParentForm.SystemConfig);
- }
- else
- {
- before = this.BeforeTextBox2;
- after = this.ParentForm.SystemConfig.User_Level2_Name = this.textBoxLevel2.Text;
- this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
-
- this.ParentForm.ChildFormUserEditor.UpdateAccessRightComboBox();
- this.ParentForm.ChildFormMainDisplay.UpdateDisplayUser(this.ParentForm.SystemConfig.CurrentUser);
- this.ParentForm.ChildFormMenu.UpdateDisplayUser(this.ParentForm.SystemConfig.CurrentUser);
-
- if (before != after)
- this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ChangeL2Name, "", before, after);
- }
- }
- else if (e.KeyChar == 27)
- {
- e.Handled = true;
-
- this.textBoxLevel2.Text = this.BeforeTextBox2;
- this.smartKeyboard.Hide();
- }
- else if (e.KeyChar == '<' || e.KeyChar == '>' || e.KeyChar == '|' || e.KeyChar == '"' || e.KeyChar == '?'
- || e.KeyChar == '*' || e.KeyChar == ':' || e.KeyChar == '/' || e.KeyChar == '\\')
- {
- e.Handled = true;
- }
- }
- private void textBoxLevel3_KeyPress(object sender, KeyPressEventArgs e)
- {
- string before = "", after = "";
-
- this.EnableWhenUsingKeyboard(true);
- this.textBoxLevel1.Enabled = true;
- this.textBoxLevel2.Enabled = true;
- this.textBoxLevel3.Enabled = true;
-
- if (e.KeyChar == '\r')
- {
- e.Handled = true;
- this.smartKeyboard.Hide();
-
- if (this.textBoxLevel3.Text == ""
- || this.textBoxLevel3.Text == this.ParentForm.SystemConfig.User_Level1_Name
- || this.textBoxLevel3.Text == this.ParentForm.SystemConfig.User_Level2_Name)
- {
- this.UpdateLevelNameDisplay(this.ParentForm.SystemConfig);
- }
- else
- {
- before = this.BeforeTextBox3;
- after = this.ParentForm.SystemConfig.User_Level3_Name = this.textBoxLevel3.Text;
- this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
-
- this.ParentForm.ChildFormUserEditor.UpdateAccessRightComboBox();
- this.ParentForm.ChildFormMainDisplay.UpdateDisplayUser(this.ParentForm.SystemConfig.CurrentUser);
- this.ParentForm.ChildFormMenu.UpdateDisplayUser(this.ParentForm.SystemConfig.CurrentUser);
-
- if (before != after)
- this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ChangeL3Name, "", before, after);
- }
- }
- else if (e.KeyChar == 27)
- {
- e.Handled = true;
-
- this.textBoxLevel3.Text = this.BeforeTextBox3;
- this.smartKeyboard.Hide();
- }
- else if (e.KeyChar == '<' || e.KeyChar == '>' || e.KeyChar == '|' || e.KeyChar == '"' || e.KeyChar == '?'
- || e.KeyChar == '*' || e.KeyChar == ':' || e.KeyChar == '/' || e.KeyChar == '\\')
- {
- e.Handled = true;
- }
- }
-
- private void smartKeyboard_OnXKeyClick(object sender, EventArgs e)
- {
- this.EnableWhenUsingKeyboard(true);
- this.textBoxLevel1.Enabled = true;
- this.textBoxLevel2.Enabled = true;
- this.textBoxLevel3.Enabled = true;
-
- if (this.smartKeyboard.TargetInputObject == this.textBoxLevel1)
- {
- this.textBoxLevel1.Text = this.BeforeTextBox1;
- }
- else if (this.smartKeyboard.TargetInputObject == this.textBoxLevel2)
- {
- this.textBoxLevel2.Text = this.BeforeTextBox2;
- }
- else if (this.smartKeyboard.TargetInputObject == this.textBoxLevel3)
- {
- this.textBoxLevel3.Text = this.BeforeTextBox3;
- }
-
- this.smartKeyboard.Hide();
- }
-
private void labelTitle1_Click(object sender, EventArgs e)
{
if (this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Developer)
@@ -688,8 +524,8 @@ namespace INT69DB_2A.Forms
this.checkBoxL1MenuDataBackup.Checked = true;
this.checkBoxL1MenuStatistics.Checked = true;
this.checkBoxL1MenuViewer.Checked = true;
- this.checkBoxL1MenuUser.Checked = true;
- //this.checkBoxL1MenuEquipment.Checked = true;
+ this.checkBoxL1MenuEquipment.Checked = true;
+ //this.checkBoxL1MenuUser.Checked = true;
this.buttonSave.Visible = true;
}
@@ -716,8 +552,8 @@ namespace INT69DB_2A.Forms
this.checkBoxL2MenuDataBackup.Checked = true;
this.checkBoxL2MenuStatistics.Checked = true;
this.checkBoxL2MenuViewer.Checked = true;
- this.checkBoxL2MenuUser.Checked = true;
- //this.checkBoxL2MenuEquipment.Checked = true;
+ //this.checkBoxL2MenuUser.Checked = true;
+ this.checkBoxL2MenuEquipment.Checked = true;
this.buttonSave.Visible = true;
}
@@ -744,8 +580,8 @@ namespace INT69DB_2A.Forms
this.checkBoxL3MenuDataBackup.Checked = true;
this.checkBoxL3MenuStatistics.Checked = true;
this.checkBoxL3MenuViewer.Checked = true;
- this.checkBoxL3MenuUser.Checked = true;
- //this.checkBoxL3MenuEquipment.Checked = true;
+ //this.checkBoxL3MenuUser.Checked = true;
+ this.checkBoxL3MenuEquipment.Checked = true;
this.buttonSave.Visible = true;
}
@@ -772,12 +608,76 @@ namespace INT69DB_2A.Forms
this.checkBoxNotLoginMenuStatistics.Checked = true;
this.checkBoxNotLoginMenuViewer.Checked = true;
this.checkBoxNotLoginMenuDataBackup.Checked = true;
- //this.checkBoxNotLoginMenuEquipment.Checked = true;
+ this.checkBoxNotLoginMenuEquipment.Checked = true;
this.buttonSave.Visible = true;
}
}
+ private void labelLevel1Name_Click(object sender, EventArgs e)
+ {
+ string before = "", after = "";
+
+ before = this.labelLevel1Name.Text;
+
+ DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelLevel1Name.Text);
+
+ if (keyboard.ShowDialog() == DialogResult.OK)
+ {
+ this.labelLevel1Name.Text = keyboard.RetStringValue;
+ after = this.labelLevel1Name.Text;
+
+ this.ParentForm.SystemConfig.User_Level1_Name = this.labelLevel1Name.Text;
+ this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
+
+ // Part11
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
+ this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.Level1Name, "", before, after);
+ }
+ }
+ private void labelLevel2Name_Click(object sender, EventArgs e)
+ {
+ string before = "", after = "";
+
+ before = this.labelLevel2Name.Text;
+
+ DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelLevel2Name.Text);
+
+ if (keyboard.ShowDialog() == DialogResult.OK)
+ {
+ this.labelLevel2Name.Text = keyboard.RetStringValue;
+ after = this.labelLevel2Name.Text;
+
+ this.ParentForm.SystemConfig.User_Level2_Name = this.labelLevel2Name.Text;
+ this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
+
+ // Part11
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
+ this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.Level2Name, "", before, after);
+ }
+ }
+ private void labelLevel3Name_Click(object sender, EventArgs e)
+ {
+ string before = "", after = "";
+
+ before = this.labelLevel3Name.Text;
+
+ DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelLevel3Name.Text);
+
+ if (keyboard.ShowDialog() == DialogResult.OK)
+ {
+ this.labelLevel3Name.Text = keyboard.RetStringValue;
+ after = this.labelLevel3Name.Text;
+
+ this.ParentForm.SystemConfig.User_Level3_Name = this.labelLevel3Name.Text;
+ this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
+
+ // Part11
+ if (this.ParentForm.SystemConfig.IsPart11 == true)
+ this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.Level3Name, "", before, after);
+ }
+ }
+
private void checkBox_Click(object sender, EventArgs e)
{
if (this.buttonSave.Visible == false)
diff --git a/INT69DB_2A/Forms/FormUserGroupEditor.resx b/INT69DB_2A/Forms/FormUserGroupEditor.resx
index ddf2870..a81a66e 100644
--- a/INT69DB_2A/Forms/FormUserGroupEditor.resx
+++ b/INT69DB_2A/Forms/FormUserGroupEditor.resx
@@ -862,420 +862,6 @@
fEWxEJVgwxys6MzCv5AmxH+FsM1M43gWFGn6Bnx1L54JUQk2zMGKziwo0lyffrUXlRUIXVBUVoit9k51
sKgzC4o0a+MjP3V24G548+rilVJRQ4DIFgZsmOdqFhRpYE1cBHfp6/cxplxsYcAmBkFnVp3mb7GQxpyF
NObMpzSusD+gYrSgw75pZQAAAABJRU5ErkJggg==
-
-
-
-
- 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
- 6nc2xOg6Bq4AAAAASUVORK5CYII=
-
-
-
-
- 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
- vfRZVUVVT1Whar3qgOqCmrZaqFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15L
- Wytca6tWp9aUtpy2l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AA
- bWBtwDNoMBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z
- llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQwShiXrdHW
- ztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/ajDqoOTIcGh8eO6o5s
- xybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P3NXcE9xb3Gc9LDzWepzzRHv6
- eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7efrv9HqzQXMFb0ekP/L38d/s/DNAOWBPw
- YyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuhOqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmR
- XVHYqLCopqi5lW4r96yciLaILoweXqW9KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNm
- WS6svaxnbEd2OXuaY8cp40zG28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wl
- xqae5Mnwknm9acpp2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2
- dDYvuz9HL2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8
- V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN6TeV33za
- Eb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7Ryt9K7uqNKp2Vr2v
- Tqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiIOZh58EljWGPft4xvm5sUmoqb
- PhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWytb6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/
- 0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h
- /HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavr
- XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
- fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
- tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
- 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOxAAADsQBlSsOGwAABPlJREFUeF7t2UkvbFsY
- xnFfQN+Uvi19T+m7KkX0QogIMWFCCGIkrkQIMyYGxEATEQOJb6BvDkEIX+AkZ2J+v8B777OSXaWoe+6Z
- KLXkGfxSp2ST/drnX2vtzUf+9hEi0suHcMvKyiQ7O1vMZrMkJCRIXFycxMbGSkxMjDZwvvHx8er8k5KS
- JDk5WVJSUiQ1NdUB7/F1zJmYmKjVrNHR0Q7GrL+bV+dZ3/vO19a4ppGRkRIeHi6hoaESFRUllZWVLo2C
- S7iFhYWSmZkpGRkZ6heA4fHLMYb3VsZ/XOOCAs4ZcP64gL9jzOjtcxr+a17M8X/zfpdZjXndzfiWTvMa
- c+JDBgEjWpPJJP7+/lJeXu4+XIvF4og2PT1d8vPzpbi42KGoqEgdQ0SfB4tnQUGB5Obmqg4RckhIiAQE
- BMjg4KBruHZ7rWO7gYMrKiqkvr5e6urqxGazSXV1tVRVVRGRB2BrXFpaquJFuNg2BwYGSnBwsGxsbDjD
- ReU4ICcnR0Xa2toq7e3t0tTU5IjXarWSF8K1ec/dceT9ampqHLA1RrjY7mPbjGj9/Pxcw0WwWHFROVba
- trY2aWlpkdraWvUJgBUYD63Iu+DiuuPuWNILbk3xkBi3r+jTuI1dX193hltUZJG0tDT1DYgV8eITAO/f
- 7r2J6POhNzxjysrKUqsuFlR8IGMBdVlxESjCLSkpUcs0tltYafFQyt0PJqLPZYSbl5en7nmxoNrtdtnc
- 3HSGi5qxVUaoCBbxom4s1+5+KBF9LiNcvOK5E541NTY2yvb2tmu4+JstQkXdOJDhEn0dhkukIYZLpCGG
- S6QhhkukIYZLpCGGS6QhhkukIYZLpCGGS6QhhkukIYZLpCGGS6QhhkukIYZLpCGGS6QhhkukIYZLpCGG
- S6QhhkukIYZLpCGGS6QhhkukIYZLpCGGS6QhhkukIYZLpCGGS6QhhkukIYZLpCGGS6QhhkukIYZLpCGG
- S6QhhkukIYZLpCGGS6ShPw7XbDYzXCIv8Yfhlqlw8Q0ItqqqiuESfSEEm5mZKXl5eapHhNvQ0CBbW1vO
- cCsqyiUpKUkKCgrU6osD8cpwib4GgkW4CBg9Itrm5mbZ2dlxhoulOC4uTrKzs1WspaWlisViUTETkWcg
- VECL6enp6t82m01aWlqks7NT9vb2nOHa7XYxmUySmJgoqampqnR8I/bYRORZ6A/RokXEjNW2q6tL+vr6
- 5ODgwBluR0eHBAUFSUREhMTGxqqA8ZQZcO9LRJ6BW1bjFeHiYXF3d7cMDQ3J6OiobGxsOMOdnf1L/Pz8
- VLxhYWGSkJCg9tjvl3Ei+lzGVhm3rFarVXp7e2ViYuLfRmdlbm7ONVxA2b6+vhIaGqrubZuamtSeGrUT
- kef09PRIf3+/DA8Pq2BXVlZkdXVVDg8PVasu4f74canuc7FM49HzwMCAjIyMyPj4uExOThKRh0xNTcn0
- 9LQsLS3J2tqa+tvt/v6+PDw8fAwXfv36qWJF9WNjYzIzMyPz8/OysLBARB6yuLgoy8vLsr6+Lru7u3J6
- euoSLbiEC6+vr/L09CSXl5cOFxcXcn5+rpydnXk1nCPO9/r6Wm5vb+X+/l4eHx/l+flZXl5eHPAec+IX
- cnd3Jzc3N3J1deUyqw7z4nxx7oB5MQ/mejvvd5kV5/jdr+3JyYkcHx/L0dGResUM8L7TD+ESkbfzkX8A
- aDYV804BSLEAAAAASUVORK5CYII=
-
-
-
-
- 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
- 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOxAAADsQBlSsOGwAAA7NJREFUaEPtm0kvZGEU
- hm3M8zzPhJjnGBfmeWZhShAWBDGEIIZE0MQsodHSId3KtLLwA/yyt70nubhdtejlR39JPdetiu/me845
- 99bmLTvg9fWf8Ho0f2CxWPDy8iJ/Ly8vcXp6iqOjI+zv72Nvb08Zdnd3sbOzI2xtbWFtbQ1zc3MYGxvD
- 6uqq8Lfb6/H9DQWfn5/x9PSE+/t7XF1d4ezsDMfHxzg8PMTBwYFSGA2g+ObmJpaWljA6OoqWlhZkZGRg
- amrKtixFHx8fRfL6+lo6yqqxYsvLy1hcXMTCwoKSzM/PY3Z2FuPj4+jt7UVZWRni4uIQHBwsXTfJUvT8
- /BwXFxc4OTnB9va2VGliYgLDw8Po7+9HX1+f0vT09KCzsxPV1dVIS0tDVFQU/P39RdgYaZF9eLjH+vo6
- NjY2pIuTk5MYGBiQxY2NjaitrUVNTY2SUM6AHc3Ly0NiYiLCw8Ph6+sLDw8Psyw7OzMzg+npaYyMjEiV
- mpqaUF5ejpKSEhQVFaGgoEB5cnNzpavx8fEICQmBt7c33N3d8e3bprmzQ0NDGBwcRHd3t3SztLRULpCT
- kyNkZ2crDfeYmZmJlJSUt/vVy8sLbm5u1mNMya6uLrS2tqKqqko6ypGwdWFVMWRjY2PfZF1dXbGysvIu
- e3dnkfuTcHwrKipkdDkWti6qKv8ke3t7g/b2dnR0dMgI81790rJtbW0i/OVlLRYtq2VVRstqWS2rZZVF
- y2pZLatllUXLalktq2WVRctqWS2rZZVFy2pZLatllUXLalktq2WVRcv+97KMBH01WU9PT2vZm5vfkuRk
- dxsaGiQW91llk5OTERMTg6CgIJF1cXGRiOKb7K9f16ivr0dzczPq6uok3VZYWPjpZBm7TUpKQnR0NAIC
- AiS3aCX78+elCDLsyBEuLi5Gfn6+ROSysrI+Bewqc4sJCQmIiIiAn5+fRPmcnZ3Nst+/nyA1NVWqw4Ws
- UHp6uiwmPFcZ7pH7ZxqVI2yENNlVR0dHc3bxx48Lyecy4MhEJ6tjwAuojLFP7pvjGxoaKl1lGtXJyQkO
- Dg4Sp3+TZVAzMDBQKsJ/DgsLk7xuZGSkwEKoCvfHseWe+VAyMsYcX4ra29ubZQkfTj4+PgIXsDpMYvNG
- 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
- vacIK+opBimuVTyo2K84p6Ss5KGUrlSldEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0Cvp
- vfRZVUVVT1Whar3qgOqCmrZaqFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15L
- Wytca6tWp9aUtpy2l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AA
- bWBtwDNoMBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z
- llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQwShiXrdHW
- ztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/ajDqoOTIcGh8eO6o5s
- xybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P3NXcE9xb3Gc9LDzWepzzRHv6
- eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7efrv9HqzQXMFb0ekP/L38d/s/DNAOWBPw
- YyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuhOqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmR
- XVHYqLCopqi5lW4r96yciLaILoweXqW9KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNm
- WS6svaxnbEd2OXuaY8cp40zG28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wl
- xqae5Mnwknm9acpp2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2
- dDYvuz9HL2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8
- V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN6TeV33za
- Eb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7Ryt9K7uqNKp2Vr2v
- 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
- rkJggg==
diff --git a/INT69DB_2A/Helper.cs b/INT69DB_2A/Helper.cs
index 6b5bb39..72fbd89 100644
--- a/INT69DB_2A/Helper.cs
+++ b/INT69DB_2A/Helper.cs
@@ -175,6 +175,45 @@ namespace INT69DB_2A
return sValue;
}
+ ///
+ /// Check Sum 8
+ ///
+ ///
+ ///
+ public static string Checksumcalculator(string strTemp)
+ {
+ string chkSum = "";
+ byte[] temp;
+ int value = 0, first = 0, second = 0;
+ char char1, char2;
+
+ if (strTemp == null || strTemp.Length == 0)
+ chkSum = "cc";
+ else
+ {
+ temp = new UTF8Encoding().GetBytes(strTemp);
+
+ for (int i = 0; i < temp.Length; i++)
+ value += temp[i];
+
+ first = (value & 0x00f0) >> 4;
+ if (first > 9)
+ char1 = (char)(first + 0x37);
+ else
+ char1 = (char)(first + 0x30);
+
+ second = value & 0x000f;
+ if (second > 9)
+ char2 = (char)(second + 0x37);
+ else
+ char2 = (char)(second + 0x30);
+
+ chkSum = char1.ToString() + char2.ToString();
+ }
+
+ return chkSum;
+ }
+
public static DataStore.JudgmentStatus StringToJudgmentStatusStatistics(string value)
{
if (value == "Under")
diff --git a/INT69DB_2A/INT69DB_2A.csproj b/INT69DB_2A/INT69DB_2A.csproj
index 9e418e8..8fb064a 100644
--- a/INT69DB_2A/INT69DB_2A.csproj
+++ b/INT69DB_2A/INT69DB_2A.csproj
@@ -49,6 +49,10 @@
False
..\..\..\..\..\Program Files (x86)\Intech\InModbus_V2.0.2.0\InModbus.dll
+
+ False
+ ..\INT69DB_2A_ImageDll\INT69DB_2A_ImageDll\bin\Release\INT69DB_2A_ImageDll.dll
+
@@ -307,14 +311,14 @@
Form
-
+
DialogFormLogOn.cs
-
+
Form
-
- DialogFormPasswordKeyPad1.cs
+
+ DialogFormPasswordKeyPad.cs
Form
@@ -382,11 +386,11 @@
FormEquipmentSetting.cs
-
+
Form
-
- FormFactoryReset.cs
+
+ FormInitialization.cs
Form
@@ -400,6 +404,12 @@
FormIOTest.cs
+
+ Form
+
+
+ FormOption.cs
+
Form
@@ -638,8 +648,8 @@
DialogFormLogOn.cs
Designer
-
- DialogFormPasswordKeyPad1.cs
+
+ DialogFormPasswordKeyPad.cs
Designer
@@ -686,8 +696,8 @@
FormEquipmentSetting.cs
Designer
-
- FormFactoryReset.cs
+
+ FormInitialization.cs
Designer
@@ -698,6 +708,10 @@
FormIOTest.cs
Designer
+
+ FormOption.cs
+ Designer
+
FormSystemSetting.cs
Designer
@@ -756,12 +770,6 @@
-
-
- {0E385F13-0B8B-4E88-B19C-6924AEA4F3F5}
- INT69DB_2A_ImageDll
-
-
diff --git a/INT69DB_2A/Part11_UserManager/UserItem.cs b/INT69DB_2A/Part11_UserManager/UserItem.cs
index dee5d75..f75e06e 100644
--- a/INT69DB_2A/Part11_UserManager/UserItem.cs
+++ b/INT69DB_2A/Part11_UserManager/UserItem.cs
@@ -10,30 +10,27 @@ namespace INT69DB_2A.Part11_UserManager
public class UserItem
{
#region Field
- private bool m_IsUpdate;
-
private string m_ID;
private string m_Password;
- private string m_PreviousPassword1;
- private string m_PreviousPassword2;
- private string m_PreviousPassword3;
- private int m_ExpireAccount;
+ private int m_ExpireId;
private int m_ExpirePassword;
private bool m_IsLockAccount;
private bool m_IsLockPassword;
- private DateTime m_DateRegister;
- private DateTime m_DateLogin;
- private DateTime m_DateExpireRegister;
- private DateTime m_DateExpireLogin;
+ private DateTime m_DatePasswordRegister;
+ private DateTime m_DateIdLogin;
+ private DateTime m_DatePasswordExpire;
+ private DateTime m_DateIdExpire;
private DataStore.UserGroup m_Group;
private bool m_IsAdmin;
private int m_ActiveLevel;
+
+ private int m_IsFirstPassword;
#endregion
#region Constructor
@@ -44,12 +41,6 @@ namespace INT69DB_2A.Part11_UserManager
#endregion
#region Property
- public bool IsUpdate
- {
- get { return this.m_IsUpdate; }
- set { this.m_IsUpdate = value; }
- }
-
public string ID
{
get { return this.m_ID; }
@@ -60,26 +51,11 @@ namespace INT69DB_2A.Part11_UserManager
get { return this.m_Password; }
set { this.m_Password = value; }
}
- public string PreviousPassword1
- {
- get { return this.m_PreviousPassword1; }
- set { this.m_PreviousPassword1 = value; }
- }
- public string PreviousPassword2
- {
- get { return this.m_PreviousPassword2; }
- set { this.m_PreviousPassword2 = value; }
- }
- public string PreviousPassword3
- {
- get { return this.m_PreviousPassword3; }
- set { this.m_PreviousPassword3 = value; }
- }
- public int ExpireAccount
+ public int ExpireId
{
- get { return this.m_ExpireAccount; }
- set { this.m_ExpireAccount = value; }
+ get { return this.m_ExpireId; }
+ set { this.m_ExpireId = value; }
}
public int ExpirePassword
{
@@ -98,25 +74,25 @@ namespace INT69DB_2A.Part11_UserManager
set { this.m_IsLockPassword = value; }
}
- public DateTime DateRegister
+ public DateTime DatePasswordRegister
{
- get { return this.m_DateRegister; }
- set { this.m_DateRegister = value; }
+ get { return this.m_DatePasswordRegister; }
+ set { this.m_DatePasswordRegister = value; }
}
- public DateTime DateLogin
+ public DateTime DateIdLogin
{
- get { return this.m_DateLogin; }
- set { this.m_DateLogin = value; }
+ get { return this.m_DateIdLogin; }
+ set { this.m_DateIdLogin = value; }
}
- public DateTime DateExpireRegister
+ public DateTime DatePasswordExpire
{
- get { return this.m_DateExpireRegister; }
- set { this.m_DateExpireRegister = value; }
+ get { return this.m_DatePasswordExpire; }
+ set { this.m_DatePasswordExpire = value; }
}
- public DateTime DateExpireLogin
+ public DateTime DateIdExpire
{
- get { return this.m_DateExpireLogin; }
- set { this.m_DateExpireLogin = value; }
+ get { return this.m_DateIdExpire; }
+ set { this.m_DateIdExpire = value; }
}
public DataStore.UserGroup Group
@@ -136,41 +112,52 @@ namespace INT69DB_2A.Part11_UserManager
get { return this.m_ActiveLevel; }
set { this.m_ActiveLevel = value; }
}
+
+ public int IsFirstPassword
+ {
+ get { return this.m_IsFirstPassword; }
+ set { this.m_IsFirstPassword = value; }
+ }
#endregion
#region Method
private void Initialize()
{
- this.IsUpdate = false;
-
this.ID = "-";
this.Password = "-";
- this.PreviousPassword1 = "-";
- this.PreviousPassword2 = "-";
- this.PreviousPassword3 = "-";
-
- this.ExpireAccount = 0;
+ this.ExpireId = 0;
this.ExpirePassword = 0;
- this.DateRegister = DateTime.Now;
- this.DateLogin = DateTime.Now;
- this.DateExpireRegister = DateTime.Now;
- this.DateExpireLogin = DateTime.Now;
+ this.DatePasswordRegister = DateTime.Now;
+ this.DateIdLogin = DateTime.Now;
+ this.DatePasswordExpire = DateTime.Now;
+ this.DateIdExpire = DateTime.Now;
this.Group = DataStore.UserGroup.None;
this.IsAdmin = false;
this.ActiveLevel = 1;
+
+ this.IsFirstPassword = 1; //[1] 최초 비밀번호(비밀번호 변경창 띄우기), [0] 비밀번호 변경완료됨
}
- public void SetPassword(string pass)
+ public int GetPasswordExpiryDday()
{
- this.PreviousPassword3 = this.PreviousPassword2;
- this.PreviousPassword2 = this.PreviousPassword1;
- this.PreviousPassword1 = pass;
- this.Password = pass;
+ int ret = 0;
+ DateTime timeNow = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+ TimeSpan dayDiff;
+
+ if (this.Group == DataStore.UserGroup.Admin || this.Group == DataStore.UserGroup.Developer)
+ ret = 9999;
+ else
+ {
+ dayDiff = timeNow.Date - this.DateIdExpire.Date;
+ ret = dayDiff.Days;
+ }
+
+ return ret;
}
#endregion
}
diff --git a/INT69DB_2A/Part11_UserManager/UserManager.Define.cs b/INT69DB_2A/Part11_UserManager/UserManager.Define.cs
index 91afebe..6c4e456 100644
--- a/INT69DB_2A/Part11_UserManager/UserManager.Define.cs
+++ b/INT69DB_2A/Part11_UserManager/UserManager.Define.cs
@@ -125,6 +125,9 @@ namespace INT69DB_2A.Part11_UserManager
[DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
private static extern int DLL_UserMgr_UserModifyPW(IntPtr user_id, IntPtr user_pw);
+ [DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
+ private static extern int DLL_UserMgr_UserModifyPWDirect(IntPtr user_id, IntPtr user_pw);
+
[DllImport(PathDll, CallingConvention = CallingConvention.Winapi)]
private static extern int DLL_UserMgr_UserModifyID(IntPtr user_org_id, IntPtr user_new_id);
diff --git a/INT69DB_2A/Part11_UserManager/UserManager.Structure.cs b/INT69DB_2A/Part11_UserManager/UserManager.Structure.cs
index 6e990b7..f633a7f 100644
--- a/INT69DB_2A/Part11_UserManager/UserManager.Structure.cs
+++ b/INT69DB_2A/Part11_UserManager/UserManager.Structure.cs
@@ -69,29 +69,29 @@ namespace INT69DB_2A.Part11_UserManager
USER_MGR_STATUS_OK = 0x00,
// error status
- USER_MGR_STATUS_ID_NOT_FOUND, // not found the user id
- USER_MGR_STATUS_ID_DUPLICATE, // duplicate on id
- USER_MGR_STATUS_ID_LENGTH_UNDER, // under the minimum length of id
- USER_MGR_STATUS_ID_LENGTH_OVER, // over the maximum length of id
- USER_MGR_STATUS_ID_CONT_LETTER, // continue characters or duplicate characters of id
- USER_MGR_STATUS_ID_INVALID_CHAR, // include the invalid character on id
- USER_MGR_STATUS_ID_ACCOUNT_LOCK,
+ USER_MGR_STATUS_ID_NOT_FOUND, // 1 - not found the user id
+ USER_MGR_STATUS_ID_DUPLICATE, // 2 - duplicate on id
+ USER_MGR_STATUS_ID_LENGTH_UNDER, // 3 - under the minimum length of id
+ USER_MGR_STATUS_ID_LENGTH_OVER, // 4 - over the maximum length of id
+ USER_MGR_STATUS_ID_CONT_LETTER, // 5 - continue characters or duplicate characters of id
+ USER_MGR_STATUS_ID_INVALID_CHAR, // 6 - include the invalid character on id
+ USER_MGR_STATUS_ID_ACCOUNT_LOCK, // 7 - Account Lock
- USER_MGR_STATUS_PW_DUPLICATE_HISTORY, // duplicate on password history
- USER_MGR_STATUS_PW_LENGTH_UNDER, // under the minimum length of password
- USER_MGR_STATUS_PW_LENGTH_OVER, // over the maximum length of password
- USER_MGR_STATUS_PW_CONT_LETTER, // continue characters or duplicate characters of password
- USER_MGR_STATUS_PW_INVALID_CHAR, // include the invalid character on password
- USER_MGR_STATUS_PW_EACH_MIN_CHAR, // not include minimum characters on password
- USER_MGR_STATUS_PW_NOT_SAME, // password error
- USER_MGR_STATUS_PW_PASSWORD_LOCK,
+ USER_MGR_STATUS_PW_DUPLICATE_HISTORY, // 8 - duplicate on password history
+ USER_MGR_STATUS_PW_LENGTH_UNDER, // 9 - under the minimum length of password
+ USER_MGR_STATUS_PW_LENGTH_OVER, // 10 - over the maximum length of password
+ USER_MGR_STATUS_PW_CONT_LETTER, // 11 - continue characters or duplicate characters of password
+ USER_MGR_STATUS_PW_INVALID_CHAR, // 12 - include the invalid character on password
+ USER_MGR_STATUS_PW_EACH_MIN_CHAR, // 13 - not include minimum characters on password
+ USER_MGR_STATUS_PW_NOT_SAME, // 14 - password error
+ USER_MGR_STATUS_PW_PASSWORD_LOCK, // 15 - Password Lock
- USER_MGR_STATUS_OTHER_OVER_PASSWORD_PERIOD, // over maximum password expire period (days)
- USER_MGR_STATUS_OTHER_OVER_ACCOUNT_PERIOD, // over maximum account expire period (days)
- USER_MGR_STATUS_OTHER_OVER_LOGIN_TIMEOUT, // over maximum auto logout time (minute)
+ USER_MGR_STATUS_OTHER_OVER_PASSWORD_PERIOD, // 16 - over maximum password expire period (days)
+ USER_MGR_STATUS_OTHER_OVER_ACCOUNT_PERIOD, // 17 - over maximum account expire period (days)
+ USER_MGR_STATUS_OTHER_OVER_LOGIN_TIMEOUT, // 18 - over maximum auto logout time (minute)
USER_MGR_STATUS_MAX,
- };
+ };
#endregion
#region Enum E_user_mgr_menu_id
@@ -192,7 +192,7 @@ namespace INT69DB_2A.Part11_UserManager
return dateTime;
}
- }
+ }
#endregion
#region Struct UserMgr_user_info_t
@@ -212,35 +212,38 @@ namespace INT69DB_2A.Part11_UserManager
public Int32 fadmin;
[MarshalAs(UnmanagedType.I4)]
- public Int32 expire_period_pw; // password lock
+ public Int32 password_expire_period; // password lock date
[MarshalAs(UnmanagedType.I4)]
- public Int32 expire_period_account; // account lock
+ public Int32 id_expire_period; // id lock date
[MarshalAs(UnmanagedType.I4)]
- public Int32 flock_status_account; // user ID (account) lock
+ public Int32 id_flock_status; // user ID (account) lock status
[MarshalAs(UnmanagedType.I4)]
- public Int32 flock_status_password; // password lock (need to change password)
+ public Int32 password_flock_status; // password lock status (need to change password)
[MarshalAs(UnmanagedType.Struct)]
- public DateTime_t register_date; // date/time when the user password was registered or changed
+ public DateTime_t password_register_date; // date/time when the user password was registered or changed
[MarshalAs(UnmanagedType.Struct)]
- public DateTime_t login_date; // date/time when the user was login
+ public DateTime_t id_login_date; // date/time when the user was login
[MarshalAs(UnmanagedType.Struct)]
- public DateTime_t expire_register_date;
+ public DateTime_t password_expire_date; // Password Expiration Date
[MarshalAs(UnmanagedType.Struct)]
- public DateTime_t expire_account_date;
+ public DateTime_t id_expire_date; // Account Expiration Date
[MarshalAs(UnmanagedType.Struct)]
- public MenuID_t menuID;
+ public MenuID_t menuID; // flag of Menu IDs
[MarshalAs(UnmanagedType.I4)]
- public Int32 active_level;
- }
+ public Int32 active_level; // menu active level : max : MAX_ACTIVE_LEVEL
+
+ [MarshalAs(UnmanagedType.I4)]
+ public Int32 fFirstPW; // [1] First (request to modify), [0] Next (not request)
+ }
#endregion
#region Struct UserMgr_user_modify_t
@@ -262,7 +265,7 @@ namespace INT69DB_2A.Part11_UserManager
[MarshalAs(UnmanagedType.ByValTStr, SizeConst = MAX_USER_ID_LENGTH)]
public string user_id;
- }
+ }
#endregion
#region Struct UserMgr_login_timeout_t
@@ -273,7 +276,7 @@ namespace INT69DB_2A.Part11_UserManager
[MarshalAs(UnmanagedType.ByValTStr, SizeConst = MAX_USER_ID_LENGTH)]
public string user_id;
- }
+ }
#endregion
#region Struct UserMgr_user_add_t
@@ -286,7 +289,7 @@ namespace INT69DB_2A.Part11_UserManager
[MarshalAs(UnmanagedType.ByValTStr, SizeConst = MAX_USER_ID_LENGTH)]
public string user_id;
- }
+ }
#endregion
#region Struct UserMgr_user_lock_t
@@ -298,7 +301,7 @@ namespace INT69DB_2A.Part11_UserManager
[MarshalAs(UnmanagedType.ByValTStr, SizeConst = MAX_USER_ID_LENGTH)]
public string user_id;
- }
+ }
#endregion
#region Struct UserMgr_user_list_t
@@ -324,35 +327,38 @@ namespace INT69DB_2A.Part11_UserManager
public Int32 fadmin;
[MarshalAs(UnmanagedType.I4)]
- public Int32 expire_period_pw; // password lock
+ public Int32 password_expire_period; // password lock
[MarshalAs(UnmanagedType.I4)]
- public Int32 expire_period_account; // account lock
+ public Int32 id_expire_period; // account lock
[MarshalAs(UnmanagedType.I4)]
- public Int32 flock_status_account; // user ID (account) lock
+ public Int32 id_flock_status; // user ID (account) lock
[MarshalAs(UnmanagedType.I4)]
public Int32 flock_status_password; // password lock (need to change password)
[MarshalAs(UnmanagedType.Struct)]
- public DateTime_t register_date; // date/time when the user password was registered or changed
+ public DateTime_t password_register_date; // date/time when the user password was registered or changed
[MarshalAs(UnmanagedType.Struct)]
- public DateTime_t login_date; // date/time when the user was login
+ public DateTime_t id_login_date; // date/time when the user was login
[MarshalAs(UnmanagedType.Struct)]
- public DateTime_t expire_register_date;
+ public DateTime_t password_expire_date; // Password Expiration Date
[MarshalAs(UnmanagedType.Struct)]
- public DateTime_t expire_account_date;
+ public DateTime_t id_expire_date; // Account Expiration Date
[MarshalAs(UnmanagedType.I4)]
- public Int32 active_level;
+ public Int32 active_level; // menu active level : max : MAX_ACTIVE_LEVEL
[MarshalAs(UnmanagedType.Struct)]
- public MenuID_t menuID;
- }
+ public MenuID_t menuID; // flag of Menu IDs
+
+ [MarshalAs(UnmanagedType.I4)]
+ public Int32 fFirstPW; // flag first password
+ }
#endregion
#region Struct UserMgr_user_list_name_t
diff --git a/INT69DB_2A/Part11_UserManager/UserManager.cs b/INT69DB_2A/Part11_UserManager/UserManager.cs
index f3fafec..63900e9 100644
--- a/INT69DB_2A/Part11_UserManager/UserManager.cs
+++ b/INT69DB_2A/Part11_UserManager/UserManager.cs
@@ -136,6 +136,18 @@ namespace INT69DB_2A.Part11_UserManager
DLL_UserMgr_UserModifyPW(pID, pPW);
}
+ public static int UserManager_UserModifyPWDirect(String sID, String sNewPW)
+ {
+ int ret = 0;
+
+ IntPtr pID = Marshal.StringToBSTR(sID.ToString());
+ IntPtr pPW = Marshal.StringToBSTR(sNewPW.ToString());
+
+ ret = DLL_UserMgr_UserModifyPWDirect(pID, pPW);
+
+ return ret;
+ }
+
public static void UserManager_UserModifyID(String sID, String sNewID)
{
IntPtr pID = Marshal.StringToBSTR(sID.ToString());
@@ -231,7 +243,7 @@ namespace INT69DB_2A.Part11_UserManager
}
catch
{
- }
+ }
}
private static void UserManager_GetListCallBack(ref UserMgr_user_list_t user_list)
{
@@ -263,7 +275,7 @@ namespace INT69DB_2A.Part11_UserManager
UserListLogoutDataEvent(status);
}
- catch
+ catch
{
}
}
@@ -285,7 +297,7 @@ namespace INT69DB_2A.Part11_UserManager
if (UserListLockDataEvent != null)
UserListLockDataEvent(user_lock);
}
- catch
+ catch
{
}
}
@@ -296,7 +308,7 @@ namespace INT69DB_2A.Part11_UserManager
if (UserListDefautSettingDataEvent != null)
UserListDefautSettingDataEvent(status);
}
- catch
+ catch
{
}
}
@@ -340,7 +352,7 @@ namespace INT69DB_2A.Part11_UserManager
if (UserListAddDataEvent != null)
UserListAddDataEvent(user_add);
}
- catch
+ catch
{
}
}
@@ -365,21 +377,21 @@ namespace INT69DB_2A.Part11_UserManager
try
{
}
- catch
+ catch
{
}
}
private static void UserManager_VersionCallback(StringBuilder version)
{
- try
- {
+ try
+ {
if (UserListGetVersionDataEvent != null)
UserListGetVersionDataEvent(version);
- }
- catch
- {
-
- }
+ }
+ catch
+ {
+
+ }
}
#endregion
}
diff --git a/INT69DB_2A/Version.txt b/INT69DB_2A/Version.txt
index 5955096..c5ca042 100644
--- a/INT69DB_2A/Version.txt
+++ b/INT69DB_2A/Version.txt
@@ -19,8 +19,13 @@
- Ver 4.5.0 Modify
- Framework : SmartX Framework V3.1.1(update: 2019.03.21)
- (V4.5.1) ȭ ȵǴ
+ - ͼ - Ʈ(COM1, RS485)
+ 'ȸ' ϴ
- Part 11
INT69DC_7C V11.0.0
+
+ - Level1, 2 default bool
+ - ͺ - â ߰
@ Ver 4.5.0 by CJY
- 2022.12.22
diff --git a/INT69DB_2A/bin/Release/DllAes128.dll b/INT69DB_2A/bin/Release/DllAes128.dll
index cb66331..cf8898e 100644
Binary files a/INT69DB_2A/bin/Release/DllAes128.dll and b/INT69DB_2A/bin/Release/DllAes128.dll differ
diff --git a/INT69DB_2A/bin/Release/DllUserMgr.dll b/INT69DB_2A/bin/Release/DllUserMgr.dll
index 4deab23..e976c80 100644
Binary files a/INT69DB_2A/bin/Release/DllUserMgr.dll and b/INT69DB_2A/bin/Release/DllUserMgr.dll differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration10.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration10.resources
deleted file mode 100644
index 41b3482..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration10.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration2.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration2.resources
deleted file mode 100644
index b83f7a2..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration2.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration3.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration3.resources
deleted file mode 100644
index 8457312..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration3.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration4.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration4.resources
deleted file mode 100644
index 3b6f3b5..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration4.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration5.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration5.resources
deleted file mode 100644
index e5aa5bd..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration5.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration6.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration6.resources
deleted file mode 100644
index 12b36f3..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration6.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration7.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration7.resources
deleted file mode 100644
index 701ea0e..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration7.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration8.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration8.resources
deleted file mode 100644
index 7c930ce..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlCalibration8.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlConfiguration.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlConfiguration.resources
deleted file mode 100644
index 06c24d0..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlConfiguration.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlEquipmentTest.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlEquipmentTest.resources
deleted file mode 100644
index 06c24d0..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlEquipmentTest.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplay2.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplay2.resources
deleted file mode 100644
index 3ea67a8..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplay2.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph10.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph10.resources
deleted file mode 100644
index f291001..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph10.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph2.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph2.resources
deleted file mode 100644
index 1dda85f..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph2.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph3.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph3.resources
deleted file mode 100644
index a4e2c4a..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph3.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph4.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph4.resources
deleted file mode 100644
index 2c02a78..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph4.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph5.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph5.resources
deleted file mode 100644
index 7dea008..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph5.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph6.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph6.resources
deleted file mode 100644
index 9eae72e..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph6.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph7.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph7.resources
deleted file mode 100644
index f7dae41..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph7.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph8.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph8.resources
deleted file mode 100644
index 7cb7041..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayDotGraph8.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph10.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph10.resources
deleted file mode 100644
index 8e50f24..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph10.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph2.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph2.resources
deleted file mode 100644
index f130c20..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph2.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph3.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph3.resources
deleted file mode 100644
index bf64bf1..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph3.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph4.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph4.resources
deleted file mode 100644
index ddc32aa..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph4.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph5.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph5.resources
deleted file mode 100644
index 97759ec..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph5.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph6.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph6.resources
deleted file mode 100644
index 37e88b0..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph6.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph7.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph7.resources
deleted file mode 100644
index 267c2b0..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph7.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph8.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph8.resources
deleted file mode 100644
index 6b3c774..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayEachBarGraph8.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable10.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable10.resources
deleted file mode 100644
index 5e6cf8c..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable10.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable2.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable2.resources
deleted file mode 100644
index f130c20..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable2.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable3.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable3.resources
deleted file mode 100644
index bf64bf1..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable3.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable4.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable4.resources
deleted file mode 100644
index ddc32aa..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable4.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable5.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable5.resources
deleted file mode 100644
index 97759ec..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable5.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable6.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable6.resources
deleted file mode 100644
index 37e88b0..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable6.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable7.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable7.resources
deleted file mode 100644
index 2c33bf8..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable7.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable8.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable8.resources
deleted file mode 100644
index 523e200..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Controls.ControlMainDisplayTable8.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.DialogForms.DialogFormLogOn.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.DialogForms.DialogFormLogOn.resources
deleted file mode 100644
index b6200f8..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.DialogForms.DialogFormLogOn.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.DialogForms.DialogFormMessage.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.DialogForms.DialogFormMessage.resources
deleted file mode 100644
index 69b49b1..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.DialogForms.DialogFormMessage.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.DialogForms.DialogFormNumKeyPad.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.DialogForms.DialogFormNumKeyPad.resources
deleted file mode 100644
index 06c24d0..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.DialogForms.DialogFormNumKeyPad.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.DialogForms.DialogFormPasswordKeyPad1.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.DialogForms.DialogFormPasswordKeyPad1.resources
deleted file mode 100644
index 06c24d0..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.DialogForms.DialogFormPasswordKeyPad1.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.DialogForms.DialogFormYesNo.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.DialogForms.DialogFormYesNo.resources
deleted file mode 100644
index 69b49b1..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.DialogForms.DialogFormYesNo.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormCalibration.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormCalibration.resources
deleted file mode 100644
index aa7c84f..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormCalibration.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormConfiguration.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormConfiguration.resources
deleted file mode 100644
index 17afc7b..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormConfiguration.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormDataBackup.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormDataBackup.resources
deleted file mode 100644
index 353f1fb..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormDataBackup.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormEquipmentSetting.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormEquipmentSetting.resources
deleted file mode 100644
index 021eba9..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormEquipmentSetting.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormEquipmentTest.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormEquipmentTest.resources
deleted file mode 100644
index 0be4669..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormEquipmentTest.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormFactoryReset.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormFactoryReset.resources
deleted file mode 100644
index f226e28..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormFactoryReset.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormIOTest.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormIOTest.resources
deleted file mode 100644
index f83a232..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormIOTest.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormInformation.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormInformation.resources
deleted file mode 100644
index 0f02f3d..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormInformation.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormMain.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormMain.resources
deleted file mode 100644
index 06c24d0..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormMain.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormMainDisplay.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormMainDisplay.resources
deleted file mode 100644
index 563248f..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormMainDisplay.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormMenu.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormMenu.resources
deleted file mode 100644
index 27e7a9a..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormMenu.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormMotorSetting.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormMotorSetting.resources
deleted file mode 100644
index e2ce861..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormMotorSetting.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormProgramUpdate.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormProgramUpdate.resources
deleted file mode 100644
index 282c6a6..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormProgramUpdate.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormSystemSetting.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormSystemSetting.resources
deleted file mode 100644
index ef0707c..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormSystemSetting.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormTimeSetting.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormTimeSetting.resources
deleted file mode 100644
index 314a4c3..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormTimeSetting.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormUserSetting.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormUserSetting.resources
deleted file mode 100644
index 7962fdd..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Forms.FormUserSetting.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.Properties.Resources.resources b/INT69DB_2A/obj/Debug/INT69DB_2A.Properties.Resources.resources
deleted file mode 100644
index 06c24d0..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.Properties.Resources.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.csproj.FileListAbsolute.txt b/INT69DB_2A/obj/Debug/INT69DB_2A.csproj.FileListAbsolute.txt
deleted file mode 100644
index aa55fca..0000000
--- a/INT69DB_2A/obj/Debug/INT69DB_2A.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,134 +0,0 @@
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\ResolveAssemblyReference.cache
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Properties.Resources.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.csproj.GenerateResource.Cache
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\bin\Debug\INT69DB_2A.exe
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\bin\Debug\INT69DB_2A.pdb
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\bin\Debug\INT69DB_2A_ImageDll.dll
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\bin\Debug\SmartX_IEC1000.dll
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\bin\Debug\SmartXCommon.dll
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\bin\Debug\INT69DB_2A_ImageDll.pdb
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.exe
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.pdb
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlCalibration10.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlCalibration2.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlCalibration3.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlCalibration4.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlCalibration5.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlCalibration6.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlCalibration7.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlCalibration8.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlConfiguration.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlEquipmentTest.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplay2.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayDotGraph10.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayDotGraph2.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayDotGraph3.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayDotGraph4.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayDotGraph5.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayDotGraph6.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayDotGraph7.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayDotGraph8.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayEachBarGraph10.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayEachBarGraph2.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayEachBarGraph3.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayEachBarGraph4.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayEachBarGraph5.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayEachBarGraph6.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayEachBarGraph7.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayEachBarGraph8.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayTable10.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayTable2.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayTable3.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayTable4.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayTable5.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayTable6.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayTable7.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayTable8.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.DialogForms.DialogFormLogOn.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.DialogForms.DialogFormPasswordKeyPad1.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.DialogForms.DialogFormMessage.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.DialogForms.DialogFormNumKeyPad.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.DialogForms.DialogFormYesNo.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormCalibration.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormConfiguration.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormDataBackup.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormEquipmentSetting.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormFactoryReset.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormInformation.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormIOTest.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormSystemSetting.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormMain.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormMainDisplay.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormMenu.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormMotorSetting.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormProgramUpdate.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormEquipmentTest.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormTimeSetting.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormUserSetting.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\bin\Debug\INT69DB_2A.exe
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\bin\Debug\INT69DB_2A.pdb
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\bin\Debug\INT69DB_2A_ImageDll.dll
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\bin\Debug\SmartX_IEC1000.dll
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\bin\Debug\SmartXCommon.dll
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\bin\Debug\INT69DB_2A_ImageDll.pdb
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\ResolveAssemblyReference.cache
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlCalibration10.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlCalibration2.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlCalibration3.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlCalibration4.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlCalibration5.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlCalibration6.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlCalibration7.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlCalibration8.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlConfiguration.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlEquipmentTest.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplay2.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayDotGraph10.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayDotGraph2.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayDotGraph3.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayDotGraph4.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayDotGraph5.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayDotGraph6.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayDotGraph7.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayDotGraph8.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayEachBarGraph10.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayEachBarGraph2.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayEachBarGraph3.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayEachBarGraph4.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayEachBarGraph5.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayEachBarGraph6.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayEachBarGraph7.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayEachBarGraph8.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayTable10.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayTable2.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayTable3.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayTable4.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayTable5.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayTable6.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayTable7.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Controls.ControlMainDisplayTable8.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.DialogForms.DialogFormLogOn.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.DialogForms.DialogFormPasswordKeyPad1.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.DialogForms.DialogFormMessage.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.DialogForms.DialogFormNumKeyPad.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.DialogForms.DialogFormYesNo.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormCalibration.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormConfiguration.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormDataBackup.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormEquipmentSetting.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormFactoryReset.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormInformation.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormIOTest.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormSystemSetting.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormMain.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormMainDisplay.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormMenu.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormMotorSetting.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormProgramUpdate.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormEquipmentTest.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormTimeSetting.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Forms.FormUserSetting.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.Properties.Resources.resources
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.csproj.GenerateResource.Cache
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.exe
-C:\Users\CJY\Desktop\INT69DB_2A_V4.2.0\INT69DB_2A\obj\Debug\INT69DB_2A.pdb
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.csproj.GenerateResource.Cache b/INT69DB_2A/obj/Debug/INT69DB_2A.csproj.GenerateResource.Cache
deleted file mode 100644
index 4782263..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.csproj.GenerateResource.Cache and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.exe b/INT69DB_2A/obj/Debug/INT69DB_2A.exe
deleted file mode 100644
index 3200772..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.exe and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/INT69DB_2A.pdb b/INT69DB_2A/obj/Debug/INT69DB_2A.pdb
deleted file mode 100644
index 626a9d9..0000000
Binary files a/INT69DB_2A/obj/Debug/INT69DB_2A.pdb and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/ResolveAssemblyReference.cache b/INT69DB_2A/obj/Debug/ResolveAssemblyReference.cache
deleted file mode 100644
index 8a99005..0000000
Binary files a/INT69DB_2A/obj/Debug/ResolveAssemblyReference.cache and /dev/null differ
diff --git a/INT69DB_2A/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/INT69DB_2A/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
deleted file mode 100644
index 9855951..0000000
Binary files a/INT69DB_2A/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormDataStatistics.resources b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormDataStatistics.resources
index 7cdbce7..c136bd8 100644
Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormDataStatistics.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormDataStatistics.resources differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormHistoryData.resources b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormHistoryData.resources
index 7cdbce7..c136bd8 100644
Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormHistoryData.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormHistoryData.resources differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormPasswordKeyPad1.resources b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormPasswordKeyPad1.resources
deleted file mode 100644
index 06c24d0..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormPasswordKeyPad1.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormUserEditorKeyboard.resources b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormUserEditorKeyboard.resources
index 3970265..9c87886 100644
Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormUserEditorKeyboard.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormUserEditorKeyboard.resources differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormEquipmentSetting.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormEquipmentSetting.resources
index ee4642a..d520d84 100644
Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormEquipmentSetting.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormEquipmentSetting.resources differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormFactoryReset.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormFactoryReset.resources
deleted file mode 100644
index 78b621d..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormFactoryReset.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormMenu.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormMenu.resources
index 15d784b..6405d45 100644
Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormMenu.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormMenu.resources differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormUserGroupEditor.resources b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormUserGroupEditor.resources
index 163065c..1db532b 100644
Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormUserGroupEditor.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.Forms.FormUserGroupEditor.resources differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration10.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration10.resources
deleted file mode 100644
index 41b3482..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration10.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration2.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration2.resources
deleted file mode 100644
index b83f7a2..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration2.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration3.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration3.resources
deleted file mode 100644
index 8457312..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration3.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration4.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration4.resources
deleted file mode 100644
index 3b6f3b5..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration4.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration5.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration5.resources
deleted file mode 100644
index e5aa5bd..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration5.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration6.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration6.resources
deleted file mode 100644
index 12b36f3..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration6.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration7.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration7.resources
deleted file mode 100644
index 701ea0e..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration7.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration8.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration8.resources
deleted file mode 100644
index 7c930ce..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlCalibration8.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlConfiguration.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlConfiguration.resources
deleted file mode 100644
index 06c24d0..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlConfiguration.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlEquipmentTest.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlEquipmentTest.resources
deleted file mode 100644
index 06c24d0..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlEquipmentTest.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplay2.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplay2.resources
deleted file mode 100644
index 3ea67a8..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplay2.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph10.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph10.resources
deleted file mode 100644
index f291001..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph10.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph2.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph2.resources
deleted file mode 100644
index 1dda85f..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph2.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph3.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph3.resources
deleted file mode 100644
index a4e2c4a..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph3.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph4.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph4.resources
deleted file mode 100644
index 2c02a78..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph4.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph5.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph5.resources
deleted file mode 100644
index 7dea008..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph5.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph6.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph6.resources
deleted file mode 100644
index 9eae72e..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph6.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph7.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph7.resources
deleted file mode 100644
index f7dae41..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph7.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph8.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph8.resources
deleted file mode 100644
index 7cb7041..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayDotGraph8.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph10.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph10.resources
deleted file mode 100644
index 8e50f24..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph10.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph2.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph2.resources
deleted file mode 100644
index f130c20..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph2.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph3.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph3.resources
deleted file mode 100644
index bf64bf1..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph3.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph4.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph4.resources
deleted file mode 100644
index ddc32aa..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph4.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph5.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph5.resources
deleted file mode 100644
index 97759ec..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph5.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph6.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph6.resources
deleted file mode 100644
index 37e88b0..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph6.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph7.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph7.resources
deleted file mode 100644
index 267c2b0..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph7.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph8.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph8.resources
deleted file mode 100644
index 6b3c774..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayEachBarGraph8.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable10.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable10.resources
deleted file mode 100644
index 5e6cf8c..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable10.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable2.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable2.resources
deleted file mode 100644
index f130c20..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable2.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable3.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable3.resources
deleted file mode 100644
index bf64bf1..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable3.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable4.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable4.resources
deleted file mode 100644
index ddc32aa..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable4.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable5.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable5.resources
deleted file mode 100644
index 97759ec..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable5.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable6.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable6.resources
deleted file mode 100644
index 37e88b0..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable6.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable7.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable7.resources
deleted file mode 100644
index 2c33bf8..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable7.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable8.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable8.resources
deleted file mode 100644
index 523e200..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Controls.ControlMainDisplayTable8.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.DialogForms.DialogFormLogOn.resources b/INT69DB_2A/obj/Release/INT69DB_3A.DialogForms.DialogFormLogOn.resources
deleted file mode 100644
index b6200f8..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.DialogForms.DialogFormLogOn.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.DialogForms.DialogFormMessage.resources b/INT69DB_2A/obj/Release/INT69DB_3A.DialogForms.DialogFormMessage.resources
deleted file mode 100644
index 69b49b1..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.DialogForms.DialogFormMessage.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.DialogForms.DialogFormNumKeyPad.resources b/INT69DB_2A/obj/Release/INT69DB_3A.DialogForms.DialogFormNumKeyPad.resources
deleted file mode 100644
index 06c24d0..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.DialogForms.DialogFormNumKeyPad.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.DialogForms.DialogFormPasswordKeyPad1.resources b/INT69DB_2A/obj/Release/INT69DB_3A.DialogForms.DialogFormPasswordKeyPad1.resources
deleted file mode 100644
index 06c24d0..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.DialogForms.DialogFormPasswordKeyPad1.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.DialogForms.DialogFormYesNo.resources b/INT69DB_2A/obj/Release/INT69DB_3A.DialogForms.DialogFormYesNo.resources
deleted file mode 100644
index 69b49b1..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.DialogForms.DialogFormYesNo.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormCalibration.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormCalibration.resources
deleted file mode 100644
index aa7c84f..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormCalibration.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormConfiguration.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormConfiguration.resources
deleted file mode 100644
index 17afc7b..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormConfiguration.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormDataBackup.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormDataBackup.resources
deleted file mode 100644
index 353f1fb..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormDataBackup.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormEquipmentSetting.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormEquipmentSetting.resources
deleted file mode 100644
index 021eba9..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormEquipmentSetting.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormEquipmentTest.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormEquipmentTest.resources
deleted file mode 100644
index 0be4669..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormEquipmentTest.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormFactoryReset.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormFactoryReset.resources
deleted file mode 100644
index f226e28..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormFactoryReset.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormIOTest.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormIOTest.resources
deleted file mode 100644
index f83a232..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormIOTest.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormInformation.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormInformation.resources
deleted file mode 100644
index 0f02f3d..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormInformation.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormMain.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormMain.resources
deleted file mode 100644
index 06c24d0..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormMain.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormMainDisplay.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormMainDisplay.resources
deleted file mode 100644
index 563248f..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormMainDisplay.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormMenu.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormMenu.resources
deleted file mode 100644
index 27e7a9a..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormMenu.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormMotorSetting.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormMotorSetting.resources
deleted file mode 100644
index e2ce861..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormMotorSetting.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormProgramUpdate.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormProgramUpdate.resources
deleted file mode 100644
index 282c6a6..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormProgramUpdate.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormSystemSetting.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormSystemSetting.resources
deleted file mode 100644
index ef0707c..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormSystemSetting.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormTimeSetting.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormTimeSetting.resources
deleted file mode 100644
index 314a4c3..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormTimeSetting.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormUserSetting.resources b/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormUserSetting.resources
deleted file mode 100644
index 7962fdd..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.Forms.FormUserSetting.resources and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.csproj.FileListAbsolute.txt b/INT69DB_2A/obj/Release/INT69DB_3A.csproj.FileListAbsolute.txt
deleted file mode 100644
index 89edad3..0000000
--- a/INT69DB_2A/obj/Release/INT69DB_3A.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\bin\Release\SmartX_IEC1000.dll
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\bin\Release\SmartXCommon.dll
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\ResolveAssemblyReference.cache
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlCalibration10.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlCalibration2.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlCalibration3.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlCalibration4.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlCalibration5.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlCalibration6.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlCalibration7.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlCalibration8.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlConfiguration.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlEquipmentTest.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplay2.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayDotGraph10.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayDotGraph3.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayDotGraph4.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayDotGraph5.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayDotGraph6.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayDotGraph7.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayDotGraph8.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayEachBarGraph10.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayEachBarGraph3.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayEachBarGraph4.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayEachBarGraph5.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayEachBarGraph6.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayEachBarGraph7.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayEachBarGraph8.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayTable10.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayTable3.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayTable4.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayTable5.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayTable6.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayTable7.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayTable8.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.DialogForms.DialogFormLogOn.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.DialogForms.DialogFormPasswordKeyPad1.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.DialogForms.DialogFormMessage.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.DialogForms.DialogFormNumKeyPad.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.DialogForms.DialogFormYesNo.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Forms.FormCalibration.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Forms.FormConfiguration.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Forms.FormDataBackup.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Forms.FormEquipmentSetting.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Forms.FormFactoryReset.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Forms.FormInformation.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Forms.FormIOTest.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Forms.FormSystemSetting.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Forms.FormMain.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Forms.FormMainDisplay.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Forms.FormMenu.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Forms.FormMotorSetting.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Forms.FormProgramUpdate.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Forms.FormEquipmentTest.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Forms.FormTimeSetting.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Forms.FormUserSetting.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.csproj.GenerateResource.Cache
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayDotGraph2.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayEachBarGraph2.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_3A.Controls.ControlMainDisplayTable2.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\bin\Release\INT69DB_2A.exe
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\bin\Release\INT69DB_2A.pdb
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_2A.Properties.Resources.resources
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_2A.exe
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\obj\Release\INT69DB_2A.pdb
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\bin\Release\INT69DB_2A_ImageDll.dll
-D:\Git\INT69DB_2A(2-10 임펠러)\INT69DB_3A\bin\Release\INT69DB_2A_ImageDll.pdb
diff --git a/INT69DB_2A/obj/Release/INT69DB_3A.csproj.GenerateResource.Cache b/INT69DB_2A/obj/Release/INT69DB_3A.csproj.GenerateResource.Cache
deleted file mode 100644
index 8022e95..0000000
Binary files a/INT69DB_2A/obj/Release/INT69DB_3A.csproj.GenerateResource.Cache and /dev/null differ
diff --git a/INT69DB_2A/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/INT69DB_2A/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
index ffc0773..07cc679 100644
Binary files a/INT69DB_2A/obj/Release/TempPE/Properties.Resources.Designer.cs.dll and b/INT69DB_2A/obj/Release/TempPE/Properties.Resources.Designer.cs.dll differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll.csproj b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll.csproj
index 2afeaeb..7481ebd 100644
--- a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll.csproj
+++ b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll.csproj
@@ -586,9 +586,6 @@
-
-
-
@@ -1129,6 +1126,186 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/ImageDll.cs b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/ImageDll.cs
index 355889f..612421c 100644
--- a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/ImageDll.cs
+++ b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/ImageDll.cs
@@ -85,6 +85,9 @@ namespace INT69DB_2A_ImageDll
engFormMenuMotorDisable,
engFormMenuMotorDown,
engFormMenuMotorUp,
+ engFormMenuOptionDisable,
+ engFormMenuOptionDown,
+ engFormMenuOptionUp,
engFormMenuStatisticsDisable,
engFormMenuStatisticsDown,
engFormMenuStatisticsUp,
@@ -118,12 +121,15 @@ namespace INT69DB_2A_ImageDll
engPasteAllUp,
engPasteDown,
engPasteUp,
- engMainLoginDisable,
- engMainLoginDown,
- engMainLoginUp,
- engMainCancelDisable,
- engMainCancelDown,
- engMainCancelUp,
+ engMainLoginChangeDisable,
+ engMainLoginChangeDown,
+ engMainLoginChangeUp,
+ engMainLoginCancelDisable,
+ engMainLoginCancelDown,
+ engMainLoginCancelUp,
+ engMainLoginLoginDisable,
+ engMainLoginLoginDown,
+ engMainLoginLoginUp,
#endregion
#region Chinese
@@ -205,6 +211,9 @@ namespace INT69DB_2A_ImageDll
chnFormMenuMotorDisable,
chnFormMenuMotorDown,
chnFormMenuMotorUp,
+ chnFormMenuOptionDisable,
+ chnFormMenuOptionDown,
+ chnFormMenuOptionUp,
chnFormMenuStatisticsDisable,
chnFormMenuStatisticsDown,
chnFormMenuStatisticsUp,
@@ -238,12 +247,15 @@ namespace INT69DB_2A_ImageDll
chnPasteAllUp,
chnPasteDown,
chnPasteUp,
- chnMainCancelDisable,
- chnMainCancelDown,
- chnMainCancelUp,
- chnMainLoginDisable,
- chnMainLoginDown,
- chnMainLoginUp,
+ chnMainLoginChangeDisable,
+ chnMainLoginChangeDown,
+ chnMainLoginChangeUp,
+ chnMainLoginCancelDisable,
+ chnMainLoginCancelDown,
+ chnMainLoginCancelUp,
+ chnMainLoginLoginDisable,
+ chnMainLoginLoginDown,
+ chnMainLoginLoginUp,
#endregion
#region Korean
@@ -281,6 +293,9 @@ namespace INT69DB_2A_ImageDll
korFormMenuMotorDisable,
korFormMenuMotorDown,
korFormMenuMotorUp,
+ korFormMenuOptionDisable,
+ korFormMenuOptionDown,
+ korFormMenuOptionUp,
korFormMenuStatisticsDisable,
korFormMenuStatisticsDown,
korFormMenuStatisticsUp,
@@ -299,7 +314,19 @@ namespace INT69DB_2A_ImageDll
korFormMenuUserDisable,
korFormMenuUserDown,
korFormMenuUserUp,
+ korMainLoginChangeDisable,
+ korMainLoginChangeDown,
+ korMainLoginChangeUp,
+ korMainLoginCancelDisable,
+ korMainLoginCancelDown,
+ korMainLoginCancelUp,
+ korMainLoginLoginDisable,
+ korMainLoginLoginDown,
+ korMainLoginLoginUp,
#endregion
+
+ LoginImage1,
+ LoginImage2,
}
public Bitmap GetImage(ButtonImages image)
@@ -529,6 +556,15 @@ namespace INT69DB_2A_ImageDll
case ButtonImages.engFormMenuMotorUp:
bt = new Bitmap(Resource1.engFormMenuMotorUp);
break;
+ case ButtonImages.engFormMenuOptionDisable:
+ bt = new Bitmap(Resource1.engFormMenuOptionDisable);
+ break;
+ case ButtonImages.engFormMenuOptionDown:
+ bt = new Bitmap(Resource1.engFormMenuOptionDown);
+ break;
+ case ButtonImages.engFormMenuOptionUp:
+ bt = new Bitmap(Resource1.engFormMenuOptionUp);
+ break;
case ButtonImages.engFormMenuStatisticsDisable:
bt = new Bitmap(Resource1.engFormMenuStatisticsDisable);
break;
@@ -626,23 +662,32 @@ namespace INT69DB_2A_ImageDll
case ButtonImages.engPasteUp:
bt = new Bitmap(Resource1.engPasteUp);
break;
- case ButtonImages.engMainLoginDisable:
- bt = new Bitmap(Resource1.engMainLoginDisable);
+ case ButtonImages.engMainLoginChangeDisable:
+ bt = new Bitmap(Resource1.engMainLoginChangeDisable);
break;
- case ButtonImages.engMainLoginDown:
- bt = new Bitmap(Resource1.engMainLoginDown);
+ case ButtonImages.engMainLoginChangeDown:
+ bt = new Bitmap(Resource1.engMainLoginChangeDown);
break;
- case ButtonImages.engMainLoginUp:
- bt = new Bitmap(Resource1.engMainLoginUp);
+ case ButtonImages.engMainLoginChangeUp:
+ bt = new Bitmap(Resource1.engMainLoginChangeUp);
break;
- case ButtonImages.engMainCancelDisable:
- bt = new Bitmap(Resource1.engMainCancelDisable);
+ case ButtonImages.engMainLoginCancelDisable:
+ bt = new Bitmap(Resource1.engMainLoginCancelDisable);
break;
- case ButtonImages.engMainCancelDown:
- bt = new Bitmap(Resource1.engMainCancelDown);
+ case ButtonImages.engMainLoginCancelDown:
+ bt = new Bitmap(Resource1.engMainLoginCancelDown);
break;
- case ButtonImages.engMainCancelUp:
- bt = new Bitmap(Resource1.engMainCancelUp);
+ case ButtonImages.engMainLoginCancelUp:
+ bt = new Bitmap(Resource1.engMainLoginCancelUp);
+ break;
+ case ButtonImages.engMainLoginLoginDisable:
+ bt = new Bitmap(Resource1.engMainLoginLoginDisable);
+ break;
+ case ButtonImages.engMainLoginLoginDown:
+ bt = new Bitmap(Resource1.engMainLoginLoginDown);
+ break;
+ case ButtonImages.engMainLoginLoginUp:
+ bt = new Bitmap(Resource1.engMainLoginLoginUp);
break;
#endregion
#region 중문
@@ -881,6 +926,15 @@ namespace INT69DB_2A_ImageDll
case ButtonImages.chnFormMenuMotorUp:
bt = new Bitmap(Resource1.chnFormMenuMotorUp);
break;
+ case ButtonImages.chnFormMenuOptionDisable:
+ bt = new Bitmap(Resource1.chnFormMenuOptionDisable);
+ break;
+ case ButtonImages.chnFormMenuOptionDown:
+ bt = new Bitmap(Resource1.chnFormMenuOptionDown);
+ break;
+ case ButtonImages.chnFormMenuOptionUp:
+ bt = new Bitmap(Resource1.chnFormMenuOptionUp);
+ break;
case ButtonImages.chnFormMenuStatisticsDisable:
bt = new Bitmap(Resource1.chnFormMenuStatisticsDisable);
break;
@@ -978,23 +1032,32 @@ namespace INT69DB_2A_ImageDll
case ButtonImages.chnPasteUp:
bt = new Bitmap(Resource1.chnPasteUp);
break;
- case ButtonImages.chnMainCancelDisable:
- bt = new Bitmap(Resource1.chnMainCancelDisable);
+ case ButtonImages.chnMainLoginChangeDisable:
+ bt = new Bitmap(Resource1.chnMainLoginChangeDisable);
break;
- case ButtonImages.chnMainCancelDown:
- bt = new Bitmap(Resource1.chnMainCancelDown);
+ case ButtonImages.chnMainLoginChangeDown:
+ bt = new Bitmap(Resource1.chnMainLoginChangeDown);
break;
- case ButtonImages.chnMainCancelUp:
- bt = new Bitmap(Resource1.chnMainCancelUp);
+ case ButtonImages.chnMainLoginChangeUp:
+ bt = new Bitmap(Resource1.chnMainLoginChangeUp);
break;
- case ButtonImages.chnMainLoginDisable:
- bt = new Bitmap(Resource1.chnMainLoginDisable);
+ case ButtonImages.chnMainLoginCancelDisable:
+ bt = new Bitmap(Resource1.chnMainLoginCancelDisable);
break;
- case ButtonImages.chnMainLoginDown:
- bt = new Bitmap(Resource1.chnMainLoginDown);
+ case ButtonImages.chnMainLoginCancelDown:
+ bt = new Bitmap(Resource1.chnMainLoginCancelDown);
break;
- case ButtonImages.chnMainLoginUp:
- bt = new Bitmap(Resource1.chnMainLoginUp);
+ case ButtonImages.chnMainLoginCancelUp:
+ bt = new Bitmap(Resource1.chnMainLoginCancelUp);
+ break;
+ case ButtonImages.chnMainLoginLoginDisable:
+ bt = new Bitmap(Resource1.chnMainLoginLoginDisable);
+ break;
+ case ButtonImages.chnMainLoginLoginDown:
+ bt = new Bitmap(Resource1.chnMainLoginLoginDown);
+ break;
+ case ButtonImages.chnMainLoginLoginUp:
+ bt = new Bitmap(Resource1.chnMainLoginLoginUp);
break;
#endregion
#region 한글
@@ -1101,6 +1164,15 @@ namespace INT69DB_2A_ImageDll
case ButtonImages.korFormMenuMotorUp:
bt = new Bitmap(Resource1.korFormMenuMotorUp);
break;
+ case ButtonImages.korFormMenuOptionDisable:
+ bt = new Bitmap(Resource1.korFormMenuOptionDisable);
+ break;
+ case ButtonImages.korFormMenuOptionDown:
+ bt = new Bitmap(Resource1.korFormMenuOptionDown);
+ break;
+ case ButtonImages.korFormMenuOptionUp:
+ bt = new Bitmap(Resource1.korFormMenuOptionUp);
+ break;
case ButtonImages.korFormMenuStatisticsDisable:
bt = new Bitmap(Resource1.korFormMenuStatisticsDisable);
break;
@@ -1157,6 +1229,39 @@ namespace INT69DB_2A_ImageDll
break;
#endregion
#endregion
+ case ButtonImages.korMainLoginChangeDisable:
+ bt = new Bitmap(Resource1.korMainLoginChangeDisable);
+ break;
+ case ButtonImages.korMainLoginChangeDown:
+ bt = new Bitmap(Resource1.korMainLoginChangeDown);
+ break;
+ case ButtonImages.korMainLoginChangeUp:
+ bt = new Bitmap(Resource1.korMainLoginChangeUp);
+ break;
+ case ButtonImages.korMainLoginCancelDisable:
+ bt = new Bitmap(Resource1.korMainLoginCancelDisable);
+ break;
+ case ButtonImages.korMainLoginCancelDown:
+ bt = new Bitmap(Resource1.korMainLoginCancelDown);
+ break;
+ case ButtonImages.korMainLoginCancelUp:
+ bt = new Bitmap(Resource1.korMainLoginCancelUp);
+ break;
+ case ButtonImages.korMainLoginLoginDisable:
+ bt = new Bitmap(Resource1.korMainLoginLoginDisable);
+ break;
+ case ButtonImages.korMainLoginLoginDown:
+ bt = new Bitmap(Resource1.korMainLoginLoginDown);
+ break;
+ case ButtonImages.korMainLoginLoginUp:
+ bt = new Bitmap(Resource1.korMainLoginLoginUp);
+ break;
+ case ButtonImages.LoginImage1:
+ bt = new Bitmap(Resource1.LoginImage1);
+ break;
+ case ButtonImages.LoginImage2:
+ bt = new Bitmap(Resource1.LoginImage2);
+ break;
default :
bt = new Bitmap(Resource1.korFormMenuUserUp);
break;
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resource1.Designer.cs b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resource1.Designer.cs
index d2b4665..abbe656 100644
--- a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resource1.Designer.cs
+++ b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resource1.Designer.cs
@@ -603,6 +603,27 @@ namespace INT69DB_2A_ImageDll {
}
}
+ internal static System.Drawing.Bitmap chnFormMenuOptionDisable {
+ get {
+ object obj = ResourceManager.GetObject("chnFormMenuOptionDisable", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap chnFormMenuOptionDown {
+ get {
+ object obj = ResourceManager.GetObject("chnFormMenuOptionDown", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap chnFormMenuOptionUp {
+ get {
+ object obj = ResourceManager.GetObject("chnFormMenuOptionUp", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
internal static System.Drawing.Bitmap chnFormMenuStatisticsDisable {
get {
object obj = ResourceManager.GetObject("chnFormMenuStatisticsDisable", resourceCulture);
@@ -799,44 +820,65 @@ namespace INT69DB_2A_ImageDll {
}
}
- internal static System.Drawing.Bitmap chnMainCancelDisable {
+ internal static System.Drawing.Bitmap chnMainLoginCancelDisable {
get {
- object obj = ResourceManager.GetObject("chnMainCancelDisable", resourceCulture);
+ object obj = ResourceManager.GetObject("chnMainLoginCancelDisable", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
- internal static System.Drawing.Bitmap chnMainCancelDown {
+ internal static System.Drawing.Bitmap chnMainLoginCancelDown {
get {
- object obj = ResourceManager.GetObject("chnMainCancelDown", resourceCulture);
+ object obj = ResourceManager.GetObject("chnMainLoginCancelDown", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
- internal static System.Drawing.Bitmap chnMainCancelUp {
+ internal static System.Drawing.Bitmap chnMainLoginCancelUp {
get {
- object obj = ResourceManager.GetObject("chnMainCancelUp", resourceCulture);
+ object obj = ResourceManager.GetObject("chnMainLoginCancelUp", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
- internal static System.Drawing.Bitmap chnMainLoginDisable {
+ internal static System.Drawing.Bitmap chnMainLoginChangeDisable {
get {
- object obj = ResourceManager.GetObject("chnMainLoginDisable", resourceCulture);
+ object obj = ResourceManager.GetObject("chnMainLoginChangeDisable", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
- internal static System.Drawing.Bitmap chnMainLoginDown {
+ internal static System.Drawing.Bitmap chnMainLoginChangeDown {
get {
- object obj = ResourceManager.GetObject("chnMainLoginDown", resourceCulture);
+ object obj = ResourceManager.GetObject("chnMainLoginChangeDown", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
- internal static System.Drawing.Bitmap chnMainLoginUp {
+ internal static System.Drawing.Bitmap chnMainLoginChangeUp {
get {
- object obj = ResourceManager.GetObject("chnMainLoginUp", resourceCulture);
+ object obj = ResourceManager.GetObject("chnMainLoginChangeUp", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap chnMainLoginLoginDisable {
+ get {
+ object obj = ResourceManager.GetObject("chnMainLoginLoginDisable", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap chnMainLoginLoginDown {
+ get {
+ object obj = ResourceManager.GetObject("chnMainLoginLoginDown", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap chnMainLoginLoginUp {
+ get {
+ object obj = ResourceManager.GetObject("chnMainLoginLoginUp", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -1380,6 +1422,27 @@ namespace INT69DB_2A_ImageDll {
}
}
+ internal static System.Drawing.Bitmap engFormMenuOptionDisable {
+ get {
+ object obj = ResourceManager.GetObject("engFormMenuOptionDisable", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap engFormMenuOptionDown {
+ get {
+ object obj = ResourceManager.GetObject("engFormMenuOptionDown", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap engFormMenuOptionUp {
+ get {
+ object obj = ResourceManager.GetObject("engFormMenuOptionUp", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
internal static System.Drawing.Bitmap engFormMenuStatisticsDisable {
get {
object obj = ResourceManager.GetObject("engFormMenuStatisticsDisable", resourceCulture);
@@ -1576,44 +1639,65 @@ namespace INT69DB_2A_ImageDll {
}
}
- internal static System.Drawing.Bitmap engMainCancelDisable {
+ internal static System.Drawing.Bitmap engMainLoginCancelDisable {
get {
- object obj = ResourceManager.GetObject("engMainCancelDisable", resourceCulture);
+ object obj = ResourceManager.GetObject("engMainLoginCancelDisable", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
- internal static System.Drawing.Bitmap engMainCancelDown {
+ internal static System.Drawing.Bitmap engMainLoginCancelDown {
get {
- object obj = ResourceManager.GetObject("engMainCancelDown", resourceCulture);
+ object obj = ResourceManager.GetObject("engMainLoginCancelDown", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
- internal static System.Drawing.Bitmap engMainCancelUp {
+ internal static System.Drawing.Bitmap engMainLoginCancelUp {
get {
- object obj = ResourceManager.GetObject("engMainCancelUp", resourceCulture);
+ object obj = ResourceManager.GetObject("engMainLoginCancelUp", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
- internal static System.Drawing.Bitmap engMainLoginDisable {
+ internal static System.Drawing.Bitmap engMainLoginChangeDisable {
get {
- object obj = ResourceManager.GetObject("engMainLoginDisable", resourceCulture);
+ object obj = ResourceManager.GetObject("engMainLoginChangeDisable", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
- internal static System.Drawing.Bitmap engMainLoginDown {
+ internal static System.Drawing.Bitmap engMainLoginChangeDown {
get {
- object obj = ResourceManager.GetObject("engMainLoginDown", resourceCulture);
+ object obj = ResourceManager.GetObject("engMainLoginChangeDown", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
- internal static System.Drawing.Bitmap engMainLoginUp {
+ internal static System.Drawing.Bitmap engMainLoginChangeUp {
get {
- object obj = ResourceManager.GetObject("engMainLoginUp", resourceCulture);
+ object obj = ResourceManager.GetObject("engMainLoginChangeUp", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap engMainLoginLoginDisable {
+ get {
+ object obj = ResourceManager.GetObject("engMainLoginLoginDisable", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap engMainLoginLoginDown {
+ get {
+ object obj = ResourceManager.GetObject("engMainLoginLoginDown", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap engMainLoginLoginUp {
+ get {
+ object obj = ResourceManager.GetObject("engMainLoginLoginUp", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -1975,6 +2059,27 @@ namespace INT69DB_2A_ImageDll {
}
}
+ internal static System.Drawing.Bitmap korFormMenuOptionDisable {
+ get {
+ object obj = ResourceManager.GetObject("korFormMenuOptionDisable", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap korFormMenuOptionDown {
+ get {
+ object obj = ResourceManager.GetObject("korFormMenuOptionDown", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap korFormMenuOptionUp {
+ get {
+ object obj = ResourceManager.GetObject("korFormMenuOptionUp", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
internal static System.Drawing.Bitmap korFormMenuStatisticsDisable {
get {
object obj = ResourceManager.GetObject("korFormMenuStatisticsDisable", resourceCulture);
@@ -2184,5 +2289,82 @@ namespace INT69DB_2A_ImageDll {
return ((System.Drawing.Bitmap)(obj));
}
}
+
+ internal static System.Drawing.Bitmap korMainLoginCancelDisable {
+ get {
+ object obj = ResourceManager.GetObject("korMainLoginCancelDisable", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap korMainLoginCancelDown {
+ get {
+ object obj = ResourceManager.GetObject("korMainLoginCancelDown", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap korMainLoginCancelUp {
+ get {
+ object obj = ResourceManager.GetObject("korMainLoginCancelUp", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap korMainLoginChangeDisable {
+ get {
+ object obj = ResourceManager.GetObject("korMainLoginChangeDisable", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap korMainLoginChangeDown {
+ get {
+ object obj = ResourceManager.GetObject("korMainLoginChangeDown", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap korMainLoginChangeUp {
+ get {
+ object obj = ResourceManager.GetObject("korMainLoginChangeUp", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap korMainLoginLoginDisable {
+ get {
+ object obj = ResourceManager.GetObject("korMainLoginLoginDisable", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap korMainLoginLoginDown {
+ get {
+ object obj = ResourceManager.GetObject("korMainLoginLoginDown", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap korMainLoginLoginUp {
+ get {
+ object obj = ResourceManager.GetObject("korMainLoginLoginUp", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap LoginImage1 {
+ get {
+ object obj = ResourceManager.GetObject("LoginImage1", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap LoginImage2 {
+ get {
+ object obj = ResourceManager.GetObject("LoginImage2", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
}
}
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resource1.resx b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resource1.resx
index 81461e0..3b20aee 100644
--- a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resource1.resx
+++ b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resource1.resx
@@ -352,33 +352,6 @@
Resources\engPasteUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- Resources\chnMainCancelDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- Resources\chnMainCancelDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- Resources\chnMainCancelUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- Resources\engMainCancelDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- Resources\engMainCancelDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- Resources\engMainCancelUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- Resources\engMainLoginDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- Resources\engMainLoginDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- Resources\engMainLoginUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
Resources\chnFormMainDisplayLoginDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -544,15 +517,6 @@
Resources\chnBackgroundUserLogin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- Resources\chnMainLoginDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- Resources\chnMainLoginDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- Resources\chnMainLoginUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
Resources\korBackgroundUserLogin.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -1030,4 +994,118 @@
Resources\korFormMenuStatisticsUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Resources\chnFormMenuOptionDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\chnFormMenuOptionDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\chnFormMenuOptionUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\engFormMenuOptionDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\engFormMenuOptionDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\engFormMenuOptionUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\korFormMenuOptionDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\korFormMenuOptionDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\korFormMenuOptionUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\chnMainLoginCancelDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\chnMainLoginCancelDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\chnMainLoginCancelUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\chnMainLoginChangeDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\chnMainLoginChangeDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\chnMainLoginChangeUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\chnMainLoginLoginDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\chnMainLoginLoginDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\chnMainLoginLoginUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\engMainLoginCancelDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\engMainLoginCancelDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\engMainLoginCancelUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\engMainLoginChangeDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\engMainLoginChangeDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\engMainLoginChangeUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\engMainLoginLoginDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\engMainLoginLoginDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\engMainLoginLoginUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\korMainLoginCancelDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\korMainLoginCancelDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\korMainLoginCancelUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\korMainLoginChangeDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\korMainLoginChangeDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\korMainLoginChangeUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\korMainLoginLoginDisable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\korMainLoginLoginDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\korMainLoginLoginUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\LoginImage1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Resources\LoginImage2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/LoginImage1.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/LoginImage1.png
new file mode 100644
index 0000000..84c9f21
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/LoginImage1.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/LoginImage2.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/LoginImage2.png
new file mode 100644
index 0000000..6747d22
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/LoginImage2.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnFormMenuOptionDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnFormMenuOptionDisable.png
new file mode 100644
index 0000000..0b2e5bc
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnFormMenuOptionDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnFormMenuOptionDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnFormMenuOptionDown.png
new file mode 100644
index 0000000..6b8742f
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnFormMenuOptionDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnFormMenuOptionUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnFormMenuOptionUp.png
new file mode 100644
index 0000000..07854a1
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnFormMenuOptionUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginCancelDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginCancelDisable.png
new file mode 100644
index 0000000..30a166c
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginCancelDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginCancelDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginCancelDown.png
new file mode 100644
index 0000000..c2178eb
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginCancelDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginCancelUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginCancelUp.png
new file mode 100644
index 0000000..f17b47d
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginCancelUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginChangeDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginChangeDisable.png
new file mode 100644
index 0000000..82d2712
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginChangeDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginChangeDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginChangeDown.png
new file mode 100644
index 0000000..0ba995a
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginChangeDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginChangeUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginChangeUp.png
new file mode 100644
index 0000000..d7cd284
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginChangeUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginLoginDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginLoginDisable.png
new file mode 100644
index 0000000..58e90a4
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginLoginDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginLoginDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginLoginDown.png
new file mode 100644
index 0000000..afc60eb
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginLoginDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginLoginUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginLoginUp.png
new file mode 100644
index 0000000..d491751
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/chnMainLoginLoginUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginCancelDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginCancelDisable.png
new file mode 100644
index 0000000..41b99d4
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginCancelDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginCancelDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginCancelDown.png
new file mode 100644
index 0000000..98ce545
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginCancelDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginCancelUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginCancelUp.png
new file mode 100644
index 0000000..eea883a
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginCancelUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginChangeDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginChangeDisable.png
new file mode 100644
index 0000000..6ae8217
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginChangeDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginChangeDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginChangeDown.png
new file mode 100644
index 0000000..e3a2b5d
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginChangeDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginChangeUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginChangeUp.png
new file mode 100644
index 0000000..8a94cc9
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginChangeUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginDisable.png
new file mode 100644
index 0000000..6079a45
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginDown.png
new file mode 100644
index 0000000..1841e49
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginUp.png
new file mode 100644
index 0000000..c70f831
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMainLoginUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMenuOptionDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMenuOptionDisable.png
new file mode 100644
index 0000000..5ba6dfc
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMenuOptionDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMenuOptionDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMenuOptionDown.png
new file mode 100644
index 0000000..d787bef
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMenuOptionDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMenuOptionUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMenuOptionUp.png
new file mode 100644
index 0000000..ec7f9ec
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engFormMenuOptionUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginCancelDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginCancelDisable.png
new file mode 100644
index 0000000..41b99d4
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginCancelDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginCancelDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginCancelDown.png
new file mode 100644
index 0000000..98ce545
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginCancelDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginCancelUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginCancelUp.png
new file mode 100644
index 0000000..eea883a
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginCancelUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginChangeDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginChangeDisable.png
new file mode 100644
index 0000000..6ae8217
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginChangeDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginChangeDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginChangeDown.png
new file mode 100644
index 0000000..e3a2b5d
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginChangeDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginChangeUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginChangeUp.png
new file mode 100644
index 0000000..8a94cc9
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginChangeUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginLoginDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginLoginDisable.png
new file mode 100644
index 0000000..6079a45
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginLoginDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginLoginDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginLoginDown.png
new file mode 100644
index 0000000..1841e49
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginLoginDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginLoginUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginLoginUp.png
new file mode 100644
index 0000000..c70f831
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/engMainLoginLoginUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginCancelDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginCancelDisable.png
new file mode 100644
index 0000000..f7840c5
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginCancelDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginCancelDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginCancelDown.png
new file mode 100644
index 0000000..785f021
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginCancelDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginCancelUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginCancelUp.png
new file mode 100644
index 0000000..fde822e
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginCancelUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginChangeDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginChangeDisable.png
new file mode 100644
index 0000000..057cf31
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginChangeDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginChangeDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginChangeDown.png
new file mode 100644
index 0000000..64a8e6c
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginChangeDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginChangeUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginChangeUp.png
new file mode 100644
index 0000000..8f98169
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginChangeUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginDisable.png
new file mode 100644
index 0000000..8c683e5
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginDown.png
new file mode 100644
index 0000000..6ca2f4c
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginUp.png
new file mode 100644
index 0000000..9feb635
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMainLoginUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMenuOptionDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMenuOptionDisable.png
new file mode 100644
index 0000000..26ea936
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMenuOptionDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMenuOptionDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMenuOptionDown.png
new file mode 100644
index 0000000..b0bce1f
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMenuOptionDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMenuOptionUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMenuOptionUp.png
new file mode 100644
index 0000000..877d90b
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korFormMenuOptionUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginCancelDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginCancelDisable.png
new file mode 100644
index 0000000..f7840c5
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginCancelDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginCancelDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginCancelDown.png
new file mode 100644
index 0000000..785f021
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginCancelDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginCancelUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginCancelUp.png
new file mode 100644
index 0000000..fde822e
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginCancelUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginChangeDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginChangeDisable.png
new file mode 100644
index 0000000..057cf31
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginChangeDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginChangeDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginChangeDown.png
new file mode 100644
index 0000000..64a8e6c
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginChangeDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginChangeUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginChangeUp.png
new file mode 100644
index 0000000..8f98169
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginChangeUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginDisable.png
new file mode 100644
index 0000000..8c683e5
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginDown.png
new file mode 100644
index 0000000..6ca2f4c
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginLoginDisable.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginLoginDisable.png
new file mode 100644
index 0000000..8c683e5
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginLoginDisable.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginLoginDown.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginLoginDown.png
new file mode 100644
index 0000000..6ca2f4c
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginLoginDown.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginLoginUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginLoginUp.png
new file mode 100644
index 0000000..9feb635
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginLoginUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginUp.png b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginUp.png
new file mode 100644
index 0000000..9feb635
Binary files /dev/null and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/Resources/korMainLoginUp.png differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/INT69DB_2A_ImageDll.Resource1.resources b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/INT69DB_2A_ImageDll.Resource1.resources
index 8a57ddd..3ebae7d 100644
Binary files a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/INT69DB_2A_ImageDll.Resource1.resources and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/INT69DB_2A_ImageDll.Resource1.resources differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/ResolveAssemblyReference.cache b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/ResolveAssemblyReference.cache
deleted file mode 100644
index 0059aa2..0000000
Binary files a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/ResolveAssemblyReference.cache and /dev/null differ
diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/TempPE/Resource1.Designer.cs.dll b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/TempPE/Resource1.Designer.cs.dll
index b1087df..5af5679 100644
Binary files a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/TempPE/Resource1.Designer.cs.dll and b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/TempPE/Resource1.Designer.cs.dll differ