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

添加注解

parent 21cc9bb8
...@@ -45,8 +45,7 @@ ...@@ -45,8 +45,7 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<DocumentationFile> <DocumentationFile>bin\Debug\MISC.xml</DocumentationFile>
</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
...@@ -70,6 +69,7 @@ ...@@ -70,6 +69,7 @@
</Reference> </Reference>
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
......
...@@ -3,13 +3,31 @@ using System.Collections.Generic; ...@@ -3,13 +3,31 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.ComponentModel; using System.ComponentModel;
using System.Runtime.Serialization;
namespace Misc namespace Misc
{ {
/// <summary>
/// 方向
/// </summary>
public enum DIRECTION public enum DIRECTION
{ {
/// <summary>
/// 定点
/// </summary>
[Description("定点")]
FIX = 2, FIX = 2,
/// <summary>
/// 前进
/// </summary>
[Description("前进")]
FORWARD = 1, FORWARD = 1,
/// <summary>
/// 后退
/// </summary>
[Description("后退")]
BACKWARD = 0 BACKWARD = 0
} }
} }
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
<DocumentationFile>bin\Debug\FLY.OBJComponents.xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
......
...@@ -226,7 +226,7 @@ namespace FLY.Thick.Base.UI ...@@ -226,7 +226,7 @@ namespace FLY.Thick.Base.UI
initParamService.IsTimeGridAdvEnabled = this.IsTimeGridAdvEnabled; initParamService.IsTimeGridAdvEnabled = this.IsTimeGridAdvEnabled;
initParamService.AutoOrgInterval = this.AutoOrgInterval; initParamService.AutoOrgInterval = this.AutoOrgInterval;
initParamService.Encoder1_mmpp = this.Encoder1_mmpp; initParamService.Encoder1_mmpp = this.Encoder1_mmpp;
initParamService.Speed1Scale = this.Speed1Scale;
initParamService.FilmVSrc = this.FilmVSrc; initParamService.FilmVSrc = this.FilmVSrc;
initParamService.FilmVThreshold = this.FilmVThreshold; initParamService.FilmVThreshold = this.FilmVThreshold;
initParamService.Encoder2_mmpp = this.Encoder2_mmpp; initParamService.Encoder2_mmpp = this.Encoder2_mmpp;
......
...@@ -2,8 +2,15 @@ ...@@ -2,8 +2,15 @@
namespace FLY.Thick.Base.Common namespace FLY.Thick.Base.Common
{ {
/// <summary>
///
/// </summary>
public class CurveCell : INotifyPropertyChanged public class CurveCell : INotifyPropertyChanged
{ {
/// <summary>
///
/// </summary>
/// <returns></returns>
public override string ToString() public override string ToString()
{ {
return "value=" + Value.ToString() + " ad=" + AD.ToString() + " revisedad=" + RevisedAD.ToString(); return "value=" + Value.ToString() + " ad=" + AD.ToString() + " revisedad=" + RevisedAD.ToString();
...@@ -13,7 +20,9 @@ namespace FLY.Thick.Base.Common ...@@ -13,7 +20,9 @@ namespace FLY.Thick.Base.Common
/// 面密度 /// 面密度
/// </summary> /// </summary>
public double Value { get; set; } public double Value { get; set; }
/// <summary>
///
/// </summary>
public int AD { get; set; } public int AD { get; set; }
/// <summary> /// <summary>
...@@ -26,9 +35,15 @@ namespace FLY.Thick.Base.Common ...@@ -26,9 +35,15 @@ namespace FLY.Thick.Base.Common
#endregion #endregion
} }
/// <summary>
///
/// </summary>
public class CurveCell2 : INotifyPropertyChanged public class CurveCell2 : INotifyPropertyChanged
{ {
/// <summary>
///
/// </summary>
/// <returns></returns>
public override string ToString() public override string ToString()
{ {
return $"ad={AD},value={Value:F2}"; return $"ad={AD},value={Value:F2}";
...@@ -37,14 +52,18 @@ namespace FLY.Thick.Base.Common ...@@ -37,14 +52,18 @@ namespace FLY.Thick.Base.Common
/// 面密度 /// 面密度
/// </summary> /// </summary>
public double Value { get; set; } public double Value { get; set; }
/// <summary>
///
/// </summary>
public int AD { get; set; } public int AD { get; set; }
#region INotifyPropertyChanged 成员 #region INotifyPropertyChanged 成员
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
#endregion #endregion
} }
/// <summary>
///
/// </summary>
public enum AD2ValueFlag public enum AD2ValueFlag
{ {
/// <summary> /// <summary>
...@@ -74,6 +93,9 @@ namespace FLY.Thick.Base.Common ...@@ -74,6 +93,9 @@ namespace FLY.Thick.Base.Common
/// </summary> /// </summary>
X2 X2
} }
/// <summary>
///
/// </summary>
public enum CurveCorrectWay public enum CurveCorrectWay
{ {
/// <summary> /// <summary>
......
...@@ -84,13 +84,14 @@ namespace FLY.Thick.Base.Common ...@@ -84,13 +84,14 @@ namespace FLY.Thick.Base.Common
#endregion #endregion
#region 运行状态 #region 运行状态
/// <summary> /// <summary>
/// 运行状态 /// 运行状态 定点 FIX = 0 \ 归零 ORG = 1 \ 扫描 SCAN = 2 \ 前进 FORW = 3 \ 后退 BACKW = 4 \ 停止 STOP = 5 \ 急停 EMGS = 6 \ 机架修正 CORR = 7 \ 运行至 RUNNING = 10 \ 连接断开 DISCONNECTED = 11
/// </summary> /// </summary>
public CTRL_STATE ControllerState { get; set; } public CTRL_STATE ControllerState { get; set; }
/// <summary> /// <summary>
/// /// 自动扫描倒计时
/// </summary> /// </summary>
public int AutoScanCounter { get; set; } = 5; public int AutoScanCounter { get; set; } = 5;
...@@ -103,8 +104,14 @@ namespace FLY.Thick.Base.Common ...@@ -103,8 +104,14 @@ namespace FLY.Thick.Base.Common
#region IO #region IO
/// <summary>
/// AD盒的输入口
/// </summary>
public UInt16 IStatus { get; set; } = 0xffff; public UInt16 IStatus { get; set; } = 0xffff;
/// <summary>
/// AD盒的输出口
/// </summary>
public UInt16 OStatus { get; set; } = 0xffff; public UInt16 OStatus { get; set; } = 0xffff;
/// <summary> /// <summary>
......
...@@ -104,17 +104,17 @@ namespace FLY.Thick.Base.Common ...@@ -104,17 +104,17 @@ namespace FLY.Thick.Base.Common
public class GridInfo public class GridInfo
{ {
/// <summary> /// <summary>
/// 数据方向 /// 数据方向 0:后退 / 1:前进
/// </summary> /// </summary>
public Misc.DIRECTION direction; public Misc.DIRECTION direction { get; set; }
/// <summary> /// <summary>
/// AD值数据 /// AD值数据
/// </summary> /// </summary>
public int[] data; public int[] data { get; set; }
/// <summary> /// <summary>
/// 厚度值数据 /// 厚度值数据
/// </summary> /// </summary>
public double[] thick; public double[] thick { get; set; }
} }
......
...@@ -24,8 +24,7 @@ ...@@ -24,8 +24,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<DocumentationFile> <DocumentationFile>bin\Debug\FLY.Thick.Base.xml</DocumentationFile>
</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
......
...@@ -125,12 +125,31 @@ namespace FLY.Thick.Base.IService ...@@ -125,12 +125,31 @@ namespace FLY.Thick.Base.IService
/// </summary> /// </summary>
void Apply(); void Apply();
} }
/// <summary>
///
/// </summary>
public class BorderSearchGetViewReponse public class BorderSearchGetViewReponse
{ {
/// <summary>
/// 方向
/// </summary>
public DIRECTION direction; public DIRECTION direction;
/// <summary>
/// 1个grid 多少个脉冲
/// </summary>
public int posOfGrid; public int posOfGrid;
/// <summary>
/// 开始grid号
/// </summary>
public int gridBegin; public int gridBegin;
/// <summary>
/// 数据
/// </summary>
public int[] dat; public int[] dat;
/// <summary>
/// 边界
/// </summary>
public Range border; public Range border;
} }
} }
...@@ -25,18 +25,18 @@ namespace FLY.Thick.Base.IService ...@@ -25,18 +25,18 @@ namespace FLY.Thick.Base.IService
/// <summary> /// <summary>
/// 数据, AD数据!!!!! /// 数据, AD数据!!!!!
/// </summary> /// </summary>
public int[] ADs; public int[] ADs { get; set; }
/// <summary> /// <summary>
/// 数据, 厚度数据!!!!! /// 数据, 厚度数据!!!!!
/// </summary> /// </summary>
public double[] thicks; public double[] thicks { get; set; }
/// <summary> /// <summary>
/// 单数据时间间隔 /// 单数据时间间隔
/// </summary> /// </summary>
public TimeSpan ts; public TimeSpan ts { get; set; }
/// <summary> /// <summary>
/// 开始时间点 /// 开始时间点
/// </summary> /// </summary>
public DateTime time; public DateTime time { get; set; }
} }
} }
...@@ -41,6 +41,12 @@ namespace FLY.Thick.Base.IService ...@@ -41,6 +41,12 @@ namespace FLY.Thick.Base.IService
/// </summary> /// </summary>
DateTime DebugUpdateTime { get; } DateTime DebugUpdateTime { get; }
/// <summary>
/// 获取调试数据
/// </summary>
/// <param name="asyncDelegate"></param>
/// <param name="asyncContext"></param>
[Call(typeof(RejectDebugData))] [Call(typeof(RejectDebugData))]
void GetDebugData(AsyncCBHandler asyncDelegate, object asyncContext); void GetDebugData(AsyncCBHandler asyncDelegate, object asyncContext);
...@@ -48,23 +54,26 @@ namespace FLY.Thick.Base.IService ...@@ -48,23 +54,26 @@ namespace FLY.Thick.Base.IService
} }
public class RejectDebugData public class RejectDebugData
{ {
public int start_grid; /// <summary>
/// 开始grid号
/// </summary>
public int start_grid { get; set; }
/// <summary> /// <summary>
/// 滤波后的数据 /// 滤波后的数据
/// </summary> /// </summary>
public double[] filterDatas; public double[] filterDatas { get; set; }
/// <summary> /// <summary>
/// 剔除后的数据 /// 剔除后的数据
/// </summary> /// </summary>
public double[] rejectDatas; public double[] rejectDatas { get; set; }
/// <summary> /// <summary>
/// 上面的数据,都是grid数据,最后需要以脉冲显示在画面上 /// 上面的数据,都是grid数据,最后需要以脉冲显示在画面上
/// </summary> /// </summary>
public int posOfGrid; public int posOfGrid { get; set; }
/// <summary> /// <summary>
/// 目标值 /// 目标值
/// </summary> /// </summary>
public double target; public double target { get; set; }
} }
} }
...@@ -70,51 +70,59 @@ namespace FLY.Thick.Base.IService ...@@ -70,51 +70,59 @@ namespace FLY.Thick.Base.IService
/// <param name="orgDatas">原始数据</param> /// <param name="orgDatas">原始数据</param>
void SetCorrData(int groupIndex, int[][] corrDatas, int avg, int[][] orgDatas); void SetCorrData(int groupIndex, int[][] corrDatas, int avg, int[][] orgDatas);
/// <summary>
/// 获取 组 的 机架修正信息
/// </summary>
/// <param name="groupIndex"></param>
/// <param name="asyncDelegate"></param>
/// <param name="asyncContext"></param>
[Call(typeof(GetScanCorrGroupResponse))] [Call(typeof(GetScanCorrGroupResponse))]
void GetScanCorrGroup(int groupIndex, AsyncCBHandler asyncDelegate, object asyncContext); void GetScanCorrGroup(int groupIndex, AsyncCBHandler asyncDelegate, object asyncContext);
} }
/// <summary>
///
/// </summary>
public class GetScanCorrGroupResponse public class GetScanCorrGroupResponse
{ {
/// <summary> /// <summary>
/// 组序号 /// 组序号
/// </summary> /// </summary>
public int GroupIndex; public int GroupIndex { get; set; }
/// <summary> /// <summary>
/// 更新时间 /// 更新时间
/// </summary> /// </summary>
public DateTime UpdateTime; public DateTime UpdateTime { get; set; }
/// <summary> /// <summary>
/// 机架准备好了 /// 机架准备好了
/// </summary> /// </summary>
public bool IsDataOK; public bool IsDataOK { get; set; }
/// <summary> /// <summary>
/// 机架总长,脉冲 /// 机架总长,脉冲
/// </summary> /// </summary>
public int PosLen; public int PosLen { get; set; }
/// <summary> /// <summary>
/// 1个grid = N个pos /// 1个grid = N个pos
/// </summary> /// </summary>
public int PosOfGrid; public int PosOfGrid { get; set; }
/// <summary> /// <summary>
/// 原始 正反方向机架AD值数据, grid数据 /// 原始 正反方向机架AD值数据, grid数据
/// </summary> /// </summary>
public int[][] OrgDatas; public int[][] OrgDatas { get; set; }
/// <summary> /// <summary>
/// 修正用 正反方向机架AD值数据 /// 修正用 正反方向机架AD值数据
/// </summary> /// </summary>
public int[][] CorrDatas; public int[][] CorrDatas { get; set; }
/// <summary> /// <summary>
/// CorrDatas 的均值 /// CorrDatas 的均值
/// </summary> /// </summary>
public int Avg; public int Avg { get; set; }
} }
......
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