Skip to content

T
thick-casting
Commit ad0cf58f authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

修复 ScanData数据表 EndTime 为 DateTime.Now, 但 Time 为 flyad.Now, 导致时间错乱

parent b4cb97a5
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
Project.FLY.Thick.FilmCasting/FLY.Thick.FilmCasting/Server/ScanMotion.cs
View file @ ad0cf58f
......@@ -356,7 +356,7 @@ namespace FLY.Thick.FilmCasting.Server
//需要边界获取,扫描数据
StartDataEndTime = mFlyAD.Now;
StartDataEndTime = DateTime.Now;
//需要显示动态扫描图
mFlyAD.MiniGridEvent += Flyad_MiniGridEvent;
......@@ -386,7 +386,7 @@ namespace FLY.Thick.FilmCasting.Server
mFlyAD.SetVelocity(gsample.Velocity);
//需要采样数据
StartDataEndTime = mFlyAD.Now;
StartDataEndTime = DateTime.Now;
mFlyAD.Runto(to);
State = CTRLST.FORW_SAMPLE_ING;
......@@ -435,7 +435,7 @@ namespace FLY.Thick.FilmCasting.Server
//要变速，分开两段
mFlyAD.MiniGridEvent += Flyad_MiniGridEvent;
StartDataEndTime = mFlyAD.Now;
StartDataEndTime = DateTime.Now;
mFlyAD.SetVelocity(Velocity);
mFlyAD.Runto(r.End);
......@@ -461,7 +461,7 @@ namespace FLY.Thick.FilmCasting.Server
to = r.Begin;
//以扫描速度到目的地
mFlyAD.SetVelocity(gsample.Velocity);
StartDataEndTime = mFlyAD.Now;
StartDataEndTime = DateTime.Now;
mFlyAD.Runto(to);
State = CTRLST.BACKW_SAMPLE_ING;
}
......@@ -492,7 +492,7 @@ namespace FLY.Thick.FilmCasting.Server
to = r.Begin;
//以扫描速度到目的地
mFlyAD.SetVelocity(gsample.Velocity);
StartDataEndTime = mFlyAD.Now;
StartDataEndTime = DateTime.Now;
mFlyAD.Runto(to);
State = CTRLST.BACKW_SAMPLE_ING;
......@@ -577,7 +577,7 @@ namespace FLY.Thick.FilmCasting.Server
State = CTRLST.FORW_SAMPLE_ING2;
//需要边界获取,扫描数据
StartDataEndTime = mFlyAD.Now;
StartDataEndTime = DateTime.Now;
//需要显示动态扫描图
mFlyAD.MiniGridEvent += Flyad_MiniGridEvent;
......@@ -643,7 +643,7 @@ namespace FLY.Thick.FilmCasting.Server
{
//正常的情况，刚做完正向样品采集，现在反向
mFlyAD.MiniGridEvent += Flyad_MiniGridEvent;
StartDataEndTime = mFlyAD.Now;
StartDataEndTime = DateTime.Now;
//直接去到取样的位置
mFlyAD.Runto(r.Begin);
......@@ -691,7 +691,7 @@ namespace FLY.Thick.FilmCasting.Server
to = r.Begin;
//以扫描速度到目的地
mFlyAD.SetVelocity(gsample.Velocity);
StartDataEndTime = mFlyAD.Now;
StartDataEndTime = DateTime.Now;
mFlyAD.Runto(to);
State = CTRLST.BACKW_SAMPLE_ING;
......@@ -717,7 +717,7 @@ namespace FLY.Thick.FilmCasting.Server
mFlyAD.SetVelocity(Velocity);
StartDataEndTime = mFlyAD.Now;
StartDataEndTime = DateTime.Now;
mFlyAD.MiniGridEvent+= Flyad_MiniGridEvent;
mFlyAD.Runto(to);
......@@ -745,7 +745,7 @@ namespace FLY.Thick.FilmCasting.Server
int to = ScanRange.Begin;
mFlyAD.SetVelocity(Velocity);
StartDataEndTime = mFlyAD.Now;
StartDataEndTime = DateTime.Now;
mFlyAD.MiniGridEvent += Flyad_MiniGridEvent;
mFlyAD.Runto(to);
......
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