M071.git - Gitblit

			@@ -94,8 +94,9 @@
			float zoomFactor = (float)((double)surfaceMsg.YResolution / (double)surfaceMsg.XResolution);
			int zoomHeight = (int)(zoomFactor * height);

			IntPtr zoomPtr = Marshal.AllocHGlobal(zoomHeight * (int)width * 2);
			//IntPtr zoomPtr = Marshal.AllocHGlobal(zoomHeight * (int)width * 2);
			//IntPtr zoomPtr = Marshal.AllocHGlobal(zoomHeight * (int)width * 4);
			IntPtr zoomPtr = Marshal.AllocHGlobal(zoomHeight * (int)width * (int)IIConfig.ByteNums);

			//没有插值，默认0
			//Parallel.For(0, height, h =>
			@@ -103,40 +104,45 @@
			// CopyMemory((IntPtr)((long)zoomPtr + width * 2 * Math.Floor(h * zoomFactor)), (IntPtr)((long)bufferPointer + width * 2 * h), width * 2);
			// });

			//使用上一行原有数据
			Parallel.For(0, zoomHeight, h =>
			if (IIConfig.ByteNums == GocatorDataByteNums.Byte2)
			{
			int originHeightIndex = (int)Math.Floor((double)height * h / (double)zoomHeight);
			//使用上一行原有数据
			Parallel.For(0, zoomHeight, h =>
			{
			int originHeightIndex = (int)Math.Floor((double)height * h / (double)zoomHeight);

			CopyMemory((IntPtr)((long)zoomPtr + width * 2 * h), (IntPtr)((long)bufferPointer + width * 2 * originHeightIndex), width * 2);
			});
			CopyMemory((IntPtr)((long)zoomPtr + width * 2 * h), (IntPtr)((long)bufferPointer + width * 2 * originHeightIndex), width * 2);
			});
			}
			else
			{
			//使用上一行原有数据
			Parallel.For(0, zoomHeight, h =>
			{
			int originHeightIndex = (int)Math.Floor((double)height * h / (double)zoomHeight);

			////使用上一行原有数据
			//Parallel.For(0, zoomHeight, h =>
			//{
			// int originHeightIndex = (int)Math.Floor((double)height * h / (double)zoomHeight);
			byte[] rowBuffer = new byte[width * 4];
			Parallel.For(0, width, w =>
			{
			rowBuffer[w * 4 + 2] = Marshal.ReadByte(bufferPointer, (int)(width * 2 * originHeightIndex + w * 2));
			rowBuffer[w * 4 + 3] = Marshal.ReadByte(bufferPointer, (int)(width * 2 * originHeightIndex + w * 2 + 1));
			});

			// byte[] rowBuffer = new byte[width * 4];
			// Parallel.For(0, width, w =>
			// {
			// rowBuffer[w * 4 + 2] = Marshal.ReadByte(bufferPointer, (int)(width * 2 * originHeightIndex + w * 2));
			// rowBuffer[w * 4 + 3] = Marshal.ReadByte(bufferPointer, (int)(width * 2 * originHeightIndex + w * 2 + 1));
			// });

			// Marshal.Copy(rowBuffer, 0, (IntPtr)((long)zoomPtr + width * 2 * h), rowBuffer.Length);
			//});
			Marshal.Copy(rowBuffer, 0, (IntPtr)((long)zoomPtr + width * 2 * h), rowBuffer.Length);
			});
			}

			if (imgSet != null)
			{
			imgSet.HImage = new HImage();
			imgSet.HImage.GenImage1("uint2", (int)width, zoomHeight, zoomPtr);

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

			imgSet.HImage_2 = new HImage();
			imgSet.HImage_2.GenImage1("uint2", (int)width, zoomHeight, zoomPtr);

			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);

			LaserScanParam para = new LaserScanParam()
			{
			@@ -212,23 +218,17 @@

			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)
			{
			system.Start();
			}
			else
			{
			system.Stop();
			}
			system.Start();
			}

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

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

			try
			{
			dataSet = system.ReceiveData(IIConfig.SnapshotTimeout);
			@@ -260,6 +265,15 @@
			{
			LogAsync(DateTime.Now, $"{Name}获取图像异常", ex.GetExceptionMessage());
			return null;
			}
			}

			if (!IIConfig.IsAsyncMode)
			{
			if (!opConfig.IsOpenConnection)
			{
			system.Stop();
			sensor.Flush();
			}
			}

			@@ -289,7 +303,12 @@

			if (!string.IsNullOrWhiteSpace(opConfig.JobName) && _currentJob != opConfig.JobName)
			{
			_currentJob = sensor.DefaultJob = opConfig.JobName;
			LogAsync(DateTime.Now, $"{Name}切换当前任务为{opConfig.JobName}", "");
			sensor.CopyFile(_currentJob, "_live.job");

			bool isChanged = false;
			sensor.LoadedJob(ref _currentJob, ref isChanged);
			LogAsync(DateTime.Now, $"{Name}当前任务{_currentJob}", "");
			}

			sensor.Flush();
			@@ -345,18 +364,17 @@
			_currentExposure = (float)sensor.Setup.GetExposure(GoRole.Main);
			}

			_currentJob = sensor.DefaultJob;
			if (!string.IsNullOrWhiteSpace(IIConfig.DefaultJob) && _currentJob != IIConfig.DefaultJob)
			{
			//_currentJob = sensor.DefaultJob = IIConfig.DefaultJob;
			string currentJob = IIConfig.DefaultJob;
			bool isChanged = false;
			sensor.LoadedJob(ref currentJob, ref isChanged);
			bool isChanged = false;
			sensor.LoadedJob(ref _currentJob, ref isChanged);
			LogAsync(DateTime.Now, $"{Name}当前任务{_currentJob}", "");

			if (!isChanged)
			{
			throw new ProcessException($"{Name}未成功切换至任务{IIConfig.DefaultJob}");
			}
			if (!string.IsNullOrWhiteSpace(IIConfig.DefaultJob) && IIConfig.DefaultJob != _currentJob)
			{
			sensor.CopyFile(IIConfig.DefaultJob, "_live.job");
			//_currentJob = IIConfig.DefaultJob;

			sensor.LoadedJob(ref _currentJob, ref isChanged);
			LogAsync(DateTime.Now, $"{Name}当前任务{_currentJob}", "");
			}

			sensor.Flush();
			@@ -525,21 +543,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;
			}
			}
			}