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

- 로그데이터 Load 시 일괄 -> 현재 페이지만 로드 

- treeView 선택한 파일 제목을 상단에 표시 -> 현재 Load된 데이터의 파일 제목을 상단에 표시
 - 버그수정
   1. 시간 변경 시 날짜표시 버그 수정
   2. Part11 사용 안했을 때 데이터 백업 시, 데이터 개수가 /2로 표시되는 버그 수정
      Part11 사용 시에만 전체 개수 /2 해야함(ini 파일)
   3. 시리얼, 이더넷 통신 - OPT4 : 바코드 사용하지 않을 때 설정하고 Test Send 버튼 눌렀을때 문제 수정
   4. 유저설정 등급이름 변경버튼 누르고 keyboard X 눌렀을 때, textBox가 사라지지 않는 버그 수정
   5. 유저 비밀번호 변경시점부터 다시 D-Day 계산
   6. 백업 시, smartFile Close 제대로 안되어 백업이 안되는 버그 수정
master
DESKTOP-999R8N3\CJY 2023-06-21 19:11:37 +09:00
parent 8d9c31eece
commit b2623b69c4
25 changed files with 798 additions and 824 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
ITC81DB_0H/Controls/Bottom/ControlBottomLog.Designer.cs generated
View File

@ -31,7 +31,7 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlBottomLog)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlBottomLog));
this.buttonLogHistory = new SmartX.SmartButton(); this.buttonLogHistory = new SmartX.SmartButton();
this.buttonHelp = new SmartX.SmartButton(); this.buttonHelp = new SmartX.SmartButton();
this.buttonLogJudge = new SmartX.SmartButton(); this.buttonLogInspection = new SmartX.SmartButton();
this.buttonLogOthers = new SmartX.SmartButton(); this.buttonLogOthers = new SmartX.SmartButton();
this.SuspendLayout(); this.SuspendLayout();
// //
@ -97,36 +97,36 @@
this.buttonHelp.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonHelp.UpImage"))); this.buttonHelp.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonHelp.UpImage")));
this.buttonHelp.Click += new System.EventHandler(this.buttonMenu_Click); this.buttonHelp.Click += new System.EventHandler(this.buttonMenu_Click);
// //
// buttonLogJudge // buttonLogInspection
// //
this.buttonLogJudge.BackPictureBox = null; this.buttonLogInspection.BackPictureBox = null;
this.buttonLogJudge.BackPictureBox1 = null; this.buttonLogInspection.BackPictureBox1 = null;
this.buttonLogJudge.BackPictureBox2 = null; this.buttonLogInspection.BackPictureBox2 = null;
this.buttonLogJudge.ButtonColor = System.Drawing.Color.Gray; this.buttonLogInspection.ButtonColor = System.Drawing.Color.Gray;
this.buttonLogJudge.ButtonImageAutoSize = true; this.buttonLogInspection.ButtonImageAutoSize = true;
this.buttonLogJudge.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonLogInspection.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonLogJudge.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonLogJudge.DisableImage"))); this.buttonLogInspection.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonLogInspection.DisableImage")));
this.buttonLogJudge.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLogJudge.DownImage"))); this.buttonLogInspection.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLogInspection.DownImage")));
this.buttonLogJudge.GroupID = 0; this.buttonLogInspection.GroupID = 0;
this.buttonLogJudge.InitVisible = true; this.buttonLogInspection.InitVisible = true;
this.buttonLogJudge.Location = new System.Drawing.Point(100, 0); this.buttonLogInspection.Location = new System.Drawing.Point(100, 0);
this.buttonLogJudge.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonLogInspection.Mode = SmartX.SmartButton.BUTTONMODE.RADIO;
this.buttonLogJudge.Name = "buttonLogJudge"; this.buttonLogInspection.Name = "buttonLogInspection";
this.buttonLogJudge.NestedClickEventPrevent = false; this.buttonLogInspection.NestedClickEventPrevent = false;
this.buttonLogJudge.OutlinePixel = 1; this.buttonLogInspection.OutlinePixel = 1;
this.buttonLogJudge.RepeatInterval = 200; this.buttonLogInspection.RepeatInterval = 200;
this.buttonLogJudge.RepeatIntervalAccelerate = null; this.buttonLogInspection.RepeatIntervalAccelerate = null;
this.buttonLogJudge.SafeInterval = 200; this.buttonLogInspection.SafeInterval = 200;
this.buttonLogJudge.Size = new System.Drawing.Size(65, 65); this.buttonLogInspection.Size = new System.Drawing.Size(65, 65);
this.buttonLogJudge.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; this.buttonLogInspection.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonLogJudge.TabIndex = 7; this.buttonLogInspection.TabIndex = 7;
this.buttonLogJudge.TextColor = System.Drawing.Color.Black; this.buttonLogInspection.TextColor = System.Drawing.Color.Black;
this.buttonLogJudge.TextDownColor = System.Drawing.Color.White; this.buttonLogInspection.TextDownColor = System.Drawing.Color.White;
this.buttonLogJudge.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonLogInspection.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.buttonLogJudge.TextLocation = new System.Drawing.Point(0, 0); this.buttonLogInspection.TextLocation = new System.Drawing.Point(0, 0);
this.buttonLogJudge.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonLogInspection.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonLogJudge.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLogJudge.UpImage"))); this.buttonLogInspection.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLogInspection.UpImage")));
this.buttonLogJudge.Click += new System.EventHandler(this.buttonMenu_Click); this.buttonLogInspection.Click += new System.EventHandler(this.buttonMenu_Click);
// //
// buttonLogOthers // buttonLogOthers
// //
@ -165,7 +165,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.Color.Black; this.BackColor = System.Drawing.Color.Black;
this.Controls.Add(this.buttonLogOthers); this.Controls.Add(this.buttonLogOthers);
this.Controls.Add(this.buttonLogJudge); this.Controls.Add(this.buttonLogInspection);
this.Controls.Add(this.buttonHelp); this.Controls.Add(this.buttonHelp);
this.Controls.Add(this.buttonLogHistory); this.Controls.Add(this.buttonLogHistory);
this.Name = "ControlBottomLog"; this.Name = "ControlBottomLog";
@ -178,7 +178,7 @@
private SmartX.SmartButton buttonLogHistory; private SmartX.SmartButton buttonLogHistory;
private SmartX.SmartButton buttonHelp; private SmartX.SmartButton buttonHelp;
private SmartX.SmartButton buttonLogJudge; private SmartX.SmartButton buttonLogInspection;
private SmartX.SmartButton buttonLogOthers; private SmartX.SmartButton buttonLogOthers;
} }
} }

36
ITC81DB_0H/Controls/Bottom/ControlBottomLog.cs
View File

@ -54,7 +54,7 @@ namespace ITC81DB_0H.Controls
this.CollectionButtonMenu = new Collection<SmartButton>(); this.CollectionButtonMenu = new Collection<SmartButton>();
this.CollectionButtonMenu.Clear(); this.CollectionButtonMenu.Clear();
this.CollectionButtonMenu.Add(this.buttonHelp); this.CollectionButtonMenu.Add(this.buttonHelp);
this.CollectionButtonMenu.Add(this.buttonLogJudge); this.CollectionButtonMenu.Add(this.buttonLogInspection);
this.CollectionButtonMenu.Add(this.buttonLogHistory); this.CollectionButtonMenu.Add(this.buttonLogHistory);
this.CollectionButtonMenu.Add(this.buttonLogOthers); this.CollectionButtonMenu.Add(this.buttonLogOthers);
} }
@ -70,28 +70,28 @@ namespace ITC81DB_0H.Controls
switch (status.CurrentUser.Group) switch (status.CurrentUser.Group)
{ {
case Define.E_UserGroup.Level1: case Define.E_UserGroup.Level1:
this.buttonLogJudge.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsLogEnable; this.buttonLogInspection.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsLogEnable;
this.buttonLogHistory.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsLogEnable; this.buttonLogHistory.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsLogEnable;
this.buttonLogOthers.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsLogEnable; this.buttonLogOthers.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsLogEnable;
break; break;
case Define.E_UserGroup.Level2: case Define.E_UserGroup.Level2:
this.buttonLogJudge.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsLogEnable; this.buttonLogInspection.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsLogEnable;
this.buttonLogHistory.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsLogEnable; this.buttonLogHistory.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsLogEnable;
this.buttonLogOthers.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsLogEnable; this.buttonLogOthers.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsLogEnable;
break; break;
case Define.E_UserGroup.Level3: case Define.E_UserGroup.Level3:
this.buttonLogJudge.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsLogEnable; this.buttonLogInspection.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsLogEnable;
this.buttonLogHistory.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsLogEnable; this.buttonLogHistory.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsLogEnable;
this.buttonLogOthers.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsLogEnable; this.buttonLogOthers.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsLogEnable;
break; break;
case Define.E_UserGroup.Admin: case Define.E_UserGroup.Admin:
case Define.E_UserGroup.Developer: case Define.E_UserGroup.Developer:
this.buttonLogJudge.Enabled = true; this.buttonLogInspection.Enabled = true;
this.buttonLogHistory.Enabled = true; this.buttonLogHistory.Enabled = true;
this.buttonLogOthers.Enabled = true; this.buttonLogOthers.Enabled = true;
break; break;
case Define.E_UserGroup.NotLogin: case Define.E_UserGroup.NotLogin:
this.buttonLogJudge.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.NotLogin.IsLogEnable; this.buttonLogInspection.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.NotLogin.IsLogEnable;
this.buttonLogHistory.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.NotLogin.IsLogEnable; this.buttonLogHistory.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.NotLogin.IsLogEnable;
this.buttonLogOthers.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.NotLogin.IsLogEnable; this.buttonLogOthers.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.NotLogin.IsLogEnable;
break; break;
@ -106,18 +106,18 @@ namespace ITC81DB_0H.Controls
case Define.E_MenuBottomLog.Help: case Define.E_MenuBottomLog.Help:
if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.DOWN) if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.DOWN)
this.buttonHelp.ButtonDown(); this.buttonHelp.ButtonDown();
if (this.buttonLogJudge.ButtonStatus != SmartButton.BUTSTATUS.UP) if (this.buttonLogInspection.ButtonStatus != SmartButton.BUTSTATUS.UP)
this.buttonLogJudge.ButtonUp(); this.buttonLogInspection.ButtonUp();
if (this.buttonLogHistory.ButtonStatus != SmartButton.BUTSTATUS.UP) if (this.buttonLogHistory.ButtonStatus != SmartButton.BUTSTATUS.UP)
this.buttonLogHistory.ButtonUp(); this.buttonLogHistory.ButtonUp();
if (this.buttonLogOthers.ButtonStatus != SmartButton.BUTSTATUS.UP) if (this.buttonLogOthers.ButtonStatus != SmartButton.BUTSTATUS.UP)
this.buttonLogOthers.ButtonUp(); this.buttonLogOthers.ButtonUp();
break; break;
case Define.E_MenuBottomLog.LogJudge: case Define.E_MenuBottomLog.LogInspection:
if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP) if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP)
this.buttonHelp.ButtonUp(); this.buttonHelp.ButtonUp();
if (this.buttonLogJudge.ButtonStatus != SmartButton.BUTSTATUS.DOWN) if (this.buttonLogInspection.ButtonStatus != SmartButton.BUTSTATUS.DOWN)
this.buttonLogJudge.ButtonDown(); this.buttonLogInspection.ButtonDown();
if (this.buttonLogHistory.ButtonStatus != SmartButton.BUTSTATUS.UP) if (this.buttonLogHistory.ButtonStatus != SmartButton.BUTSTATUS.UP)
this.buttonLogHistory.ButtonUp(); this.buttonLogHistory.ButtonUp();
if (this.buttonLogOthers.ButtonStatus != SmartButton.BUTSTATUS.UP) if (this.buttonLogOthers.ButtonStatus != SmartButton.BUTSTATUS.UP)
@ -126,8 +126,8 @@ namespace ITC81DB_0H.Controls
case Define.E_MenuBottomLog.LogHistory: case Define.E_MenuBottomLog.LogHistory:
if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP) if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP)
this.buttonHelp.ButtonUp(); this.buttonHelp.ButtonUp();
if (this.buttonLogJudge.ButtonStatus != SmartButton.BUTSTATUS.UP) if (this.buttonLogInspection.ButtonStatus != SmartButton.BUTSTATUS.UP)
this.buttonLogJudge.ButtonUp(); this.buttonLogInspection.ButtonUp();
if (this.buttonLogHistory.ButtonStatus != SmartButton.BUTSTATUS.DOWN) if (this.buttonLogHistory.ButtonStatus != SmartButton.BUTSTATUS.DOWN)
this.buttonLogHistory.ButtonDown(); this.buttonLogHistory.ButtonDown();
if (this.buttonLogOthers.ButtonStatus != SmartButton.BUTSTATUS.UP) if (this.buttonLogOthers.ButtonStatus != SmartButton.BUTSTATUS.UP)
@ -136,8 +136,8 @@ namespace ITC81DB_0H.Controls
case Define.E_MenuBottomLog.LogOthers: case Define.E_MenuBottomLog.LogOthers:
if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP) if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP)
this.buttonHelp.ButtonUp(); this.buttonHelp.ButtonUp();
if (this.buttonLogJudge.ButtonStatus != SmartButton.BUTSTATUS.UP) if (this.buttonLogInspection.ButtonStatus != SmartButton.BUTSTATUS.UP)
this.buttonLogJudge.ButtonUp(); this.buttonLogInspection.ButtonUp();
if (this.buttonLogHistory.ButtonStatus != SmartButton.BUTSTATUS.UP) if (this.buttonLogHistory.ButtonStatus != SmartButton.BUTSTATUS.UP)
this.buttonLogHistory.ButtonUp(); this.buttonLogHistory.ButtonUp();
if (this.buttonLogOthers.ButtonStatus != SmartButton.BUTSTATUS.DOWN) if (this.buttonLogOthers.ButtonStatus != SmartButton.BUTSTATUS.DOWN)
@ -151,7 +151,7 @@ namespace ITC81DB_0H.Controls
public void DisplayRefresh(SystemStatus status) public void DisplayRefresh(SystemStatus status)
{ {
this.buttonHelp.ButtonDown(); this.buttonHelp.ButtonDown();
this.buttonLogJudge.ButtonUp(); this.buttonLogInspection.ButtonUp();
this.buttonLogHistory.ButtonUp(); this.buttonLogHistory.ButtonUp();
this.buttonLogOthers.ButtonUp(); this.buttonLogOthers.ButtonUp();
@ -170,8 +170,8 @@ namespace ITC81DB_0H.Controls
if (button == this.buttonHelp) if (button == this.buttonHelp)
this.CurrentMenu = Define.E_MenuBottomLog.Help; this.CurrentMenu = Define.E_MenuBottomLog.Help;
else if (button == this.buttonLogJudge) else if (button == this.buttonLogInspection)
this.CurrentMenu = Define.E_MenuBottomLog.LogJudge; this.CurrentMenu = Define.E_MenuBottomLog.LogInspection;
else if (button == this.buttonLogHistory) else if (button == this.buttonLogHistory)
this.CurrentMenu = Define.E_MenuBottomLog.LogHistory; this.CurrentMenu = Define.E_MenuBottomLog.LogHistory;
else if (button == this.buttonLogOthers) else if (button == this.buttonLogOthers)

6
ITC81DB_0H/Controls/Bottom/ControlBottomLog.resx
View File

@ -571,7 +571,7 @@
EokEN/TP/2dxOBwOh8PhcFRPLPYX7crKpWVbDjQAAAAASUVORK5CYII= EokEN/TP/2dxOBwOh8PhcFRPLPYX7crKpWVbDjQAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="buttonLogJudge.DisableImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="buttonLogInspection.DisableImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAAEEAAABBCAIAAAABlV4SAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH iVBORw0KGgoAAAANSUhEUgAAAEEAAABBCAIAAAABlV4SAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@ -652,7 +652,7 @@
AABJRU5ErkJggg== AABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="buttonLogJudge.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="buttonLogInspection.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAAEEAAABBCAIAAAABlV4SAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH iVBORw0KGgoAAAANSUhEUgAAAEEAAABBCAIAAAABlV4SAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@ -724,7 +724,7 @@
uZAZ4uxk6z8AAAAASUVORK5CYII= uZAZ4uxk6z8AAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="buttonLogJudge.UpImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="buttonLogInspection.UpImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAAEEAAABBCAIAAAABlV4SAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH iVBORw0KGgoAAAANSUhEUgAAAEEAAABBCAIAAAABlV4SAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp

4
ITC81DB_0H/Controls/CenterBasic/ControlCenterBasicTime.cs
View File

@ -107,13 +107,13 @@ namespace ITC81DB_0H.Controls
{ {
string before = "", after = ""; string before = "", after = "";
before = DateTime.Now.ToString("yyyy-MM-DD HH:mm"); before = DateTime.Now.ToString("yyyy-MM-dd HH:mm");
DateTime setDateTime; DateTime setDateTime;
try try
{ {
setDateTime = new DateTime(int.Parse(this.upDownYear.TxtValue), int.Parse(this.upDownMonth.TxtValue), setDateTime = new DateTime(int.Parse(this.upDownYear.TxtValue), int.Parse(this.upDownMonth.TxtValue),
int.Parse(this.upDownDate.TxtValue), int.Parse(this.upDownHour.TxtValue), int.Parse(this.upDownMinute.TxtValue), 00); int.Parse(this.upDownDate.TxtValue), int.Parse(this.upDownHour.TxtValue), int.Parse(this.upDownMinute.TxtValue), 00);
after = setDateTime.ToString("yyyy-MM-DD HH:mm"); after = setDateTime.ToString("yyyy-MM-dd HH:mm");
} }
catch catch
{ {

1
ITC81DB_0H/Controls/CenterConfiguration/ControlCenterConfiSerial.cs
View File

@ -11,7 +11,6 @@ using System.Text;
using System.Threading; using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
using ITC81DB_0H.Forms; using ITC81DB_0H.Forms;
using ITC81DB_2H_ImageDll; using ITC81DB_2H_ImageDll;
using ITC81DB_0H.DialogForms; using ITC81DB_0H.DialogForms;

6
ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipUser.cs
View File

@ -1473,9 +1473,9 @@ namespace ITC81DB_0H.Controls
if (this.PasswordChar == false) if (this.PasswordChar == false)
this.SetTextBoxPasswordChar(this.PasswordChar); this.SetTextBoxPasswordChar(this.PasswordChar);
} }
else if (this.smartKeyboard.TargetInputObject == this.buttonLevel1 else if (this.smartKeyboard.TargetInputObject == this.textBoxLevel1
|| this.smartKeyboard.TargetInputObject == this.buttonLevel2 || this.smartKeyboard.TargetInputObject == this.textBoxLevel2
|| this.smartKeyboard.TargetInputObject == this.buttonLevel3) || this.smartKeyboard.TargetInputObject == this.textBoxLevel3)
{ {
if (this.buttonLevel1.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) if (this.buttonLevel1.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN)
{ {

50
ITC81DB_0H/Controls/CenterLog/ControlCenterLogHelp.cs
View File

@ -49,9 +49,9 @@ namespace ITC81DB_0H.Controls
if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English)
{ {
this.buttonLogJudge.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogInspectionDisable)); this.buttonLogInspection.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogInspectionDisable));
this.buttonLogJudge.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogInspectionDown)); this.buttonLogInspection.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogInspectionDown));
this.buttonLogJudge.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogInspectionUp)); this.buttonLogInspection.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogInspectionUp));
this.buttonLogHistory.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogHistoryDisable)); this.buttonLogHistory.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogHistoryDisable));
this.buttonLogHistory.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogHistoryDown)); this.buttonLogHistory.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogHistoryDown));
this.buttonLogHistory.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogHistoryUp)); this.buttonLogHistory.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogHistoryUp));
@ -61,9 +61,9 @@ namespace ITC81DB_0H.Controls
} }
else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese)
{ {
this.buttonLogJudge.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpLogInspectionDisable)); this.buttonLogInspection.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpLogInspectionDisable));
this.buttonLogJudge.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpLogInspectionDown)); this.buttonLogInspection.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpLogInspectionDown));
this.buttonLogJudge.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpLogInspectionUp)); this.buttonLogInspection.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpLogInspectionUp));
this.buttonLogHistory.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpLogHistoryDisable)); this.buttonLogHistory.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpLogHistoryDisable));
this.buttonLogHistory.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpLogHistoryDown)); this.buttonLogHistory.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpLogHistoryDown));
this.buttonLogHistory.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpLogHistoryUp)); this.buttonLogHistory.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpLogHistoryUp));
@ -76,9 +76,9 @@ namespace ITC81DB_0H.Controls
} }
else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Russian) else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Russian)
{ {
this.buttonLogJudge.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusHelpLogInspectionDisable)); this.buttonLogInspection.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusHelpLogInspectionDisable));
this.buttonLogJudge.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusHelpLogInspectionDown)); this.buttonLogInspection.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusHelpLogInspectionDown));
this.buttonLogJudge.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusHelpLogInspectionUp)); this.buttonLogInspection.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusHelpLogInspectionUp));
this.buttonLogHistory.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusHelpLogHistoryDisable)); this.buttonLogHistory.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusHelpLogHistoryDisable));
this.buttonLogHistory.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusHelpLogHistoryDown)); this.buttonLogHistory.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusHelpLogHistoryDown));
this.buttonLogHistory.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusHelpLogHistoryUp)); this.buttonLogHistory.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusHelpLogHistoryUp));
@ -88,9 +88,9 @@ namespace ITC81DB_0H.Controls
} }
else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.German) else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.German)
{ {
this.buttonLogJudge.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerHelpLogInspectionDisable)); this.buttonLogInspection.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerHelpLogInspectionDisable));
this.buttonLogJudge.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerHelpLogInspectionDown)); this.buttonLogInspection.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerHelpLogInspectionDown));
this.buttonLogJudge.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerHelpLogInspectionUp)); this.buttonLogInspection.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerHelpLogInspectionUp));
this.buttonLogHistory.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerHelpLogHistoryDisable)); this.buttonLogHistory.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerHelpLogHistoryDisable));
this.buttonLogHistory.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerHelpLogHistoryDown)); this.buttonLogHistory.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerHelpLogHistoryDown));
this.buttonLogHistory.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerHelpLogHistoryUp)); this.buttonLogHistory.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerHelpLogHistoryUp));
@ -100,9 +100,9 @@ namespace ITC81DB_0H.Controls
} }
else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish)
{ {
this.buttonLogJudge.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogInspectionDisable)); this.buttonLogInspection.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogInspectionDisable));
this.buttonLogJudge.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogInspectionDown)); this.buttonLogInspection.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogInspectionDown));
this.buttonLogJudge.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogInspectionUp)); this.buttonLogInspection.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogInspectionUp));
this.buttonLogHistory.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogHistoryDisable)); this.buttonLogHistory.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogHistoryDisable));
this.buttonLogHistory.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogHistoryDown)); this.buttonLogHistory.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogHistoryDown));
this.buttonLogHistory.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogHistoryUp)); this.buttonLogHistory.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpLogHistoryUp));
@ -112,9 +112,9 @@ namespace ITC81DB_0H.Controls
} }
else else
{ {
this.buttonLogJudge.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.korHelpLogInspectionDisable)); this.buttonLogInspection.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.korHelpLogInspectionDisable));
this.buttonLogJudge.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.korHelpLogInspectionDown)); this.buttonLogInspection.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.korHelpLogInspectionDown));
this.buttonLogJudge.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.korHelpLogInspectionUp)); this.buttonLogInspection.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.korHelpLogInspectionUp));
this.buttonLogHistory.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.korHelpLogHistoryDisable)); this.buttonLogHistory.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.korHelpLogHistoryDisable));
this.buttonLogHistory.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.korHelpLogHistoryDown)); this.buttonLogHistory.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.korHelpLogHistoryDown));
this.buttonLogHistory.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.korHelpLogHistoryUp)); this.buttonLogHistory.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.korHelpLogHistoryUp));
@ -133,28 +133,28 @@ namespace ITC81DB_0H.Controls
switch (status.CurrentUser.Group) switch (status.CurrentUser.Group)
{ {
case Define.E_UserGroup.Level1: case Define.E_UserGroup.Level1:
this.buttonLogJudge.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsLogJudge; this.buttonLogInspection.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsLogJudge;
this.buttonLogHistory.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsLogHistory; this.buttonLogHistory.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsLogHistory;
this.buttonLogOthers.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsLogOthers; this.buttonLogOthers.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level1.IsLogOthers;
break; break;
case Define.E_UserGroup.Level2: case Define.E_UserGroup.Level2:
this.buttonLogJudge.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsLogJudge; this.buttonLogInspection.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsLogJudge;
this.buttonLogHistory.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsLogHistory; this.buttonLogHistory.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsLogHistory;
this.buttonLogOthers.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsLogOthers; this.buttonLogOthers.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level2.IsLogOthers;
break; break;
case Define.E_UserGroup.Level3: case Define.E_UserGroup.Level3:
this.buttonLogJudge.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsLogJudge; this.buttonLogInspection.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsLogJudge;
this.buttonLogHistory.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsLogHistory; this.buttonLogHistory.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsLogHistory;
this.buttonLogOthers.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsLogOthers; this.buttonLogOthers.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.Level3.IsLogOthers;
break; break;
case Define.E_UserGroup.Admin: case Define.E_UserGroup.Admin:
case Define.E_UserGroup.Developer: case Define.E_UserGroup.Developer:
this.buttonLogJudge.Enabled = true; this.buttonLogInspection.Enabled = true;
this.buttonLogHistory.Enabled = true; this.buttonLogHistory.Enabled = true;
this.buttonLogOthers.Enabled = true; this.buttonLogOthers.Enabled = true;
break; break;
case Define.E_UserGroup.NotLogin: case Define.E_UserGroup.NotLogin:
this.buttonLogJudge.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.NotLogin.IsLogJudge; this.buttonLogInspection.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.NotLogin.IsLogJudge;
this.buttonLogHistory.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.NotLogin.IsLogHistory; this.buttonLogHistory.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.NotLogin.IsLogHistory;
this.buttonLogOthers.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.NotLogin.IsLogOthers; this.buttonLogOthers.Enabled = this.ParentForm.ParentForm.CurrentUserGroup.NotLogin.IsLogOthers;
break; break;
@ -179,8 +179,8 @@ namespace ITC81DB_0H.Controls
if (button == null) if (button == null)
return; return;
if (button == this.buttonLogJudge) if (button == this.buttonLogInspection)
this.CurrentMenu = Define.E_MenuBottomLog.LogJudge; this.CurrentMenu = Define.E_MenuBottomLog.LogInspection;
else if (button == this.buttonLogHistory) else if (button == this.buttonLogHistory)
this.CurrentMenu = Define.E_MenuBottomLog.LogHistory; this.CurrentMenu = Define.E_MenuBottomLog.LogHistory;
else if (button == this.buttonLogOthers) else if (button == this.buttonLogOthers)

64
ITC81DB_0H/Controls/CenterLog/ControlCenterLogHelp.designer.cs generated
View File

@ -32,7 +32,7 @@
this.smartGroupBox1 = new SmartX.SmartGroupBox(); this.smartGroupBox1 = new SmartX.SmartGroupBox();
this.buttonLogOthers = new SmartX.SmartButton(); this.buttonLogOthers = new SmartX.SmartButton();
this.buttonLogHistory = new SmartX.SmartButton(); this.buttonLogHistory = new SmartX.SmartButton();
this.buttonLogJudge = new SmartX.SmartButton(); this.buttonLogInspection = new SmartX.SmartButton();
this.smartGroupBox1.SuspendLayout(); this.smartGroupBox1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
@ -43,7 +43,7 @@
this.smartGroupBox1.BackPictureBox1 = null; this.smartGroupBox1.BackPictureBox1 = null;
this.smartGroupBox1.Controls.Add(this.buttonLogOthers); this.smartGroupBox1.Controls.Add(this.buttonLogOthers);
this.smartGroupBox1.Controls.Add(this.buttonLogHistory); this.smartGroupBox1.Controls.Add(this.buttonLogHistory);
this.smartGroupBox1.Controls.Add(this.buttonLogJudge); this.smartGroupBox1.Controls.Add(this.buttonLogInspection);
this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198)))));
this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.Black; this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.Black;
this.smartGroupBox1.FrameLineThickness = 2; this.smartGroupBox1.FrameLineThickness = 2;
@ -119,36 +119,36 @@
this.buttonLogHistory.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLogHistory.UpImage"))); this.buttonLogHistory.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLogHistory.UpImage")));
this.buttonLogHistory.Click += new System.EventHandler(this.buttonMenu_Click); this.buttonLogHistory.Click += new System.EventHandler(this.buttonMenu_Click);
// //
// buttonLogJudge // buttonLogInspection
// //
this.buttonLogJudge.BackPictureBox = null; this.buttonLogInspection.BackPictureBox = null;
this.buttonLogJudge.BackPictureBox1 = null; this.buttonLogInspection.BackPictureBox1 = null;
this.buttonLogJudge.BackPictureBox2 = null; this.buttonLogInspection.BackPictureBox2 = null;
this.buttonLogJudge.ButtonColor = System.Drawing.Color.Gray; this.buttonLogInspection.ButtonColor = System.Drawing.Color.Gray;
this.buttonLogJudge.ButtonImageAutoSize = true; this.buttonLogInspection.ButtonImageAutoSize = true;
this.buttonLogJudge.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonLogInspection.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonLogJudge.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonLogJudge.DisableImage"))); this.buttonLogInspection.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonLogInspection.DisableImage")));
this.buttonLogJudge.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLogJudge.DownImage"))); this.buttonLogInspection.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLogInspection.DownImage")));
this.buttonLogJudge.GroupID = 0; this.buttonLogInspection.GroupID = 0;
this.buttonLogJudge.InitVisible = true; this.buttonLogInspection.InitVisible = true;
this.buttonLogJudge.Location = new System.Drawing.Point(28, 17); this.buttonLogInspection.Location = new System.Drawing.Point(28, 17);
this.buttonLogJudge.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonLogInspection.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonLogJudge.Name = "buttonLogJudge"; this.buttonLogInspection.Name = "buttonLogInspection";
this.buttonLogJudge.NestedClickEventPrevent = false; this.buttonLogInspection.NestedClickEventPrevent = false;
this.buttonLogJudge.OutlinePixel = 1; this.buttonLogInspection.OutlinePixel = 1;
this.buttonLogJudge.RepeatInterval = 200; this.buttonLogInspection.RepeatInterval = 200;
this.buttonLogJudge.RepeatIntervalAccelerate = null; this.buttonLogInspection.RepeatIntervalAccelerate = null;
this.buttonLogJudge.SafeInterval = 200; this.buttonLogInspection.SafeInterval = 200;
this.buttonLogJudge.Size = new System.Drawing.Size(160, 208); this.buttonLogInspection.Size = new System.Drawing.Size(160, 208);
this.buttonLogJudge.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; this.buttonLogInspection.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonLogJudge.TabIndex = 177; this.buttonLogInspection.TabIndex = 177;
this.buttonLogJudge.TextColor = System.Drawing.Color.Black; this.buttonLogInspection.TextColor = System.Drawing.Color.Black;
this.buttonLogJudge.TextDownColor = System.Drawing.Color.White; this.buttonLogInspection.TextDownColor = System.Drawing.Color.White;
this.buttonLogJudge.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonLogInspection.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.buttonLogJudge.TextLocation = new System.Drawing.Point(0, 0); this.buttonLogInspection.TextLocation = new System.Drawing.Point(0, 0);
this.buttonLogJudge.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonLogInspection.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonLogJudge.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLogJudge.UpImage"))); this.buttonLogInspection.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLogInspection.UpImage")));
this.buttonLogJudge.Click += new System.EventHandler(this.buttonMenu_Click); this.buttonLogInspection.Click += new System.EventHandler(this.buttonMenu_Click);
// //
// ControlCenterLogHelp // ControlCenterLogHelp
// //
@ -167,7 +167,7 @@
private SmartX.SmartGroupBox smartGroupBox1; private SmartX.SmartGroupBox smartGroupBox1;
private SmartX.SmartButton buttonLogHistory; private SmartX.SmartButton buttonLogHistory;
private SmartX.SmartButton buttonLogJudge; private SmartX.SmartButton buttonLogInspection;
private SmartX.SmartButton buttonLogOthers; private SmartX.SmartButton buttonLogOthers;
} }
} }

6
ITC81DB_0H/Controls/CenterLog/ControlCenterLogHelp.resx
View File

@ -987,7 +987,7 @@
M2fGW/tyOjvggAPCfwHhuq4+uhuAWwAAAABJRU5ErkJggg== M2fGW/tyOjvggAPCfwHhuq4+uhuAWwAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="buttonLogJudge.DisableImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="buttonLogInspection.DisableImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAAKAAAADQCAYAAACA7WrsAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH iVBORw0KGgoAAAANSUhEUgAAAKAAAADQCAYAAACA7WrsAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@ -1119,7 +1119,7 @@
/JeFaHjs2DE5ceKE49QNF5lfeOEF2blzZ/47fTHPZs6cKf8HocAxsmjvTckAAAAASUVORK5CYII= /JeFaHjs2DE5ceKE49QNF5lfeOEF2blzZ/47fTHPZs6cKf8HocAxsmjvTckAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="buttonLogJudge.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="buttonLogInspection.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAAKAAAADQCAYAAACA7WrsAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH iVBORw0KGgoAAAANSUhEUgAAAKAAAADQCAYAAACA7WrsAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@ -1264,7 +1264,7 @@
3z5z4MABRUkbTjJv27bNJio+ghXyrFq1auZ/RCWCPqJl6I0AAAAASUVORK5CYII= 3z5z4MABRUkbTjJv27bNJio+ghXyrFq1auZ/RCWCPqJl6I0AAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="buttonLogJudge.UpImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="buttonLogInspection.UpImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAAKAAAADQCAYAAACA7WrsAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH iVBORw0KGgoAAAANSUhEUgAAAKAAAADQCAYAAACA7WrsAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp

368
ITC81DB_0H/Controls/CenterLog/ControlCenterLogHistory.cs
View File

@ -27,6 +27,7 @@ namespace ITC81DB_0H.Controls
private int TotalCount; private int TotalCount;
private int CurrentCount; private int CurrentCount;
private static int ListBoxLineCount = 16; // 화면에 보여지는 listBox 줄 수 private static int ListBoxLineCount = 16; // 화면에 보여지는 listBox 줄 수
public bool IsFileOpen;
private string SelectedNodeFullPath; private string SelectedNodeFullPath;
private List<DataBackupYear> ListHistoryFile; private List<DataBackupYear> ListHistoryFile;
@ -109,6 +110,7 @@ namespace ITC81DB_0H.Controls
{ {
this.FileIndex = 0; this.FileIndex = 0;
this.TotalCount = 0; this.TotalCount = 0;
this.IsFileOpen = false;
this.ListHistoryFile = new List<DataBackupYear>(); this.ListHistoryFile = new List<DataBackupYear>();
this.CollectionData = new Collection<string[]>(); this.CollectionData = new Collection<string[]>();
@ -125,26 +127,17 @@ namespace ITC81DB_0H.Controls
this.CollectionListBox.Add(this.listBoxEvent); this.CollectionListBox.Add(this.listBoxEvent);
this.CollectionListBox.Add(this.listBoxDetail); this.CollectionListBox.Add(this.listBoxDetail);
} }
private void UpdateInitialStatus()
private void UpdateListBoxCount()
{ {
this.labelTotalIndex.Text = this.TotalCount.ToString(); this.labelFileName.Text = "";
this.labelCurrentIndex.Text = this.CurrentCount.ToString(); this.labelCurrentIndex.Text = "0";
} this.labelTotalIndex.Text = "0";
private void UpdateListBoxDataDisplay(string data) this.labelFind.Text = "";
{
if (data.Contains(",") == false)
return;
string[] sb = data.Split(','); this.ClearListBox();
string temp = ""; this.ClearData();
this.listBoxTime.AddItem(sb[1]);
this.listBoxLoginID.AddItem(sb[2]);
this.listBoxEvent.AddItem(sb[3]);
this.listBoxDetail.AddItem(sb[4]);
} }
private void UpdateDisplayFile() private void UpdateFileList()
{ {
int fileCount = 0; int fileCount = 0;
//TreeNode node; //TreeNode node;
@ -224,100 +217,6 @@ namespace ITC81DB_0H.Controls
this.labelCount.Text = fileCount.ToString(); this.labelCount.Text = fileCount.ToString();
} }
private void UpdateInitialStatus()
{
this.labelFileName.Text = "";
this.labelCurrentIndex.Text = "0";
this.labelTotalIndex.Text = "0";
this.labelFind.Text = "";
this.ClearListBox();
this.ClearData();
}
public void ClearData()
{
this.CollectionData.Clear();
this.ListTime.Clear();
this.ListLoginID.Clear();
this.ListEvent.Clear();
this.ListDetail.Clear();
}
public void ClearListBox()
{
for (int i = 0; i < this.CollectionListBox.Count; i++)
this.CollectionListBox[i].ClearAll();
}
private void ListBoxScrollUp(int value)
{
if (this.CurrentCount == ListBoxLineCount || (this.CurrentCount < ListBoxLineCount && this.CurrentCount == this.TotalCount))
return;
int start = 0, last = 0;
this.ClearListBox();
if (this.CurrentCount - value <= ListBoxLineCount)
{
start = 0;
last = ListBoxLineCount;
this.CurrentCount = ListBoxLineCount;
}
else
{
this.CurrentCount = this.CurrentCount - value;
start = this.CurrentCount - ListBoxLineCount;
last = this.CurrentCount;
}
for (int i = start; i < last; i++)
{
this.listBoxTime.AddItem(this.ListTime[i]);
this.listBoxLoginID.AddItem(this.ListLoginID[i]);
this.listBoxEvent.AddItem(this.ListEvent[i]);
this.listBoxDetail.AddItem(this.ListDetail[i]);
}
this.UpdateListBoxCount();
}
private void ListBoxScrollDown(int value)
{
if (this.TotalCount == this.CurrentCount)
return;
int start = 0, last = 0;
this.ClearListBox();
if (this.CurrentCount + value >= this.TotalCount)
{
start = this.TotalCount - ListBoxLineCount;
last = this.TotalCount;
this.CurrentCount = this.TotalCount;
}
else
{
this.CurrentCount = this.CurrentCount + value;
start = this.CurrentCount - ListBoxLineCount;
last = this.CurrentCount;
}
for (int i = start; i < last; i++)
{
this.listBoxTime.AddItem(this.ListTime[i]);
this.listBoxLoginID.AddItem(this.ListLoginID[i]);
this.listBoxEvent.AddItem(this.ListEvent[i]);
this.listBoxDetail.AddItem(this.ListDetail[i]);
}
this.UpdateListBoxCount();
}
private List<string> DayHistoryDirectorySort(FileInfo[] files) private List<string> DayHistoryDirectorySort(FileInfo[] files)
{ {
@ -364,33 +263,91 @@ namespace ITC81DB_0H.Controls
} }
} }
// 사용안함 public void ClearData()
public void LoadFile(string fullFilePath)
{ {
this.smartFile1.FilePathName = fullFilePath; this.CollectionData.Clear();
this.smartFile1.Open(2000000);
this.smartFile1.ReadStringAllBuffer();
try this.ListTime.Clear();
{ this.ListLoginID.Clear();
long lineNum = this.smartFile1.GetCount(); this.ListEvent.Clear();
this.TotalCount = (int)lineNum; this.ListDetail.Clear();
for (int i = 1; i < lineNum; i++) }
{ public void ClearListBox()
this.UpdateListBoxDataDisplay(this.smartFile1.ReadStringBuffer(i)); {
} for (int i = 0; i < this.CollectionListBox.Count; i++)
} this.CollectionListBox[i].ClearAll();
catch
{
DialogFormMessage myMsg = new DialogFormMessage(16, this.ParentForm.ParentForm.SystemConfig1.Language);
myMsg.ShowDialog();
this.smartFile1.Close();
}
this.smartFile1.Close();
} }
private void ListBoxScrollUp(int value)
{
if (this.CurrentCount == ListBoxLineCount || (this.CurrentCount < ListBoxLineCount && this.CurrentCount == this.TotalCount)
|| this.listBoxTime.ItemCount == 0)
return;
int startIndex = 0, endIndex = 0;
this.ClearData();
this.ClearListBox();
if (this.CurrentCount - value <= ListBoxLineCount)
{
startIndex = 0 + 1;
endIndex = ListBoxLineCount + 1;
this.CurrentCount = ListBoxLineCount;
}
else
{
this.CurrentCount = this.CurrentCount - value;
startIndex = this.CurrentCount - ListBoxLineCount;
endIndex = this.CurrentCount;
}
this.UpdateData(startIndex, endIndex);
}
private void ListBoxScrollDown(int value)
{
if (this.TotalCount == this.CurrentCount || this.listBoxTime.ItemCount == 0)
return;
int startIndex = 0, endIndex = 0;
this.ClearData();
this.ClearListBox();
if (this.CurrentCount + value >= this.TotalCount)
{
startIndex = this.TotalCount - ListBoxLineCount;
endIndex = this.TotalCount;
this.CurrentCount = this.TotalCount;
}
else
{
this.CurrentCount = this.CurrentCount + value;
startIndex = this.CurrentCount - ListBoxLineCount;
endIndex = this.CurrentCount;
}
this.UpdateData(startIndex, endIndex);
}
private void UpdateData(int startIndex, int endIndex)
{
for (int i = startIndex; i < endIndex; i++)
this.CollectionData.Add(this.smartFile1.ReadStringBuffer(i).Split(','));
this.UpdateListData();
this.UpdateListBoxDataDisplay();
this.UpdateListBoxCount();
}
private void UpdateListBoxCount()
{
this.labelTotalIndex.Text = this.TotalCount.ToString();
this.labelCurrentIndex.Text = this.CurrentCount.ToString();
}
private void UpdateListData() private void UpdateListData()
{ {
// List Item Add // List Item Add
@ -402,36 +359,20 @@ namespace ITC81DB_0H.Controls
this.ListDetail.Add(this.CollectionData[i][4]); this.ListDetail.Add(this.CollectionData[i][4]);
} }
} }
private void UpdateInitialListBoxDataDisplay() private void UpdateListBoxDataDisplay()
{ {
if (this.TotalCount > ListBoxLineCount) for (int i = 0; i < this.ListTime.Count; i++)
{ {
for (int i = this.CurrentCount - ListBoxLineCount; i < this.TotalCount; i++) this.listBoxTime.AddItem(this.ListTime[i]);
{ this.listBoxLoginID.AddItem(this.ListLoginID[i]);
this.listBoxTime.AddItem(this.ListTime[i]); this.listBoxEvent.AddItem(this.ListEvent[i]);
this.listBoxLoginID.AddItem(this.ListLoginID[i]); this.listBoxDetail.AddItem(this.ListDetail[i]);
this.listBoxEvent.AddItem(this.ListEvent[i]);
this.listBoxDetail.AddItem(this.ListDetail[i]);
}
}
else
{
for (int i = 0; i < this.TotalCount; i++)
{
this.listBoxTime.AddItem(this.ListTime[i]);
this.listBoxLoginID.AddItem(this.ListLoginID[i]);
this.listBoxEvent.AddItem(this.ListEvent[i]);
this.listBoxDetail.AddItem(this.ListDetail[i]);
}
} }
} }
public void LoadFileLast15Datas(string fullFilePath)
{
int flag = 0;
this.smartFile1.FilePathName = fullFilePath; public void LoadDatas(string fullFilePath)
this.smartFile1.Open(2000000); {
this.smartFile1.ReadStringAllBuffer(); int startIndex = 0, endIndex = 0;
try try
{ {
@ -440,35 +381,42 @@ namespace ITC81DB_0H.Controls
this.ParentForm.SplashStart(); this.ParentForm.SplashStart();
long lineNum = this.smartFile1.GetCount(); this.smartFile1.FilePathName = fullFilePath;
for (int i = 0; i < lineNum; i++) if (this.smartFile1.Open(2000000) == true)
this.IsFileOpen = true;
bool bValue = this.smartFile1.ReadStringAllBuffer();
if (bValue == false)
{ {
if (flag == 100) this.smartFile1.Close();
{ this.IsFileOpen = false;
Thread.Sleep(5); return;
flag = 0;
}
this.CollectionData.Add(this.smartFile1.ReadStringBuffer(i).Split(','));
flag++;
} }
this.smartFile1.Close();
this.CollectionData.RemoveAt(0);
this.TotalCount = this.CollectionData.Count; long lineNum = this.smartFile1.GetCount();
this.TotalCount = (int)lineNum;
if (this.TotalCount > ListBoxLineCount)
{
startIndex = this.TotalCount - ListBoxLineCount;
endIndex = this.TotalCount;
}
else
{
startIndex = 0 + 1; // 맨 첫 줄은 제목
endIndex = this.TotalCount;
}
this.TotalCount = (int)lineNum - 1; // 맨 첫 줄 제외
this.CurrentCount = this.TotalCount; this.CurrentCount = this.TotalCount;
this.labelFind.Text = this.CurrentCount.ToString();
// File Name // File Name
string[] data = fullFilePath.Split('\\'); string[] data = fullFilePath.Split('\\');
this.labelFileName.Text = data[data.Length - 1]; this.labelFileName.Text = data[data.Length - 1];
// List<string> 갱신
this.UpdateListData();
// listBox 표시
this.UpdateInitialListBoxDataDisplay();
this.UpdateListBoxCount(); this.UpdateData(startIndex, endIndex);
this.labelFind.Text = this.CurrentCount.ToString();
this.smartFile1.Close();
this.ParentForm.SplashFinish(); this.ParentForm.SplashFinish();
this.Enabled = true; this.Enabled = true;
@ -477,8 +425,18 @@ namespace ITC81DB_0H.Controls
{ {
DialogFormMessage myMsg = new DialogFormMessage(16, this.ParentForm.ParentForm.SystemConfig1.Language); DialogFormMessage myMsg = new DialogFormMessage(16, this.ParentForm.ParentForm.SystemConfig1.Language);
myMsg.ShowDialog(); myMsg.ShowDialog();
this.smartFile1.Close();
this.ParentForm.SplashFinish(); this.ParentForm.SplashFinish();
this.smartFile1.Close();
this.IsFileOpen = false;
this.Enabled = true;
}
}
public void FileClose()
{
if (this.IsFileOpen == true)
{
this.smartFile1.Close();
this.IsFileOpen = false;
} }
} }
@ -488,10 +446,11 @@ namespace ITC81DB_0H.Controls
this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus);
this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu);
this.UpdateDisplayFile();
this.treeView.ExpandAll();
this.UpdateInitialStatus(); this.UpdateInitialStatus();
this.UpdateFileList();
this.treeView.ExpandAll();
this.TotalCount = 0; this.TotalCount = 0;
this.SelectedNodeFullPath = "";
if (int.Parse(this.labelCount.Text) == 0) if (int.Parse(this.labelCount.Text) == 0)
{ {
@ -512,7 +471,7 @@ namespace ITC81DB_0H.Controls
else else
e.Node.Checked = true; e.Node.Checked = true;
this.labelFileName.Text = e.Node.Text; //this.labelFileName.Text = e.Node.Text;
this.SelectedNodeFullPath = this.treeView.SelectedNode.FullPath; this.SelectedNodeFullPath = this.treeView.SelectedNode.FullPath;
} }
//else //else
@ -526,12 +485,18 @@ namespace ITC81DB_0H.Controls
} }
private void buttonRead_Click(object sender, EventArgs e) private void buttonRead_Click(object sender, EventArgs e)
{ {
if (this.labelFileName.Text == "" || this.labelFileName.Text == null) if (this.SelectedNodeFullPath == "" || this.SelectedNodeFullPath == null)
return; return;
if (this.IsFileOpen == true)
{
this.smartFile1.Close();
this.IsFileOpen = false;
}
this.Enabled = false; this.Enabled = false;
this.LoadFileLast15Datas(this.ParentForm.ParentForm.PathDataHistoryFolder + this.SelectedNodeFullPath); this.LoadDatas(this.ParentForm.ParentForm.PathDataHistoryFolder + this.SelectedNodeFullPath);
} }
private void labelFind_Click(object sender, EventArgs e) private void labelFind_Click(object sender, EventArgs e)
@ -565,55 +530,45 @@ namespace ITC81DB_0H.Controls
if (this.labelFind.Text == "" || this.labelFind.Text == null || this.listBoxTime.ItemCount == 0) if (this.labelFind.Text == "" || this.labelFind.Text == null || this.listBoxTime.ItemCount == 0)
return; return;
int start = 0, last = 0; int startIndex = 0, endIndex = 0;
int index = int.Parse(this.labelFind.Text); int index = int.Parse(this.labelFind.Text);
try try
{ {
this.ClearData();
this.ClearListBox(); this.ClearListBox();
if (this.TotalCount > ListBoxLineCount) if (this.TotalCount > ListBoxLineCount)
{ {
if (index - ListBoxLineCount < 0) if (index - ListBoxLineCount < 0)
{ {
start = 0; startIndex = 0 + 1;
last = ListBoxLineCount; endIndex = ListBoxLineCount + 1;
this.CurrentCount = ListBoxLineCount; this.CurrentCount = ListBoxLineCount;
} }
else else
{ {
start = index - ListBoxLineCount; startIndex = index - ListBoxLineCount;
last = index; endIndex = index;
this.CurrentCount = index; this.CurrentCount = index;
} }
} }
else else
{ {
start = 0; startIndex = 0 + 1;
last = this.TotalCount; endIndex = this.TotalCount + 1;
this.CurrentCount = this.TotalCount; this.CurrentCount = this.TotalCount;
} }
for (int i = start; i < last; i++) this.UpdateData(startIndex, endIndex);
{
this.listBoxTime.AddItem(this.ListTime[i]);
this.listBoxLoginID.AddItem(this.ListLoginID[i]);
this.listBoxEvent.AddItem(this.ListEvent[i]);
this.listBoxDetail.AddItem(this.ListDetail[i]);
}
this.UpdateListBoxCount();
this.smartFile1.Close();
} }
catch catch
{ {
DialogFormMessage myMsg = new DialogFormMessage(16, this.ParentForm.ParentForm.SystemConfig1.Language); DialogFormMessage myMsg = new DialogFormMessage(16, this.ParentForm.ParentForm.SystemConfig1.Language);
myMsg.ShowDialog(); myMsg.ShowDialog();
this.smartFile1.Close();
} }
} }
@ -630,13 +585,6 @@ namespace ITC81DB_0H.Controls
{ {
this.ListBoxScrollDown(ListBoxLineCount); this.ListBoxScrollDown(ListBoxLineCount);
} }
private void listBox_Click(object sender, EventArgs e)
{
SmartX.SmartListBox listBox = sender as SmartX.SmartListBox;
listBox.SelectItemIndex = -1;
}
#endregion #endregion
} }
} }

30
ITC81DB_0H/Controls/CenterLog/ControlCenterLogHistory.designer.cs generated
View File

@ -39,6 +39,7 @@
this.listBoxDetail = new SmartX.SmartListBox(); this.listBoxDetail = new SmartX.SmartListBox();
this.listBoxEvent = new SmartX.SmartListBox(); this.listBoxEvent = new SmartX.SmartListBox();
this.listBoxTime = new SmartX.SmartListBox(); this.listBoxTime = new SmartX.SmartListBox();
this.treeView = new System.Windows.Forms.TreeView();
this.labelTotalIndex = new SmartX.SmartLabel(); this.labelTotalIndex = new SmartX.SmartLabel();
this.labelCurrentIndex = new SmartX.SmartLabel(); this.labelCurrentIndex = new SmartX.SmartLabel();
this.smartSeparatorLine1 = new SmartX.SmartSeparatorLine(); this.smartSeparatorLine1 = new SmartX.SmartSeparatorLine();
@ -53,7 +54,6 @@
this.labelCount = new SmartX.SmartLabel(); this.labelCount = new SmartX.SmartLabel();
this.buttonBackup = new SmartX.SmartButton(); this.buttonBackup = new SmartX.SmartButton();
this.smartFile1 = new SmartX.SmartFile(); this.smartFile1 = new SmartX.SmartFile();
this.treeView = new System.Windows.Forms.TreeView();
this.smartGroupBox1.SuspendLayout(); this.smartGroupBox1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
@ -94,7 +94,7 @@
this.smartGroupBox1.Location = new System.Drawing.Point(0, 0); this.smartGroupBox1.Location = new System.Drawing.Point(0, 0);
this.smartGroupBox1.Name = "smartGroupBox1"; this.smartGroupBox1.Name = "smartGroupBox1";
this.smartGroupBox1.RoundRadius = 10; this.smartGroupBox1.RoundRadius = 10;
this.smartGroupBox1.Size = new System.Drawing.Size(710, 469); this.smartGroupBox1.Size = new System.Drawing.Size(710, 470);
this.smartGroupBox1.TabIndex = 173; this.smartGroupBox1.TabIndex = 173;
this.smartGroupBox1.TextColor = System.Drawing.Color.Black; this.smartGroupBox1.TextColor = System.Drawing.Color.Black;
// //
@ -107,6 +107,7 @@
this.listBoxLoginID.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER; this.listBoxLoginID.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxLoginID.ColumnDelimiter = '\0'; this.listBoxLoginID.ColumnDelimiter = '\0';
this.listBoxLoginID.ColumnOffsets = null; this.listBoxLoginID.ColumnOffsets = null;
this.listBoxLoginID.Enabled = false;
this.listBoxLoginID.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.listBoxLoginID.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
this.listBoxLoginID.FontColor = System.Drawing.Color.Black; this.listBoxLoginID.FontColor = System.Drawing.Color.Black;
this.listBoxLoginID.InitVisible = true; this.listBoxLoginID.InitVisible = true;
@ -131,7 +132,6 @@
this.listBoxLoginID.Size = new System.Drawing.Size(68, 318); this.listBoxLoginID.Size = new System.Drawing.Size(68, 318);
this.listBoxLoginID.TabIndex = 253; this.listBoxLoginID.TabIndex = 253;
this.listBoxLoginID.Text = "smartListBox1"; this.listBoxLoginID.Text = "smartListBox1";
this.listBoxLoginID.Click += new System.EventHandler(this.listBox_Click);
// //
// smartLabel1 // smartLabel1
// //
@ -266,6 +266,7 @@
this.listBoxDetail.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER; this.listBoxDetail.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxDetail.ColumnDelimiter = '\0'; this.listBoxDetail.ColumnDelimiter = '\0';
this.listBoxDetail.ColumnOffsets = null; this.listBoxDetail.ColumnOffsets = null;
this.listBoxDetail.Enabled = false;
this.listBoxDetail.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.listBoxDetail.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
this.listBoxDetail.FontColor = System.Drawing.Color.Black; this.listBoxDetail.FontColor = System.Drawing.Color.Black;
this.listBoxDetail.InitVisible = true; this.listBoxDetail.InitVisible = true;
@ -290,7 +291,6 @@
this.listBoxDetail.Size = new System.Drawing.Size(152, 318); this.listBoxDetail.Size = new System.Drawing.Size(152, 318);
this.listBoxDetail.TabIndex = 243; this.listBoxDetail.TabIndex = 243;
this.listBoxDetail.Text = "smartListBox2"; this.listBoxDetail.Text = "smartListBox2";
this.listBoxDetail.Click += new System.EventHandler(this.listBox_Click);
// //
// listBoxEvent // listBoxEvent
// //
@ -301,6 +301,7 @@
this.listBoxEvent.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER; this.listBoxEvent.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxEvent.ColumnDelimiter = '\0'; this.listBoxEvent.ColumnDelimiter = '\0';
this.listBoxEvent.ColumnOffsets = null; this.listBoxEvent.ColumnOffsets = null;
this.listBoxEvent.Enabled = false;
this.listBoxEvent.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.listBoxEvent.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
this.listBoxEvent.FontColor = System.Drawing.Color.Black; this.listBoxEvent.FontColor = System.Drawing.Color.Black;
this.listBoxEvent.InitVisible = true; this.listBoxEvent.InitVisible = true;
@ -325,7 +326,6 @@
this.listBoxEvent.Size = new System.Drawing.Size(118, 318); this.listBoxEvent.Size = new System.Drawing.Size(118, 318);
this.listBoxEvent.TabIndex = 242; this.listBoxEvent.TabIndex = 242;
this.listBoxEvent.Text = "smartListBox1"; this.listBoxEvent.Text = "smartListBox1";
this.listBoxEvent.Click += new System.EventHandler(this.listBox_Click);
// //
// listBoxTime // listBoxTime
// //
@ -336,6 +336,7 @@
this.listBoxTime.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER; this.listBoxTime.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxTime.ColumnDelimiter = '\0'; this.listBoxTime.ColumnDelimiter = '\0';
this.listBoxTime.ColumnOffsets = null; this.listBoxTime.ColumnOffsets = null;
this.listBoxTime.Enabled = false;
this.listBoxTime.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.listBoxTime.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
this.listBoxTime.FontColor = System.Drawing.Color.Black; this.listBoxTime.FontColor = System.Drawing.Color.Black;
this.listBoxTime.InitVisible = true; this.listBoxTime.InitVisible = true;
@ -360,7 +361,15 @@
this.listBoxTime.Size = new System.Drawing.Size(60, 318); this.listBoxTime.Size = new System.Drawing.Size(60, 318);
this.listBoxTime.TabIndex = 241; this.listBoxTime.TabIndex = 241;
this.listBoxTime.Text = "smartListBox1"; this.listBoxTime.Text = "smartListBox1";
this.listBoxTime.Click += new System.EventHandler(this.listBox_Click); //
// treeView
//
this.treeView.CheckBoxes = true;
this.treeView.Location = new System.Drawing.Point(8, 37);
this.treeView.Name = "treeView";
this.treeView.Size = new System.Drawing.Size(226, 422);
this.treeView.TabIndex = 240;
this.treeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_AfterSelect);
// //
// labelTotalIndex // labelTotalIndex
// //
@ -662,15 +671,6 @@
// //
this.smartFile1.FilePathName = null; this.smartFile1.FilePathName = null;
// //
// treeView
//
this.treeView.CheckBoxes = true;
this.treeView.Location = new System.Drawing.Point(8, 37);
this.treeView.Name = "treeView";
this.treeView.Size = new System.Drawing.Size(226, 422);
this.treeView.TabIndex = 240;
this.treeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_AfterSelect);
//
// ControlCenterLogHistory // ControlCenterLogHistory
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);

411
ITC81DB_0H/Controls/CenterLog/ControlCenterLogInspection.cs
View File

@ -27,6 +27,7 @@ namespace ITC81DB_0H.Controls
private int TotalCount; private int TotalCount;
private int CurrentCount; private int CurrentCount;
private static int ListBoxLineCount = 16; // 화면에 보여지는 listBox 줄 수 private static int ListBoxLineCount = 16; // 화면에 보여지는 listBox 줄 수
public bool IsFileOpen;
private string SelectedNodeFullPath; private string SelectedNodeFullPath;
private List<DataBackupYear> ListInspectionFile; private List<DataBackupYear> ListInspectionFile;
@ -111,6 +112,7 @@ namespace ITC81DB_0H.Controls
{ {
this.FileIndex = 0; this.FileIndex = 0;
this.TotalCount = 0; this.TotalCount = 0;
this.IsFileOpen = false;
this.ListInspectionFile = new List<DataBackupYear>(); this.ListInspectionFile = new List<DataBackupYear>();
this.CollectionData = new Collection<string[]>(); this.CollectionData = new Collection<string[]>();
@ -131,27 +133,17 @@ namespace ITC81DB_0H.Controls
this.CollectionListBox.Add(this.listBoxOver); this.CollectionListBox.Add(this.listBoxOver);
this.CollectionListBox.Add(this.listBoxWeight); this.CollectionListBox.Add(this.listBoxWeight);
} }
private void UpdateInitialStatus()
private void UpdateListBoxCount()
{ {
this.labelTotalIndex.Text = this.TotalCount.ToString(); this.labelFileName.Text = "";
this.labelCurrentIndex.Text = this.CurrentCount.ToString(); this.labelCurrentIndex.Text = "0";
} this.labelTotalIndex.Text = "0";
private void UpdateListBoxDataDisplay(string data) this.labelFind.Text = "";
{
if (data.Contains(",") == false)
return;
string[] sb = data.Split(','); this.ClearListBox();
this.ClearData();
this.listBoxTime.AddItem(sb[1]);
this.listBoxGrade.AddItem(sb[3]);
this.listBoxUnder.AddItem(sb[5]);
this.listBoxPass.AddItem(sb[6]);
this.listBoxOver.AddItem(sb[7]);
this.listBoxWeight.AddItem(sb[9]);
} }
private void UpdateDisplayFile() private void UpdateFileList()
{ {
int fileCount = 0; int fileCount = 0;
//TreeNode node; //TreeNode node;
@ -231,107 +223,21 @@ namespace ITC81DB_0H.Controls
this.labelCount.Text = fileCount.ToString(); this.labelCount.Text = fileCount.ToString();
} }
private void UpdateInitialStatus()
/// <summary>
/// 모든 자식 노드를 가져온다.
/// </summary>
/// <param name="node"></param>
/// <param name="childNodes"></param>
public void GetAllChildNodes(TreeNode node, ref List<TreeNode> childNodes)
{ {
this.labelFileName.Text = ""; foreach (TreeNode subNode in node.Nodes)
this.labelCurrentIndex.Text = "0"; {
this.labelTotalIndex.Text = "0"; childNodes.Add(subNode);
this.labelFind.Text = "";
this.ClearListBox(); this.GetAllChildNodes(subNode, ref childNodes);
this.ClearData(); }
} }
public void ClearData()
{
this.CollectionData.Clear();
this.ListTime.Clear();
this.ListGrade.Clear();
this.ListUnder.Clear();
this.ListPass.Clear();
this.ListOver.Clear();
this.ListWeight.Clear();
}
public void ClearListBox()
{
for (int i = 0; i < this.CollectionListBox.Count; i++)
this.CollectionListBox[i].ClearAll();
}
private void ListBoxScrollUp(int value)
{
if (this.CurrentCount == ListBoxLineCount || (this.CurrentCount < ListBoxLineCount && this.CurrentCount == this.TotalCount))
return;
int start = 0, last = 0;
this.ClearListBox();
if (this.CurrentCount - value <= ListBoxLineCount)
{
start = 0;
last = ListBoxLineCount;
this.CurrentCount = ListBoxLineCount;
}
else
{
this.CurrentCount = this.CurrentCount - value;
start = this.CurrentCount - ListBoxLineCount;
last = this.CurrentCount;
}
for (int i = start; i < last; i++)
{
this.listBoxTime.AddItem(this.ListTime[i]);
this.listBoxGrade.AddItem(this.ListGrade[i]);
this.listBoxUnder.AddItem(this.ListUnder[i]);
this.listBoxPass.AddItem(this.ListPass[i]);
this.listBoxOver.AddItem(this.ListOver[i]);
this.listBoxWeight.AddItem(this.ListWeight[i]);
}
this.UpdateListBoxCount();
}
private void ListBoxScrollDown(int value)
{
if (this.TotalCount == this.CurrentCount)
return;
int start = 0, last = 0;
this.ClearListBox();
if (this.CurrentCount + value >= this.TotalCount)
{
start = this.TotalCount - ListBoxLineCount;
last = this.TotalCount;
this.CurrentCount = this.TotalCount;
}
else
{
this.CurrentCount = this.CurrentCount + value;
start = this.CurrentCount - ListBoxLineCount;
last = this.CurrentCount;
}
for (int i = start; i < last; i++)
{
this.listBoxTime.AddItem(this.ListTime[i]);
this.listBoxGrade.AddItem(this.ListGrade[i]);
this.listBoxUnder.AddItem(this.ListUnder[i]);
this.listBoxPass.AddItem(this.ListPass[i]);
this.listBoxOver.AddItem(this.ListOver[i]);
this.listBoxWeight.AddItem(this.ListWeight[i]);
}
this.UpdateListBoxCount();
}
private List<string> DayInspectionDirectorySort(FileInfo[] files) private List<string> DayInspectionDirectorySort(FileInfo[] files)
{ {
List<string> listFile = new List<string>(); List<string> listFile = new List<string>();
@ -381,33 +287,88 @@ namespace ITC81DB_0H.Controls
} }
} }
// 사용안함 public void ClearData()
public void LoadFile(string fullFilePath)
{ {
this.smartFile1.FilePathName = fullFilePath; this.CollectionData.Clear();
this.smartFile1.Open(2000000);
this.smartFile1.ReadStringAllBuffer();
try this.ListTime.Clear();
{ this.ListGrade.Clear();
long lineNum = this.smartFile1.GetCount(); this.ListUnder.Clear();
this.TotalCount = (int)lineNum; this.ListPass.Clear();
for (int i = 1; i < lineNum; i++) this.ListOver.Clear();
{ this.ListWeight.Clear();
this.UpdateListBoxDataDisplay(this.smartFile1.ReadStringBuffer(i)); }
} public void ClearListBox()
} {
catch for (int i = 0; i < this.CollectionListBox.Count; i++)
{ this.CollectionListBox[i].ClearAll();
DialogFormMessage myMsg = new DialogFormMessage(16, this.ParentForm.ParentForm.SystemConfig1.Language);
myMsg.ShowDialog();
this.smartFile1.Close();
}
this.smartFile1.Close();
} }
private void ListBoxScrollUp(int value)
{
if (this.CurrentCount == ListBoxLineCount || (this.CurrentCount < ListBoxLineCount && this.CurrentCount == this.TotalCount)
|| this.listBoxTime.ItemCount == 0)
return;
int startIndex = 0, endIndex = 0;
this.ClearData();
this.ClearListBox();
if (this.CurrentCount - value <= ListBoxLineCount)
{
startIndex = 0 + 1;
endIndex = ListBoxLineCount + 1;
this.CurrentCount = ListBoxLineCount;
}
else
{
this.CurrentCount = this.CurrentCount - value;
startIndex = this.CurrentCount - ListBoxLineCount;
endIndex = this.CurrentCount;
}
this.UpdateData(startIndex, endIndex);
}
private void ListBoxScrollDown(int value)
{
if (this.TotalCount == this.CurrentCount || this.listBoxTime.ItemCount == 0)
return;
int startIndex = 0, endIndex = 0;
this.ClearData();
this.ClearListBox();
if (this.CurrentCount + value >= this.TotalCount)
{
startIndex = this.TotalCount - ListBoxLineCount;
endIndex = this.TotalCount;
this.CurrentCount = this.TotalCount;
}
else
{
this.CurrentCount = this.CurrentCount + value;
startIndex = this.CurrentCount - ListBoxLineCount;
endIndex = this.CurrentCount;
}
this.UpdateData(startIndex, endIndex);
}
private void UpdateData(int startIndex, int endIndex)
{
for (int i = startIndex; i < endIndex; i++)
this.CollectionData.Add(this.smartFile1.ReadStringBuffer(i).Split(','));
this.UpdateListData();
this.UpdateListBoxDataDisplay();
this.UpdateListBoxCount();
}
private void UpdateListData() private void UpdateListData()
{ {
// List Item Add // List Item Add
@ -421,40 +382,29 @@ namespace ITC81DB_0H.Controls
this.ListWeight.Add(this.CollectionData[i][9]); this.ListWeight.Add(this.CollectionData[i][9]);
} }
} }
private void UpdateInitialListBoxDataDisplay() private void UpdateListBoxCount()
{ {
if (this.TotalCount > ListBoxLineCount) this.labelTotalIndex.Text = this.TotalCount.ToString();
this.labelCurrentIndex.Text = this.CurrentCount.ToString();
}
private void UpdateListBoxDataDisplay()
{
for (int i = 0; i < this.ListTime.Count; i++)
{ {
for (int i = this.CurrentCount - ListBoxLineCount; i < this.TotalCount; i++) this.listBoxTime.AddItem(this.ListTime[i]);
{ this.listBoxGrade.AddItem(this.ListGrade[i]);
this.listBoxTime.AddItem(this.ListTime[i]); this.listBoxUnder.AddItem(this.ListUnder[i]);
this.listBoxGrade.AddItem(this.ListGrade[i]); this.listBoxPass.AddItem(this.ListPass[i]);
this.listBoxUnder.AddItem(this.ListUnder[i]); this.listBoxOver.AddItem(this.ListOver[i]);
this.listBoxPass.AddItem(this.ListPass[i]); this.listBoxWeight.AddItem(this.ListWeight[i]);
this.listBoxOver.AddItem(this.ListOver[i]);
this.listBoxWeight.AddItem(this.ListWeight[i]);
}
}
else
{
for (int i = 0; i < this.TotalCount; i++)
{
this.listBoxTime.AddItem(this.ListTime[i]);
this.listBoxGrade.AddItem(this.ListGrade[i]);
this.listBoxUnder.AddItem(this.ListUnder[i]);
this.listBoxPass.AddItem(this.ListPass[i]);
this.listBoxOver.AddItem(this.ListOver[i]);
this.listBoxWeight.AddItem(this.ListWeight[i]);
}
} }
} }
public void LoadFileLast15Datas(string fullFilePath)
{
int flag = 0;
this.smartFile1.FilePathName = fullFilePath; public void LoadDatas(string fullFilePath)
this.smartFile1.Open(2000000); {
this.smartFile1.ReadStringAllBuffer(); // 맨 끝 ListBoxLineCount 만큼의 데이터 Load
int startIndex = 0, endIndex = 0;
try try
{ {
@ -463,73 +413,77 @@ namespace ITC81DB_0H.Controls
this.ParentForm.SplashStart(); this.ParentForm.SplashStart();
long lineNum = this.smartFile1.GetCount(); this.smartFile1.FilePathName = fullFilePath;
for (int i = 0; i < lineNum; i++) if (this.smartFile1.Open(2000000) == true)
this.IsFileOpen = true;
bool bValue = this.smartFile1.ReadStringAllBuffer();
if (bValue == false)
{ {
if (flag == 100) this.smartFile1.Close();
{ this.IsFileOpen = false;
Thread.Sleep(5); return;
flag = 0;
}
this.CollectionData.Add(this.smartFile1.ReadStringBuffer(i).Split(','));
flag++;
} }
this.smartFile1.Close();
this.CollectionData.RemoveAt(0);
this.TotalCount = this.CollectionData.Count; long lineNum = this.smartFile1.GetCount();
this.TotalCount = (int)lineNum;
if (this.TotalCount > ListBoxLineCount)
{
startIndex = this.TotalCount - ListBoxLineCount;
endIndex = this.TotalCount;
}
else
{
startIndex = 0 + 1; // 맨 첫 줄은 제목
endIndex = this.TotalCount;
}
this.TotalCount = (int)lineNum - 1; // 맨 첫 줄 제외
this.CurrentCount = this.TotalCount; this.CurrentCount = this.TotalCount;
this.labelFind.Text = this.CurrentCount.ToString();
this.UpdateData(startIndex, endIndex);
// File Name // File Name
string[] data = fullFilePath.Split('\\'); string[] data = fullFilePath.Split('\\');
this.labelFileName.Text = data[data.Length - 1]; this.labelFileName.Text = data[data.Length - 1];
// List<string> 갱신
this.UpdateListData();
// listBox 표시
this.UpdateInitialListBoxDataDisplay();
this.UpdateListBoxCount();
this.labelFind.Text = this.CurrentCount.ToString();
this.smartFile1.Close();
this.ParentForm.SplashFinish(); this.ParentForm.SplashFinish();
this.Enabled = true; this.Enabled = true;
} }
catch catch (Exception ex)
{ {
FormMain.Exception(ex);
DialogFormMessage myMsg = new DialogFormMessage(16, this.ParentForm.ParentForm.SystemConfig1.Language); DialogFormMessage myMsg = new DialogFormMessage(16, this.ParentForm.ParentForm.SystemConfig1.Language);
myMsg.ShowDialog(); myMsg.ShowDialog();
this.smartFile1.Close();
this.ParentForm.SplashFinish(); this.ParentForm.SplashFinish();
this.smartFile1.Close();
this.IsFileOpen = false;
this.Enabled = true;
} }
} }
public void FileClose()
/// <summary>
/// 모든 자식 노드를 가져온다.
/// </summary>
/// <param name="node"></param>
/// <param name="childNodes"></param>
public void GetAllChildNodes(TreeNode node, ref List<TreeNode> childNodes)
{ {
foreach(TreeNode subNode in node.Nodes) if (this.IsFileOpen == true)
{ {
childNodes.Add(subNode); this.smartFile1.Close();
this.IsFileOpen = false;
this.GetAllChildNodes(subNode, ref childNodes);
} }
} }
public void DisplayRefresh(SystemStatus status) public void DisplayRefresh(SystemStatus status)
{ {
this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.LogJudge; this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.LogInspection;
this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus);
this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu);
this.UpdateDisplayFile();
this.treeView.ExpandAll();
this.UpdateInitialStatus(); this.UpdateInitialStatus();
this.UpdateFileList();
this.treeView.ExpandAll();
this.TotalCount = 0; this.TotalCount = 0;
this.SelectedNodeFullPath = "";
if (int.Parse(this.labelCount.Text) == 0) if (int.Parse(this.labelCount.Text) == 0)
{ {
@ -550,7 +504,7 @@ namespace ITC81DB_0H.Controls
else else
e.Node.Checked = true; e.Node.Checked = true;
this.labelFileName.Text = e.Node.Text; //this.labelFileName.Text = e.Node.Text;
this.SelectedNodeFullPath = this.treeView.SelectedNode.FullPath; this.SelectedNodeFullPath = this.treeView.SelectedNode.FullPath;
} }
//else //else
@ -571,12 +525,18 @@ namespace ITC81DB_0H.Controls
private void buttonRead_Click(object sender, EventArgs e) private void buttonRead_Click(object sender, EventArgs e)
{ {
if (this.labelFileName.Text == "" || this.labelFileName.Text == null) if (this.SelectedNodeFullPath == "" || this.SelectedNodeFullPath == null)
return; return;
if (this.IsFileOpen == true)
{
this.smartFile1.Close();
this.IsFileOpen = false;
}
this.Enabled = false; this.Enabled = false;
this.LoadFileLast15Datas(this.ParentForm.ParentForm.PathDataInspectionFolder + this.SelectedNodeFullPath); this.LoadDatas(this.ParentForm.ParentForm.PathDataInspectionFolder + this.SelectedNodeFullPath);
} }
private void labelFind_Click(object sender, EventArgs e) private void labelFind_Click(object sender, EventArgs e)
@ -610,57 +570,45 @@ namespace ITC81DB_0H.Controls
if (this.labelFind.Text == "" || this.labelFind.Text == null || this.listBoxTime.ItemCount == 0) if (this.labelFind.Text == "" || this.labelFind.Text == null || this.listBoxTime.ItemCount == 0)
return; return;
int start = 0, last = 0; int startIndex = 0, endIndex = 0;
int index = int.Parse(this.labelFind.Text); int index = int.Parse(this.labelFind.Text);
try try
{ {
this.ClearData();
this.ClearListBox(); this.ClearListBox();
if (this.TotalCount > ListBoxLineCount) if (this.TotalCount > ListBoxLineCount)
{ {
if (index - ListBoxLineCount < 0) if (index - ListBoxLineCount < 0)
{ {
start = 0; startIndex = 0 + 1;
last = ListBoxLineCount; endIndex = ListBoxLineCount + 1;
this.CurrentCount = ListBoxLineCount; this.CurrentCount = ListBoxLineCount;
} }
else else
{ {
start = index - ListBoxLineCount; startIndex = index - ListBoxLineCount;
last = index; endIndex = index;
this.CurrentCount = index; this.CurrentCount = index;
} }
} }
else else
{ {
start = 0; startIndex = 0 + 1;
last = this.TotalCount; endIndex = this.TotalCount + 1;
this.CurrentCount = this.TotalCount; this.CurrentCount = this.TotalCount;
} }
for (int i = start; i < last; i++) this.UpdateData(startIndex, endIndex);
{
this.listBoxTime.AddItem(this.ListTime[i]);
this.listBoxGrade.AddItem(this.ListGrade[i]);
this.listBoxUnder.AddItem(this.ListUnder[i]);
this.listBoxPass.AddItem(this.ListPass[i]);
this.listBoxOver.AddItem(this.ListOver[i]);
this.listBoxWeight.AddItem(this.ListWeight[i]);
}
this.UpdateListBoxCount();
this.smartFile1.Close();
} }
catch catch
{ {
DialogFormMessage myMsg = new DialogFormMessage(16, this.ParentForm.ParentForm.SystemConfig1.Language); DialogFormMessage myMsg = new DialogFormMessage(16, this.ParentForm.ParentForm.SystemConfig1.Language);
myMsg.ShowDialog(); myMsg.ShowDialog();
this.smartFile1.Close();
} }
} }
@ -677,13 +625,6 @@ namespace ITC81DB_0H.Controls
{ {
this.ListBoxScrollDown(ListBoxLineCount); this.ListBoxScrollDown(ListBoxLineCount);
} }
private void listBox_Click(object sender, EventArgs e)
{
SmartX.SmartListBox listBox = sender as SmartX.SmartListBox;
listBox.SelectItemIndex = -1;
}
#endregion #endregion
} }
} }

14
ITC81DB_0H/Controls/CenterLog/ControlCenterLogInspection.designer.cs generated
View File

@ -102,7 +102,7 @@
this.smartGroupBox1.Location = new System.Drawing.Point(0, 0); this.smartGroupBox1.Location = new System.Drawing.Point(0, 0);
this.smartGroupBox1.Name = "smartGroupBox1"; this.smartGroupBox1.Name = "smartGroupBox1";
this.smartGroupBox1.RoundRadius = 10; this.smartGroupBox1.RoundRadius = 10;
this.smartGroupBox1.Size = new System.Drawing.Size(710, 469); this.smartGroupBox1.Size = new System.Drawing.Size(710, 470);
this.smartGroupBox1.TabIndex = 173; this.smartGroupBox1.TabIndex = 173;
this.smartGroupBox1.TextColor = System.Drawing.Color.Black; this.smartGroupBox1.TextColor = System.Drawing.Color.Black;
// //
@ -115,6 +115,7 @@
this.listBoxPass.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER; this.listBoxPass.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxPass.ColumnDelimiter = '\0'; this.listBoxPass.ColumnDelimiter = '\0';
this.listBoxPass.ColumnOffsets = null; this.listBoxPass.ColumnOffsets = null;
this.listBoxPass.Enabled = false;
this.listBoxPass.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.listBoxPass.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
this.listBoxPass.FontColor = System.Drawing.Color.Black; this.listBoxPass.FontColor = System.Drawing.Color.Black;
this.listBoxPass.InitVisible = true; this.listBoxPass.InitVisible = true;
@ -139,7 +140,6 @@
this.listBoxPass.Size = new System.Drawing.Size(62, 318); this.listBoxPass.Size = new System.Drawing.Size(62, 318);
this.listBoxPass.TabIndex = 251; this.listBoxPass.TabIndex = 251;
this.listBoxPass.Text = "smartListBox3"; this.listBoxPass.Text = "smartListBox3";
this.listBoxPass.Click += new System.EventHandler(this.listBox_Click);
// //
// smartLabel1 // smartLabel1
// //
@ -274,6 +274,7 @@
this.listBoxWeight.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER; this.listBoxWeight.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxWeight.ColumnDelimiter = '\0'; this.listBoxWeight.ColumnDelimiter = '\0';
this.listBoxWeight.ColumnOffsets = null; this.listBoxWeight.ColumnOffsets = null;
this.listBoxWeight.Enabled = false;
this.listBoxWeight.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.listBoxWeight.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
this.listBoxWeight.FontColor = System.Drawing.Color.Black; this.listBoxWeight.FontColor = System.Drawing.Color.Black;
this.listBoxWeight.InitVisible = true; this.listBoxWeight.InitVisible = true;
@ -298,7 +299,6 @@
this.listBoxWeight.Size = new System.Drawing.Size(76, 318); this.listBoxWeight.Size = new System.Drawing.Size(76, 318);
this.listBoxWeight.TabIndex = 245; this.listBoxWeight.TabIndex = 245;
this.listBoxWeight.Text = "smartListBox4"; this.listBoxWeight.Text = "smartListBox4";
this.listBoxWeight.Click += new System.EventHandler(this.listBox_Click);
// //
// listBoxOver // listBoxOver
// //
@ -309,6 +309,7 @@
this.listBoxOver.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER; this.listBoxOver.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxOver.ColumnDelimiter = '\0'; this.listBoxOver.ColumnDelimiter = '\0';
this.listBoxOver.ColumnOffsets = null; this.listBoxOver.ColumnOffsets = null;
this.listBoxOver.Enabled = false;
this.listBoxOver.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.listBoxOver.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
this.listBoxOver.FontColor = System.Drawing.Color.Black; this.listBoxOver.FontColor = System.Drawing.Color.Black;
this.listBoxOver.InitVisible = true; this.listBoxOver.InitVisible = true;
@ -333,7 +334,6 @@
this.listBoxOver.Size = new System.Drawing.Size(62, 318); this.listBoxOver.Size = new System.Drawing.Size(62, 318);
this.listBoxOver.TabIndex = 244; this.listBoxOver.TabIndex = 244;
this.listBoxOver.Text = "smartListBox3"; this.listBoxOver.Text = "smartListBox3";
this.listBoxOver.Click += new System.EventHandler(this.listBox_Click);
// //
// listBoxUnder // listBoxUnder
// //
@ -344,6 +344,7 @@
this.listBoxUnder.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER; this.listBoxUnder.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxUnder.ColumnDelimiter = '\0'; this.listBoxUnder.ColumnDelimiter = '\0';
this.listBoxUnder.ColumnOffsets = null; this.listBoxUnder.ColumnOffsets = null;
this.listBoxUnder.Enabled = false;
this.listBoxUnder.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.listBoxUnder.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
this.listBoxUnder.FontColor = System.Drawing.Color.Black; this.listBoxUnder.FontColor = System.Drawing.Color.Black;
this.listBoxUnder.InitVisible = true; this.listBoxUnder.InitVisible = true;
@ -368,7 +369,6 @@
this.listBoxUnder.Size = new System.Drawing.Size(62, 318); this.listBoxUnder.Size = new System.Drawing.Size(62, 318);
this.listBoxUnder.TabIndex = 243; this.listBoxUnder.TabIndex = 243;
this.listBoxUnder.Text = "smartListBox2"; this.listBoxUnder.Text = "smartListBox2";
this.listBoxUnder.Click += new System.EventHandler(this.listBox_Click);
// //
// listBoxGrade // listBoxGrade
// //
@ -379,6 +379,7 @@
this.listBoxGrade.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER; this.listBoxGrade.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxGrade.ColumnDelimiter = '\0'; this.listBoxGrade.ColumnDelimiter = '\0';
this.listBoxGrade.ColumnOffsets = null; this.listBoxGrade.ColumnOffsets = null;
this.listBoxGrade.Enabled = false;
this.listBoxGrade.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.listBoxGrade.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
this.listBoxGrade.FontColor = System.Drawing.Color.Black; this.listBoxGrade.FontColor = System.Drawing.Color.Black;
this.listBoxGrade.InitVisible = true; this.listBoxGrade.InitVisible = true;
@ -403,7 +404,6 @@
this.listBoxGrade.Size = new System.Drawing.Size(74, 318); this.listBoxGrade.Size = new System.Drawing.Size(74, 318);
this.listBoxGrade.TabIndex = 242; this.listBoxGrade.TabIndex = 242;
this.listBoxGrade.Text = "smartListBox1"; this.listBoxGrade.Text = "smartListBox1";
this.listBoxGrade.Click += new System.EventHandler(this.listBox_Click);
// //
// listBoxTime // listBoxTime
// //
@ -414,6 +414,7 @@
this.listBoxTime.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER; this.listBoxTime.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxTime.ColumnDelimiter = '\0'; this.listBoxTime.ColumnDelimiter = '\0';
this.listBoxTime.ColumnOffsets = null; this.listBoxTime.ColumnOffsets = null;
this.listBoxTime.Enabled = false;
this.listBoxTime.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.listBoxTime.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
this.listBoxTime.FontColor = System.Drawing.Color.Black; this.listBoxTime.FontColor = System.Drawing.Color.Black;
this.listBoxTime.InitVisible = true; this.listBoxTime.InitVisible = true;
@ -438,7 +439,6 @@
this.listBoxTime.Size = new System.Drawing.Size(60, 318); this.listBoxTime.Size = new System.Drawing.Size(60, 318);
this.listBoxTime.TabIndex = 241; this.listBoxTime.TabIndex = 241;
this.listBoxTime.Text = "smartListBox1"; this.listBoxTime.Text = "smartListBox1";
this.listBoxTime.Click += new System.EventHandler(this.listBox_Click);
// //
// treeView // treeView
// //

320
ITC81DB_0H/Controls/CenterLog/ControlCenterLogOthers.cs
View File

@ -27,6 +27,7 @@ namespace ITC81DB_0H.Controls
private int TotalCount; private int TotalCount;
private int CurrentCount; private int CurrentCount;
private static int ListBoxLineCount = 16; // 화면에 보여지는 listBox 줄 수 private static int ListBoxLineCount = 16; // 화면에 보여지는 listBox 줄 수
public bool IsFileOpen;
private string SelectedNodeFullPath; private string SelectedNodeFullPath;
private List<DataBackupYear> ListOthersFile; private List<DataBackupYear> ListOthersFile;
@ -103,21 +104,22 @@ namespace ITC81DB_0H.Controls
{ {
this.FileIndex = 0; this.FileIndex = 0;
this.TotalCount = 0; this.TotalCount = 0;
this.IsFileOpen = false;
this.ListOthersFile = new List<DataBackupYear>(); this.ListOthersFile = new List<DataBackupYear>();
this.CollectionData = new Collection<string>(); this.CollectionData = new Collection<string>();
} }
private void UpdateInitialStatus()
{
this.labelFileName.Text = "";
this.labelCurrentIndex.Text = "0";
this.labelTotalIndex.Text = "0";
this.labelFind.Text = "";
private void UpdateListBoxCount() this.ClearData();
{ this.ClearListBox();
this.labelTotalIndex.Text = this.TotalCount.ToString();
this.labelCurrentIndex.Text = this.CurrentCount.ToString();
} }
private void UpdateListBoxDataDisplay(string data) private void UpdateFileList()
{
this.listBoxLog.AddItem(data);
}
private void UpdateDisplayFile()
{ {
int fileCount = 0; int fileCount = 0;
//TreeNode node; //TreeNode node;
@ -197,88 +199,6 @@ namespace ITC81DB_0H.Controls
this.labelCount.Text = fileCount.ToString(); this.labelCount.Text = fileCount.ToString();
} }
private void UpdateInitialStatus()
{
this.labelFileName.Text = "";
this.labelCurrentIndex.Text = "0";
this.labelTotalIndex.Text = "0";
this.labelFind.Text = "";
this.ClearData();
this.ClearListBox();
}
public void ClearData()
{
this.CollectionData.Clear();
}
public void ClearListBox()
{
this.listBoxLog.ClearAll();
}
private void ListBoxScrollUp(int value)
{
if (this.CurrentCount == ListBoxLineCount || (this.CurrentCount < ListBoxLineCount && this.CurrentCount == this.TotalCount))
return;
int start = 0, last = 0;
this.ClearListBox();
if (this.CurrentCount - value <= ListBoxLineCount)
{
start = 0;
last = ListBoxLineCount;
this.CurrentCount = ListBoxLineCount;
}
else
{
this.CurrentCount = this.CurrentCount - value;
start = this.CurrentCount - ListBoxLineCount;
last = this.CurrentCount;
}
for (int i = start; i < last; i++)
{
this.listBoxLog.AddItem(this.CollectionData[i]);
}
this.UpdateListBoxCount();
}
private void ListBoxScrollDown(int value)
{
if (this.TotalCount == this.CurrentCount)
return;
int start = 0, last = 0;
this.ClearListBox();
if (this.CurrentCount + value >= this.TotalCount)
{
start = this.TotalCount - ListBoxLineCount;
last = this.TotalCount;
this.CurrentCount = this.TotalCount;
}
else
{
this.CurrentCount = this.CurrentCount + value;
start = this.CurrentCount - ListBoxLineCount;
last = this.CurrentCount;
}
for (int i = start; i < last; i++)
{
this.listBoxLog.AddItem(this.CollectionData[i]);
}
this.UpdateListBoxCount();
}
private List<string> DayOthersDirectorySort(FileInfo[] files) private List<string> DayOthersDirectorySort(FileInfo[] files)
{ {
@ -325,56 +245,95 @@ namespace ITC81DB_0H.Controls
} }
} }
// 사용안함 public void ClearData()
public void LoadFile(string fullFilePath)
{ {
this.smartFile1.FilePathName = fullFilePath; this.CollectionData.Clear();
this.smartFile1.Open(2000000); }
this.smartFile1.ReadStringAllBuffer(); public void ClearListBox()
{
try this.listBoxLog.ClearAll();
{
long lineNum = this.smartFile1.GetCount();
this.TotalCount = (int)lineNum;
for (int i = 0; i < lineNum; i++)
{
this.UpdateListBoxDataDisplay(this.smartFile1.ReadStringBuffer(i));
}
this.listBoxLog.SelectItemIndex = (int)lineNum - 1;
this.listBoxLog.SelectItemIndex = -1;
}
catch
{
DialogFormMessage myMsg = new DialogFormMessage(16, this.ParentForm.ParentForm.SystemConfig1.Language);
myMsg.ShowDialog();
this.smartFile1.Close();
}
this.smartFile1.Close();
} }
private void UpdateInitialListBoxDataDisplay() private void ListBoxScrollUp(int value)
{ {
if (this.TotalCount > ListBoxLineCount) if (this.CurrentCount == ListBoxLineCount || (this.CurrentCount < ListBoxLineCount && this.CurrentCount == this.TotalCount)
|| this.listBoxLog.ItemCount == 0)
return;
int startIndex = 0, endIndex = 0;
this.ClearData();
this.ClearListBox();
if (this.CurrentCount - value <= ListBoxLineCount)
{ {
for (int i = this.CurrentCount - ListBoxLineCount; i < this.TotalCount; i++) startIndex = 0;
this.listBoxLog.AddItem(this.CollectionData[i]); endIndex = ListBoxLineCount;
this.CurrentCount = ListBoxLineCount;
} }
else else
{ {
for (int i = 0; i < this.TotalCount; i++) this.CurrentCount = this.CurrentCount - value;
this.listBoxLog.AddItem(this.CollectionData[i]);
}
}
public void LoadFileLast15Datas(string fullFilePath)
{
int flag = 0;
this.smartFile1.FilePathName = fullFilePath; startIndex = this.CurrentCount - ListBoxLineCount;
this.smartFile1.Open(2000000); endIndex = this.CurrentCount;
this.smartFile1.ReadStringAllBuffer(); }
this.UpdateData(startIndex, endIndex);
}
private void ListBoxScrollDown(int value)
{
if (this.TotalCount == this.CurrentCount || this.listBoxLog.ItemCount == 0)
return;
int startIndex = 0, endIndex = 0;
this.ClearData();
this.ClearListBox();
if (this.CurrentCount + value >= this.TotalCount)
{
startIndex = this.TotalCount - ListBoxLineCount;
endIndex = this.TotalCount;
this.CurrentCount = this.TotalCount;
}
else
{
this.CurrentCount = this.CurrentCount + value;
startIndex = this.CurrentCount - ListBoxLineCount;
endIndex = this.CurrentCount;
}
this.UpdateData(startIndex, endIndex);
}
private void UpdateData(int startIndex, int endIndex)
{
for (int i = startIndex; i < endIndex; i++)
this.CollectionData.Add(this.smartFile1.ReadStringBuffer(i));
this.UpdateListBoxDataDisplay();
this.UpdateListBoxCount();
}
private void UpdateListBoxDataDisplay()
{
for (int i = 0; i < this.CollectionData.Count; i++)
this.listBoxLog.AddItem(this.CollectionData[i]);
}
private void UpdateListBoxCount()
{
this.labelTotalIndex.Text = this.TotalCount.ToString();
this.labelCurrentIndex.Text = this.CurrentCount.ToString();
}
public void LoadDatas(string fullFilePath)
{
// 맨 끝 ListBoxLineCount 만큼의 데이터 Load
int startIndex = 0, endIndex = 0;
try try
{ {
@ -383,42 +342,63 @@ namespace ITC81DB_0H.Controls
this.ParentForm.SplashStart(); this.ParentForm.SplashStart();
long lineNum = this.smartFile1.GetCount(); this.smartFile1.FilePathName = fullFilePath;
for (int i = 0; i < lineNum; i++) if (this.smartFile1.Open(2000000) == true)
this.IsFileOpen = true;
bool bValue = this.smartFile1.ReadStringAllBuffer();
if (bValue == false)
{ {
if (flag == 100) this.smartFile1.Close();
{ this.IsFileOpen = false;
Thread.Sleep(5); return;
flag = 0; }
}
this.CollectionData.Add(this.smartFile1.ReadStringBuffer(i)); long lineNum = this.smartFile1.GetCount();
flag++; this.TotalCount = (int)lineNum;
if (this.TotalCount > ListBoxLineCount)
{
startIndex = this.TotalCount - ListBoxLineCount;
endIndex = this.TotalCount;
}
else
{
startIndex = 0; // 맨 첫줄부터 표시
endIndex = this.TotalCount;
} }
this.smartFile1.Close();
this.TotalCount = this.CollectionData.Count;
this.CurrentCount = this.TotalCount; this.CurrentCount = this.TotalCount;
this.labelFind.Text = this.CurrentCount.ToString();
// File Name // File Name
string[] data = fullFilePath.Split('\\'); string[] data = fullFilePath.Split('\\');
this.labelFileName.Text = data[data.Length - 1]; this.labelFileName.Text = data[data.Length - 1];
// listBox 표시
this.UpdateInitialListBoxDataDisplay();
this.UpdateListBoxCount(); this.UpdateData(startIndex, endIndex);
this.labelFind.Text = this.CurrentCount.ToString();
this.smartFile1.Close();
this.ParentForm.SplashFinish(); this.ParentForm.SplashFinish();
this.Enabled = true; this.Enabled = true;
} }
catch catch (Exception ex)
{ {
FormMain.Exception(ex);
DialogFormMessage myMsg = new DialogFormMessage(16, this.ParentForm.ParentForm.SystemConfig1.Language); DialogFormMessage myMsg = new DialogFormMessage(16, this.ParentForm.ParentForm.SystemConfig1.Language);
myMsg.ShowDialog(); myMsg.ShowDialog();
this.smartFile1.Close();
this.ParentForm.SplashFinish(); this.ParentForm.SplashFinish();
this.smartFile1.Close();
this.IsFileOpen = false;
this.Enabled = true;
}
}
public void FileClose()
{
if (this.IsFileOpen == true)
{
this.smartFile1.Close();
this.IsFileOpen = false;
} }
} }
@ -428,10 +408,11 @@ namespace ITC81DB_0H.Controls
this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus);
this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu);
this.UpdateDisplayFile();
this.treeView.ExpandAll();
this.UpdateInitialStatus(); this.UpdateInitialStatus();
this.UpdateFileList();
this.treeView.ExpandAll();
this.TotalCount = 0; this.TotalCount = 0;
this.SelectedNodeFullPath = "";
if (int.Parse(this.labelCount.Text) == 0) if (int.Parse(this.labelCount.Text) == 0)
{ {
@ -452,7 +433,7 @@ namespace ITC81DB_0H.Controls
else else
e.Node.Checked = true; e.Node.Checked = true;
this.labelFileName.Text = e.Node.Text; //this.labelFileName.Text = e.Node.Text;
this.SelectedNodeFullPath = this.treeView.SelectedNode.FullPath; this.SelectedNodeFullPath = this.treeView.SelectedNode.FullPath;
} }
//else //else
@ -466,12 +447,18 @@ namespace ITC81DB_0H.Controls
} }
private void buttonRead_Click(object sender, EventArgs e) private void buttonRead_Click(object sender, EventArgs e)
{ {
if (this.labelFileName.Text == "" || this.labelFileName.Text == null) if (this.SelectedNodeFullPath == "" || this.SelectedNodeFullPath == null)
return; return;
if (this.IsFileOpen == true)
{
this.smartFile1.Close();
this.IsFileOpen = false;
}
this.Enabled = false; this.Enabled = false;
this.LoadFileLast15Datas(this.ParentForm.ParentForm.PathDataOthersFolder + this.SelectedNodeFullPath); this.LoadDatas(this.ParentForm.ParentForm.PathDataOthersFolder + this.SelectedNodeFullPath);
} }
private void labelFind_Click(object sender, EventArgs e) private void labelFind_Click(object sender, EventArgs e)
@ -505,50 +492,45 @@ namespace ITC81DB_0H.Controls
if (this.labelFind.Text == "" || this.labelFind.Text == null || this.listBoxLog.ItemCount == 0) if (this.labelFind.Text == "" || this.labelFind.Text == null || this.listBoxLog.ItemCount == 0)
return; return;
int start = 0, last = 0; int startIndex = 0, endIndex = 0;
int index = int.Parse(this.labelFind.Text); int index = int.Parse(this.labelFind.Text);
try try
{ {
this.ClearData();
this.ClearListBox(); this.ClearListBox();
if (this.TotalCount > ListBoxLineCount) if (this.TotalCount > ListBoxLineCount)
{ {
if (index - ListBoxLineCount < 0) if (index - ListBoxLineCount < 0)
{ {
start = 0; startIndex = 0 + 1;
last = ListBoxLineCount; endIndex = ListBoxLineCount + 1;
this.CurrentCount = ListBoxLineCount; this.CurrentCount = ListBoxLineCount;
} }
else else
{ {
start = index - ListBoxLineCount; startIndex = index - ListBoxLineCount;
last = index; endIndex = index;
this.CurrentCount = index; this.CurrentCount = index;
} }
} }
else else
{ {
start = 0; startIndex = 0 + 1;
last = this.TotalCount; endIndex = this.TotalCount + 1;
this.CurrentCount = this.TotalCount; this.CurrentCount = this.TotalCount;
} }
for (int i = start; i < last; i++) this.UpdateData(startIndex, endIndex);
this.listBoxLog.AddItem(this.CollectionData[i]);
this.UpdateListBoxCount();
this.smartFile1.Close();
} }
catch catch
{ {
DialogFormMessage myMsg = new DialogFormMessage(16, this.ParentForm.ParentForm.SystemConfig1.Language); DialogFormMessage myMsg = new DialogFormMessage(16, this.ParentForm.ParentForm.SystemConfig1.Language);
myMsg.ShowDialog(); myMsg.ShowDialog();
this.smartFile1.Close();
} }
} }

3
ITC81DB_0H/Controls/CenterLog/ControlCenterLogOthers.designer.cs generated
View File

@ -82,7 +82,7 @@
this.smartGroupBox1.Location = new System.Drawing.Point(0, 0); this.smartGroupBox1.Location = new System.Drawing.Point(0, 0);
this.smartGroupBox1.Name = "smartGroupBox1"; this.smartGroupBox1.Name = "smartGroupBox1";
this.smartGroupBox1.RoundRadius = 10; this.smartGroupBox1.RoundRadius = 10;
this.smartGroupBox1.Size = new System.Drawing.Size(710, 469); this.smartGroupBox1.Size = new System.Drawing.Size(710, 470);
this.smartGroupBox1.TabIndex = 173; this.smartGroupBox1.TabIndex = 173;
this.smartGroupBox1.TextColor = System.Drawing.Color.Black; this.smartGroupBox1.TextColor = System.Drawing.Color.Black;
// //
@ -219,6 +219,7 @@
this.listBoxLog.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER; this.listBoxLog.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER;
this.listBoxLog.ColumnDelimiter = '\0'; this.listBoxLog.ColumnDelimiter = '\0';
this.listBoxLog.ColumnOffsets = null; this.listBoxLog.ColumnOffsets = null;
this.listBoxLog.Enabled = false;
this.listBoxLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); this.listBoxLog.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular);
this.listBoxLog.FontColor = System.Drawing.Color.Black; this.listBoxLog.FontColor = System.Drawing.Color.Black;
this.listBoxLog.InitVisible = true; this.listBoxLog.InitVisible = true;

4
ITC81DB_0H/Datastore/Define.cs
View File

@ -52,7 +52,7 @@ namespace ITC81DB_2H.Datastore
EquipMyPage, EquipMyPage,
LogHelp, LogHelp,
LogJudge, LogInspection,
LogHistory, LogHistory,
LogOthers, LogOthers,
@ -145,7 +145,7 @@ namespace ITC81DB_2H.Datastore
public enum E_MenuBottomLog public enum E_MenuBottomLog
{ {
Help, Help,
LogJudge, LogInspection,
LogHistory, LogHistory,
LogOthers, LogOthers,
} }

103
ITC81DB_0H/DialogForms/DialogFormLogOn.cs
View File

@ -162,50 +162,7 @@ namespace ITC81DB_0H.DialogForms
{ {
string sValue = ""; string sValue = "";
if (this.UserInfo.active_level == 1) this.SuccessLogin(this.UserInfo);
this.ParentForm.CurrentSystemStatus.CurrentUser.Group = Define.E_UserGroup.Level1;
else if (this.UserInfo.active_level == 2)
this.ParentForm.CurrentSystemStatus.CurrentUser.Group = Define.E_UserGroup.Level2;
else if (this.UserInfo.active_level == 3)
this.ParentForm.CurrentSystemStatus.CurrentUser.Group = Define.E_UserGroup.Level3;
else if (this.UserInfo.active_level == 9)
this.ParentForm.CurrentSystemStatus.CurrentUser.Group = Define.E_UserGroup.Admin;
else if (this.UserInfo.active_level == 10)
this.ParentForm.CurrentSystemStatus.CurrentUser.Group = Define.E_UserGroup.Developer;
this.ParentForm.CurrentSystemStatus.CurrentUser.ActiveLevel = this.UserInfo.active_level;
this.ParentForm.CurrentSystemStatus.CurrentUser.ID = this.UserInfo.user_id;
this.ParentForm.CurrentSystemStatus.CurrentUser.Password = this.UserInfo.user_pw;
this.ParentForm.CurrentSystemStatus.CurrentUser.ExpireAccount = this.UserInfo.expire_period_account;
this.ParentForm.CurrentSystemStatus.CurrentUser.ExpirePassword = this.UserInfo.expire_period_pw;
DateTime time = DateTime.ParseExact(this.UserInfo.register_date.GetDateTime(), "yyyyMMddHHmmss", null);
this.ParentForm.CurrentSystemStatus.CurrentUser.DateRegister = time;
time = DateTime.ParseExact(this.UserInfo.login_date.GetDateTime(), "yyyyMMddHHmmss", null);
this.ParentForm.CurrentSystemStatus.CurrentUser.DateLogin = time;
if (this.ParentForm.CurrentSystemStatus.CurrentUser.Group == Define.E_UserGroup.Admin
|| this.ParentForm.CurrentSystemStatus.CurrentUser.Group == Define.E_UserGroup.Developer)
{
this.ParentForm.CurrentSystemStatus.CurrentUser.DateExpireRegister = DateTime.Now;
this.ParentForm.CurrentSystemStatus.CurrentUser.DateExpireLogin = DateTime.Now;
}
else
{
time = DateTime.ParseExact(this.UserInfo.expire_account_date.GetDateTime(), "yyyyMMddHHmmss", null);
this.ParentForm.CurrentSystemStatus.CurrentUser.DateExpireLogin = time;
time = DateTime.ParseExact(this.UserInfo.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
this.ParentForm.CurrentSystemStatus.CurrentUser.DateExpireRegister = time;
}
this.ParentForm.CurrentSystemStatus.CurrentUser.IsLockAccount = this.UserInfo.flock_status_account == 0 ? false : true;
this.ParentForm.CurrentSystemStatus.CurrentUser.IsLockPassword = this.UserInfo.flock_status_password == 0 ? false : true;
if (this.ParentForm.SystemConfig3.IsPart11 == true)
this.ParentForm.CurrentSystemStatus.CurrentUser.IsAdmin = this.UserInfo.fadmin == 0 ? false : true;
else
this.ParentForm.CurrentSystemStatus.CurrentUser.IsAdmin = true;
sValue = this.ParentForm.ChildFormMainDisplay.DisplayExpireOfPassword(this.ParentForm.CurrentSystemStatus.CurrentUser.Group); sValue = this.ParentForm.ChildFormMainDisplay.DisplayExpireOfPassword(this.ParentForm.CurrentSystemStatus.CurrentUser.Group);
if (sValue != "-") if (sValue != "-")
@ -221,7 +178,9 @@ namespace ITC81DB_0H.DialogForms
DialogFormLogOn changePW = new DialogFormLogOn(this.ParentForm, this.ParentForm.SystemConfig1.Language, this.textBoxID.Text); DialogFormLogOn changePW = new DialogFormLogOn(this.ParentForm, this.ParentForm.SystemConfig1.Language, this.textBoxID.Text);
if (changePW.ShowDialog() == DialogResult.OK) if (changePW.ShowDialog() == DialogResult.OK)
{ {
UserManager.UserManager_UserLoginDirect(this.textBoxID.Text, this.textBoxPassword.Text, ref this.UserInfo); UserManager.UserManager_UserLoginDirect(this.ID, this.textBoxPassword.Text, ref this.UserInfo);
this.SuccessLogin(this.UserInfo);
} }
} }
} }
@ -251,7 +210,12 @@ namespace ITC81DB_0H.DialogForms
if (intExpireDate > 0) if (intExpireDate > 0)
{ {
DialogFormLogOn changePW = new DialogFormLogOn(this.ParentForm, this.ParentForm.SystemConfig1.Language, this.textBoxID.Text); DialogFormLogOn changePW = new DialogFormLogOn(this.ParentForm, this.ParentForm.SystemConfig1.Language, this.textBoxID.Text);
changePW.ShowDialog(); if (changePW.ShowDialog() == DialogResult.OK)
{
UserManager.UserManager_UserLoginDirect(this.ID, this.textBoxPassword.Text, ref this.UserInfo);
this.SuccessLogin(this.UserInfo);
}
} }
} }
} }
@ -262,6 +226,53 @@ namespace ITC81DB_0H.DialogForms
} }
} }
} }
private void SuccessLogin(UserManager.UserMgr_user_info_t user)
{
if (user.active_level == 1)
this.ParentForm.CurrentSystemStatus.CurrentUser.Group = Define.E_UserGroup.Level1;
else if (user.active_level == 2)
this.ParentForm.CurrentSystemStatus.CurrentUser.Group = Define.E_UserGroup.Level2;
else if (user.active_level == 3)
this.ParentForm.CurrentSystemStatus.CurrentUser.Group = Define.E_UserGroup.Level3;
else if (user.active_level == 9)
this.ParentForm.CurrentSystemStatus.CurrentUser.Group = Define.E_UserGroup.Admin;
else if (user.active_level == 10)
this.ParentForm.CurrentSystemStatus.CurrentUser.Group = Define.E_UserGroup.Developer;
this.ParentForm.CurrentSystemStatus.CurrentUser.ActiveLevel = user.active_level;
this.ParentForm.CurrentSystemStatus.CurrentUser.ID = user.user_id;
this.ParentForm.CurrentSystemStatus.CurrentUser.Password = user.user_pw;
this.ParentForm.CurrentSystemStatus.CurrentUser.ExpireAccount = user.expire_period_account;
this.ParentForm.CurrentSystemStatus.CurrentUser.ExpirePassword = user.expire_period_pw;
DateTime time = DateTime.ParseExact(user.register_date.GetDateTime(), "yyyyMMddHHmmss", null);
this.ParentForm.CurrentSystemStatus.CurrentUser.DateRegister = time;
time = DateTime.ParseExact(user.login_date.GetDateTime(), "yyyyMMddHHmmss", null);
this.ParentForm.CurrentSystemStatus.CurrentUser.DateLogin = time;
if (this.ParentForm.CurrentSystemStatus.CurrentUser.Group == Define.E_UserGroup.Admin
|| this.ParentForm.CurrentSystemStatus.CurrentUser.Group == Define.E_UserGroup.Developer)
{
this.ParentForm.CurrentSystemStatus.CurrentUser.DateExpireRegister = DateTime.Now;
this.ParentForm.CurrentSystemStatus.CurrentUser.DateExpireLogin = DateTime.Now;
}
else
{
time = DateTime.ParseExact(user.expire_account_date.GetDateTime(), "yyyyMMddHHmmss", null);
this.ParentForm.CurrentSystemStatus.CurrentUser.DateExpireLogin = time;
time = DateTime.ParseExact(user.expire_register_date.GetDateTime(), "yyyyMMddHHmmss", null);
this.ParentForm.CurrentSystemStatus.CurrentUser.DateExpireRegister = time;
}
this.ParentForm.CurrentSystemStatus.CurrentUser.IsLockAccount = user.flock_status_account == 0 ? false : true;
this.ParentForm.CurrentSystemStatus.CurrentUser.IsLockPassword = user.flock_status_password == 0 ? false : true;
if (this.ParentForm.SystemConfig3.IsPart11 == true)
this.ParentForm.CurrentSystemStatus.CurrentUser.IsAdmin = user.fadmin == 0 ? false : true;
else
this.ParentForm.CurrentSystemStatus.CurrentUser.IsAdmin = true;
}
public void InitializeDesignChangePassword(Define.E_LanguageID language) public void InitializeDesignChangePassword(Define.E_LanguageID language)
{ {

5
ITC81DB_0H/Forms/FormMain.cs
View File

@ -14578,7 +14578,10 @@ namespace ITC81DB_0H.Forms
{ {
UserManager.UserMgr_user_info_t user = (UserManager.UserMgr_user_info_t)data; UserManager.UserMgr_user_info_t user = (UserManager.UserMgr_user_info_t)data;
this.ChildFormMenu.CallBackUserListModifyInfoData(user); if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.MainDisplay)
this.ChildFormMainDisplay.CallBackUserListModifyInfoData(user);
else
this.ChildFormMenu.CallBackUserListModifyInfoData(user);
} }
catch (Exception ex) catch (Exception ex)
{ {

12
ITC81DB_0H/Forms/FormMainDisplay.cs
View File

@ -597,11 +597,12 @@ namespace ITC81DB_0H.Forms
{ {
this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOff; this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOff;
this.labelExpireOfPassword.Text = "D-0"; this.labelExpireOfPassword.Text = "D-0";
} }
else if (intExpireDate < 0) else if (intExpireDate < 0)
{ {
if (intExpireDate * -1 > this.ParentForm.CurrentSystemStatus.CurrentUser.ExpirePassword)
expireDate = "-" + (this.ParentForm.CurrentSystemStatus.CurrentUser.ExpirePassword - 1).ToString();
this.labelExpireOfPassword.Text = "D" + expireDate; this.labelExpireOfPassword.Text = "D" + expireDate;
if (intExpireDate >= -10) if (intExpireDate >= -10)
this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOff; this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOff;
@ -944,6 +945,11 @@ namespace ITC81DB_0H.Forms
return ret; return ret;
} }
public void CallBackUserListModifyInfoData(UserManager.UserMgr_user_info_t user)
{
this.ParentForm.CurrentSystemStatus.CurrentUser.DateExpireRegister = DateTime.Now.AddDays(this.ParentForm.CurrentSystemStatus.CurrentUser.ExpirePassword - 1);
this.DisplayExpireOfPassword(this.ParentForm.CurrentSystemStatus.CurrentUser.Group);
}
public void CallBackUserListLoginTimeoutDataEvent(UserManager.UserMgr_login_timeout_t user) public void CallBackUserListLoginTimeoutDataEvent(UserManager.UserMgr_login_timeout_t user)
{ {
string code = "", message1 = "", message2 = ""; string code = "", message1 = "", message2 = "";
@ -1241,6 +1247,8 @@ namespace ITC81DB_0H.Forms
this.ProductChange(this.ParentForm.SystemConfig1.ProductNumber); this.ProductChange(this.ParentForm.SystemConfig1.ProductNumber);
// Log - smartFile Close
this.ParentForm.ChildFormMenu.FileClose();
this.buttonPrint.Visible = this.ParentForm.SystemConfig1.IsPrinterEnable; this.buttonPrint.Visible = this.ParentForm.SystemConfig1.IsPrinterEnable;
if (this.ParentForm.SystemConfig1.IsPrintPerProductEnable == true) if (this.ParentForm.SystemConfig1.IsPrintPerProductEnable == true)

7
ITC81DB_0H/Forms/FormMenu.Designer.cs generated
View File

@ -46,6 +46,7 @@
this.labelExpireOfPassword = new SmartX.SmartLabel(); this.labelExpireOfPassword = new SmartX.SmartLabel();
this.labelUserID = new SmartX.SmartLabel(); this.labelUserID = new SmartX.SmartLabel();
this.labelUserLevel = new SmartX.SmartLabel(); this.labelUserLevel = new SmartX.SmartLabel();
this.timerTimeout = new System.Windows.Forms.Timer();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
// //
@ -421,6 +422,11 @@
this.labelUserLevel.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelUserLevel.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelUserLevel.Wordwrap = false; this.labelUserLevel.Wordwrap = false;
// //
// timerTimeout
//
this.timerTimeout.Interval = 10000;
this.timerTimeout.Tick += new System.EventHandler(this.timerTimeout_Tick);
//
// FormMenu // FormMenu
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@ -468,5 +474,6 @@
private SmartX.SmartLabel labelExpireOfPassword; private SmartX.SmartLabel labelExpireOfPassword;
private SmartX.SmartLabel labelUserID; private SmartX.SmartLabel labelUserID;
private SmartX.SmartLabel labelUserLevel; private SmartX.SmartLabel labelUserLevel;
private System.Windows.Forms.Timer timerTimeout;
} }
} }

87
ITC81DB_0H/Forms/FormMenu.cs
View File

@ -63,7 +63,7 @@ namespace ITC81DB_0H.Forms
public ControlCenterSystemBLDCMotorSetting CenterSystemBLDCMotorSetting; public ControlCenterSystemBLDCMotorSetting CenterSystemBLDCMotorSetting;
// 로그 // 로그
public ControlCenterLogHelp CenterLogHelp; public ControlCenterLogHelp CenterLogHelp;
public ControlCenterLogInspection CenterLogJudge; public ControlCenterLogInspection CenterLogInspection;
public ControlCenterLogHistory CenterLogHistory; public ControlCenterLogHistory CenterLogHistory;
public ControlCenterLogOthers CenterLogOthers; public ControlCenterLogOthers CenterLogOthers;
// 시스템 정보 // 시스템 정보
@ -364,17 +364,17 @@ namespace ITC81DB_0H.Forms
private void CreateCenterLogControl() private void CreateCenterLogControl()
{ {
this.CenterLogHelp = new ControlCenterLogHelp(this); this.CenterLogHelp = new ControlCenterLogHelp(this);
this.CenterLogJudge = new ControlCenterLogInspection(this); this.CenterLogInspection = new ControlCenterLogInspection(this);
this.CenterLogHistory = new ControlCenterLogHistory(this); this.CenterLogHistory = new ControlCenterLogHistory(this);
this.CenterLogOthers = new ControlCenterLogOthers(this); this.CenterLogOthers = new ControlCenterLogOthers(this);
this.CenterLogHelp.Location = new Point(0, 65); this.CenterLogHelp.Location = new Point(0, 65);
this.CenterLogJudge.Location = new Point(0, 65); this.CenterLogInspection.Location = new Point(0, 65);
this.CenterLogHistory.Location = new Point(0, 65); this.CenterLogHistory.Location = new Point(0, 65);
this.CenterLogOthers.Location = new Point(0, 65); this.CenterLogOthers.Location = new Point(0, 65);
this.Controls.Add(this.CenterLogHelp); this.Controls.Add(this.CenterLogHelp);
this.Controls.Add(this.CenterLogJudge); this.Controls.Add(this.CenterLogInspection);
this.Controls.Add(this.CenterLogHistory); this.Controls.Add(this.CenterLogHistory);
this.Controls.Add(this.CenterLogOthers); this.Controls.Add(this.CenterLogOthers);
} }
@ -621,6 +621,9 @@ namespace ITC81DB_0H.Forms
} }
else if (intExpireDate < 0) else if (intExpireDate < 0)
{ {
if (intExpireDate * -1 > this.ParentForm.CurrentSystemStatus.CurrentUser.ExpirePassword)
expireDate = "-" + (this.ParentForm.CurrentSystemStatus.CurrentUser.ExpirePassword - 1).ToString();
if (intExpireDate >= -10) if (intExpireDate >= -10)
this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOff; this.labelExpireOfPassword.ForeColor = this.ParentForm.ColorLogOff;
else else
@ -737,19 +740,24 @@ namespace ITC81DB_0H.Forms
List<string> listSelectedFile = new List<string>(); // 백업할 파일 리스트 (yyyy\\MM\\filename.csv) List<string> listSelectedFile = new List<string>(); // 백업할 파일 리스트 (yyyy\\MM\\filename.csv)
this.Q_FileList = new Queue<string>(); this.Q_FileList = new Queue<string>();
this.ParentForm.SetTrackingHistoryData(Define.E_TrackingOperation.DataBackup, this.SelectedDataType.ToString());
switch (type) switch (type)
{ {
case Define.E_DataType.None: case Define.E_DataType.None:
break; break;
case Define.E_DataType.History: case Define.E_DataType.History:
this.CenterLogHistory.FileClose();
dataFolderPath = this.ParentForm.PathDataHistoryFolder; dataFolderPath = this.ParentForm.PathDataHistoryFolder;
this.SelectedDataType = Define.E_DataType.History; this.SelectedDataType = Define.E_DataType.History;
break; break;
case Define.E_DataType.Inspection: case Define.E_DataType.Inspection:
this.CenterLogInspection.FileClose();
dataFolderPath = this.ParentForm.PathDataInspectionFolder; dataFolderPath = this.ParentForm.PathDataInspectionFolder;
this.SelectedDataType = Define.E_DataType.Inspection; this.SelectedDataType = Define.E_DataType.Inspection;
break; break;
case Define.E_DataType.Others: case Define.E_DataType.Others:
this.CenterLogOthers.FileClose();
dataFolderPath = this.ParentForm.PathDataOthersFolder; dataFolderPath = this.ParentForm.PathDataOthersFolder;
this.SelectedDataType = Define.E_DataType.Others; this.SelectedDataType = Define.E_DataType.Others;
break; break;
@ -785,6 +793,9 @@ namespace ITC81DB_0H.Forms
// Splash Start // Splash Start
this.SplashStart(); this.SplashStart();
this.timerTimeout.Enabled = true;
//if (this.ParentForm.IsCommunicationLogOpen == true)
// this.ParentForm.smartFileCommunicationLog.WriteString(string.Format("Backup() ({0:yyyy-MM-dd HH:mm:ss}): timeout true1", DateTime.Now));
try try
{ {
@ -806,7 +817,11 @@ namespace ITC81DB_0H.Forms
header.Type = 1; header.Type = 1;
for (int i = 0; i < listSelectedFile.Count; i++) for (int i = 0; i < listSelectedFile.Count; i++)
{
this.CreateHeaderFile(this.ParentForm.PathHeaderFolder, listSelectedFile[i], header); this.CreateHeaderFile(this.ParentForm.PathHeaderFolder, listSelectedFile[i], header);
//if (this.ParentForm.IsCommunicationLogOpen == true)
// this.ParentForm.smartFileCommunicationLog.WriteString(string.Format("Header-FileName ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, listSelectedFile[i]));
}
#endregion #endregion
#region 파일 암호화 #region 파일 암호화
@ -830,6 +845,10 @@ namespace ITC81DB_0H.Forms
} }
else else
{ {
this.timerTimeout.Enabled = false;
//if (this.ParentForm.IsCommunicationLogOpen == true)
// this.ParentForm.smartFileCommunicationLog.WriteString(string.Format("Backup() ({0:yyyy-MM-dd HH:mm:ss}): timeout false1", DateTime.Now));
#region Part11 미사용 시 - USB 복사 #region Part11 미사용 시 - USB 복사
// USB\SerialNumber\Data\{Type}\yyyyMMdd_HHmmss 루트 // USB\SerialNumber\Data\{Type}\yyyyMMdd_HHmmss 루트
targetPath = string.Format("{0}{1}\\Data\\{2}\\{3}\\", targetPath, this.ParentForm.SystemConfig1.SerialNumber, type, DateTime.Now.ToString("yyyyMMdd_HHmmss")); targetPath = string.Format("{0}{1}\\Data\\{2}\\{3}\\", targetPath, this.ParentForm.SystemConfig1.SerialNumber, type, DateTime.Now.ToString("yyyyMMdd_HHmmss"));
@ -870,7 +889,7 @@ namespace ITC81DB_0H.Forms
} }
// 복사 완료 메시지 // 복사 완료 메시지
DialogFormMessage msg = new DialogFormMessage((count / 2).ToString(), this.ParentForm.SystemConfig1.Language); DialogFormMessage msg = new DialogFormMessage(count.ToString(), this.ParentForm.SystemConfig1.Language);
this.SplashFinish(); this.SplashFinish();
msg.ShowDialog(); msg.ShowDialog();
#endregion #endregion
@ -880,6 +899,9 @@ namespace ITC81DB_0H.Forms
{ {
// 제조사에 문의하세요 // 제조사에 문의하세요
DialogFormMessage msg = new DialogFormMessage(6, this.ParentForm.SystemConfig1.Language); DialogFormMessage msg = new DialogFormMessage(6, this.ParentForm.SystemConfig1.Language);
this.timerTimeout.Enabled = false;
//if (this.ParentForm.IsCommunicationLogOpen == true)
// this.ParentForm.smartFileCommunicationLog.WriteString(string.Format("Backup() ({0:yyyy-MM-dd HH:mm:ss}): timeout false2", DateTime.Now));
msg.ShowDialog(); msg.ShowDialog();
this.SplashFinish(); this.SplashFinish();
return; return;
@ -955,7 +977,10 @@ namespace ITC81DB_0H.Forms
//} //}
// 복사 완료 메시지 // 복사 완료 메시지
DialogFormMessage msg = new DialogFormMessage(count.ToString(), this.ParentForm.SystemConfig1.Language); DialogFormMessage msg = new DialogFormMessage((count / 2).ToString(), this.ParentForm.SystemConfig1.Language);
this.timerTimeout.Enabled = false;
//if (this.ParentForm.IsCommunicationLogOpen == true)
// this.ParentForm.smartFileCommunicationLog.WriteString(string.Format("FileCopy() ({0:yyyy-MM-dd HH:mm:ss}): timeout false1", DateTime.Now));
this.SplashFinish(); this.SplashFinish();
msg.ShowDialog(); msg.ShowDialog();
#endregion #endregion
@ -964,12 +989,22 @@ namespace ITC81DB_0H.Forms
{ {
// 제조사에 문의하세요 // 제조사에 문의하세요
DialogFormMessage msg = new DialogFormMessage(6, this.ParentForm.SystemConfig1.Language); DialogFormMessage msg = new DialogFormMessage(6, this.ParentForm.SystemConfig1.Language);
this.timerTimeout.Enabled = false;
//if (this.ParentForm.IsCommunicationLogOpen == true)
// this.ParentForm.smartFileCommunicationLog.WriteString(string.Format("FileCopy() ({0:yyyy-MM-dd HH:mm:ss}): timeout false2", DateTime.Now));
this.SplashFinish(); this.SplashFinish();
msg.ShowDialog(); msg.ShowDialog();
return; return;
} }
} }
public void FileClose()
{
this.CenterLogHistory.FileClose();
this.CenterLogInspection.FileClose();
this.CenterLogOthers.FileClose();
}
public void CopyFolder(string sourceFolder, string destFolder) public void CopyFolder(string sourceFolder, string destFolder)
{ {
if (!Directory.Exists(destFolder)) if (!Directory.Exists(destFolder))
@ -1041,9 +1076,9 @@ namespace ITC81DB_0H.Forms
try try
{ {
this.Splash = new SmartX.SmartSplash(); this.Splash = new SmartX.SmartSplash();
this.Splash.CenterPosition = false; this.Splash.CenterPosition = true;
this.Splash.Left = 462; //this.Splash.Left = 462;
this.Splash.Top = 200; //this.Splash.Top = 200;
this.Splash.AnimationInterval = 200; this.Splash.AnimationInterval = 200;
this.Splash.LoadingImagePathname = "SmartLoading4"; this.Splash.LoadingImagePathname = "SmartLoading4";
this.Splash.Start(); this.Splash.Start();
@ -1166,10 +1201,16 @@ namespace ITC81DB_0H.Forms
this.UI_Invoke(delegate this.UI_Invoke(delegate
{ {
//this.labelPercentage.Text = string.Format("{0} %", sender.percentage); //this.labelPercentage.Text = string.Format("{0} %", sender.percentage);
//if (this.ParentForm.IsCommunicationLogOpen == true)
// this.ParentForm.smartFileCommunicationLog.WriteString(string.Format("CallBackEncryptionEvent() ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, sender.percentage));
}); });
if (sender.percentage == 100) if (sender.percentage == 100)
{ {
this.timerTimeout.Enabled = false;
//if (this.ParentForm.IsCommunicationLogOpen == true)
// this.ParentForm.smartFileCommunicationLog.WriteString(string.Format("CallBackEncryptionEvent() ({0:yyyy-MM-dd HH:mm:ss}): timeout false", DateTime.Now));
if (sender.status == 0) if (sender.status == 0)
{ {
if (this.Q_FileList.Count != 0) if (this.Q_FileList.Count != 0)
@ -1456,9 +1497,9 @@ namespace ITC81DB_0H.Forms
this.CenterLogHelp.BringToFront(); this.CenterLogHelp.BringToFront();
this.CenterLogHelp.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterLogHelp.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
break; break;
case Define.E_MenuBottomLog.LogJudge: case Define.E_MenuBottomLog.LogInspection:
this.CenterLogJudge.BringToFront(); this.CenterLogInspection.BringToFront();
this.CenterLogJudge.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterLogInspection.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
break; break;
case Define.E_MenuBottomLog.LogHistory: case Define.E_MenuBottomLog.LogHistory:
this.CenterLogHistory.BringToFront(); this.CenterLogHistory.BringToFront();
@ -1767,7 +1808,7 @@ namespace ITC81DB_0H.Forms
case Define.E_DisplayStore.LogHelp: case Define.E_DisplayStore.LogHelp:
this.labelTitleRoot.Text = "Log > Help"; this.labelTitleRoot.Text = "Log > Help";
break; break;
case Define.E_DisplayStore.LogJudge: case Define.E_DisplayStore.LogInspection:
this.labelTitleRoot.Text = "Log > Judgment log"; this.labelTitleRoot.Text = "Log > Judgment log";
break; break;
case Define.E_DisplayStore.LogHistory: case Define.E_DisplayStore.LogHistory:
@ -1871,7 +1912,7 @@ namespace ITC81DB_0H.Forms
case Define.E_DisplayStore.LogHelp: case Define.E_DisplayStore.LogHelp:
this.labelTitleRoot.Text = "日志 > 帮助"; this.labelTitleRoot.Text = "日志 > 帮助";
break; break;
case Define.E_DisplayStore.LogJudge: case Define.E_DisplayStore.LogInspection:
this.labelTitleRoot.Text = "日志 > 判断日志"; this.labelTitleRoot.Text = "日志 > 判断日志";
break; break;
case Define.E_DisplayStore.LogHistory: case Define.E_DisplayStore.LogHistory:
@ -2162,7 +2203,7 @@ namespace ITC81DB_0H.Forms
case Define.E_DisplayStore.LogHelp: case Define.E_DisplayStore.LogHelp:
this.labelTitleRoot.Text = "로그 > 도움말"; this.labelTitleRoot.Text = "로그 > 도움말";
break; break;
case Define.E_DisplayStore.LogJudge: case Define.E_DisplayStore.LogInspection:
this.labelTitleRoot.Text = "로그 > 판정로그"; this.labelTitleRoot.Text = "로그 > 판정로그";
break; break;
case Define.E_DisplayStore.LogHistory: case Define.E_DisplayStore.LogHistory:
@ -2383,13 +2424,29 @@ namespace ITC81DB_0H.Forms
private void timerEncryption_Tick(object sender, EventArgs e) private void timerEncryption_Tick(object sender, EventArgs e)
{ {
this.timerEncryption.Enabled = false; this.timerEncryption.Enabled = false;
this.timerTimeout.Enabled = true;
//if (this.ParentForm.IsCommunicationLogOpen == true)
// this.ParentForm.smartFileCommunicationLog.WriteString(string.Format("timerEncryption_Tick() ({0:yyyy-MM-dd HH:mm:ss}): timeout true", DateTime.Now));
this.EncryptionFile(this.Q_FileList.Dequeue()); this.EncryptionFile(this.Q_FileList.Dequeue());
} }
private void timerFileCopy_Tick(object sender, EventArgs e) private void timerFileCopy_Tick(object sender, EventArgs e)
{ {
this.timerFileCopy.Enabled = false; this.timerFileCopy.Enabled = false;
this.timerTimeout.Enabled = true;
//if (this.ParentForm.IsCommunicationLogOpen == true)
// this.ParentForm.smartFileCommunicationLog.WriteString(string.Format("timerFileCopy_Tick() ({0:yyyy-MM-dd HH:mm:ss}): timeout true", DateTime.Now));
this.FileCopy(this.SelectedDataType); this.FileCopy(this.SelectedDataType);
} }
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.SystemConfig1.Language);
myMsg.ShowDialog();
}
public Define.E_MenuBottomConfiguration CurrentConfigurationMenu() public Define.E_MenuBottomConfiguration CurrentConfigurationMenu()
{ {

3
ITC81DB_0H/Forms/FormMenu.resx
View File

@ -1854,6 +1854,9 @@
<metadata name="timerFileCopy.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="timerFileCopy.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>155, 12</value> <value>155, 12</value>
</metadata> </metadata>
<metadata name="timerTimeout.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>417, 12</value>
</metadata>
<metadata name="$this.FormFactorShadowProperty" xml:space="preserve"> <metadata name="$this.FormFactorShadowProperty" xml:space="preserve">
<value>WEBPAD</value> <value>WEBPAD</value>
</metadata> </metadata>

14
ITC81DB_0H/Version.txt
View File

@ -12,6 +12,20 @@
기본형 컨베어 고정밀센서 계량기 기본형 컨베어 고정밀센서 계량기
*/ */
@ Ver 3.0.1 by CJY
- 2023.6.21
- Ver 3.0.0 Modify
- 로그데이터 Load 시 일괄 -> 현재 페이지만 로드
- treeView 선택한 파일 제목을 상단에 표시 -> 현재 Load된 데이터의 파일 제목을 상단에 표시
- 버그수정
1. 시간 변경 시 날짜표시 버그 수정
2. Part11 사용 안했을 때 데이터 백업 시, 데이터 개수가 /2로 표시되는 버그 수정
Part11 사용 시에만 전체 개수 /2 해야함(ini 파일)
3. 시리얼, 이더넷 통신 - OPT4 : 바코드 사용하지 않을 때 설정하고 Test Send 버튼 눌렀을때 문제 수정
4. 유저설정 등급이름 변경버튼 누르고 keyboard X 눌렀을 때, textBox가 사라지지 않는 버그 수정
5. 유저 비밀번호 변경시점부터 다시 D-Day 계산
6. 백업 시, smartFile Close 제대로 안되어 백업이 안되는 버그 수정
@ Ver 3.0.0 by CJY @ Ver 3.0.0 by CJY
- 2023.05.24 - 2023.05.24
- Ver 2.2.3 Modify - Ver 2.2.3 Modify

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.