From 330002911a64ea58d6834b64228870228eb75391 Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期四, 20 三月 2025 16:12:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs
index 83758ca..b634d6e 100644
--- a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs
+++ b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs
@@ -10,36 +10,37 @@
 {
     public partial class IBoxFormDataFilter : DocumentPage
     {
-
         public IBoxFormDataFilter()
         {
             InitializeComponent();
             imageComboBoxEdit1.EditValue = "Flow";
             InitChart();
         }
+
         public void HideButton()
         {
             //simpleButton1.Visible = simpleButton2.Visible = simpleButton3.Visible = simpleButton4.Visible = false;
-            layoutControlItem7.Visibility = layoutControlItem9.Visibility = layoutControlItem8.Visibility = layoutControlItem3.Visibility =  DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            layoutControlItem7.Visibility = layoutControlItem9.Visibility = layoutControlItem8.Visibility = layoutControlItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
         }
+
         private void EboxFormDataFilter_Load(object sender, EventArgs e)
         {
             SendText(IBoxHelper.startCode + IBoxHelper.getfilterCode + IBoxHelper.paramCode + IBoxHelper.endCode);
         }
 
         public event EventHandler<string> SendData;
+
         private void SendText(string content)
         {
             if (SendData != null)
             {
                 SendData?.Invoke(null, content);
-
             }
             else
             {
                 if (IBoxHelper.Ping())
                 {
-                    var smsg = content.Split(new string[] { IBoxHelper.paramCode }, StringSplitOptions.RemoveEmptyEntries);
+                    var smsg = content.Split(new string[] { IBoxHelper.paramCode, IBoxHelper.startCode }, StringSplitOptions.RemoveEmptyEntries);
                     if (smsg.Length < 2)
                     {
                         return;
@@ -81,10 +82,11 @@
             checkEditIsPress.Checked = model.IsPressFilter;
             imageComboBoxEdit1_SelectedIndexChanged(null, null);
         }
+
         private Series _seriesOld, _seriesNew;
-        List<TimeValue> timeValuesOld_csv = new List<TimeValue>();
-        List<TimeValue> timeValuesNew_csv = new List<TimeValue>();
-        FilterKalman filterKalman = null;
+        private List<TimeValue> timeValuesOld_csv = new List<TimeValue>();
+        private List<TimeValue> timeValuesNew_csv = new List<TimeValue>();
+        private FilterKalman filterKalman = null;
 
         private void InitChart()
         {
@@ -105,10 +107,9 @@
             diag.ZoomingOptions.ZoomInMouseAction.ModifierKeys = ChartModifierKeys.None;
             diag.EnableAxisXZooming = true;
             diag.EnableAxisXScrolling = true;
-
         }
 
-        private void ClearChart()
+        public void ClearChart()
         {
             this.chartControl1.BeginInit();
 
@@ -155,6 +156,7 @@
                 };
             }
         }
+
         private void simpleButton2_Click_1(object sender, EventArgs e)
         {
             ReSet();
@@ -170,7 +172,6 @@
             var QValue = double.Parse(textEditQValue.Text);
             var AValue = double.Parse(textEditAValue.Text);
             var HValue = double.Parse(textEditHValue.Text);
-
 
             SetValue();
 
@@ -194,10 +195,12 @@
             //_seriesNew.BindToData(timeValuesNew_csv, "Time", "Value");
             this.chartControl1.EndInit();
         }
-        IBoxFilterViewModel model = new IBoxFilterViewModel();
+
+        private IBoxFilterViewModel model = new IBoxFilterViewModel();
+
         private void simpleButton4_Click(object sender, EventArgs e)
         {
-            Save();            
+            Save();
         }
 
         public void Save()
@@ -227,6 +230,7 @@
                             checkEditIsControlInput.Checked = model.FlowFilterConfig.IsControlInput;
                         }
                         break;
+
                     case "Press":
                         if (model.PressFilterConfig != null)
                         {
@@ -253,6 +257,7 @@
         public void Import()
         {
             #region Load
+
             ClearChart();
 
             var dlg = new OpenFileDialog();
@@ -288,11 +293,11 @@
                                     continue;
                                 var timeValue = new TimeValue(time, value);
                                 timeValuesOld_csv.Add(timeValue);
-
                             }
                         }
                     }
                     break;
+
                 default:
                     {
                         WaitFormHelper.HideWaitForm();
@@ -302,7 +307,8 @@
                     break;
             }
             WaitFormHelper.HideWaitForm();
-            #endregion
+
+            #endregion Load
 
             if (timeValuesOld_csv.Count < 1)
             {

--
Gitblit v1.9.3