diff --git a/Camera_connect/BaslerCamera.cs b/Camera_connect/BaslerCamera.cs index 5230e91..2adae46 100644 --- a/Camera_connect/BaslerCamera.cs +++ b/Camera_connect/BaslerCamera.cs @@ -7,23 +7,18 @@ using System.Windows.Forms; namespace Camera_connect { - public class BaslerCamera + public class BaslerCamera(Main form) { - private readonly Main form; - private readonly object lockObject = new object(); + private readonly Main form = form; + private readonly object lockObject = new(); public int CameraNumber => CameraFinder.Enumerate().Count; public event Action CameraImageEvent; - private readonly List allCameras = new List(); - private readonly PixelDataConverter pxConvert = new PixelDataConverter(); + private readonly List allCameras = []; + private readonly PixelDataConverter pxConvert = new(); private bool isGrabbing; private bool isCameraOpen = false; - public BaslerCamera(Main form) - { - this.form = form; - } - public void CameraInit() { var allCameraInfos = CameraFinder.Enumerate(); diff --git a/Camera_connect/Main.cs b/Camera_connect/Main.cs index de6dcbb..aeebd23 100644 --- a/Camera_connect/Main.cs +++ b/Camera_connect/Main.cs @@ -236,7 +236,7 @@ namespace Camera_connect // 更新 PictureBox 圖像 pictureBox1.Invoke((MethodInvoker)delegate { - Bitmap oldImage = pictureBox1.Image as Bitmap; + Bitmap? oldImage = pictureBox1.Image as Bitmap; pictureBox1.Image = image; oldImage?.Dispose(); // 確保釋放舊的 Bitmap 資源 });