|
|
@@ -38,7 +38,7 @@ namespace TeamAAS_VP.Models
|
|
|
/// <summary>
|
|
|
/// 触发相机命令
|
|
|
/// </summary>
|
|
|
- public string TriggerCommand { get; set; }
|
|
|
+ public string TriggerCommand { get; set; }
|
|
|
|
|
|
/// <summary>
|
|
|
/// 机器人
|
|
|
@@ -68,7 +68,7 @@ namespace TeamAAS_VP.Models
|
|
|
public ObservableCollection<ProcedureOutput> ProcedureOutputs
|
|
|
{
|
|
|
get { return _ProcedureOutputs; }
|
|
|
- set { SetProperty(ref _ProcedureOutputs,value); }
|
|
|
+ set { SetProperty(ref _ProcedureOutputs, value); }
|
|
|
}
|
|
|
|
|
|
private string _OutputSeparator = ";";
|
|
|
@@ -89,7 +89,7 @@ namespace TeamAAS_VP.Models
|
|
|
public FeederWorks FeederWorks
|
|
|
{
|
|
|
get { return _FeederWorks; }
|
|
|
- set { SetProperty(ref _FeederWorks,value); }
|
|
|
+ set { SetProperty(ref _FeederWorks, value); }
|
|
|
}
|
|
|
|
|
|
private FeederStockWorks _FeederStockWorks;
|
|
|
@@ -130,7 +130,7 @@ namespace TeamAAS_VP.Models
|
|
|
public float ExposureTime
|
|
|
{
|
|
|
get { return _ExposureTime; }
|
|
|
- set { SetProperty(ref _ExposureTime, value);}
|
|
|
+ set { SetProperty(ref _ExposureTime, value); }
|
|
|
}
|
|
|
|
|
|
private float _Gain;
|
|
|
@@ -151,7 +151,7 @@ namespace TeamAAS_VP.Models
|
|
|
public CogToolBlock ToolBlock
|
|
|
{
|
|
|
get { return _ToolBlock; }
|
|
|
- set { SetProperty(ref _ToolBlock,value); }
|
|
|
+ set { SetProperty(ref _ToolBlock, value); }
|
|
|
}
|
|
|
|
|
|
private ObservableCollection<ToolInfo> _ToolInfo = new ObservableCollection<ToolInfo>();
|
|
|
@@ -214,7 +214,7 @@ namespace TeamAAS_VP.Models
|
|
|
set { SetProperty(ref _OutputPointMode, value); }
|
|
|
}
|
|
|
|
|
|
- private int _OutputPointCountMax=100;
|
|
|
+ private int _OutputPointCountMax = 100;
|
|
|
/// <summary>
|
|
|
/// 每次发送给机器人的点数最大值
|
|
|
/// </summary>
|
|
|
@@ -229,12 +229,12 @@ namespace TeamAAS_VP.Models
|
|
|
/// 是否剔除本次识别到的物料与上一次识别到的物料位置过近的点
|
|
|
/// </summary>
|
|
|
public bool IsExcludeNearPoint
|
|
|
- {
|
|
|
+ {
|
|
|
get { return _IsExcludeNearPoint; }
|
|
|
set { SetProperty(ref _IsExcludeNearPoint, value); }
|
|
|
}
|
|
|
|
|
|
- private double _ExcludeNearPointThreshol=1;
|
|
|
+ private double _ExcludeNearPointThreshol = 1;
|
|
|
/// <summary>
|
|
|
/// 物料位置过近阈值
|
|
|
/// </summary>
|
|
|
@@ -305,6 +305,16 @@ namespace TeamAAS_VP.Models
|
|
|
set { SetProperty(ref _IsCompress, value); }
|
|
|
}
|
|
|
|
|
|
+ private bool _IsDelaySaveImage;
|
|
|
+ /// <summary>
|
|
|
+ /// 是否延迟保存图片
|
|
|
+ /// </summary>
|
|
|
+ public bool IsDelaySaveImage
|
|
|
+ {
|
|
|
+ get { return _IsDelaySaveImage; }
|
|
|
+ set { SetProperty(ref _IsDelaySaveImage, value); }
|
|
|
+ }
|
|
|
+
|
|
|
private FeederFrequencyModel _FeederFindFrequency;
|
|
|
/// <summary>
|
|
|
/// Feeder自动寻频配置
|
|
|
@@ -365,11 +375,11 @@ namespace TeamAAS_VP.Models
|
|
|
{
|
|
|
Id = Guid.NewGuid();
|
|
|
ProcedureOutputs = new ObservableCollection<ProcedureOutput>();
|
|
|
- ToolInfo= new ObservableCollection<ToolInfo>();
|
|
|
- FeederFindFrequency= new FeederFrequencyModel();
|
|
|
- UserDefineParameters= new ObservableCollection<ProcedureUserDefineParam>();
|
|
|
+ ToolInfo = new ObservableCollection<ToolInfo>();
|
|
|
+ FeederFindFrequency = new FeederFrequencyModel();
|
|
|
+ UserDefineParameters = new ObservableCollection<ProcedureUserDefineParam>();
|
|
|
FeederWorks = new FeederWorks();
|
|
|
- FeederStockWorks= new FeederStockWorks();
|
|
|
+ FeederStockWorks = new FeederStockWorks();
|
|
|
LightChannels = new ObservableCollection<ChannelConfig>();
|
|
|
}
|
|
|
|
|
|
@@ -394,9 +404,9 @@ namespace TeamAAS_VP.Models
|
|
|
{
|
|
|
Id = this.Id,
|
|
|
Name = this.Name,
|
|
|
- CameraName=this.CameraName,
|
|
|
+ CameraName = this.CameraName,
|
|
|
VisionModel = this.VisionModel,
|
|
|
- TriggerCommand=this.TriggerCommand,
|
|
|
+ TriggerCommand = this.TriggerCommand,
|
|
|
RobotId = this.RobotId,
|
|
|
FeederId = this.FeederId,
|
|
|
CameraId = this.CameraId,
|
|
|
@@ -419,13 +429,14 @@ namespace TeamAAS_VP.Models
|
|
|
SaveImageModel = this.SaveImageModel,
|
|
|
SaveImagePathModel = this.SaveImagePathModel,
|
|
|
SavePath = this.SavePath,
|
|
|
- ImageFileNameFormat=this.ImageFileNameFormat,
|
|
|
+ ImageFileNameFormat = this.ImageFileNameFormat,
|
|
|
IsCompress = this.IsCompress,
|
|
|
+ IsDelaySaveImage = this.IsDelaySaveImage,
|
|
|
FeederFindFrequency = this.FeederFindFrequency?.Copy(),
|
|
|
- IsExcludeNearPoint=this.IsExcludeNearPoint,
|
|
|
+ IsExcludeNearPoint = this.IsExcludeNearPoint,
|
|
|
ExcludeNearPointThreshol = this.ExcludeNearPointThreshol,
|
|
|
- OutputPointMode=this.OutputPointMode,
|
|
|
- OutputSeparator=this.OutputSeparator,
|
|
|
+ OutputPointMode = this.OutputPointMode,
|
|
|
+ OutputSeparator = this.OutputSeparator,
|
|
|
UserDefineParameters = new ObservableCollection<ProcedureUserDefineParam>(this.UserDefineParameters.Select(udp => udp.Copy())),
|
|
|
LightChannels = this.LightChannels == null ? new ObservableCollection<ChannelConfig>() : new ObservableCollection<ChannelConfig>(this.LightChannels.Select(ch => new ChannelConfig
|
|
|
{
|