Compare commits
17
Commits
24c85e3cde
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f5bbe81324 | ||
|
|
aaa50f4129 | ||
|
|
6a62a421b8 | ||
|
|
4633b6099b | ||
|
|
59444f4035 | ||
|
|
1e00af4b58 | ||
|
|
65ad859b2f | ||
|
|
fc885caddd | ||
|
|
376e57f15d | ||
|
|
60dea348d2 | ||
|
|
85d5515a97 | ||
|
|
c25bd820c3 | ||
|
|
a5a778fb1c | ||
|
|
f9a85f0e33 | ||
|
|
2097cc6bb3 | ||
|
|
277c87ad3d | ||
|
|
c1b86be4aa |
@@ -195,11 +195,11 @@ public class RenderingCanvas : UserControl, IDisposable
|
||||
if (pre != null) //this section will never occur if the datacontext not set twice.
|
||||
{
|
||||
pre.Terminate();
|
||||
pre.ImageRequestAfterBufferSwapped -= RenderingCanvas_BufferSwapped;
|
||||
pre.FrameReady -= RenderingCanvas_BufferSwapped;
|
||||
}
|
||||
if (cur != null)
|
||||
{
|
||||
cur.ImageRequestAfterBufferSwapped += RenderingCanvas_BufferSwapped;
|
||||
cur.FrameReady += RenderingCanvas_BufferSwapped;
|
||||
cur.Start((int)DisplayerPane.RenderSize.Width, (int)DisplayerPane.RenderSize.Height);
|
||||
|
||||
cur.IsVisible = IsVisible;
|
||||
@@ -235,8 +235,8 @@ public class RenderingCanvas : UserControl, IDisposable
|
||||
CurrentWindow = Window.GetWindow(this);
|
||||
|
||||
// Set up DispEngine rendering
|
||||
DispEngine.ImageRequestAfterBufferSwapped -= RenderingCanvas_BufferSwapped;
|
||||
DispEngine.ImageRequestAfterBufferSwapped += RenderingCanvas_BufferSwapped;
|
||||
DispEngine.FrameReady -= RenderingCanvas_BufferSwapped;
|
||||
DispEngine.FrameReady += RenderingCanvas_BufferSwapped;
|
||||
DispEngine.Start((int)DisplayerPane.RenderSize.Width, (int)DisplayerPane.RenderSize.Height);
|
||||
DispEngine.IsVisible = IsVisible;
|
||||
}
|
||||
@@ -247,7 +247,7 @@ public class RenderingCanvas : UserControl, IDisposable
|
||||
private unsafe void RenderingCanvas_Unloaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
DispEngine.IsVisible = IsVisible;
|
||||
DispEngine.ImageRequestAfterBufferSwapped -= RenderingCanvas_BufferSwapped;
|
||||
DispEngine.FrameReady -= RenderingCanvas_BufferSwapped;
|
||||
CurrentWindow = null;
|
||||
}
|
||||
#endregion
|
||||
@@ -256,7 +256,7 @@ public class RenderingCanvas : UserControl, IDisposable
|
||||
/// <summary>
|
||||
/// Handles the buffer swapped event from DispEngine
|
||||
/// </summary>
|
||||
private unsafe void RenderingCanvas_BufferSwapped(byte* data, int w, int h)
|
||||
private unsafe void RenderingCanvas_BufferSwapped(byte* data, int w, int h, FramePins pins)
|
||||
{
|
||||
if (data == null)
|
||||
return;
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
using Google.Protobuf.WellKnownTypes;
|
||||
using Hi.Disp;
|
||||
using Hi.Geom;
|
||||
using Hi.Licenses;
|
||||
|
||||
+3
-3
@@ -12,8 +12,8 @@
|
||||
HiAPI wpf canvas.
|
||||
</Description>
|
||||
<Configurations>Debug;Release</Configurations>
|
||||
<VersionBuild>140</VersionBuild>
|
||||
<VersionPrefix>3.1.$(VersionBuild)</VersionPrefix>
|
||||
<VersionBuild>30</VersionBuild>
|
||||
<VersionPrefix>3.2.$(VersionBuild)</VersionPrefix>
|
||||
<PackageId>Hi.WpfPlus</PackageId>
|
||||
<PackageTags>HiAPI</PackageTags>
|
||||
<RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
|
||||
@@ -29,7 +29,7 @@
|
||||
<ProjectReference Include="..\HiDisp\HiDisp.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(Configuration)'=='Release'">
|
||||
<PackageReference Include="HiDisp" Version="3.1.*" />
|
||||
<PackageReference Include="HiDisp" Version="3.2.*" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)'=='Release'">
|
||||
<IsIgnoreObfuscar>true</IsIgnoreObfuscar>
|
||||
|
||||
Reference in New Issue
Block a user