chojy
/
ITC81DB_2H
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- 그룹에디터 History log 빠진부분 추가 

- Part11 사용 시, Login 버튼 움직이지 않게 수정
- 버전 변경
- 운전 중 Log메뉴버튼 눌리는 버그 수정
master V3.1.0
DESKTOP-999R8N3\CJY 2023-07-26 09:53:50 +09:00
parent 2f037c497c
commit d5ef99682f
11 changed files with 75 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs
View File

@ -913,7 +913,11 @@ namespace ITC81DB_0H.Controls
string before = "", after = "";
if (this.ParentForm.ParentForm.SystemConfig3.IsPart11 == true)
{
if (this.buttonLogin.ButtonStatus == SmartButton.BUTSTATUS.UP)
this.buttonLogin.ButtonDown();
return;
}
if (this.ParentForm.ParentForm.SystemConfig1.IsLogin == false)
before = "OFF";

4
ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipUpdate.cs
View File

@ -242,7 +242,7 @@ namespace ITC81DB_0H.Controls
this.TreatmentCopyNewFile(newFiles);
this.progressBarUpdate.Value += 100;
this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingOperation.Update, "");
this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingOperation.Update, "LCD");
this.ParentForm.Enabled = false;
this.UpdateStep = Define.E_Step3.Step3;
this.UpdateLabelStatus(this.UpdateStep, this.ParentForm.ParentForm.SystemConfig1.Language);
@ -475,7 +475,7 @@ namespace ITC81DB_0H.Controls
}
#endregion
this.progressBarUpdate.Value = 100;
this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingOperation.Update, "Mainboard");
break;
default:
break;

5
ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipUserGroupEditor.Designer.cs generated
View File

@ -748,12 +748,13 @@
this.checkBoxL3EquipmentFunction.BackPictureBox = null;
this.checkBoxL3EquipmentFunction.BackPictureBox1 = null;
this.checkBoxL3EquipmentFunction.BackPictureBox2 = null;
this.checkBoxL3EquipmentFunction.CheckBoxBackColor = System.Drawing.Color.White;
this.checkBoxL3EquipmentFunction.CheckBoxBackColor = System.Drawing.Color.Silver;
this.checkBoxL3EquipmentFunction.CheckBoxCheckColor = System.Drawing.Color.Green;
this.checkBoxL3EquipmentFunction.CheckBoxForeColor = System.Drawing.Color.Black;
this.checkBoxL3EquipmentFunction.CheckBoxSymbolSize = 25;
this.checkBoxL3EquipmentFunction.Checked = false;
this.checkBoxL3EquipmentFunction.Checked = true;
this.checkBoxL3EquipmentFunction.CheckLineWidth = 3;
this.checkBoxL3EquipmentFunction.Enabled = false;
this.checkBoxL3EquipmentFunction.ImageCheckBox = null;
this.checkBoxL3EquipmentFunction.ImageUnCheckBox = null;
this.checkBoxL3EquipmentFunction.InitVisible = true;

31
ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipUserGroupEditor.cs
View File

@ -445,7 +445,6 @@ namespace ITC81DB_0H.Controls
this.buttonSave.Visible = true;
}
private void textBoxLevel1_GotFocus(object sender, EventArgs e)
{
this.smartKeyboard.TargetInputObject = this.textBoxLevel1;
@ -496,6 +495,8 @@ namespace ITC81DB_0H.Controls
private void textBoxLevel1_KeyPress(object sender, KeyPressEventArgs e)
{
string before = "", after = "";
if (e.KeyChar == '\r')
{
e.Handled = true;
@ -509,12 +510,16 @@ namespace ITC81DB_0H.Controls
}
else
{
this.ParentForm.ParentForm.SystemConfig2.UserGroupLevel1Name = this.textBoxLevel1.Text;
before = this.BeforeTextBox1;
after = this.ParentForm.ParentForm.SystemConfig2.UserGroupLevel1Name = this.textBoxLevel1.Text;
this.ParentForm.ParentForm.SaveSystemConfigurationFile2(this.ParentForm.ParentForm.SystemConfig2);
this.ParentForm.ParentForm.ChildFormMenu.CenterEquipUser.UpdateAccessRightComboBox();
this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateDisplayUser(this.ParentForm.ParentForm.CurrentSystemStatus);
this.ParentForm.ParentForm.ChildFormMenu.UpdateDisplayUser(this.ParentForm.ParentForm.CurrentSystemStatus);
if (before != after)
this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingParameter.ChangeL1Name, "", before, after);
}
}
else if (e.KeyChar == 27)
@ -532,6 +537,8 @@ namespace ITC81DB_0H.Controls
}
private void textBoxLevel2_KeyPress(object sender, KeyPressEventArgs e)
{
string before = "", after = "";
if (e.KeyChar == '\r')
{
e.Handled = true;
@ -545,12 +552,16 @@ namespace ITC81DB_0H.Controls
}
else
{
this.ParentForm.ParentForm.SystemConfig2.UserGroupLevel2Name = this.textBoxLevel2.Text;
before = this.BeforeTextBox2;
after = this.ParentForm.ParentForm.SystemConfig2.UserGroupLevel2Name = this.textBoxLevel2.Text;
this.ParentForm.ParentForm.SaveSystemConfigurationFile2(this.ParentForm.ParentForm.SystemConfig2);
this.ParentForm.ParentForm.ChildFormMenu.CenterEquipUser.UpdateAccessRightComboBox();
this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateDisplayUser(this.ParentForm.ParentForm.CurrentSystemStatus);
this.ParentForm.ParentForm.ChildFormMenu.UpdateDisplayUser(this.ParentForm.ParentForm.CurrentSystemStatus);
if (before != after)
this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingParameter.ChangeL2Name, "", before, after);
}
}
else if (e.KeyChar == 27)
@ -568,6 +579,8 @@ namespace ITC81DB_0H.Controls
}
private void textBoxLevel3_KeyPress(object sender, KeyPressEventArgs e)
{
string before = "", after = "";
if (e.KeyChar == '\r')
{
e.Handled = true;
@ -581,12 +594,16 @@ namespace ITC81DB_0H.Controls
}
else
{
this.ParentForm.ParentForm.SystemConfig2.UserGroupLevel3Name = this.textBoxLevel3.Text;
before = this.BeforeTextBox3;
after = this.ParentForm.ParentForm.SystemConfig2.UserGroupLevel3Name = this.textBoxLevel3.Text;
this.ParentForm.ParentForm.SaveSystemConfigurationFile2(this.ParentForm.ParentForm.SystemConfig2);
this.ParentForm.ParentForm.ChildFormMenu.CenterEquipUser.UpdateAccessRightComboBox();
this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateDisplayUser(this.ParentForm.ParentForm.CurrentSystemStatus);
this.ParentForm.ParentForm.ChildFormMenu.UpdateDisplayUser(this.ParentForm.ParentForm.CurrentSystemStatus);
if (before != after)
this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingParameter.ChangeL3Name, "", before, after);
}
}
else if (e.KeyChar == 27)
@ -623,6 +640,8 @@ namespace ITC81DB_0H.Controls
private void buttonSave_Click(object sender, EventArgs e)
{
string detail;
#region Level1
this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMainDisplayClear = this.checkBoxL1MainClear.Checked;
this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsMainDisplayProductNo = this.checkBoxL1MainProductNo.Checked;
@ -750,6 +769,10 @@ namespace ITC81DB_0H.Controls
this.ParentForm.ParentForm.SaveUserGroupFile(this.ParentForm.ParentForm.CurrentUserGroup);
this.UpdateAllMenu(this.ParentForm.ParentForm.CurrentSystemStatus);
// Part 11
detail = "Change access right";
this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingOperation.GroupEditor, detail);
this.buttonSave.Visible = false;
}
private void buttonBack_Click(object sender, EventArgs e)

42
ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.Designer.cs generated
View File

@ -105,7 +105,7 @@
this.labelTitleDllAes128.ForeColor = System.Drawing.Color.White;
this.labelTitleDllAes128.InitVisible = true;
this.labelTitleDllAes128.LineSpacing = 0F;
this.labelTitleDllAes128.Location = new System.Drawing.Point(385, 327);
this.labelTitleDllAes128.Location = new System.Drawing.Point(378, 310);
this.labelTitleDllAes128.Name = "labelTitleDllAes128";
this.labelTitleDllAes128.Size = new System.Drawing.Size(150, 33);
this.labelTitleDllAes128.TabIndex = 200;
@ -127,7 +127,7 @@
this.labelTitleDllUserMgr.ForeColor = System.Drawing.Color.White;
this.labelTitleDllUserMgr.InitVisible = true;
this.labelTitleDllUserMgr.LineSpacing = 0F;
this.labelTitleDllUserMgr.Location = new System.Drawing.Point(61, 327);
this.labelTitleDllUserMgr.Location = new System.Drawing.Point(54, 310);
this.labelTitleDllUserMgr.Name = "labelTitleDllUserMgr";
this.labelTitleDllUserMgr.Size = new System.Drawing.Size(150, 33);
this.labelTitleDllUserMgr.TabIndex = 199;
@ -149,7 +149,7 @@
this.labelAes128Ver.ForeColor = System.Drawing.Color.White;
this.labelAes128Ver.InitVisible = true;
this.labelAes128Ver.LineSpacing = 0F;
this.labelAes128Ver.Location = new System.Drawing.Point(541, 327);
this.labelAes128Ver.Location = new System.Drawing.Point(534, 310);
this.labelAes128Ver.Name = "labelAes128Ver";
this.labelAes128Ver.Size = new System.Drawing.Size(139, 33);
this.labelAes128Ver.TabIndex = 198;
@ -171,7 +171,7 @@
this.labelUserMgrVer.ForeColor = System.Drawing.Color.White;
this.labelUserMgrVer.InitVisible = true;
this.labelUserMgrVer.LineSpacing = 0F;
this.labelUserMgrVer.Location = new System.Drawing.Point(216, 327);
this.labelUserMgrVer.Location = new System.Drawing.Point(209, 310);
this.labelUserMgrVer.Name = "labelUserMgrVer";
this.labelUserMgrVer.Size = new System.Drawing.Size(163, 33);
this.labelUserMgrVer.TabIndex = 197;
@ -226,7 +226,7 @@
this.smartLabel1.ForeColor = System.Drawing.Color.White;
this.smartLabel1.InitVisible = true;
this.smartLabel1.LineSpacing = 0F;
this.smartLabel1.Location = new System.Drawing.Point(386, 249);
this.smartLabel1.Location = new System.Drawing.Point(379, 232);
this.smartLabel1.Name = "smartLabel1";
this.smartLabel1.Size = new System.Drawing.Size(150, 33);
this.smartLabel1.TabIndex = 195;
@ -247,7 +247,7 @@
this.smartLabel3.ForeColor = System.Drawing.Color.White;
this.smartLabel3.InitVisible = true;
this.smartLabel3.LineSpacing = 0F;
this.smartLabel3.Location = new System.Drawing.Point(61, 249);
this.smartLabel3.Location = new System.Drawing.Point(54, 232);
this.smartLabel3.Name = "smartLabel3";
this.smartLabel3.Size = new System.Drawing.Size(150, 33);
this.smartLabel3.TabIndex = 194;
@ -268,11 +268,11 @@
this.smartLabel4.ForeColor = System.Drawing.Color.White;
this.smartLabel4.InitVisible = true;
this.smartLabel4.LineSpacing = 0F;
this.smartLabel4.Location = new System.Drawing.Point(542, 250);
this.smartLabel4.Location = new System.Drawing.Point(535, 233);
this.smartLabel4.Name = "smartLabel4";
this.smartLabel4.Size = new System.Drawing.Size(139, 33);
this.smartLabel4.TabIndex = 193;
this.smartLabel4.Text = "ITC81DB_0H";
this.smartLabel4.Text = "ITC81DB_2H";
this.smartLabel4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
this.smartLabel4.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.smartLabel4.Wordwrap = false;
@ -289,7 +289,7 @@
this.smartLabel5.ForeColor = System.Drawing.Color.White;
this.smartLabel5.InitVisible = true;
this.smartLabel5.LineSpacing = 0F;
this.smartLabel5.Location = new System.Drawing.Point(217, 249);
this.smartLabel5.Location = new System.Drawing.Point(210, 232);
this.smartLabel5.Name = "smartLabel5";
this.smartLabel5.Size = new System.Drawing.Size(163, 33);
this.smartLabel5.TabIndex = 192;
@ -301,7 +301,7 @@
// textBoxSerialNo
//
this.textBoxSerialNo.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Bold);
this.textBoxSerialNo.Location = new System.Drawing.Point(256, 86);
this.textBoxSerialNo.Location = new System.Drawing.Point(249, 69);
this.textBoxSerialNo.Name = "textBoxSerialNo";
this.textBoxSerialNo.Size = new System.Drawing.Size(200, 34);
this.textBoxSerialNo.TabIndex = 190;
@ -326,7 +326,7 @@
this.smartKeyboard.KeyUpImage2 = null;
this.smartKeyboard.KeyUpImage3 = null;
this.smartKeyboard.LeftMargin = 5;
this.smartKeyboard.Location = new System.Drawing.Point(15, 118);
this.smartKeyboard.Location = new System.Drawing.Point(8, 101);
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)))));
@ -355,7 +355,7 @@
this.labelSerialNo.ForeColor = System.Drawing.Color.White;
this.labelSerialNo.InitVisible = true;
this.labelSerialNo.LineSpacing = 0F;
this.labelSerialNo.Location = new System.Drawing.Point(542, 210);
this.labelSerialNo.Location = new System.Drawing.Point(535, 193);
this.labelSerialNo.Name = "labelSerialNo";
this.labelSerialNo.Size = new System.Drawing.Size(139, 33);
this.labelSerialNo.TabIndex = 61;
@ -378,7 +378,7 @@
this.smartLabel2.ForeColor = System.Drawing.Color.White;
this.smartLabel2.InitVisible = true;
this.smartLabel2.LineSpacing = 0F;
this.smartLabel2.Location = new System.Drawing.Point(386, 210);
this.smartLabel2.Location = new System.Drawing.Point(379, 193);
this.smartLabel2.Name = "smartLabel2";
this.smartLabel2.Size = new System.Drawing.Size(150, 33);
this.smartLabel2.TabIndex = 60;
@ -399,7 +399,7 @@
this.smartLabel34.ForeColor = System.Drawing.Color.White;
this.smartLabel34.InitVisible = true;
this.smartLabel34.LineSpacing = 0F;
this.smartLabel34.Location = new System.Drawing.Point(61, 210);
this.smartLabel34.Location = new System.Drawing.Point(54, 193);
this.smartLabel34.Name = "smartLabel34";
this.smartLabel34.Size = new System.Drawing.Size(150, 33);
this.smartLabel34.TabIndex = 59;
@ -420,7 +420,7 @@
this.smartLabel35.ForeColor = System.Drawing.Color.White;
this.smartLabel35.InitVisible = true;
this.smartLabel35.LineSpacing = 0F;
this.smartLabel35.Location = new System.Drawing.Point(386, 288);
this.smartLabel35.Location = new System.Drawing.Point(379, 271);
this.smartLabel35.Name = "smartLabel35";
this.smartLabel35.Size = new System.Drawing.Size(150, 33);
this.smartLabel35.TabIndex = 58;
@ -441,7 +441,7 @@
this.smartLabel36.ForeColor = System.Drawing.Color.White;
this.smartLabel36.InitVisible = true;
this.smartLabel36.LineSpacing = 0F;
this.smartLabel36.Location = new System.Drawing.Point(62, 288);
this.smartLabel36.Location = new System.Drawing.Point(55, 271);
this.smartLabel36.Name = "smartLabel36";
this.smartLabel36.Size = new System.Drawing.Size(150, 33);
this.smartLabel36.TabIndex = 57;
@ -462,7 +462,7 @@
this.labelModel.ForeColor = System.Drawing.Color.White;
this.labelModel.InitVisible = true;
this.labelModel.LineSpacing = 0F;
this.labelModel.Location = new System.Drawing.Point(217, 210);
this.labelModel.Location = new System.Drawing.Point(210, 193);
this.labelModel.Name = "labelModel";
this.labelModel.Size = new System.Drawing.Size(163, 33);
this.labelModel.TabIndex = 56;
@ -483,7 +483,7 @@
this.labelDisplayVer.ForeColor = System.Drawing.Color.White;
this.labelDisplayVer.InitVisible = true;
this.labelDisplayVer.LineSpacing = 0F;
this.labelDisplayVer.Location = new System.Drawing.Point(542, 288);
this.labelDisplayVer.Location = new System.Drawing.Point(535, 271);
this.labelDisplayVer.Name = "labelDisplayVer";
this.labelDisplayVer.Size = new System.Drawing.Size(139, 33);
this.labelDisplayVer.TabIndex = 55;
@ -504,7 +504,7 @@
this.labelControlVer.ForeColor = System.Drawing.Color.White;
this.labelControlVer.InitVisible = true;
this.labelControlVer.LineSpacing = 0F;
this.labelControlVer.Location = new System.Drawing.Point(217, 288);
this.labelControlVer.Location = new System.Drawing.Point(210, 271);
this.labelControlVer.Name = "labelControlVer";
this.labelControlVer.Size = new System.Drawing.Size(163, 33);
this.labelControlVer.TabIndex = 54;
@ -525,7 +525,7 @@
this.labelInfo2.ForeColor = System.Drawing.Color.OliveDrab;
this.labelInfo2.InitVisible = true;
this.labelInfo2.LineSpacing = 0F;
this.labelInfo2.Location = new System.Drawing.Point(61, 171);
this.labelInfo2.Location = new System.Drawing.Point(54, 154);
this.labelInfo2.Name = "labelInfo2";
this.labelInfo2.Size = new System.Drawing.Size(568, 33);
this.labelInfo2.TabIndex = 53;
@ -546,7 +546,7 @@
this.labelInfo1.ForeColor = System.Drawing.Color.BurlyWood;
this.labelInfo1.InitVisible = true;
this.labelInfo1.LineSpacing = 0F;
this.labelInfo1.Location = new System.Drawing.Point(61, 132);
this.labelInfo1.Location = new System.Drawing.Point(54, 115);
this.labelInfo1.Name = "labelInfo1";
this.labelInfo1.Size = new System.Drawing.Size(568, 33);
this.labelInfo1.TabIndex = 52;

14
ITC81DB_0H/Controls/Etc/ControlConfiOptionBoard2.cs
View File

@ -396,13 +396,7 @@ namespace ITC81DB_0H.Controls
if (myKeyPad.ShowDialog() == DialogResult.OK)
{
if (myKeyPad.doubleValue < 0 || myKeyPad.doubleValue > 9999)
{
// 입력범위를 확인하세요
DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.ParentForm.SystemConfig1.Language);
myMsg.ShowDialog();
}
else
if (myKeyPad.IntValue == 0 || (myKeyPad.IntValue >= 10 && myKeyPad.IntValue <= 9999))
{
this.labelZeroZoneCycle.Text = myKeyPad.StringValue;
@ -414,6 +408,12 @@ namespace ITC81DB_0H.Controls
if (before != after)
this.ParentForm.ParentForm.SetTrackingHistoryData(Define.E_TrackingParameter.OPT2ZeroCycle, "", before, after);
}
else
{
// 입력범위를 확인하세요
DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.ParentForm.SystemConfig1.Language);
myMsg.ShowDialog();
}
}
}
private void labelZeroZoneCount_Click(object sender, EventArgs e)

5
ITC81DB_0H/Datastore/Define.cs
View File

@ -412,6 +412,7 @@ namespace ITC81DB_2H.Datastore
Init_Main,
Init_LCD,
DataBackup,
GroupEditor,
}
public enum E_TrackingParameter
@ -511,6 +512,10 @@ namespace ITC81DB_2H.Datastore
OPT2Port,
OPT2ZeroCycle,
OPT2ZeroCount,
ChangeL1Name,
ChangeL2Name,
ChangeL3Name,
EquipmentID,
BuzzerONTime,

4
ITC81DB_0H/Forms/FormMain.cs
View File

@ -24,8 +24,8 @@ namespace ITC81DB_0H.Forms
public partial class FormMain : Form
{
#region Field
public static string DisplayVersion = "3.0.1";
public static string ReleaseDate = "2023.6.21";
public static string DisplayVersion = "3.1.0";
public static string ReleaseDate = "2023.7.21";
private SmartSplash SmartSplashProgramLoad;
public bool IsCommunicationLogOpen;

4
ITC81DB_0H/Forms/FormMenu.cs
View File

@ -1564,6 +1564,7 @@ namespace ITC81DB_0H.Forms
this.buttonConfiguration.Enabled = false;
this.buttonSystem.Enabled = false;
this.buttonEquipment.Enabled = false;
this.buttonLog.Enabled = false;
this.buttonInformation.Enabled = false;
this.buttonMain.Enabled = false;
@ -1572,6 +1573,7 @@ namespace ITC81DB_0H.Forms
this.BottomEquipment.Enabled = false;
this.BottomInformation.Enabled = false;
this.BottomSystem.Enabled = false;
this.BottomLog.Enabled = false;
this.pictureBoxStart.Visible = true;
this.pictureBoxStop.Visible = false;
@ -1587,6 +1589,7 @@ namespace ITC81DB_0H.Forms
this.buttonConfiguration.Enabled = true;
this.buttonSystem.Enabled = true;
this.buttonEquipment.Enabled = true;
this.buttonLog.Enabled = true;
this.buttonInformation.Enabled = true;
this.buttonMain.Enabled = true;
@ -1595,6 +1598,7 @@ namespace ITC81DB_0H.Forms
this.BottomEquipment.Enabled = true;
this.BottomInformation.Enabled = true;
this.BottomSystem.Enabled = true;
this.BottomLog.Enabled = true;
this.pictureBoxStart.Visible = false;
this.pictureBoxStop.Visible = true;

BIN
ITC81DB_0H/bin/Release/ITC81DB_2H.exe
View File

Binary file not shown.

BIN
ITC81DB_0H/obj/Release/ITC81DB_2H.exe
View File

Binary file not shown.