Skip to content

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

Merge branch 'feature-feng-updateMahApp-20201203' of… 

Merge branch 'feature-feng-updateMahApp-20201203' of http://private.flyautomation.net:82/panruising/thick_public into feature-feng-updateMahApp-20201203
parents 78df386d 8f8df42b
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 20 deletions
Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgGetSample.xaml.cs
View file @ 884b8fe1
...@@ -64,10 +64,6 @@ namespace FLY.Thick.Base.UI ...@@ -64,10 +64,6 @@ namespace FLY.Thick.Base.UI
/// </summary> /// </summary>
public bool Enable { get; set; } public bool Enable { get; set; }
/// <summary>
/// 参数：间隔
/// </summary>
public int Interval { get; set; }
/// <summary> /// <summary>
/// 参数：速度 /// 参数：速度
...@@ -141,33 +137,32 @@ namespace FLY.Thick.Base.UI ...@@ -141,33 +137,32 @@ namespace FLY.Thick.Base.UI
this.getSampleService = getSampleService; this.getSampleService = getSampleService;
this.gageInfoService = gageInfoService; this.gageInfoService = gageInfoService;
this.tempdatas = tempdatas; this.tempdatas = tempdatas;
Misc.BindingOperations.SetBinding(this.getSampleService, "Enable", this, "Enable"); Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.Enable), this, nameof(Enable));
Misc.BindingOperations.SetBinding(this.getSampleService, "Interval", this, "Interval"); Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.Velocity), this, nameof(Velocity));
Misc.BindingOperations.SetBinding(this.getSampleService, "Velocity", this, "Velocity"); Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.Range), this, nameof(Range));
Misc.BindingOperations.SetBinding(this.getSampleService, "Range", this, "Range"); Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.Window), this, nameof(Window));
Misc.BindingOperations.SetBinding(this.getSampleService, "Window", this, "Window"); Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.IsCheckByPercent), this, nameof(IsCheckByPercent));
Misc.BindingOperations.SetBinding(this.getSampleService, "IsCheckByPercent", this, "IsCheckByPercent"); Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.ErrPercent), this, nameof(ErrPercent));
Misc.BindingOperations.SetBinding(this.getSampleService, "ErrPercent", this, "ErrPercent"); Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.ErrValue), this, nameof(ErrValue));
Misc.BindingOperations.SetBinding(this.getSampleService, "ErrValue", this, "ErrValue"); Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.Search), this, nameof(Search));
Misc.BindingOperations.SetBinding(this.getSampleService, "Search", this, "Search");
Samples = new SampleCell[this.getSampleService.Samples.Count()]; Samples = new SampleCell[this.getSampleService.Samples.Count()];
Features = new SampleFeature[this.getSampleService.Features.Count()]; Features = new SampleFeature[this.getSampleService.Features.Count()];
for (int i = 0; i < Samples.Count(); i++) for (int i = 0; i < Samples.Count(); i++)
{ {
Samples[i] = new SampleCell(); Samples[i] = new SampleCell();
Misc.BindingOperations.SetBinding(this.getSampleService.Samples[i], "Enable", Samples[i], "Enable"); Misc.BindingOperations.SetBinding(this.getSampleService.Samples[i], nameof(SampleCell.Enable), Samples[i], nameof(SampleCell.Enable));
Misc.BindingOperations.SetBinding(this.getSampleService.Samples[i], "JustForCheck", Samples[i], "JustForCheck"); Misc.BindingOperations.SetBinding(this.getSampleService.Samples[i], nameof(SampleCell.JustForCheck), Samples[i], nameof(SampleCell.JustForCheck));
Misc.BindingOperations.SetBinding(this.getSampleService.Samples[i], "OrgAD", Samples[i], "OrgAD"); Misc.BindingOperations.SetBinding(this.getSampleService.Samples[i], nameof(SampleCell.OrgAD), Samples[i], nameof(SampleCell.OrgAD));
Misc.BindingOperations.SetBinding(this.getSampleService.Samples[i], "Position", Samples[i], "Position"); Misc.BindingOperations.SetBinding(this.getSampleService.Samples[i], nameof(SampleCell.Position), Samples[i], nameof(SampleCell.Position));
} }
for (int i = 0; i < Features.Count(); i++) for (int i = 0; i < Features.Count(); i++)
{ {
Features[i] = new SampleFeature(); Features[i] = new SampleFeature();
Misc.BindingOperations.SetBinding(this.getSampleService.Features[i], "Enable", Features[i], "Enable"); Misc.BindingOperations.SetBinding(this.getSampleService.Features[i], nameof(SampleFeature.Enable), Features[i], nameof(SampleFeature.Enable));
Misc.BindingOperations.SetBinding(this.getSampleService.Features[i], "StartPos", Features[i], "StartPos"); Misc.BindingOperations.SetBinding(this.getSampleService.Features[i], nameof(SampleFeature.StartPos), Features[i], nameof(SampleFeature.StartPos));
Misc.BindingOperations.SetBinding(this.getSampleService.Features[i], "EndPos", Features[i], "EndPos"); Misc.BindingOperations.SetBinding(this.getSampleService.Features[i], nameof(SampleFeature.EndPos), Features[i], nameof(SampleFeature.EndPos));
} }
} }
...@@ -295,6 +290,7 @@ namespace FLY.Thick.Base.UI ...@@ -295,6 +290,7 @@ namespace FLY.Thick.Base.UI
SampleCell sampleCell = new SampleCell(); SampleCell sampleCell = new SampleCell();
Samples[i] = sampleCell; Samples[i] = sampleCell;
} }
Features = new SampleFeature[2];
Features[0] = new SampleFeature(); Features[0] = new SampleFeature();
Features[1] = new SampleFeature(); Features[1] = new SampleFeature();
......
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