M071.git - Gitblit

			@@ -66,6 +66,8 @@
			}

			HandleGoData(dataSet);

			dataSet.Dispose();
			}

			private void HandleGoData(GoDataSet dataSet, GoImageSet imgSet = null)
			@@ -88,9 +90,13 @@
			long bufferSize = width * height;
			IntPtr bufferPointer = surfaceMsg.Data;


			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 =>
			@@ -98,23 +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);

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

			if (imgSet != null)
			{
			imgSet.HImage = new HImage();
			imgSet.HImage.GenImage1("int2", (int)width, zoomHeight, zoomPtr);
			//imgSet.HImage = imgSet.HImage.ZoomImageSize((int)width, zoomHeight, "constant");
			//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("int2", (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()
			{
			@@ -183,28 +211,24 @@
			// }
			// break;
			}

			dataObj.Dispose();
			}
			}

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

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

			try
			{
			dataSet = system.ReceiveData(IIConfig.SnapshotTimeout);
			@@ -239,7 +268,19 @@
			}
			}

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

			HandleGoData(dataSet, imgSet);

			dataSet.Dispose();

			if (imgSet.HImage == null)
			{
			LogAsync(DateTime.Now, $"{Name}未能获取HImage图像", "");
			@@ -262,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();
			@@ -318,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();
			@@ -414,6 +459,8 @@
			_snapHandle.Set();
			}
			}

			dataSet.Dispose();
			}

			#region 重写图片保存操作
			@@ -424,7 +471,7 @@
			OnImageUpdated?.Invoke(this, showImage, imgSetId);
			});

			GoImageSet set = _imageSetList.FirstOrDefault(u => u.Id == imgSetId) as GoImageSet;
			GoImageSet set = _imageSetList[imgSetId] as GoImageSet;

			if (set == null)
			return;
			@@ -465,7 +512,7 @@
			{
			await Task.Run(() =>
			{
			GoImageSet set = _imageSetList.FirstOrDefault(u => u.Id == imgSetId) as GoImageSet;
			GoImageSet set = _imageSetList[imgSetId] as GoImageSet;
			if (set == null)
			return;

			@@ -495,6 +542,17 @@
			}
			});
			}

			//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);
			//}
			#endregion
			}