feat: add support for visualization of float and double channel types, add support for two channels mats

Author: dmako

Directory.Build.props

@@ -13,7 +13,7 @@
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     </PropertyGroup>
     <PropertyGroup>
-        <Version>0.99.0-preview.1</Version>
+        <Version>0.99.1-preview.2</Version>
         <Company>David Makovský</Company>
         <Copyright>Copyright © 2024-$([System.DateTime]::Now.ToString(yyyy)) David Makovský</Copyright>
         <Authors>David Makovský</Authors>

OpenCvSharpVisualizer.DebuggeeSide/OpenCvSharpVisualizerSource.cs

@@ -10,25 +10,84 @@ public override void GetData(object target, Stream outgoingData)
         switch (target)
         {
             case Mat mat:
-                SerializeAsJson(outgoingData, CreateDataSource(mat, mat.ToString()));
+                SerializeAsJson(outgoingData, CreateDataSource(mat));
                 break;
             case UMat umat:
-                SerializeAsJson(outgoingData, CreateDataSource(umat, umat.ToString()));
+                SerializeAsJson(outgoingData, CreateDataSource(umat));
                 break;
             default:
                 throw new NotSupportedException(target.GetType().FullName);
         }
     }
 
-    private static MatObjectDataSource CreateDataSource(InputArray inputArray, string description)
+    private static MatObjectDataSource CreateDataSource(Mat mat)
     {
-        _ = Cv2.ImEncode(".png", inputArray, out var buffer);
+        using var pngWriteableMat = PreparePngMat(mat);
+        _ = Cv2.ImEncode(".png", pngWriteableMat, out var buffer);
+
         return new MatObjectDataSource
         {
             PngDataBase64 = Convert.ToBase64String(buffer),
-            Width = inputArray.Size().Width,
-            Height = inputArray.Size().Height,
-            Description = description
+            Width = mat.Width,
+            Height = mat.Height,
+            Description = mat.ToString()
         };
     }
+
+    private static MatObjectDataSource CreateDataSource(UMat umat)
+    {
+        using var mat = umat.GetMat(AccessFlag.READ);
+        using var pngWriteableMat = PreparePngMat(mat);
+        _ = Cv2.ImEncode(".png", pngWriteableMat, out var buffer);
+
+        return new MatObjectDataSource
+        {
+            PngDataBase64 = Convert.ToBase64String(buffer),
+            Width = umat.Width,
+            Height = umat.Height,
+            Description = umat.ToString()
+        };
+    }
+
+    private static Mat PreparePngMat(Mat mat)
+    {
+        var matType = mat.Type();
+
+        if (matType.Depth == MatType.CV_USRTYPE1)
+        {
+            throw new NotSupportedException("Unsupported MatType: CV_USRTYPE1");
+        }
+        else if (matType.IsInteger && matType.Channels != 2)
+        {
+            return mat.Clone();
+        }
+        else if (matType.Channels == 1)
+        {
+            var result = new Mat(mat.Size(), MatType.CV_8UC1);
+            mat.ConvertTo(result, MatType.CV_8UC1, 255.0);
+            return result;
+            //return matType.Depth == MatType.CV_32F ? PrepareFloatImage(mat) : PrepareDoubleImage(mat);
+        }
+        else if (matType.Channels == 3)
+        {
+            var result = new Mat(mat.Size(), MatType.CV_8UC3);
+            mat.ConvertTo(result, MatType.CV_8UC3, 255.0);
+            return result;
+        }
+        else if (matType.Channels == 4)
+        {
+            var result = new Mat(mat.Size(), MatType.CV_8UC4);
+            mat.ConvertTo(result, MatType.CV_8UC4, 255.0);
+            return result;
+        }
+        else if (matType.Channels == 2)
+        {
+            Cv2.Split(mat, out var twoChannels);
+            var channels = new[] { twoChannels[0], twoChannels[1], twoChannels[0] };
+            var result = new Mat(mat.Size(), MatType.CV_8UC3);
+            Cv2.Merge(channels, result);
+            return result;
+        }
+        throw new NotSupportedException("Unknown Mat format");
+    }
 }

OpenCvSharpVisualizer/OpenCvSharpVisualizer.csproj

@@ -13,9 +13,6 @@
         <Compile Remove="OpenCvSharpVisualizerControl.xaml.cs" />
         <None Remove="OpenCvSharpVisualizerControl.xaml" />
         <Page Remove="OpenCvSharpVisualizerControl.xaml" />
-        <None Include="source.extension.vsixmanifest">
-            <SubType>Designer</SubType>
-        </None>
     </ItemGroup>
 
     <ItemGroup>