Commit 54e5c2ff by 鲁志-悦动

修复二次确认倒计时数字不变的缺陷

parent 38f633e8
...@@ -159,9 +159,7 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\bin\x64\Debug\NvAPIWrapper.dll ...@@ -159,9 +159,7 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\bin\x64\Debug\NvAPIWrapper.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\bin\x64\Debug\AltaxoCore.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\bin\x64\Debug\AltaxoCore.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\bin\x64\Debug\Newtonsoft.Json.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\bin\x64\Debug\Newtonsoft.Json.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\bin\x64\Debug\System.Memory.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\bin\x64\Debug\System.Memory.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\bin\x64\Debug\System.Collections.Immutable.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\bin\x64\Debug\System.Numerics.Vectors.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\bin\x64\Debug\System.Numerics.Vectors.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\bin\x64\Debug\System.Runtime.CompilerServices.Unsafe.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\bin\x64\Debug\System.Buffers.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\bin\x64\Debug\System.Buffers.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\bin\x64\Debug\VIZ.Framework.Core.pdb C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\bin\x64\Debug\VIZ.Framework.Core.pdb
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\bin\x64\Debug\log4net.xml C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\bin\x64\Debug\log4net.xml
......
a83c5d648dadec9571c1a255b923e0d9044e93ee02822d123d5c05393c67f4ad 9a29495fd000d7cfc390caea2531b63ad4e01cabcde39992dc960963f52610ba
...@@ -245,7 +245,6 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\bin\x64\Debug\NvAPIWrapper.dll ...@@ -245,7 +245,6 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\bin\x64\Debug\NvAPIWrapper.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\bin\x64\Debug\AltaxoCore.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\bin\x64\Debug\AltaxoCore.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\bin\x64\Debug\VIZ.FGOUT.Storage.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\bin\x64\Debug\VIZ.FGOUT.Storage.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\bin\x64\Debug\System.Memory.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\bin\x64\Debug\System.Memory.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\bin\x64\Debug\System.Collections.Immutable.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\bin\x64\Debug\CsvHelper.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\bin\x64\Debug\CsvHelper.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\bin\x64\Debug\LiteDB.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\bin\x64\Debug\LiteDB.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\bin\x64\Debug\System.Numerics.Vectors.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\bin\x64\Debug\System.Numerics.Vectors.dll
...@@ -277,3 +276,4 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\obj\x64\Debug\VIZ.FGOUT.Connect ...@@ -277,3 +276,4 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\obj\x64\Debug\VIZ.FGOUT.Connect
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\obj\x64\Debug\VIZ.FGOUT.Connection.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\obj\x64\Debug\VIZ.FGOUT.Connection.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\obj\x64\Debug\VIZ.FGOUT.Connection.pdb C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\obj\x64\Debug\VIZ.FGOUT.Connection.pdb
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\obj\x64\Debug\VIZ.FGOU.8135E5BE.Up2Date C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\obj\x64\Debug\VIZ.FGOU.8135E5BE.Up2Date
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Connection\bin\x64\Debug\System.Runtime.CompilerServices.Unsafe.xml
a6d37163fdb07189b20bc5cc28dfe1bb38043a2ff612bba2b397af5181537a58 0caed37e7dcc0a89cbc7f90cc0f37a3b75f101a07cc9e20e7a01fb23087ff53b
...@@ -225,7 +225,6 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\bin\x64\Debug\Newtonsoft.Json.dll ...@@ -225,7 +225,6 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\bin\x64\Debug\Newtonsoft.Json.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\bin\x64\Debug\CsvHelper.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\bin\x64\Debug\CsvHelper.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\bin\x64\Debug\LiteDB.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\bin\x64\Debug\LiteDB.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\bin\x64\Debug\System.Memory.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\bin\x64\Debug\System.Memory.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\bin\x64\Debug\System.Collections.Immutable.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\bin\x64\Debug\Microsoft.Bcl.AsyncInterfaces.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\bin\x64\Debug\Microsoft.Bcl.AsyncInterfaces.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\bin\x64\Debug\System.Threading.Tasks.Extensions.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\bin\x64\Debug\System.Threading.Tasks.Extensions.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\bin\x64\Debug\Microsoft.Bcl.HashCode.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\bin\x64\Debug\Microsoft.Bcl.HashCode.dll
...@@ -253,3 +252,4 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\obj\x64\Debug\VIZ.FGOUT.Domain.cspr ...@@ -253,3 +252,4 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\obj\x64\Debug\VIZ.FGOUT.Domain.cspr
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\obj\x64\Debug\VIZ.FGOUT.Domain.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\obj\x64\Debug\VIZ.FGOUT.Domain.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\obj\x64\Debug\VIZ.FGOUT.Domain.pdb C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\obj\x64\Debug\VIZ.FGOUT.Domain.pdb
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\obj\x64\Debug\VIZ.FGOU.A3F58D04.Up2Date C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\obj\x64\Debug\VIZ.FGOU.A3F58D04.Up2Date
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Domain\bin\x64\Debug\System.Runtime.CompilerServices.Unsafe.xml
...@@ -534,7 +534,6 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\bin\x64\Debug\NAudio.dll ...@@ -534,7 +534,6 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\bin\x64\Debug\NAudio.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\bin\x64\Debug\Microsoft.Bcl.AsyncInterfaces.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\bin\x64\Debug\Microsoft.Bcl.AsyncInterfaces.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\bin\x64\Debug\System.Threading.Tasks.Extensions.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\bin\x64\Debug\System.Threading.Tasks.Extensions.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\bin\x64\Debug\Microsoft.Bcl.HashCode.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\bin\x64\Debug\Microsoft.Bcl.HashCode.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\bin\x64\Debug\System.Collections.Immutable.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\bin\x64\Debug\System.Numerics.Vectors.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\bin\x64\Debug\System.Numerics.Vectors.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\bin\x64\Debug\System.Buffers.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\bin\x64\Debug\System.Buffers.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\bin\x64\Debug\VIZ.Framework.Common.pdb C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\bin\x64\Debug\VIZ.Framework.Common.pdb
......
...@@ -811,8 +811,8 @@ ...@@ -811,8 +811,8 @@
Foreground="Black" Foreground="Black"
IsEnabled="False" IsEnabled="False"
Style="{StaticResource TextBoxStyle}" Style="{StaticResource TextBoxStyle}"
Text="{Binding AutoSendCount, Mode=TwoWay}" />--> Text="{Binding AutoSendCount}" />-->
<TextBlock <!--<TextBlock
Width="30" Width="30"
Height="30" Height="30"
Padding="0,6,0,0" Padding="0,6,0,0"
...@@ -823,6 +823,19 @@ ...@@ -823,6 +823,19 @@
Foreground="Black" Foreground="Black"
IsEnabled="False" IsEnabled="False"
Text="{Binding AutoSendCount, Mode=TwoWay}" Text="{Binding AutoSendCount, Mode=TwoWay}"
TextAlignment="Center" />-->
<fcommon:CountdownDisplayControl
Width="30"
Height="30"
Padding="0,6,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="Yellow"
FontSize="14"
Foreground="Black"
IsEnabled="False"
NumText="{Binding AutoSendCount}"
TempNumText="{Binding AutoSendCount}"
TextAlignment="Center" /> TextAlignment="Center" />
</StackPanel> </StackPanel>
</Border> </Border>
......
...@@ -241,12 +241,12 @@ namespace VIZ.FGOUT.Module ...@@ -241,12 +241,12 @@ namespace VIZ.FGOUT.Module
{ {
try try
{ {
WPFHelper.BeginInvoke(() => //WPFHelper.BeginInvoke(() =>
{ //{
if (AutoSendCount == 1) if (AutoSendCount == 1)
AutoSendCount = _tempAutoSendCount; AutoSendCount = _tempAutoSendCount;
AutoSendCount--; AutoSendCount--;
}); //});
} }
catch (Exception ex) catch (Exception ex)
{ {
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "17FE220AD980A726BEEBAB4819C71DFB53C9A7CAAE07A0EF18ACDBB808871D30" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A9E446E52202FB592D2DDA06292EF9A66CAF6396058637C224187CFE75309B21"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1246 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1259 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1375 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1388 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1390 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1403 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3; internal VIZ.FGOUT.Module.NDIView cam3;
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "17FE220AD980A726BEEBAB4819C71DFB53C9A7CAAE07A0EF18ACDBB808871D30" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A9E446E52202FB592D2DDA06292EF9A66CAF6396058637C224187CFE75309B21"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1246 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1259 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1375 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1388 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1390 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1403 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3; internal VIZ.FGOUT.Module.NDIView cam3;
......
...@@ -794,7 +794,6 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\NvAPIWrapper.dll ...@@ -794,7 +794,6 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\NvAPIWrapper.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\AltaxoCore.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\AltaxoCore.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\CsvHelper.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\CsvHelper.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\NAudio.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\NAudio.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\System.Collections.Immutable.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\Microsoft.Bcl.AsyncInterfaces.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\Microsoft.Bcl.AsyncInterfaces.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\System.Threading.Tasks.Extensions.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\System.Threading.Tasks.Extensions.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\Microsoft.Bcl.HashCode.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\Microsoft.Bcl.HashCode.dll
......
 C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;
......
...@@ -316,7 +316,6 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Storage\bin\x64\Debug\VizConnectC.dll ...@@ -316,7 +316,6 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Storage\bin\x64\Debug\VizConnectC.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Storage\bin\x64\Debug\NvAPIWrapper.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Storage\bin\x64\Debug\NvAPIWrapper.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Storage\bin\x64\Debug\AltaxoCore.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Storage\bin\x64\Debug\AltaxoCore.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Storage\bin\x64\Debug\Newtonsoft.Json.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Storage\bin\x64\Debug\Newtonsoft.Json.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Storage\bin\x64\Debug\System.Collections.Immutable.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Storage\bin\x64\Debug\VIZ.Framework.Core.pdb C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Storage\bin\x64\Debug\VIZ.Framework.Core.pdb
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Storage\bin\x64\Debug\VIZ.Framework.Storage.pdb C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Storage\bin\x64\Debug\VIZ.Framework.Storage.pdb
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Storage\bin\x64\Debug\BouncyCastle.Crypto.xml C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Storage\bin\x64\Debug\BouncyCastle.Crypto.xml
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -104,6 +104,6 @@ ALGORITHM_ClearTrackingBox_TIME=1000 ...@@ -104,6 +104,6 @@ ALGORITHM_ClearTrackingBox_TIME=1000
ALGORITHM_ReconfirmAutoSend_TIME=3000 ALGORITHM_ReconfirmAutoSend_TIME=3000
[Stream] [Stream]
;音视频流的缓存时间(单位:秒) ;音视频流的缓存时间(单位:秒)
STREAM_CACHEED_TIME=20 STREAM_CACHEED_TIME=10
...@@ -732,7 +732,6 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\CsvHelper.dll ...@@ -732,7 +732,6 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\CsvHelper.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\System.Memory.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\System.Memory.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\System.Runtime.CompilerServices.Unsafe.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\System.Runtime.CompilerServices.Unsafe.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\NAudio.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\NAudio.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\System.Collections.Immutable.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\Microsoft.Bcl.AsyncInterfaces.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\Microsoft.Bcl.AsyncInterfaces.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\System.Threading.Tasks.Extensions.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\System.Threading.Tasks.Extensions.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\Microsoft.Bcl.HashCode.dll C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\x64\Debug\Microsoft.Bcl.HashCode.dll
......
...@@ -252,7 +252,6 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\Alta ...@@ -252,7 +252,6 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\Alta
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\System.Memory.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\System.Memory.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\System.Runtime.CompilerServices.Unsafe.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\System.Runtime.CompilerServices.Unsafe.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\NAudio.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\NAudio.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\System.Collections.Immutable.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\System.Numerics.Vectors.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\System.Numerics.Vectors.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\System.Buffers.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\System.Buffers.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\VIZ.Framework.Common.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Debug\VIZ.Framework.Common.pdb
......
...@@ -333,6 +333,7 @@ ...@@ -333,6 +333,7 @@
<Compile Include="Widgets\ResizeImageControl\ResizeImageControl.cs" /> <Compile Include="Widgets\ResizeImageControl\ResizeImageControl.cs" />
<Compile Include="Widgets\ShowMessageControl\ShowMessage.cs" /> <Compile Include="Widgets\ShowMessageControl\ShowMessage.cs" />
<Compile Include="Widgets\ShowMessageControl\ShowMessageControl.cs" /> <Compile Include="Widgets\ShowMessageControl\ShowMessageControl.cs" />
<Compile Include="Widgets\TimeDisplayControl\CountdownDisplayControl.cs" />
<Compile Include="Widgets\TimeDisplayControl\TimeDisplayControl.cs" /> <Compile Include="Widgets\TimeDisplayControl\TimeDisplayControl.cs" />
<Compile Include="Widgets\VideoTimeBar\EventArgs\VideoTimeBarValueChangedEventArgs.cs" /> <Compile Include="Widgets\VideoTimeBar\EventArgs\VideoTimeBarValueChangedEventArgs.cs" />
<Compile Include="Widgets\VideoTimeBar\VideoTimeBar.cs" /> <Compile Include="Widgets\VideoTimeBar\VideoTimeBar.cs" />
......
using SharpDX.Mathematics.Interop; using SharpDX.Mathematics.Interop;
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
using SharpDX.Mathematics.Interop; using SharpDX.Mathematics.Interop;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
using System; namespace VIZ.Framework.Common
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Common
{ {
/// <summary> /// <summary>
/// 框选框插件扩展 /// 框选框插件扩展
......
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
...@@ -2,9 +2,6 @@ ...@@ -2,9 +2,6 @@
using SharpDX.Mathematics.Interop; using SharpDX.Mathematics.Interop;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core; using VIZ.Framework.Core;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
......
using System; using System.Windows;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
using System; using System.Windows;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using Xceed.Wpf.Toolkit;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
using System; using System.Windows.Controls;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Controls;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.Framework.Domain; using VIZ.Framework.Domain;
......
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Input; using System.Windows.Input;
......
using log4net; using log4net;
using System; using System;
using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
......
using System; using System.Windows;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using VIZ.Framework.Core; using VIZ.Framework.Core;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
......
using System; using System.Windows;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
using System; using System.Windows;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
using System; using System.Windows;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using VIZ.Framework.Core; using VIZ.Framework.Core;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
......
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Collections.Specialized; using System.Collections.Specialized;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Controls.Primitives; using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
using System; namespace VIZ.Framework.Common
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Common
{ {
/// <summary> /// <summary>
/// 导航控件创建模式 /// 导航控件创建模式
......
using System; using System.Windows;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Media;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
using System; using System.Windows;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
using System; namespace VIZ.Framework.Common
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Common
{ {
/// <summary> /// <summary>
/// 显示消息 /// 显示消息
......
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.Framework.Domain; using VIZ.Framework.Domain;
......
using log4net;
using System;
using System.Diagnostics;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using VIZ.Framework.Core;
using VIZ.Framework.Domain;
namespace VIZ.Framework.Common
{
/// <summary>
/// 时间控件
/// </summary>
public class CountdownDisplayControl : TextBlock, IDisposable
{
/// <summary>
/// 日志
/// </summary>
private readonly static ILog log = LogManager.GetLogger(typeof(CountdownDisplayControl));
/// <summary>
/// 时间控件
/// </summary>
public CountdownDisplayControl()
{
ApplicationDomain.ObjectPoolManager.Add($"CountdownDisplayControl__{Guid.NewGuid()}", this);
this.Loaded += TimeDisplayControl_Loaded;
}
/// <summary>
/// 更新任务信息
/// </summary>
private TaskInfo updateTaskInfo;
/// <summary>
/// 更新任务
/// </summary>
private Task updateTask;
/// <summary>
/// 销毁
/// </summary>
public void Dispose()
{
if (this.updateTaskInfo == null)
return;
this.updateTaskInfo.IsCancel = true;
this.updateTaskInfo = null;
this.updateTask = null;
}
/// <summary>
/// 控件完成加载
/// </summary>
private void TimeDisplayControl_Loaded(object sender, System.Windows.RoutedEventArgs e)
{
if (this.updateTask != null)
return;
this.updateTaskInfo = new TaskInfo();
this.updateTask = Task.Run(this.update);
}
public int NumText
{
get { return (int)GetValue(NumTextProperty); }
set { SetValue(NumTextProperty, value); }
}
public static readonly DependencyProperty NumTextProperty =
DependencyProperty.Register(nameof(NumText), typeof(int), typeof(CountdownDisplayControl));
public int TempNumText
{
get { return (int)GetValue(TempNumTextProperty); }
set { SetValue(TempNumTextProperty, value); }
}
public static readonly DependencyProperty TempNumTextProperty =
DependencyProperty.Register(nameof(TempNumText), typeof(int), typeof(CountdownDisplayControl));
/// <summary>
/// 更新
/// </summary>
[DebuggerNonUserCode]
private void update()
{
TaskInfo info = this.updateTaskInfo;
if (info == null)
return;
while (!info.IsCancel)
{
WPFHelper.BeginInvoke(() =>
{
//if (NumText == 1)
// NumText = TempNumText + 1;
//NumText--;
this.Text = NumText.ToString();
});
Task.Delay(1000).Wait();
}
}
}
}
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
using System; using log4net;
using System.Collections.Generic; using System;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.Framework.Domain; using VIZ.Framework.Domain;
using log4net;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using VIZ.Framework.Core; using VIZ.Framework.Core;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
......
using log4net; using log4net;
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Forms.Integration; using System.Windows.Forms.Integration;
......
 //------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为,并且如果
// 重新生成代码,这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace XamlGeneratedNamespace {
/// <summary>
/// GeneratedInternalTypeHelper
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
/// <summary>
/// CreateInstance
/// </summary>
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
}
/// <summary>
/// GetPropertyValue
/// </summary>
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// SetPropertyValue
/// </summary>
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// CreateDelegate
/// </summary>
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
delegateType,
handler}, null)));
}
/// <summary>
/// AddEventHandler
/// </summary>
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
eventInfo.AddEventHandler(target, handler);
}
}
}
4efb79595219a205f84d40a3e36206c30465f5ff55be1494d88989f0ca8953fb f92d309fd0b0926f8c7349c81be87b38d5649cb3a3b7eed2717422c12e1bb7fa
...@@ -396,7 +396,6 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Debug\VizConnectC.d ...@@ -396,7 +396,6 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Debug\VizConnectC.d
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Debug\NvAPIWrapper.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Debug\NvAPIWrapper.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Debug\AltaxoCore.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Debug\AltaxoCore.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Debug\NAudio.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Debug\NAudio.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Debug\System.Collections.Immutable.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Debug\VIZ.Framework.Core.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Debug\VIZ.Framework.Core.pdb
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Debug\VIZ.Framework.Domain.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Debug\VIZ.Framework.Domain.pdb
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Debug\VIZ.Framework.Storage.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Debug\VIZ.Framework.Storage.pdb
......
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
15488264905 15-721109437
120494897808 121-1133520871
44-1238315823 44-785521425
MessageBox\MessageBoxEx.xaml;MessageBox\MessageBoxExWindow.xaml;Themes\Generic.xaml;VideoControl\Control\VideoControl.xaml;Widgets\ColorPickButton\ColorPickButton.xaml;Widgets\ColorPickButton\ColorPickWindow.xaml;Widgets\GPIOPinTestControl\GPIOPinTestControl.xaml;Widgets\HotkeyBox\HotkeyBox.xaml;Widgets\IconButton\IconButton.xaml;Widgets\LabelValue\LabelValue.xaml;Widgets\NavigationControl\NavigationControl.xaml;Widgets\ResizeImageControl\ResizeImageControl.xaml;Widgets\ShowMessageControl\ShowMessageControl.xaml;Widgets\VideoTimeBar\VideoTimeBar.xaml;Widgets\ViewLoader\ViewLoader.xaml; MessageBox\MessageBoxEx.xaml;MessageBox\MessageBoxExWindow.xaml;Themes\Generic.xaml;VideoControl\Control\VideoControl.xaml;Widgets\ColorPickButton\ColorPickButton.xaml;Widgets\ColorPickButton\ColorPickWindow.xaml;Widgets\GPIOPinTestControl\GPIOPinTestControl.xaml;Widgets\HotkeyBox\HotkeyBox.xaml;Widgets\IconButton\IconButton.xaml;Widgets\LabelValue\LabelValue.xaml;Widgets\NavigationControl\NavigationControl.xaml;Widgets\ResizeImageControl\ResizeImageControl.xaml;Widgets\ShowMessageControl\ShowMessageControl.xaml;Widgets\VideoTimeBar\VideoTimeBar.xaml;Widgets\ViewLoader\ViewLoader.xaml;
False True
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs 
FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxEx.xaml;; FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxEx.xaml;;
FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.xaml;; FC:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\MessageBox\MessageBoxExWindow.xaml;;
......
...@@ -123,9 +123,7 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Debug\VizConnec ...@@ -123,9 +123,7 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Debug\VizConnec
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Debug\NvAPIWrapper.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Debug\NvAPIWrapper.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Debug\AltaxoCore.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Debug\AltaxoCore.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Debug\System.Memory.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Debug\System.Memory.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Debug\System.Collections.Immutable.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Debug\System.Numerics.Vectors.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Debug\System.Numerics.Vectors.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Debug\System.Runtime.CompilerServices.Unsafe.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Debug\System.Buffers.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Debug\System.Buffers.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Debug\VIZ.Framework.Core.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Debug\VIZ.Framework.Core.pdb
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Debug\VIZ.Framework.Domain.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Debug\VIZ.Framework.Domain.pdb
......
...@@ -120,9 +120,7 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Debug\SharpDX.Mathema ...@@ -120,9 +120,7 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Debug\SharpDX.Mathema
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Debug\TDx.SpaceMouse.Navigation3D.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Debug\TDx.SpaceMouse.Navigation3D.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Debug\VizConnectC.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Debug\VizConnectC.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Debug\System.Memory.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Debug\System.Memory.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Debug\System.Collections.Immutable.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Debug\System.Numerics.Vectors.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Debug\System.Numerics.Vectors.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Debug\System.Runtime.CompilerServices.Unsafe.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Debug\System.Buffers.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Debug\System.Buffers.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Debug\AltaxoCore.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Debug\AltaxoCore.pdb
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Debug\AltaxoCore.xml C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Debug\AltaxoCore.xml
......
...@@ -98,9 +98,7 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Domain\bin\x64\Debug\VizConnectC.d ...@@ -98,9 +98,7 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Domain\bin\x64\Debug\VizConnectC.d
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Domain\bin\x64\Debug\NvAPIWrapper.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Domain\bin\x64\Debug\NvAPIWrapper.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Domain\bin\x64\Debug\AltaxoCore.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Domain\bin\x64\Debug\AltaxoCore.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Domain\bin\x64\Debug\System.Memory.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Domain\bin\x64\Debug\System.Memory.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Domain\bin\x64\Debug\System.Collections.Immutable.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Domain\bin\x64\Debug\System.Numerics.Vectors.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Domain\bin\x64\Debug\System.Numerics.Vectors.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Domain\bin\x64\Debug\System.Runtime.CompilerServices.Unsafe.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Domain\bin\x64\Debug\System.Buffers.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Domain\bin\x64\Debug\System.Buffers.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Domain\bin\x64\Debug\VIZ.Framework.Core.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Domain\bin\x64\Debug\VIZ.Framework.Core.pdb
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Domain\bin\x64\Debug\VIZ.Framework.Storage.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Domain\bin\x64\Debug\VIZ.Framework.Storage.pdb
......
...@@ -265,7 +265,6 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Debug\AltaxoCore.dl ...@@ -265,7 +265,6 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Debug\AltaxoCore.dl
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Debug\System.Memory.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Debug\System.Memory.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Debug\System.Runtime.CompilerServices.Unsafe.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Debug\System.Runtime.CompilerServices.Unsafe.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Debug\NAudio.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Debug\NAudio.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Debug\System.Collections.Immutable.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Debug\System.Numerics.Vectors.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Debug\System.Numerics.Vectors.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Debug\System.Buffers.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Debug\System.Buffers.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Debug\VIZ.Framework.Common.Resource.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Debug\VIZ.Framework.Common.Resource.pdb
......
...@@ -111,9 +111,7 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Storage\bin\x64\Debug\VizConnectC. ...@@ -111,9 +111,7 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Storage\bin\x64\Debug\VizConnectC.
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Storage\bin\x64\Debug\NvAPIWrapper.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Storage\bin\x64\Debug\NvAPIWrapper.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Storage\bin\x64\Debug\AltaxoCore.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Storage\bin\x64\Debug\AltaxoCore.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Storage\bin\x64\Debug\System.Memory.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Storage\bin\x64\Debug\System.Memory.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Storage\bin\x64\Debug\System.Collections.Immutable.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Storage\bin\x64\Debug\System.Numerics.Vectors.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Storage\bin\x64\Debug\System.Numerics.Vectors.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Storage\bin\x64\Debug\System.Runtime.CompilerServices.Unsafe.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Storage\bin\x64\Debug\System.Buffers.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Storage\bin\x64\Debug\System.Buffers.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Storage\bin\x64\Debug\VIZ.Framework.Core.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Storage\bin\x64\Debug\VIZ.Framework.Core.pdb
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Storage\bin\x64\Debug\log4net.xml C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Storage\bin\x64\Debug\log4net.xml
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment