From 819e311969a8e3d7abe2f2e166115925ad489820 Mon Sep 17 00:00:00 2001 From: "DESKTOP-999R8N3\\CJY" Date: Wed, 6 Sep 2023 09:32:45 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT69DC_7C/DataStore.cs | 6 +- .../DialogForms/DialogFormDataViewerFilter.cs | 4 +- .../Forms/FormDataBackup_Part11.Designer.cs | 14 +- INT69DC_7C/Forms/FormDataBackup_Part11.cs | 4 +- INT69DC_7C/Forms/FormDataBackup_Part11.resx | 4 +- INT69DC_7C/Forms/FormDataStatistics.cs | 2 + INT69DC_7C/Forms/FormDataViewer.Designer.cs | 27 ++- INT69DC_7C/Forms/FormDataViewer.cs | 216 ++---------------- INT69DC_7C/Forms/FormMain.cs | 8 +- 9 files changed, 62 insertions(+), 223 deletions(-) diff --git a/INT69DC_7C/DataStore.cs b/INT69DC_7C/DataStore.cs index 2b26959..b0541bc 100644 --- a/INT69DC_7C/DataStore.cs +++ b/INT69DC_7C/DataStore.cs @@ -24,6 +24,7 @@ namespace INT69DC_7C FormNone = 0, FormMainDisplay, FormMenu, + FormDataViewer, FormInformation, FormCommunication, FormDataStatistics, @@ -40,7 +41,6 @@ namespace INT69DC_7C FormProgramUpdate, FormUserEditor, FormUserGroupEditor, - FormDataViewer, FormDataBackup, }; @@ -4163,7 +4163,7 @@ namespace INT69DC_7C #endregion #region Property - public bool TpyeAlarm + public bool TypeAlarm { get { return this.m_TpyeAlarm; } set { this.m_TpyeAlarm = value; } @@ -4183,7 +4183,7 @@ namespace INT69DC_7C #region Method private void Initialize() { - this.TpyeAlarm = true; + this.TypeAlarm = true; this.TypeOperation = true; this.TypeParameter = true; } diff --git a/INT69DC_7C/DialogForms/DialogFormDataViewerFilter.cs b/INT69DC_7C/DialogForms/DialogFormDataViewerFilter.cs index 1a4f330..8067af9 100644 --- a/INT69DC_7C/DialogForms/DialogFormDataViewerFilter.cs +++ b/INT69DC_7C/DialogForms/DialogFormDataViewerFilter.cs @@ -76,7 +76,7 @@ namespace INT69DC_7C.DialogForms private void UpdateDisplay(DataViewerFilter filter) { - this.checkBoxTypeAlarm.Checked = filter.TpyeAlarm; + this.checkBoxTypeAlarm.Checked = filter.TypeAlarm; this.checkBoxTypeOperation.Checked = filter.TypeOperation; this.checkBoxTypeParameter.Checked = filter.TypeParameter; } @@ -90,7 +90,7 @@ namespace INT69DC_7C.DialogForms #region Event Handler private void buttonOk_Click(object sender, EventArgs e) { - this.ParentForm.ParentForm.CurrentDataViewerFilter.TpyeAlarm = this.checkBoxTypeAlarm.Checked; + this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeAlarm = this.checkBoxTypeAlarm.Checked; this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeOperation = this.checkBoxTypeOperation.Checked; this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeParameter = this.checkBoxTypeParameter.Checked; diff --git a/INT69DC_7C/Forms/FormDataBackup_Part11.Designer.cs b/INT69DC_7C/Forms/FormDataBackup_Part11.Designer.cs index 2a9d8a7..aa63414 100644 --- a/INT69DC_7C/Forms/FormDataBackup_Part11.Designer.cs +++ b/INT69DC_7C/Forms/FormDataBackup_Part11.Designer.cs @@ -76,7 +76,7 @@ this.labelTitle.BackPictureBox2 = null; this.labelTitle.BorderColor = System.Drawing.Color.Black; this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitle.Font = new System.Drawing.Font("New Gulim", 35F, System.Drawing.FontStyle.Bold); + this.labelTitle.Font = new System.Drawing.Font("새굴림", 35F, System.Drawing.FontStyle.Bold); this.labelTitle.InitVisible = true; this.labelTitle.LineSpacing = 0F; this.labelTitle.Location = new System.Drawing.Point(199, 7); @@ -126,7 +126,7 @@ this.smartGroupBox1.Controls.Add(this.treeViewInspection); this.smartGroupBox1.Controls.Add(this.buttonInspectionBackup); this.smartGroupBox1.Controls.Add(this.labelInspectionFileCount); - this.smartGroupBox1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); + this.smartGroupBox1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.Black; this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.Black; this.smartGroupBox1.FrameLineThickness = 1; @@ -188,7 +188,7 @@ this.labelInspectionFileCount.BackPictureBox2 = null; this.labelInspectionFileCount.BorderColor = System.Drawing.Color.Black; this.labelInspectionFileCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelInspectionFileCount.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold); + this.labelInspectionFileCount.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold); this.labelInspectionFileCount.InitVisible = true; this.labelInspectionFileCount.LineSpacing = 0F; this.labelInspectionFileCount.Location = new System.Drawing.Point(46, 26); @@ -207,7 +207,7 @@ this.smartGroupBox2.Controls.Add(this.treeViewHistory); this.smartGroupBox2.Controls.Add(this.buttonHistoryBackup); this.smartGroupBox2.Controls.Add(this.labelHistoryFileCount); - this.smartGroupBox2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); + this.smartGroupBox2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.smartGroupBox2.FrameLineColor1 = System.Drawing.Color.Black; this.smartGroupBox2.FrameLineColor2 = System.Drawing.Color.Black; this.smartGroupBox2.FrameLineThickness = 1; @@ -269,7 +269,7 @@ this.labelHistoryFileCount.BackPictureBox2 = null; this.labelHistoryFileCount.BorderColor = System.Drawing.Color.Black; this.labelHistoryFileCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelHistoryFileCount.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold); + this.labelHistoryFileCount.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold); this.labelHistoryFileCount.InitVisible = true; this.labelHistoryFileCount.LineSpacing = 0F; this.labelHistoryFileCount.Location = new System.Drawing.Point(46, 26); @@ -332,7 +332,7 @@ this.smartGroupBox3.Controls.Add(this.listBoxOther); this.smartGroupBox3.Controls.Add(this.buttonOtherBackup); this.smartGroupBox3.Controls.Add(this.labelOtherFileCount); - this.smartGroupBox3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); + this.smartGroupBox3.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.smartGroupBox3.FrameLineColor1 = System.Drawing.Color.Black; this.smartGroupBox3.FrameLineColor2 = System.Drawing.Color.Black; this.smartGroupBox3.FrameLineThickness = 1; @@ -392,7 +392,7 @@ this.labelOtherFileCount.BackPictureBox2 = null; this.labelOtherFileCount.BorderColor = System.Drawing.Color.Black; this.labelOtherFileCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelOtherFileCount.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold); + this.labelOtherFileCount.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold); this.labelOtherFileCount.InitVisible = true; this.labelOtherFileCount.LineSpacing = 0F; this.labelOtherFileCount.Location = new System.Drawing.Point(46, 26); diff --git a/INT69DC_7C/Forms/FormDataBackup_Part11.cs b/INT69DC_7C/Forms/FormDataBackup_Part11.cs index 3176225..6fbd9b1 100644 --- a/INT69DC_7C/Forms/FormDataBackup_Part11.cs +++ b/INT69DC_7C/Forms/FormDataBackup_Part11.cs @@ -836,8 +836,8 @@ namespace INT69DC_7C.Forms this.UpdateDisplayHistoryFile(); this.UpdateDisplayOtherFile(); - this.treeViewInspection.ExpandAll(); - this.treeViewHistory.ExpandAll(); + //this.treeViewInspection.ExpandAll(); + //this.treeViewHistory.ExpandAll(); } #endregion diff --git a/INT69DC_7C/Forms/FormDataBackup_Part11.resx b/INT69DC_7C/Forms/FormDataBackup_Part11.resx index f9d5735..2912cc1 100644 --- a/INT69DC_7C/Forms/FormDataBackup_Part11.resx +++ b/INT69DC_7C/Forms/FormDataBackup_Part11.resx @@ -1143,10 +1143,10 @@ - 17, 17 + 16, 8 - 157, 17 + 160, 8 diff --git a/INT69DC_7C/Forms/FormDataStatistics.cs b/INT69DC_7C/Forms/FormDataStatistics.cs index 7568a5e..a7d15b4 100644 --- a/INT69DC_7C/Forms/FormDataStatistics.cs +++ b/INT69DC_7C/Forms/FormDataStatistics.cs @@ -856,6 +856,7 @@ namespace INT69DC_7C.Forms for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++) { + #region 데이터 출력 // Lane Number sw.Write("{0}", i + 1); sw.Write(","); @@ -986,6 +987,7 @@ namespace INT69DC_7C.Forms sw.Write(datas[i].TotalNGCount); sw.WriteLine(); + #endregion } sw.Close(); diff --git a/INT69DC_7C/Forms/FormDataViewer.Designer.cs b/INT69DC_7C/Forms/FormDataViewer.Designer.cs index a085d99..7c05885 100644 --- a/INT69DC_7C/Forms/FormDataViewer.Designer.cs +++ b/INT69DC_7C/Forms/FormDataViewer.Designer.cs @@ -264,13 +264,14 @@ this.labelCurrentIndex.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelCurrentIndex.InitVisible = true; this.labelCurrentIndex.LineSpacing = 0F; - this.labelCurrentIndex.Location = new System.Drawing.Point(948, 279); + this.labelCurrentIndex.Location = new System.Drawing.Point(948, 282); this.labelCurrentIndex.Name = "labelCurrentIndex"; this.labelCurrentIndex.Size = new System.Drawing.Size(70, 20); this.labelCurrentIndex.TabIndex = 239; this.labelCurrentIndex.Text = "0"; this.labelCurrentIndex.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelCurrentIndex.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelCurrentIndex.Visible = false; this.labelCurrentIndex.Wordwrap = false; // // smartSeparatorLine1 @@ -282,11 +283,12 @@ this.smartSeparatorLine1.Line2Visible = true; this.smartSeparatorLine1.Line2Width = 1F; this.smartSeparatorLine1.LineDirection = SmartX.SmartSeparatorLine.DIR.Horizontal; - this.smartSeparatorLine1.Location = new System.Drawing.Point(948, 305); + this.smartSeparatorLine1.Location = new System.Drawing.Point(948, 308); this.smartSeparatorLine1.Name = "smartSeparatorLine1"; this.smartSeparatorLine1.Size = new System.Drawing.Size(70, 2); this.smartSeparatorLine1.TabIndex = 238; this.smartSeparatorLine1.Text = "smartSeparatorLine1"; + this.smartSeparatorLine1.Visible = false; // // labelTotalIndex // @@ -298,13 +300,14 @@ this.labelTotalIndex.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelTotalIndex.InitVisible = true; this.labelTotalIndex.LineSpacing = 0F; - this.labelTotalIndex.Location = new System.Drawing.Point(948, 313); + this.labelTotalIndex.Location = new System.Drawing.Point(948, 316); this.labelTotalIndex.Name = "labelTotalIndex"; this.labelTotalIndex.Size = new System.Drawing.Size(70, 20); this.labelTotalIndex.TabIndex = 38; this.labelTotalIndex.Text = "0"; this.labelTotalIndex.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelTotalIndex.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTotalIndex.Visible = false; this.labelTotalIndex.Wordwrap = false; // // buttonDown @@ -320,7 +323,7 @@ this.buttonDown.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Regular); this.buttonDown.GroupID = 0; this.buttonDown.InitVisible = true; - this.buttonDown.Location = new System.Drawing.Point(948, 344); + this.buttonDown.Location = new System.Drawing.Point(948, 350); this.buttonDown.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonDown.Name = "buttonDown"; this.buttonDown.NestedClickEventPrevent = false; @@ -402,7 +405,7 @@ this.listBoxEvent.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle; this.listBoxEvent.SeparationlineVisibleBottom = false; this.listBoxEvent.SeparationlineVisibleTop = false; - this.listBoxEvent.Size = new System.Drawing.Size(180, 535); + this.listBoxEvent.Size = new System.Drawing.Size(180, 540); this.listBoxEvent.TabIndex = 28; this.listBoxEvent.Text = "smartListBox1"; this.listBoxEvent.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged); @@ -456,7 +459,7 @@ this.listBoxType.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle; this.listBoxType.SeparationlineVisibleBottom = false; this.listBoxType.SeparationlineVisibleTop = false; - this.listBoxType.Size = new System.Drawing.Size(90, 535); + this.listBoxType.Size = new System.Drawing.Size(90, 540); this.listBoxType.TabIndex = 28; this.listBoxType.Text = "smartListBox1"; this.listBoxType.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged); @@ -490,7 +493,7 @@ this.listBoxAfter.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle; this.listBoxAfter.SeparationlineVisibleBottom = false; this.listBoxAfter.SeparationlineVisibleTop = false; - this.listBoxAfter.Size = new System.Drawing.Size(130, 535); + this.listBoxAfter.Size = new System.Drawing.Size(130, 540); this.listBoxAfter.TabIndex = 28; this.listBoxAfter.Text = "smartListBox1"; this.listBoxAfter.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged); @@ -524,7 +527,7 @@ this.listBoxBefore.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle; this.listBoxBefore.SeparationlineVisibleBottom = false; this.listBoxBefore.SeparationlineVisibleTop = false; - this.listBoxBefore.Size = new System.Drawing.Size(130, 535); + this.listBoxBefore.Size = new System.Drawing.Size(130, 540); this.listBoxBefore.TabIndex = 28; this.listBoxBefore.Text = "smartListBox1"; this.listBoxBefore.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged); @@ -558,7 +561,7 @@ this.listBoxDetail.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle; this.listBoxDetail.SeparationlineVisibleBottom = false; this.listBoxDetail.SeparationlineVisibleTop = false; - this.listBoxDetail.Size = new System.Drawing.Size(180, 535); + this.listBoxDetail.Size = new System.Drawing.Size(180, 540); this.listBoxDetail.TabIndex = 28; this.listBoxDetail.Text = "smartListBox1"; this.listBoxDetail.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged); @@ -592,7 +595,7 @@ this.listBoxLoginID.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle; this.listBoxLoginID.SeparationlineVisibleBottom = false; this.listBoxLoginID.SeparationlineVisibleTop = false; - this.listBoxLoginID.Size = new System.Drawing.Size(110, 535); + this.listBoxLoginID.Size = new System.Drawing.Size(110, 540); this.listBoxLoginID.TabIndex = 28; this.listBoxLoginID.Text = "smartListBox1"; this.listBoxLoginID.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged); @@ -626,7 +629,7 @@ this.listBoxTime.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle; this.listBoxTime.SeparationlineVisibleBottom = false; this.listBoxTime.SeparationlineVisibleTop = false; - this.listBoxTime.Size = new System.Drawing.Size(80, 535); + this.listBoxTime.Size = new System.Drawing.Size(80, 540); this.listBoxTime.TabIndex = 28; this.listBoxTime.Text = "smartListBox1"; this.listBoxTime.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged); @@ -644,7 +647,7 @@ this.smartLabel8.LineSpacing = 0F; this.smartLabel8.Location = new System.Drawing.Point(852, 5); this.smartLabel8.Name = "smartLabel8"; - this.smartLabel8.Size = new System.Drawing.Size(93, 30); + this.smartLabel8.Size = new System.Drawing.Size(90, 30); this.smartLabel8.TabIndex = 28; this.smartLabel8.Text = "Type"; this.smartLabel8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; diff --git a/INT69DC_7C/Forms/FormDataViewer.cs b/INT69DC_7C/Forms/FormDataViewer.cs index b70cd1f..9e02845 100644 --- a/INT69DC_7C/Forms/FormDataViewer.cs +++ b/INT69DC_7C/Forms/FormDataViewer.cs @@ -20,9 +20,9 @@ namespace INT69DC_7C.Forms private int m_SelectNodeIndex; private int RemainCNT; private int StartIndex; - private int CurrentCount; - private int TotalCount; - private static int ListBoxLineCount = 50; // 화면에 보여지는 listBox 줄 수 + private int DataRemainCNT; + private int DataAllCNT; + private static int ListBoxLineCount = 30; // 화면에 보여지는 listBox 줄 수 public bool IsFileOpen; public string PathDestinationFileName; private FormMain m_ParentForm; @@ -78,8 +78,8 @@ namespace INT69DC_7C.Forms this.SelectNodeIndex = -1; this.StartIndex = 0; this.RemainCNT = 0; - this.CurrentCount = 0; - this.TotalCount = 0; + this.DataRemainCNT = 0; + this.DataAllCNT = 0; this.IsFileOpen = false; this.PathDestinationFileName = ""; @@ -149,8 +149,8 @@ namespace INT69DC_7C.Forms { this.StartIndex = 0; this.RemainCNT = 0; - this.CurrentCount = 0; - this.TotalCount = 0; + this.DataRemainCNT = 0; + this.DataAllCNT = 0; } else { @@ -159,20 +159,20 @@ namespace INT69DC_7C.Forms } this.labelItemsCount.Text = this.StartIndex.ToString() + " / " + this.RemainCNT.ToString(); - this.labelRemainDataCount.Text = this.CurrentCount.ToString(); + this.labelRemainDataCount.Text = this.DataRemainCNT.ToString(); if (this.listBoxTime.ItemCount == 0) this.labelItemCount.Text = "0 / 0"; else - this.labelItemCount.Text = (this.StartIndex + 29).ToString() + " / " + this.TotalCount.ToString(); + this.labelItemCount.Text = (this.StartIndex + 29).ToString() + " / " + this.DataAllCNT.ToString(); } private void UpdateDisplay() { int cnt = 0; - if (this.ListTime.Count > ListBoxLineCount) + if (this.ListTime.Count > 50) { - cnt = ListBoxLineCount; - this.CurrentCount = this.ListTime.Count - ListBoxLineCount; + cnt = 50; + this.DataRemainCNT = this.ListTime.Count - 50; } else cnt = this.ListTime.Count; @@ -204,11 +204,11 @@ namespace INT69DC_7C.Forms splash.LoadingImagePathname = "SmartLoading4"; splash.Start(); - index = this.ListTime.Count - this.CurrentCount; + index = this.ListTime.Count - this.DataRemainCNT; - if (this.CurrentCount > ListBoxLineCount) + if (this.DataRemainCNT > 50) { - range = index + ListBoxLineCount; + range = index + 50; for (int i = index; i < range; i++) { this.listBoxTime.AddItem(this.ListTime[i]); @@ -220,7 +220,7 @@ namespace INT69DC_7C.Forms this.listBoxType.AddItem(this.ListType[i]); } - this.CurrentCount = this.CurrentCount - ListBoxLineCount; + this.DataRemainCNT = this.DataRemainCNT - 50; } else { @@ -235,7 +235,7 @@ namespace INT69DC_7C.Forms this.listBoxType.AddItem(this.ListType[i]); } - this.CurrentCount = 0; + this.DataRemainCNT = 0; } this.ListBoxItemsCount(); @@ -247,41 +247,6 @@ namespace INT69DC_7C.Forms this.labelDisplayUpdateElapsedTime.Text = this.smartTimer1.StopWatchElapsedMicrosecond.ToString(); } - private void UpdateListItem(DataViewerFilter filter) - { - bool enable = false; - // List Item Add - for (int i = 0; i < this.CollectionHistoryData.Count; i++) - { - // 필터 적용 - switch (this.CollectionHistoryData[i][7]) - { - case "Alarm": - enable = filter.TpyeAlarm; - break; - case "Operation": - enable = filter.TypeOperation; - break; - case "Parameter": - enable = filter.TypeParameter; - break; - default: - enable = false; - break; - } - - if (enable == true) - { - this.ListTime.Add(this.CollectionHistoryData[i][1]); - this.ListLoginID.Add(this.CollectionHistoryData[i][2]); - this.ListEvent.Add(this.CollectionHistoryData[i][3]); - this.ListDetail.Add(this.CollectionHistoryData[i][4]); - this.ListBefore.Add(this.CollectionHistoryData[i][5]); - this.ListAfter.Add(this.CollectionHistoryData[i][6]); - this.ListType.Add(this.CollectionHistoryData[i][7]); - } - } - } private void UpdateListItemByFilter(DataViewerFilter filter) { bool enable = false; @@ -292,7 +257,7 @@ namespace INT69DC_7C.Forms switch (this.CollectionHistoryData[i][7]) { case "Alarm": - enable = filter.TpyeAlarm; + enable = filter.TypeAlarm; break; case "Operation": enable = filter.TypeOperation; @@ -318,48 +283,6 @@ namespace INT69DC_7C.Forms } } - private void UpdateListData() - { - // List Item Add - for (int i = 0; i < this.CollectionHistoryData.Count; i++) - { - this.ListTime.Add(this.CollectionHistoryData[i][1]); - this.ListLoginID.Add(this.CollectionHistoryData[i][2]); - this.ListEvent.Add(this.CollectionHistoryData[i][3]); - this.ListDetail.Add(this.CollectionHistoryData[i][4]); - this.ListBefore.Add(this.CollectionHistoryData[i][5]); - this.ListAfter.Add(this.CollectionHistoryData[i][6]); - this.ListType.Add(this.CollectionHistoryData[i][7]); - } - } - private void UpdateListBoxDataDisplay() - { - for (int i = 0; i < this.ListTime.Count; 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.listBoxBefore.AddItem(this.ListBefore[i]); - this.listBoxAfter.AddItem(this.ListAfter[i]); - this.listBoxType.AddItem(this.ListType[i]); - } - } - private void UpdateListBoxCount() - { - this.labelTotalIndex.Text = this.TotalCount.ToString(); - this.labelCurrentIndex.Text = this.CurrentCount.ToString(); - } - private void UpdateData(int startIndex, int endIndex) - { - for (int i = startIndex; i < endIndex; i++) - this.CollectionHistoryData.Add(this.ParentForm.smartFileIO.ReadStringBuffer(i).Split(',')); - - this.UpdateListData(); - this.UpdateListBoxDataDisplay(); - this.UpdateListBoxCount(); - } - public int DataRead(string filePath) { //string path = ""; @@ -402,7 +325,7 @@ namespace INT69DC_7C.Forms this.ParentForm.smartFileIO.Close(); this.CollectionHistoryData.RemoveAt(0); - this.TotalCount = this.CollectionHistoryData.Count; + this.DataAllCNT = this.CollectionHistoryData.Count; // 파일 로딩 시간 타이머 off this.smartTimer1.StopWatch(); @@ -415,7 +338,7 @@ namespace INT69DC_7C.Forms string[] data = filePath.Split('\\'); this.labelFileName.Text = data[data.Length - 1]; // List 갱신 - this.UpdateListItem(this.ParentForm.CurrentDataViewerFilter); + this.UpdateListItemByFilter(this.ParentForm.CurrentDataViewerFilter); // 화면 표시 this.UpdateDisplay(); @@ -440,95 +363,6 @@ namespace INT69DC_7C.Forms return ret; } - public int DataRead1(string filePath) - { - //string path = ""; - int startIndex = 0, endIndex = 0; - int ret = 0, flag = 0; - long lineNum = 0; - - SmartSplash splash; - - splash = new SmartSplash(); - splash.CenterPosition = true; - splash.AnimationInterval = 100; - splash.LoadingImagePathname = "SmartLoading4"; - splash.Start(); - - this.ClearData(); - this.CollectionHistoryData.Clear(); - - // 파일 로딩 시간 타이머 ON - this.smartTimer1.StartWatch(); - - this.ParentForm.smartFileIO.FilePathName = filePath; - if(this.ParentForm.smartFileIO.Open(2000000)== true) - this.IsFileOpen = true; - bool bValue = this.ParentForm.smartFileIO.ReadStringAllBuffer(); - if (bValue == false) - { - this.ParentForm.smartFileIO.Close(); - this.IsFileOpen = false; - return -1; - } - - try - { - lineNum = this.ParentForm.smartFileIO.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.UpdateData(startIndex, endIndex); - - // 파일 로딩 시간 타이머 off - this.smartTimer1.StopWatch(); - this.labelFileReadElapsedTime.Text = this.smartTimer1.StopWatchElapsedMicrosecond.ToString(); - - // 화면 표시 로딩시간 타이머 on - this.smartTimer1.StartWatch(); - - // File Name - string[] data = filePath.Split('\\'); - this.labelFileName.Text = data[data.Length - 1]; - //// List 갱신 - //this.UpdateListItem(this.ParentForm.CurrentDataViewerFilter); - //// 화면 표시 - //this.UpdateDisplay(); - - // 화면 표시 로딩시간 타이머 off - this.smartTimer1.StopWatch(); - this.labelDisplayUpdateElapsedTime.Text = this.smartTimer1.StopWatchElapsedMicrosecond.ToString(); - - //this.CollectionHistoryData.Clear(); - ret = 0; - splash.Finish(); - } - catch - { - this.CollectionHistoryData.Clear(); - ret = -1; - splash.Finish(); - DialogFormMessage msg = new DialogFormMessage(13, this.ParentForm.SystemConfig.Language); - msg.ShowDialog(); - - this.ParentForm.smartFileIO.Close(); - } - - return ret; - } public void ClearData() { this.CollectionHistoryData.Clear(); @@ -581,10 +415,10 @@ namespace INT69DC_7C.Forms { DialogFormDataViewerFilter form = new DialogFormDataViewerFilter(this); if (form.ShowDialog() == DialogResult.OK) - { + { // 필터적용 this.ClearData(); - this.UpdateListItem(this.ParentForm.CurrentDataViewerFilter); + this.UpdateListItemByFilter(this.ParentForm.CurrentDataViewerFilter); this.UpdateDisplay(); } } @@ -596,13 +430,13 @@ namespace INT69DC_7C.Forms if (this.StartIndex < 6) this.ListBoxScrollUp(); else - this.ListBoxScrollUp(ListBoxLineCount); + this.ListBoxScrollUp(50); } private void buttonDown_Click(object sender, EventArgs e) { if (this.RemainCNT == 0) { - if (this.CurrentCount != 0) + if (this.DataRemainCNT != 0) { this.UpdateDisplayAddListBox(); } @@ -612,7 +446,7 @@ namespace INT69DC_7C.Forms if (this.RemainCNT < 6) this.ListBoxScrollDown(); else - this.ListBoxScrollDown(ListBoxLineCount); + this.ListBoxScrollDown(50); } private void listBox_SelectedIndexChanged(object sender, EventArgs e) diff --git a/INT69DC_7C/Forms/FormMain.cs b/INT69DC_7C/Forms/FormMain.cs index f65330c..2afe764 100644 --- a/INT69DC_7C/Forms/FormMain.cs +++ b/INT69DC_7C/Forms/FormMain.cs @@ -254,6 +254,7 @@ namespace INT69DC_7C.Forms { this.ChildFormMainDisplay = new FormMainDisplay(this); this.ChildFormMenu = new FormMenu(this); + this.ChildFormDataViewer = new FormDataViewer(this); this.ChildFormInformation = new FormInformation(this); this.ChildFormCommunication = new FormCommunication(this); this.ChildFormDataStatistics = new FormDataStatistics(this); @@ -270,7 +271,6 @@ namespace INT69DC_7C.Forms this.ChildFormProgramUpdate = new FormProgramUpdate(this); this.ChildFormUserEditor = new FormUserEditor(this); this.ChildFormUserGroupEditor = new FormUserGroupEditor(this); - this.ChildFormDataViewer = new FormDataViewer(this); if (this.SystemConfig.IsPart11 == true) this.ChildFormDataBackup_Part11 = new FormDataBackup_Part11(this); else @@ -280,6 +280,7 @@ namespace INT69DC_7C.Forms this.smartForm.AddChildForm(this.ChildFormMainDisplay); this.smartForm.AddChildForm(this.ChildFormMenu); + this.smartForm.AddChildForm(this.ChildFormDataViewer); this.smartForm.AddChildForm(this.ChildFormInformation); this.smartForm.AddChildForm(this.ChildFormCommunication); this.smartForm.AddChildForm(this.ChildFormDataStatistics); @@ -296,7 +297,6 @@ namespace INT69DC_7C.Forms this.smartForm.AddChildForm(this.ChildFormProgramUpdate); this.smartForm.AddChildForm(this.ChildFormUserEditor); this.smartForm.AddChildForm(this.ChildFormUserGroupEditor); - this.smartForm.AddChildForm(this.ChildFormDataViewer); if (this.SystemConfig.IsPart11 == true) this.smartForm.AddChildForm(this.ChildFormDataBackup_Part11); else @@ -5082,8 +5082,8 @@ namespace INT69DC_7C.Forms } } - foreach (WeightData data in this.CollectionWeightData) - data.IsUpdate = true; + //foreach (WeightData data in this.CollectionWeightData) + // data.IsUpdate = true; #endregion if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay)