M071.git - Gitblit

			@@ -139,10 +139,12 @@
			//imgSet.HImage.GenImage1("int4", (int)width, zoomHeight, zoomPtr);
			imgSet.HImage.GenImage1(IIConfig.ByteNums == GocatorDataByteNums.Byte2 ? "uint2" : "int4", (int)width, zoomHeight, zoomPtr);

			imgSet.HImage_2 = imgSet.HImage.Clone();
			//imgSet.HImage_2 = imgSet.HImage.Clone();
			//imgSet.HImage_2.GenImage1("uint2", (int)width, zoomHeight, zoomPtr);
			//imgSet.HImage_2.GenImage1("int4", (int)width, zoomHeight, zoomPtr);
			//imgSet.HImage_2.GenImage1(IIConfig.ByteNums == GocatorDataByteNums.Byte2 ? "uint2" : "int4", (int)width, zoomHeight, zoomPtr);

			imgSet.HImage_2 = new HImage();
			imgSet.HImage_2.GenImage1(IIConfig.ByteNums == GocatorDataByteNums.Byte2 ? "uint2" : "int4", (int)width, zoomHeight, zoomPtr);

			LaserScanParam para = new LaserScanParam()
			{
			@@ -218,23 +220,42 @@

			public override IImageSet Snapshot(IOperationConfig config)
			{
			GocatorOperationConfig opConfig = config as GocatorOperationConfig;
			if (!IIConfig.IsAsyncMode)
			{
			if (config is GocatorOperationConfig opConfig)
			if (opConfig.IsOpenConnection)
			{
			if (opConfig.IsOpenConnection)
			while (sensor.State != GoState.Ready)
			{
			system.Start();
			}
			else
			{
			system.Stop();
			Thread.Sleep(10);
			}

			if (!opConfig.IsSnapshotAction)
			do
			{
			return null;
			}
			try
			{
			system.Start();
			if (sensor.State != GoState.Running)
			{
			Thread.Sleep(100);
			}
			else
			{
			break;
			}
			}
			catch (Exception ex)
			{
			LogAsync(DateTime.Now, $"开启异常：{ex.GetExceptionMessage()}", "");
			}
			} while (true);

			LogAsync(DateTime.Now, $"传感器启动成功", "");
			}

			if (!opConfig.IsSnapshotAction)
			{
			return null;
			}
			}

			@@ -258,6 +279,11 @@
			}
			else
			{
			if (!opConfig.IsSnapshotAction)
			{
			return null;
			}

			try
			{
			dataSet = system.ReceiveData(IIConfig.SnapshotTimeout);
			@@ -265,17 +291,57 @@
			catch (Exception ex)
			{
			LogAsync(DateTime.Now, $"{Name}获取图像异常", ex.GetExceptionMessage());
			return null;
			imgSet.HImage = null;
			dataSet = null;
			//return imgSet;
			}
			}

			HandleGoData(dataSet, imgSet);

			dataSet.Dispose();

			if (imgSet.HImage == null)
			if (!IIConfig.IsAsyncMode)
			{
			LogAsync(DateTime.Now, $"{Name}未能获取HImage图像", "");
			if (!opConfig.IsOpenConnection)
			{
			while (sensor.State == GoState.Busy)
			{
			Thread.Sleep(100);
			}

			do
			{
			try
			{
			system.Stop();

			if (sensor.State != GoState.Ready)
			{
			Thread.Sleep(100);
			}
			else
			{
			break;
			}
			}
			catch (Exception ex)
			{
			LogAsync(DateTime.Now, $"关闭异常：{ex.GetExceptionMessage()}", "");
			}
			} while (true);

			sensor.Flush();
			LogAsync(DateTime.Now, $"传感器关闭成功", "");
			}
			}

			if (dataSet != null)
			{
			HandleGoData(dataSet, imgSet);

			dataSet.Dispose();

			if (imgSet.HImage == null)
			{
			LogAsync(DateTime.Now, $"{Name}未能获取HImage图像", "");
			}
			}

			return imgSet;
			@@ -375,6 +441,8 @@
			protected override void Start()
			{
			base.Start();

			//system.Start();

			if (IIConfig.IsAsyncMode)
			system.Start();
			@@ -535,21 +603,29 @@
			});
			}

			public override void ClearImageSet(IImageSet set)
			{
			if (set.IsOriginSaved && set.IsFitSaved && set.IsAddtionalSaved)
			{
			(set as GoImageSet).HImage_2?.Dispose();
			(set as GoImageSet).HImage_2 = null;
			}
			//public override void ClearImageSet(IImageSet set)
			//{
			// if (set.IsOriginSaved && set.IsFitSaved && set.IsAddtionalSaved)
			// {
			// (set as GoImageSet).HImage_2?.Dispose();
			// (set as GoImageSet).HImage_2 = null;
			// }

			base.ClearImageSet(set);
			}
			// base.ClearImageSet(set);
			//}
			#endregion
			}

			public class GoImageSet : ImageSet
			{
			public HImage HImage_2 { get; set; }

			public override void Dispose()
			{
			base.Dispose();

			HImage_2?.Dispose();
			HImage_2 = null;
			}
			}
			}