Project DebugVisualizers cleanup (#1534)

Co-authored-by: Ioannis Kaliakatsos <ioannis.kaliakatsos@reishauer.com>
shimat · Feb 28, 2023 · 0498156 · 0498156
1 parent 02e6600
commit 0498156
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 37 deletions.
diff --git a/src/OpenCvSharp.DebuggerVisualizers/ImageViewer.cs b/src/OpenCvSharp.DebuggerVisualizers/ImageViewer.cs
@@ -4,25 +4,15 @@
 
 namespace OpenCvSharp.DebuggerVisualizers
 {
-    /// <summary>
-    /// 
-    /// </summary>
     public partial class ImageViewer : Form
     {
         private readonly Bitmap bitmap;
 
-        /// <summary>
-        /// 
-        /// </summary>
         public ImageViewer()
         {
             InitializeComponent();
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="proxy"></param>
         public ImageViewer(MatProxy proxy)
             : this()
         {
@@ -42,10 +32,11 @@ public ImageViewer(string imgFile)
             bitmap = new Bitmap(imgFile);
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="e"></param>
+        private void DisposeBitmap()
+        {
+            bitmap?.Dispose();
+        }
+
         protected override void OnLoad(EventArgs e)
         {
             base.OnLoad(e);
@@ -86,7 +77,7 @@ private double ReformRatio(double ratio)
 
         private void DisplayRatio(double ratio)
         {
-            this.Text = $"ImageViewer Zoom: {ratio:P1}";
+            Text = $@"ImageViewer Zoom: {ratio:P1}";
         }
     }
 }
diff --git a/src/OpenCvSharp.DebuggerVisualizers/ImageViewer.designer.cs b/src/OpenCvSharp.DebuggerVisualizers/ImageViewer.designer.cs
diff --git a/src/OpenCvSharp.DebuggerVisualizers/MatDebuggerVisualizer.cs b/src/OpenCvSharp.DebuggerVisualizers/MatDebuggerVisualizer.cs
@@ -11,18 +11,17 @@ public class MatDebuggerVisualizer : DialogDebuggerVisualizer
         protected override void Show(IDialogVisualizerService windowService, IVisualizerObjectProvider objectProvider)
         {
             // MatProxyが送られてくるはず
-            using (var proxy = objectProvider.GetObject() as MatProxy)
+            var proxy = objectProvider.GetObject() as MatProxy;
+            if (proxy is null)
             {
-                if (proxy is null)
-                {
-                    throw new ArgumentException();
-                }
-                // Formに表示
-                using (var form = new ImageViewer(proxy))
-                {
-                    windowService.ShowDialog(form);
-                }
-            } 
+                throw new ArgumentException();
+            }
+
+            // Formに表示
+            using (var form = new ImageViewer(proxy))
+            {
+                windowService.ShowDialog(form);
+            }
         }
     }
 }
diff --git a/src/OpenCvSharp.DebuggerVisualizers/MatObjectSource.cs b/src/OpenCvSharp.DebuggerVisualizers/MatObjectSource.cs
@@ -15,4 +15,4 @@ public override void GetData(object target, Stream outgoingData)
             bf.Serialize(outgoingData, new MatProxy((Mat)target));
         }
     }
-}
+}
diff --git a/src/OpenCvSharp.DebuggerVisualizers/MatProxy.cs b/src/OpenCvSharp.DebuggerVisualizers/MatProxy.cs
@@ -9,18 +9,13 @@ namespace OpenCvSharp.DebuggerVisualizers
     /// 送る際に、このProxyに表示に必要なシリアライズ可能なデータを詰めて送り、受信側で復元する。
     /// </summary>
     [Serializable]
-    public class MatProxy : IDisposable
+    public class MatProxy
     {
         public byte[] ImageData { get; private set; }
 
         public MatProxy(Mat image)
         {
-            ImageData = image.ToBytes(".png");
-        }
-
-        public void Dispose()
-        {
-            ImageData = null;
+            ImageData = image.ToBytes();
         }
 
         public Bitmap CreateBitmap()
@@ -34,4 +29,4 @@ public Bitmap CreateBitmap()
             }
         }
     }
-}
+}