1

Project.FLY.Misc/MISC/Range.cs

@@ -65,7 +65,7 @@ namespace Misc
         {
             get
             {
-                if (Misc.MyBase.ISVALIDATA(Begin))
+                if (Misc.MyBase.ISVALIDATA(Begin) && Misc.MyBase.ISVALIDATA(End))
                     return true;
                 else
                     return false;

Project.FLY.Thick.Base/FLY.Thick.Base.UI/UIModule/ScanGraph.xaml.cs

@@ -161,143 +161,49 @@ namespace ThickTcpUiInWindow.UIModule
             gage.mBulkDataClient.Add(bulkdata_client);
         }
     }
+    
     /// <summary>
     /// 扫描图的参数
     /// </summary>
     public class ScanGraphItemParam : UIModuleParam
     {
 
-        private string _charttype = "Column";
         /// <summary>
         /// 曲线类型
         /// </summary>
-        public string ChartType
-        {
-            get
-            {
-                return _charttype;
-            }
-            set
-            {
-                _charttype = value;
-
-                NotifyPropertyChanged("ChartType");
-            }
-        }
-        private int bm = 0;
+        public string ChartType { get; set; } = "Column";
+        
         /// <summary>
         /// 记录点
         /// </summary>
-        public int BM
-        {
-            get
-            {
-                return bm;
-            }
-            set
-            {
-                if (bm != value)
-                {
-                    bm = value;
-                    NotifyPropertyChanged("BM");
-                }
-            }
-        }
+        public int BM { get; set; } = 0;
 
-        private double _yrangepercent = 3;
         /// <summary>
         /// Y轴比例
         /// </summary>
-        public double YRangePercent
-        {
-            get
-            {
-                return _yrangepercent;
-            }
-            set
-            {
-                _yrangepercent = value;
-                NotifyPropertyChanged("YRangePercent");
-            }
-        }
+        public double YRangePercent { get; set; } = 3;
 
-        private string title = "扫描图";
         /// <summary>
         /// 标题
         /// </summary>
-        public string Title
-        {
-            get { return title; }
-            set
-            {
-                if (title != value)
-                {
-                    title = value;
-                    NotifyPropertyChanged("Title");
-                }
-            }
-        }
+        public string Title { get; set; } = "扫描图";
+
 
-        private int mix = 1;
         /// <summary>
         /// 混合图
         /// </summary>
-        public int Mix
-        {
-            get
-            {
-                return mix;
-            }
-            set
-            {
-                if (mix != value)
-                {
-                    mix = value;
-                    NotifyPropertyChanged("Mix");
-                }
-            }
-        }
-
+        public int Mix { get; set; } = 1;
 
-        private bool isautotarget = false;
         /// <summary>
         /// 自动目标值
         /// </summary>
-        public bool IsAutoTarget
-        {
-            get
-            {
-                return isautotarget;
-            }
-            set
-            {
-                if (isautotarget != value)
-                {
-                    isautotarget = value;
-                    NotifyPropertyChanged("IsAutoTarget");
-                }
-            }
-        }
+        public bool IsAutoTarget { get; set; } = false;
 
-        private bool ispercent = false;
+        
         /// <summary>
         /// % 显示
         /// </summary>
-        public bool IsPercent
-        {
-            get
-            {
-                return ispercent;
-            }
-            set
-            {
-                if (ispercent != value)
-                {
-                    ispercent = value;
-                    NotifyPropertyChanged("IsPercent");
-                }
-            }
-        }
+        public bool IsPercent { get; set; } = false;
 
 
         /// <summary>
@@ -319,82 +225,35 @@ namespace ThickTcpUiInWindow.UIModule
             return names.ToArray();
         }
     }
+    
     /// <summary>
     /// 全部扫描图的参数
     /// </summary>
     public class ScanGraphParams : UIModuleParams<ScanGraphItemParam>
     {
-        bool isreverserd = false;
         /// <summary>
         /// 主界面反向 
         /// </summary>
-        public bool IsReversed
-        {
-            get { return isreverserd; }
-            set
-            {
-
-                if (isreverserd != value)
-                {
-                    isreverserd = value;
-                    NotifyPropertyChanged("IsReversed");
-                }
-            }
-        }
+        public bool IsReversed { get; set; }
 
-        bool lrisvisable = false;
         /// <summary>
         /// 显示 左右标示
         /// </summary>
-        public bool LRIsVisable
-        {
-            get { return lrisvisable; }
-            set
-            {
+        public bool LRIsVisable { get; set; } = false;
 
-                if (lrisvisable != value)
-                {
-                    lrisvisable = value;
-                    NotifyPropertyChanged("LRIsVisable");
-                }
-            }
-        }
 
-        bool lrisreverserd = false;
         /// <summary>
         /// 左右标示 反向
         /// </summary>
-        public bool LRIsReversed
-        {
-            get { return lrisreverserd; }
-            set
-            {
+        public bool LRIsReversed { get; set; } = false;
 
-                if (lrisreverserd != value)
-                {
-                    lrisreverserd = value;
-                    NotifyPropertyChanged("LRIsReversed");
-                }
-            }
-        }
 
-        private int xInterval = 10;
         /// <summary>
         /// 扫描图轴间隔 ,单位分区
         /// </summary>
-        public int XInterval
-        {
-            get { return xInterval; }
-            set
-            {
+        public int XInterval { get; set; } = 10;
+
 
-                if (xInterval != value)
-                {
-                    xInterval = value;
-                    NotifyPropertyChanged("XInterval");
-                }
-            }
-        }
         static ScanGraphParams()
         {
             Misc.SaveToXmlHepler.Regist(typeof(ScanGraphParams));
@@ -432,8 +291,7 @@ namespace ThickTcpUiInWindow.UIModule
             return names.ToArray();
         }
     }
-
-
+    
     /// <summary>
     /// 扫描图控件模块
     /// </summary>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/UIModule/ScanGraphConfig.xaml

 <flyctrllib:WindowBigClose x:Class="ThickTcpUiInWindow.UIModule.ScanGraphConfig"
-                            xmlns:flyctrllib="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
+        xmlns:flyctrllib="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"