Commit 9799ba05 by 鲁志-悦动

主页面白框变成灰色 And Replay入点拖框大于等于30*30改为15*15

parent 772c0902
...@@ -243,8 +243,9 @@ ...@@ -243,8 +243,9 @@
Style="{StaticResource CheckBox_Setting}" />--> Style="{StaticResource CheckBox_Setting}" />-->
<Border <Border
Grid.ColumnSpan="3" Grid.ColumnSpan="3"
BorderBrush="White" BorderBrush="Gray"
BorderThickness="3"> BorderThickness="1"
Opacity="1">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition /> <ColumnDefinition />
...@@ -308,8 +309,8 @@ ...@@ -308,8 +309,8 @@
Grid.Row="1" Grid.Row="1"
Grid.ColumnSpan="3" Grid.ColumnSpan="3"
Margin="0,10,0,0" Margin="0,10,0,0"
BorderBrush="White" BorderBrush="Gray"
BorderThickness="3"> BorderThickness="1">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition /> <ColumnDefinition />
...@@ -512,6 +513,8 @@ ...@@ -512,6 +513,8 @@
Grid.Column="3" Grid.Column="3"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Margin="10,0,0,0" Margin="10,0,0,0"
BorderBrush="Gray"
BorderThickness="0.25"
Foreground="White" Foreground="White"
Header="选框操作"> Header="选框操作">
<Grid> <Grid>
...@@ -680,8 +683,8 @@ ...@@ -680,8 +683,8 @@
<Border <Border
Grid.Row="2" Grid.Row="2"
Margin="0,10,0,0" Margin="0,10,0,0"
BorderBrush="White" BorderBrush="Gray"
BorderThickness="3"> BorderThickness="1">
<CheckBox <CheckBox
Width="100" Width="100"
Height="40" Height="40"
...@@ -755,8 +758,8 @@ ...@@ -755,8 +758,8 @@
Grid.Column="1" Grid.Column="1"
Grid.ColumnSpan="4" Grid.ColumnSpan="4"
Margin="5,10,0,0" Margin="5,10,0,0"
BorderBrush="White" BorderBrush="Gray"
BorderThickness="3"> BorderThickness="1">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock <TextBlock
Margin="20,0,0,0" Margin="20,0,0,0"
...@@ -858,8 +861,8 @@ ...@@ -858,8 +861,8 @@
Grid.Row="3" Grid.Row="3"
Grid.ColumnSpan="5" Grid.ColumnSpan="5"
Margin="0,10,0,0" Margin="0,10,0,0"
BorderBrush="White" BorderBrush="Gray"
BorderThickness="3"> BorderThickness="1">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition /> <ColumnDefinition />
...@@ -1270,8 +1273,8 @@ ...@@ -1270,8 +1273,8 @@
Grid.Column="0" Grid.Column="0"
Width="450" Width="450"
Margin="0,5" Margin="0,5"
BorderBrush="White" BorderBrush="Gray"
BorderThickness="3"> BorderThickness="1">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock <TextBlock
Margin="35,0,0,0" Margin="35,0,0,0"
......
...@@ -8,7 +8,6 @@ using System.Threading.Tasks; ...@@ -8,7 +8,6 @@ using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Interop; using System.Windows.Interop;
using System.Windows.Threading;
using Newtonsoft.Json; using Newtonsoft.Json;
using VIZ.FGOUT.Connection; using VIZ.FGOUT.Connection;
using VIZ.FGOUT.Connection.UDP.Clip.Signal.Send; using VIZ.FGOUT.Connection.UDP.Clip.Signal.Send;
...@@ -48,7 +47,7 @@ namespace VIZ.FGOUT.Module ...@@ -48,7 +47,7 @@ namespace VIZ.FGOUT.Module
// 初始化鼠标键盘钩子 // 初始化鼠标键盘钩子
this.InitKeyboardMouseEvents(); this.InitKeyboardMouseEvents();
// 注册系统检测循环 // 注册系统检测循环
ApplicationDomainEx.LoopManager.Register("NDIMainViewModel.UpdateSystemMonitor", 1, this.UpdateSystemMonitor); //ApplicationDomainEx.LoopManager.Register("NDIMainViewModel.UpdateSystemMonitor", 1, this.UpdateSystemMonitor);
// 注册服务 // 注册服务
//ApplicationDomainEx.ServiceManager.AddService(NDIViewKeys.MainView, this); //ApplicationDomainEx.ServiceManager.AddService(NDIViewKeys.MainView, this);
ApplicationDomainEx.ServiceManager.AddService(NDIMainViewKeys.MainView, this); ApplicationDomainEx.ServiceManager.AddService(NDIMainViewKeys.MainView, this);
...@@ -173,21 +172,7 @@ namespace VIZ.FGOUT.Module ...@@ -173,21 +172,7 @@ namespace VIZ.FGOUT.Module
{ {
try try
{ {
//WPFHelper.BeginInvoke(() => WPFHelper.BeginInvoke(() =>
//{
// if (AutoSendCount == 1)
// AutoSendCount = _tempAutoSendCount;
// AutoSendCount--;
//});
//WPFHelper.Invoke(() =>
//{
// if (AutoSendCount == 1)
// AutoSendCount = _tempAutoSendCount;
// AutoSendCount--;
//},DispatcherPriority.DataBind);
WPFHelper.Invoke(() =>
{ {
if (AutoSendCount == 1) if (AutoSendCount == 1)
AutoSendCount = _tempAutoSendCount; AutoSendCount = _tempAutoSendCount;
......
...@@ -341,7 +341,7 @@ namespace VIZ.FGOUT.Module ...@@ -341,7 +341,7 @@ namespace VIZ.FGOUT.Module
{ {
_isMove = false; _isMove = false;
aa = new PathGeometry(); aa = new PathGeometry();
if (rectReplay.Width > 30 && rectReplay.Height > 30) if (rectReplay.Width >= 15 && rectReplay.Height >= 15)
{ {
if (!rectsReplay.Contains(rectReplay)) if (!rectsReplay.Contains(rectReplay))
{ {
......
...@@ -285,7 +285,7 @@ namespace VIZ.FGOUT.Module ...@@ -285,7 +285,7 @@ namespace VIZ.FGOUT.Module
EndTime = dse.TimeStamp; EndTime = dse.TimeStamp;
// Replay更新画面 // Replay更新画面
WPFHelper.Invoke(() => WPFHelper.BeginInvoke(() =>
{ {
try try
{ {
...@@ -326,6 +326,9 @@ namespace VIZ.FGOUT.Module ...@@ -326,6 +326,9 @@ namespace VIZ.FGOUT.Module
} }
//WPFHelper.Invoke(() => //WPFHelper.Invoke(() =>
//{ //{
//先清除跟踪框
//view3.video.ClearTrackingBox();
//再更新跟踪框信息
view3.video.UpdateTrackingBox(_cam3Infos); view3.video.UpdateTrackingBox(_cam3Infos);
//}); //});
} }
......
...@@ -320,8 +320,10 @@ namespace VIZ.FGOUT.Module ...@@ -320,8 +320,10 @@ namespace VIZ.FGOUT.Module
ndiView.rectsReplay.Clear(); ndiView.rectsReplay.Clear();
ndiView.canvas1.Children.Clear(); ndiView.canvas1.Children.Clear();
//清除跟踪框的数据 //清除跟踪框的数据
ndiView.saveInfo = new TrackingBoxInfo(); //ndiView.saveInfo = new TrackingBoxInfo();
ndiView.saveInfos = new List<TrackingBoxInfo>(); //ndiView.saveInfos = new List<TrackingBoxInfo>();
//清除跟踪框
//ndiView.video.ClearTrackingBox();
} }
private void NewWindow(NewWindowModel newWindowModel) private void NewWindow(NewWindowModel newWindowModel)
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2D02C516254B69E62880CD85BFB4F658700A6815BD7CFFF02BD1DF58BF34AE08" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FD60C86EDEF9C45F9803679FC06039AD232FC37A2DDD6CD90E06C4B3EB42E44C"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module { ...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 255 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 256 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _AutoMode_; internal System.Windows.Controls.RadioButton _AutoMode_;
...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module { ...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 320 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 321 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _ManualMode_; internal System.Windows.Controls.RadioButton _ManualMode_;
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1231 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1234 "..\..\..\..\..\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 1360 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1363 "..\..\..\..\..\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 1375 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1378 "..\..\..\..\..\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;
...@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module { ...@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2: case 2:
this._AutoMode_ = ((System.Windows.Controls.RadioButton)(target)); this._AutoMode_ = ((System.Windows.Controls.RadioButton)(target));
#line 260 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 261 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick); this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default #line default
...@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module { ...@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module {
case 3: case 3:
this._ManualMode_ = ((System.Windows.Controls.RadioButton)(target)); this._ManualMode_ = ((System.Windows.Controls.RadioButton)(target));
#line 324 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 325 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick); this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default #line default
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2D02C516254B69E62880CD85BFB4F658700A6815BD7CFFF02BD1DF58BF34AE08" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FD60C86EDEF9C45F9803679FC06039AD232FC37A2DDD6CD90E06C4B3EB42E44C"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module { ...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 255 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 256 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _AutoMode_; internal System.Windows.Controls.RadioButton _AutoMode_;
...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module { ...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 320 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 321 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _ManualMode_; internal System.Windows.Controls.RadioButton _ManualMode_;
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1231 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1234 "..\..\..\..\..\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 1360 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1363 "..\..\..\..\..\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 1375 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1378 "..\..\..\..\..\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;
...@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module { ...@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2: case 2:
this._AutoMode_ = ((System.Windows.Controls.RadioButton)(target)); this._AutoMode_ = ((System.Windows.Controls.RadioButton)(target));
#line 260 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 261 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick); this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default #line default
...@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module { ...@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module {
case 3: case 3:
this._ManualMode_ = ((System.Windows.Controls.RadioButton)(target)); this._ManualMode_ = ((System.Windows.Controls.RadioButton)(target));
#line 324 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 325 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick); this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default #line default
......
This source diff could not be displayed because it is too large. You can view the blob instead.
0a98a5a9f75be82f46c64b6a013aef5e8970aecd c0b9e007c3146fb9ff3a371114861be8a1807eba646a54322be828f3efec59a4
...@@ -79,7 +79,6 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\Al ...@@ -79,7 +79,6 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\Al
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\System.Memory.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\System.Memory.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\System.Runtime.CompilerServices.Unsafe.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\System.Runtime.CompilerServices.Unsafe.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\NAudio.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\NAudio.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\System.Collections.Immutable.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\System.Numerics.Vectors.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\System.Numerics.Vectors.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\System.Buffers.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\System.Buffers.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\VIZ.Framework.Common.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\VIZ.Framework.Common.pdb
...@@ -116,6 +115,6 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Release\VI ...@@ -116,6 +115,6 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Release\VI
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Release\VIZ.Framework.Common.Resource.Properties.Resources.resources C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Release\VIZ.Framework.Common.Resource.Properties.Resources.resources
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Release\VIZ.Framework.Common.Resource.csproj.GenerateResource.cache C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Release\VIZ.Framework.Common.Resource.csproj.GenerateResource.cache
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Release\VIZ.Framework.Common.Resource.csproj.CoreCompileInputs.cache C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Release\VIZ.Framework.Common.Resource.csproj.CoreCompileInputs.cache
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Release\VIZ.Framework.Common.Resource.csproj.CopyComplete
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Release\VIZ.Framework.Common.Resource.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Release\VIZ.Framework.Common.Resource.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Release\VIZ.Framework.Common.Resource.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Release\VIZ.Framework.Common.Resource.pdb
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Release\VIZ.Fram.BB1B34A6.Up2Date
...@@ -10,10 +10,10 @@ none ...@@ -10,10 +10,10 @@ none
false false
TRACE TRACE
91711917753 9-721875057
3-1719726047 3-630027162
19269851070 19468308608
Path\ArrowPathResource.xaml;Style\Button\Button_MessageBox.xaml;Style\Button\Button_Normal.xaml;Style\Button\Button_WindowTop.xaml;Style\GridSplitter\GridSplitter_None.xaml;Style\ListBox\ListBox_None.xaml;Style\ScrollView\ScrollView_Default.xaml;Style\TextBox\TextBox_None.xaml;Themes\Generic.xaml; Path\ArrowPathResource.xaml;Style\Button\Button_MessageBox.xaml;Style\Button\Button_Normal.xaml;Style\Button\Button_WindowTop.xaml;Style\GridSplitter\GridSplitter_None.xaml;Style\ListBox\ListBox_None.xaml;Style\ScrollView\ScrollView_Default.xaml;Style\TextBox\TextBox_None.xaml;Themes\Generic.xaml;
False False
......
 //------------------------------------------------------------------------------
// <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);
}
}
}
84b2030c4698be25bc8e8a9d91d364220832d516 fdc742c74c78e8cedbc468852e1373ddd0f9d9017d1562d22ed1ae78b714181f
...@@ -125,7 +125,6 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\VizConnectC ...@@ -125,7 +125,6 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\VizConnectC
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\NvAPIWrapper.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\NvAPIWrapper.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\AltaxoCore.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\AltaxoCore.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\NAudio.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\NAudio.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\System.Collections.Immutable.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\VIZ.Framework.Core.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\VIZ.Framework.Core.pdb
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\VIZ.Framework.Domain.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\VIZ.Framework.Domain.pdb
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\VIZ.Framework.Storage.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\VIZ.Framework.Storage.pdb
...@@ -184,6 +183,6 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\VIZ.Framewo ...@@ -184,6 +183,6 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\VIZ.Framewo
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\VIZ.Framework.Common.WindowHostForm.resources C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\VIZ.Framework.Common.WindowHostForm.resources
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\VIZ.Framework.Common.csproj.GenerateResource.cache C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\VIZ.Framework.Common.csproj.GenerateResource.cache
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\VIZ.Framework.Common.csproj.CoreCompileInputs.cache C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\VIZ.Framework.Common.csproj.CoreCompileInputs.cache
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\VIZ.Framework.Common.csproj.CopyComplete
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\VIZ.Framework.Common.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\VIZ.Framework.Common.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\VIZ.Framework.Common.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\VIZ.Framework.Common.pdb
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\VIZ.Fram.A89CC29D.Up2Date
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
TRACE TRACE
15488264905 15-721109437
120494897808 120150095399
44-1038958293 44928538216
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
1ed7a6b4dbfcecf1eb4e734ace8c464366bcdbfb 0bd572765c113971f1e589baf47e76d18902e903d7e1c571e1bcf014ece7ddb4
...@@ -38,9 +38,7 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\VizConn ...@@ -38,9 +38,7 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\VizConn
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\NvAPIWrapper.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\NvAPIWrapper.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\AltaxoCore.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\AltaxoCore.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\System.Memory.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\System.Memory.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\System.Collections.Immutable.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\System.Numerics.Vectors.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\System.Numerics.Vectors.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\System.Runtime.CompilerServices.Unsafe.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\System.Buffers.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\System.Buffers.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\VIZ.Framework.Core.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\VIZ.Framework.Core.pdb
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\VIZ.Framework.Domain.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\VIZ.Framework.Domain.pdb
...@@ -53,6 +51,6 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\AltaxoC ...@@ -53,6 +51,6 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\AltaxoC
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\AltaxoCore.xml C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\bin\x64\Release\AltaxoCore.xml
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\obj\x64\Release\VIZ.Framework.Connection.csproj.AssemblyReference.cache C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\obj\x64\Release\VIZ.Framework.Connection.csproj.AssemblyReference.cache
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\obj\x64\Release\VIZ.Framework.Connection.csproj.CoreCompileInputs.cache C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\obj\x64\Release\VIZ.Framework.Connection.csproj.CoreCompileInputs.cache
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\obj\x64\Release\VIZ.Framework.Connection.csproj.CopyComplete
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\obj\x64\Release\VIZ.Framework.Connection.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\obj\x64\Release\VIZ.Framework.Connection.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\obj\x64\Release\VIZ.Framework.Connection.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\obj\x64\Release\VIZ.Framework.Connection.pdb
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Connection\obj\x64\Release\VIZ.Fram.5FAA8452.Up2Date
13a38b7ba6161a488fccb9eedf7022e9a92fc448 f346e34fa113c75fbb5d7583760dcedaaea8630203ca586da10c477fb77a5759
...@@ -38,9 +38,7 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\SharpDX.Mathe ...@@ -38,9 +38,7 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\SharpDX.Mathe
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\TDx.SpaceMouse.Navigation3D.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\TDx.SpaceMouse.Navigation3D.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\VizConnectC.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\VizConnectC.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\System.Memory.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\System.Memory.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\System.Collections.Immutable.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\System.Numerics.Vectors.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\System.Numerics.Vectors.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\System.Runtime.CompilerServices.Unsafe.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\System.Buffers.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\System.Buffers.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\AltaxoCore.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\AltaxoCore.pdb
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\AltaxoCore.xml C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\AltaxoCore.xml
...@@ -53,6 +51,6 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\SharpDX.Mathe ...@@ -53,6 +51,6 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\SharpDX.Mathe
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\TDx.SpaceMouse.Navigation3D.xml C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\bin\x64\Release\TDx.SpaceMouse.Navigation3D.xml
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\obj\x64\Release\VIZ.Framework.Core.csproj.AssemblyReference.cache C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\obj\x64\Release\VIZ.Framework.Core.csproj.AssemblyReference.cache
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\obj\x64\Release\VIZ.Framework.Core.csproj.CoreCompileInputs.cache C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\obj\x64\Release\VIZ.Framework.Core.csproj.CoreCompileInputs.cache
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\obj\x64\Release\VIZ.Framework.Core.csproj.CopyComplete
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\obj\x64\Release\VIZ.Framework.Core.dll C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\obj\x64\Release\VIZ.Framework.Core.dll
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\obj\x64\Release\VIZ.Framework.Core.pdb C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\obj\x64\Release\VIZ.Framework.Core.pdb
C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Core\obj\x64\Release\VIZ.Fram.28985DC7.Up2Date
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