Skip to content

Project DebugVisualizers cleanup #1534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shimat merged 1 commit into from
Feb 28, 2023
Merged

Project DebugVisualizers cleanup #1534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 6 additions & 15 deletions src/OpenCvSharp.DebuggerVisualizers/ImageViewer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand All @@ -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);
Expand Down Expand Up @@ -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}";
}
}
}
5 changes: 3 additions & 2 deletions src/OpenCvSharp.DebuggerVisualizers/ImageViewer.designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 10 additions & 11 deletions src/OpenCvSharp.DebuggerVisualizers/MatDebuggerVisualizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
}
2 changes: 1 addition & 1 deletion src/OpenCvSharp.DebuggerVisualizers/MatObjectSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ public override void GetData(object target, Stream outgoingData)
bf.Serialize(outgoingData, new MatProxy((Mat)target));
}
}
}
}
11 changes: 3 additions & 8 deletions src/OpenCvSharp.DebuggerVisualizers/MatProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -34,4 +29,4 @@ public Bitmap CreateBitmap()
}
}
}
}
}