Skip to content

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

Merge branch 'dev6.0' of http://private.flyautomation.net:82/panruising/thick_public into dev6.0

parents f88e593c 1ca3aa5a
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgBorderSearch.xaml.cs
View file @ 1b325e17
...@@ -517,14 +517,14 @@ namespace FLY.Thick.Base.UI ...@@ -517,14 +517,14 @@ namespace FLY.Thick.Base.UI
StripLine stripline = new StripLine(); StripLine stripline = new StripLine();
stripline.BackColor = System.Drawing.Color.FromArgb(64, System.Drawing.Color.Green); stripline.BackColor = System.Drawing.Color.FromArgb(64, System.Drawing.Color.Green);
stripline.Interval = 0; stripline.Interval = 0;
stripline.IntervalOffset = border.Begin; stripline.IntervalOffset = border.Begin - BorderSearchService.SensorWidth/2;
stripline.StripWidth = BorderSearchService.SensorWidth; stripline.StripWidth = BorderSearchService.SensorWidth;
stripLines.Add(stripline); stripLines.Add(stripline);
stripline = new StripLine(); stripline = new StripLine();
stripline.BackColor = System.Drawing.Color.FromArgb(64, System.Drawing.Color.Green); stripline.BackColor = System.Drawing.Color.FromArgb(64, System.Drawing.Color.Green);
stripline.Interval = 0; stripline.Interval = 0;
stripline.IntervalOffset = border.End - BorderSearchService.SensorWidth; stripline.IntervalOffset = border.End - BorderSearchService.SensorWidth/2;
stripline.StripWidth = BorderSearchService.SensorWidth; stripline.StripWidth = BorderSearchService.SensorWidth;
stripLines.Add(stripline); stripLines.Add(stripline);
} }
......
Project.FLY.Thick.Base/FLY.Thick.Base/Server/BorderSearchPlastic.cs
View file @ 1b325e17
...@@ -33,15 +33,15 @@ namespace FLY.Thick.Base.Server ...@@ -33,15 +33,15 @@ namespace FLY.Thick.Base.Server
//算空气的平均值 //算空气的平均值
Range r2_grid = new Range(); Range r2_grid = new Range();
r2_grid.Begin = borderbegin_grid - sensor_grid; r2_grid.Begin = borderbegin_grid - sensor_grid/3;
r2_grid.End = borderend_grid + sensor_grid; r2_grid.End = borderend_grid + sensor_grid/3;
if (r2_grid.Begin < 0) if (r2_grid.Begin < 0)
r2_grid.Begin = 0; r2_grid.Begin = 0;
if (r2_grid.End > dat.Length - 1) if (r2_grid.End > dat.Length - 1)
r2_grid.End = dat.Length - 1; r2_grid.End = dat.Length - 1;
int avg1 = MyMath.Avg(dat, 0, r1_grid.Begin); int avg1 = MyMath.Avg(dat, 0, r2_grid.Begin);
int avg2 = MyMath.Avg(dat, r1_grid.End, dat.Length - 1); int avg2 = MyMath.Avg(dat, r2_grid.End, dat.Length - 1);
int threshold; int threshold;
if ((Misc.MyBase.ISVALIDATA(avg1)) && (Misc.MyBase.ISVALIDATA(avg2))) if ((Misc.MyBase.ISVALIDATA(avg1)) && (Misc.MyBase.ISVALIDATA(avg2)))
{ {
...@@ -57,7 +57,7 @@ namespace FLY.Thick.Base.Server ...@@ -57,7 +57,7 @@ namespace FLY.Thick.Base.Server
} }
else else
{ {
threshold = avg / 2; threshold = (TempAD+avg) / 2;
} }
//左边界 //左边界
......
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