xiaohuimin/DHDHSoftware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改日志1

Browse Source
This commit is contained in:
TD
2025-04-15 09:24:39 +08:00
parent 72b67b6a2f
commit b009a7355b
4 changed files with 56 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
DH.Devices.Camera/Do3ThinkCamera.cs
View File

@ -39,7 +39,7 @@ namespace DH.Devices.Camera
{
LoggerHelper.LogPath = "D://";
LoggerHelper.LogPrefix = CameraName;
}
@ -153,7 +153,7 @@ namespace DH.Devices.Camera
SetGain(Gain);
}
//全画幅
if(!IsAllPicEnabled)
if (!IsAllPicEnabled)
SetPictureRoi((int)ROIX, (int)ROIY, (int)ROIW, (int)ROIH);
//// 设置 触发延迟
@ -330,7 +330,7 @@ namespace DH.Devices.Camera
Mat cvImage = new Mat();
if (this.CameraName.Equals("Cam1"))
{
Console.WriteLine( );
Console.WriteLine();
}
if (this.CameraName.Equals("Cam2"))
{
@ -370,7 +370,7 @@ namespace DH.Devices.Camera
{
_mat = smat,
};
InitialImageSet(imageSet);
@ -378,7 +378,7 @@ namespace DH.Devices.Camera
OnHImageOutput?.Invoke(DateTime.Now, this, outImgSet);
//存图
DisplayAndSaveOriginImage(imageSet.Id,SnapshotCount);
DisplayAndSaveOriginImage(imageSet.Id, SnapshotCount);
@ -394,7 +394,7 @@ namespace DH.Devices.Camera
}
return 0;
}
public void InitialImageSet(MatSet set)
public void InitialImageSet(MatSet set)
{
//if (saveOption != null)
//{
@ -418,13 +418,25 @@ namespace DH.Devices.Camera
{
await Task.Run(() =>
{
Bitmap showImage = set._mat.ToBitmap();
Bitmap? showImage = null;
try
{
showImage = set._mat.ToBitmap();
}
catch (Exception)
{
//释放 himage
ClearImageSet(set);
return;
}
// showImage.Save("D:/test333.bmp");
// Marshal.Copy(pbyteImageBuffer, 0, (IntPtr)lAddrImage, (int)dwBufferSize);
// Bitmap saveImage = showImage?.CopyBitmap();
// Bitmap saveImage = showImage?.CopyBitmap();
// saveImage.Save("d://TEST444.BMP");
// OnShowImageUpdated?.Invoke(this, showImage, imgSetId);
if (IsSavePicEnabled)
// OnShowImageUpdated?.Invoke(this, showImage, imgSetId);
if (IsSavePicEnabled && showImage != null)
{
string fullname = Path.Combine(ImageSaveDirectory, $"{CameraName}_{_counter:D7}_{set.Id}.{set._imageFormat.ToString().ToLower()}");
ImageSaveAsync(fullname, showImage);
@ -469,7 +481,7 @@ namespace DH.Devices.Camera
{
FullName = fullName,
SaveImage = map,
};
ImageSaveHelper.ImageSaveAsync(imageSaveSet);
@ -528,7 +540,7 @@ namespace DH.Devices.Camera
LoggerHelper.LogAsync(msg);
}
}
public void LogAsync(DateTime dt, LogLevel logLevel, string msg)
public void LogAsync(DateTime dt, LogLevel logLevel, string msg)
{
LogAsync(new LogMsg(dt, logLevel, msg));
}