Commit a38c84c8 authored by 潘栩锋's avatar 潘栩锋 🚴

1

parent 48f37511
...@@ -65,7 +65,7 @@ namespace Misc ...@@ -65,7 +65,7 @@ namespace Misc
{ {
get get
{ {
if (Misc.MyBase.ISVALIDATA(Begin)) if (Misc.MyBase.ISVALIDATA(Begin) && Misc.MyBase.ISVALIDATA(End))
return true; return true;
else else
return false; return false;
......
...@@ -161,143 +161,49 @@ namespace ThickTcpUiInWindow.UIModule ...@@ -161,143 +161,49 @@ namespace ThickTcpUiInWindow.UIModule
gage.mBulkDataClient.Add(bulkdata_client); gage.mBulkDataClient.Add(bulkdata_client);
} }
} }
/// <summary> /// <summary>
/// 扫描图的参数 /// 扫描图的参数
/// </summary> /// </summary>
public class ScanGraphItemParam : UIModuleParam public class ScanGraphItemParam : UIModuleParam
{ {
private string _charttype = "Column";
/// <summary> /// <summary>
/// 曲线类型 /// 曲线类型
/// </summary> /// </summary>
public string ChartType public string ChartType { get; set; } = "Column";
{
get
{
return _charttype;
}
set
{
_charttype = value;
NotifyPropertyChanged("ChartType");
}
}
private int bm = 0;
/// <summary> /// <summary>
/// 记录点 /// 记录点
/// </summary> /// </summary>
public int BM public int BM { get; set; } = 0;
{
get
{
return bm;
}
set
{
if (bm != value)
{
bm = value;
NotifyPropertyChanged("BM");
}
}
}
private double _yrangepercent = 3;
/// <summary> /// <summary>
/// Y轴比例 /// Y轴比例
/// </summary> /// </summary>
public double YRangePercent public double YRangePercent { get; set; } = 3;
{
get
{
return _yrangepercent;
}
set
{
_yrangepercent = value;
NotifyPropertyChanged("YRangePercent");
}
}
private string title = "扫描图";
/// <summary> /// <summary>
/// 标题 /// 标题
/// </summary> /// </summary>
public string Title public string Title { get; set; } = "扫描图";
{
get { return title; }
set
{
if (title != value)
{
title = value;
NotifyPropertyChanged("Title");
}
}
}
private int mix = 1;
/// <summary> /// <summary>
/// 混合图 /// 混合图
/// </summary> /// </summary>
public int Mix public int Mix { get; set; } = 1;
{
get
{
return mix;
}
set
{
if (mix != value)
{
mix = value;
NotifyPropertyChanged("Mix");
}
}
}
private bool isautotarget = false;
/// <summary> /// <summary>
/// 自动目标值 /// 自动目标值
/// </summary> /// </summary>
public bool IsAutoTarget public bool IsAutoTarget { get; set; } = false;
{
get
{
return isautotarget;
}
set
{
if (isautotarget != value)
{
isautotarget = value;
NotifyPropertyChanged("IsAutoTarget");
}
}
}
private bool ispercent = false;
/// <summary> /// <summary>
/// % 显示 /// % 显示
/// </summary> /// </summary>
public bool IsPercent public bool IsPercent { get; set; } = false;
{
get
{
return ispercent;
}
set
{
if (ispercent != value)
{
ispercent = value;
NotifyPropertyChanged("IsPercent");
}
}
}
/// <summary> /// <summary>
...@@ -319,82 +225,35 @@ namespace ThickTcpUiInWindow.UIModule ...@@ -319,82 +225,35 @@ namespace ThickTcpUiInWindow.UIModule
return names.ToArray(); return names.ToArray();
} }
} }
/// <summary> /// <summary>
/// 全部扫描图的参数 /// 全部扫描图的参数
/// </summary> /// </summary>
public class ScanGraphParams : UIModuleParams<ScanGraphItemParam> public class ScanGraphParams : UIModuleParams<ScanGraphItemParam>
{ {
bool isreverserd = false;
/// <summary> /// <summary>
/// 主界面反向 /// 主界面反向
/// </summary> /// </summary>
public bool IsReversed public bool IsReversed { get; set; }
{
get { return isreverserd; }
set
{
if (isreverserd != value)
{
isreverserd = value;
NotifyPropertyChanged("IsReversed");
}
}
}
bool lrisvisable = false;
/// <summary> /// <summary>
/// 显示 左右标示 /// 显示 左右标示
/// </summary> /// </summary>
public bool LRIsVisable public bool LRIsVisable { get; set; } = false;
{
get { return lrisvisable; }
set
{
if (lrisvisable != value)
{
lrisvisable = value;
NotifyPropertyChanged("LRIsVisable");
}
}
}
bool lrisreverserd = false;
/// <summary> /// <summary>
/// 左右标示 反向 /// 左右标示 反向
/// </summary> /// </summary>
public bool LRIsReversed public bool LRIsReversed { get; set; } = false;
{
get { return lrisreverserd; }
set
{
if (lrisreverserd != value)
{
lrisreverserd = value;
NotifyPropertyChanged("LRIsReversed");
}
}
}
private int xInterval = 10;
/// <summary> /// <summary>
/// 扫描图轴间隔 ,单位分区 /// 扫描图轴间隔 ,单位分区
/// </summary> /// </summary>
public int XInterval public int XInterval { get; set; } = 10;
{
get { return xInterval; }
set
{
if (xInterval != value)
{
xInterval = value;
NotifyPropertyChanged("XInterval");
}
}
}
static ScanGraphParams() static ScanGraphParams()
{ {
Misc.SaveToXmlHepler.Regist(typeof(ScanGraphParams)); Misc.SaveToXmlHepler.Regist(typeof(ScanGraphParams));
...@@ -433,7 +292,6 @@ namespace ThickTcpUiInWindow.UIModule ...@@ -433,7 +292,6 @@ namespace ThickTcpUiInWindow.UIModule
} }
} }
/// <summary> /// <summary>
/// 扫描图控件模块 /// 扫描图控件模块
/// </summary> /// </summary>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment