데이터 뷰어 필터 수정

INT69DC_7C/DialogForms/DialogFormHistoryData.cs

@@ -84,6 +84,10 @@ namespace INT69DC_7C.DialogForms
         {
             this.DisplayTreeViewUpdate();
 
+            this.checkBoxTypeAlarm.Checked = this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeAlarm;
+            this.checkBoxTypeOperation.Checked = this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeOperation;
+            this.checkBoxTypeParameter.Checked = this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeParameter;
+
             this.labelNodeIndex.Text = "-";
             this.labelFileName.Text = "-";
             this.labelDate.Text = "-";
@@ -208,11 +212,6 @@ namespace INT69DC_7C.DialogForms
                 }
             }
         }
-
-        public void DisplayRefresh()
-        {
-            this.DisplayTreeViewUpdate();
-        }
         #endregion
 
         #region Event Handler
@@ -227,6 +226,13 @@ namespace INT69DC_7C.DialogForms
             this.treeView.Enabled = false;
             this.buttonRead.Enabled = false;
             this.buttonClose.Enabled = false;
+            this.checkBoxTypeAlarm.Enabled = false;
+            this.checkBoxTypeOperation.Enabled = false;
+            this.checkBoxTypeParameter.Enabled = false;
+
+            this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeAlarm = this.checkBoxTypeAlarm.Checked;
+            this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeOperation = this.checkBoxTypeOperation.Checked;
+            this.ParentForm.ParentForm.CurrentDataViewerFilter.TypeParameter = this.checkBoxTypeParameter.Checked;
 
             year = this.SeletedFilePath.Substring(1, 4);
             iMonth = int.Parse(this.SeletedFilePath.Substring(5, 2));
@@ -245,6 +251,9 @@ namespace INT69DC_7C.DialogForms
             this.treeView.Enabled = true;
             this.buttonRead.Enabled = true;
             this.buttonClose.Enabled = true;
+            this.checkBoxTypeAlarm.Enabled = true;
+            this.checkBoxTypeOperation.Enabled = true;
+            this.checkBoxTypeParameter.Enabled = true;
         }
         private void buttonClose_Click(object sender, EventArgs e)
         {

INT69DC_7C/DialogForms/DialogFormHistoryData.designer.cs

@@ -38,6 +38,9 @@
             this.labelDate = new SmartX.SmartLabel();
             this.labelNodeIndex = new SmartX.SmartLabel();
             this.buttonClose = new SmartX.SmartButton();
+            this.checkBoxTypeParameter = new SmartX.SmartCheckBox();
+            this.checkBoxTypeOperation = new SmartX.SmartCheckBox();
+            this.checkBoxTypeAlarm = new SmartX.SmartCheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
             this.smartGroupBox1.SuspendLayout();
             this.SuspendLayout();
@@ -123,6 +126,9 @@
             // 
             this.smartGroupBox1.BackPictureBox = this.smartForm1;
             this.smartGroupBox1.BackPictureBox1 = null;
+            this.smartGroupBox1.Controls.Add(this.checkBoxTypeParameter);
+            this.smartGroupBox1.Controls.Add(this.checkBoxTypeOperation);
+            this.smartGroupBox1.Controls.Add(this.checkBoxTypeAlarm);
             this.smartGroupBox1.Controls.Add(this.labelTitleDate);
             this.smartGroupBox1.Controls.Add(this.labelDate);
             this.smartGroupBox1.Controls.Add(this.labelNodeIndex);
@@ -240,6 +246,75 @@
             this.buttonClose.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonClose.UpImage")));
             this.buttonClose.Click += new System.EventHandler(this.buttonClose_Click);
             // 
+            // checkBoxTypeParameter
+            // 
+            this.checkBoxTypeParameter.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
+            this.checkBoxTypeParameter.BackPictureBox = null;
+            this.checkBoxTypeParameter.BackPictureBox1 = null;
+            this.checkBoxTypeParameter.BackPictureBox2 = null;
+            this.checkBoxTypeParameter.CheckBoxBackColor = System.Drawing.Color.White;
+            this.checkBoxTypeParameter.CheckBoxCheckColor = System.Drawing.Color.Green;
+            this.checkBoxTypeParameter.CheckBoxForeColor = System.Drawing.Color.Black;
+            this.checkBoxTypeParameter.CheckBoxSymbolSize = 14;
+            this.checkBoxTypeParameter.Checked = false;
+            this.checkBoxTypeParameter.CheckLineWidth = 3;
+            this.checkBoxTypeParameter.ForeColor = System.Drawing.Color.White;
+            this.checkBoxTypeParameter.ImageCheckBox = null;
+            this.checkBoxTypeParameter.ImageUnCheckBox = null;
+            this.checkBoxTypeParameter.InitVisible = true;
+            this.checkBoxTypeParameter.Location = new System.Drawing.Point(237, 205);
+            this.checkBoxTypeParameter.Name = "checkBoxTypeParameter";
+            this.checkBoxTypeParameter.Size = new System.Drawing.Size(100, 25);
+            this.checkBoxTypeParameter.TabIndex = 19;
+            this.checkBoxTypeParameter.Text = "Parameter";
+            this.checkBoxTypeParameter.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
+            // 
+            // checkBoxTypeOperation
+            // 
+            this.checkBoxTypeOperation.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
+            this.checkBoxTypeOperation.BackPictureBox = null;
+            this.checkBoxTypeOperation.BackPictureBox1 = null;
+            this.checkBoxTypeOperation.BackPictureBox2 = null;
+            this.checkBoxTypeOperation.CheckBoxBackColor = System.Drawing.Color.White;
+            this.checkBoxTypeOperation.CheckBoxCheckColor = System.Drawing.Color.Green;
+            this.checkBoxTypeOperation.CheckBoxForeColor = System.Drawing.Color.Black;
+            this.checkBoxTypeOperation.CheckBoxSymbolSize = 14;
+            this.checkBoxTypeOperation.Checked = false;
+            this.checkBoxTypeOperation.CheckLineWidth = 3;
+            this.checkBoxTypeOperation.ForeColor = System.Drawing.Color.White;
+            this.checkBoxTypeOperation.ImageCheckBox = null;
+            this.checkBoxTypeOperation.ImageUnCheckBox = null;
+            this.checkBoxTypeOperation.InitVisible = true;
+            this.checkBoxTypeOperation.Location = new System.Drawing.Point(237, 174);
+            this.checkBoxTypeOperation.Name = "checkBoxTypeOperation";
+            this.checkBoxTypeOperation.Size = new System.Drawing.Size(100, 25);
+            this.checkBoxTypeOperation.TabIndex = 18;
+            this.checkBoxTypeOperation.Text = "Operation";
+            this.checkBoxTypeOperation.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
+            // 
+            // checkBoxTypeAlarm
+            // 
+            this.checkBoxTypeAlarm.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30)))));
+            this.checkBoxTypeAlarm.BackPictureBox = null;
+            this.checkBoxTypeAlarm.BackPictureBox1 = null;
+            this.checkBoxTypeAlarm.BackPictureBox2 = null;
+            this.checkBoxTypeAlarm.CheckBoxBackColor = System.Drawing.Color.White;
+            this.checkBoxTypeAlarm.CheckBoxCheckColor = System.Drawing.Color.Green;
+            this.checkBoxTypeAlarm.CheckBoxForeColor = System.Drawing.Color.Black;
+            this.checkBoxTypeAlarm.CheckBoxSymbolSize = 14;
+            this.checkBoxTypeAlarm.Checked = false;
+            this.checkBoxTypeAlarm.CheckLineWidth = 3;
+            this.checkBoxTypeAlarm.ForeColor = System.Drawing.Color.White;
+            this.checkBoxTypeAlarm.ImageCheckBox = null;
+            this.checkBoxTypeAlarm.ImageUnCheckBox = null;
+            this.checkBoxTypeAlarm.InitVisible = true;
+            this.checkBoxTypeAlarm.Location = new System.Drawing.Point(237, 143);
+            this.checkBoxTypeAlarm.Name = "checkBoxTypeAlarm";
+            this.checkBoxTypeAlarm.Size = new System.Drawing.Size(100, 25);
+            this.checkBoxTypeAlarm.TabIndex = 17;
+            this.checkBoxTypeAlarm.Text = "Alarm";
+            this.checkBoxTypeAlarm.TextVAlign = SmartX.SmartCheckBox.TextVerAlign.Middle;
+            // 
             // DialogFormHistoryData
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -268,5 +343,8 @@
         private SmartX.SmartLabel labelNodeIndex;
         private SmartX.SmartLabel labelTitleDate;
         private SmartX.SmartLabel labelDate;
+        private SmartX.SmartCheckBox checkBoxTypeParameter;
+        private SmartX.SmartCheckBox checkBoxTypeOperation;
+        private SmartX.SmartCheckBox checkBoxTypeAlarm;
     }
 }

INT69DC_7C/Forms/FormDataViewer.Designer.cs

@@ -225,6 +225,7 @@
             this.buttonFilter.TextLocation = new System.Drawing.Point(0, 0);
             this.buttonFilter.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
             this.buttonFilter.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonFilter.UpImage")));
+            this.buttonFilter.Visible = false;
             this.buttonFilter.Click += new System.EventHandler(this.buttonFilter_Click);
             // 
             // panel1