Skip to content

T
Thick-Common
Commit c9e9ac3d authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

添加注解

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