Commit 269220f4 by 王永辉

缓存10秒流视频

parent cc5641a4
//------------------------------------------------------------------------------ 
// <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);
}
}
}
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
2-725104376 21870986562
3947974750 31364711570
17-424547842 171166775462
Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml; Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
True False
using System; namespace VIZ.FGOUT.Connection
using System.Collections.Generic; {
using System.Linq; public class ReplayPackage
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Connection
{
public class ReplayPackage
{ {
/// <summary> /// <summary>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
public int status { get; set; } public int status { get; set; }
/// <summary> /// <summary>
/// 字段 /// 字段
/// </summary> /// </summary>
public int loadFlag { get; set; } public int loadFlag { get; set; }
} }
......
using System; namespace VIZ.FGOUT.Domain
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Domain
{ {
/// <summary> /// <summary>
/// ReplayModel /// ReplayModel
/// </summary> /// </summary>
public class ReplayModel public class ReplayModel
{ {
} }
......
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
181380438361 18560433975
1-1441241311 1470602451
11-1602666439 11-350624472
23304678694 241319896476
Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_Setting.xaml;Style\CheckBox\CheckBox_WindowTop.xaml;Style\ComboBox\ComboBox_Setting.xaml;Style\HotkeyBox\HotkeyBox_Setting.xaml;Style\MessageBox\MessageBoxEx.xaml;Style\RadioButton\RadioButton_FootballSide.xaml;Style\RadioButton\RadioButton_NdiView.xaml;Style\RadioButton\RadioButton_Setting.xaml;Style\Slider\Slider_Setting.xaml;Style\TextBlock\TextBlock_Setting.xaml;Style\TextBox\TextBox_Setting.xaml;Style\ToogleButton\ToogleButton_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml; Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_Setting.xaml;Style\CheckBox\CheckBox_WindowTop.xaml;Style\ComboBox\ComboBox_Setting.xaml;Style\HotkeyBox\HotkeyBox_Setting.xaml;Style\MessageBox\MessageBoxEx.xaml;Style\RadioButton\RadioButton_FootballSide.xaml;Style\RadioButton\RadioButton_NdiView.xaml;Style\RadioButton\RadioButton_Setting.xaml;Style\Slider\Slider_Setting.xaml;Style\TextBlock\TextBlock_Setting.xaml;Style\TextBox\TextBox_Setting.xaml;Style\ToogleButton\ToogleButton_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml;
True False
using System; using VIZ.FGOUT.Storage;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.FGOUT.Storage;
using VIZ.Framework.Core; using VIZ.Framework.Core;
......
...@@ -113,31 +113,24 @@ namespace VIZ.FGOUT.Module ...@@ -113,31 +113,24 @@ namespace VIZ.FGOUT.Module
IsAutoEnbale = true; IsAutoEnbale = true;
IsEnbaleTarget = false; IsEnbaleTarget = false;
SendIsManual("auto");//自动模式 SendIsManual("auto");//自动模式
} }
else else
{ {
IsEnbaleTarget = true; IsEnbaleTarget = true;
IsAutoEnbale = false; IsAutoEnbale = false;
SendIsManual("manual");//手动模式 SendIsManual("manual");//手动模式
} }
} }
private void SendIsManual(string model) private void SendIsManual(string model)
{ {
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager("CAM_1"); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager("CAM_1");
//如果manager等于null 返回掉 //如果manager等于null 返回掉
if (manager == null) return; if (manager == null) return;
AlgorithmPackage_Figout_model package = new AlgorithmPackage_Figout_model(); AlgorithmPackage_Figout_model package = new AlgorithmPackage_Figout_model();
package.mode = model; package.mode = model;
manager.SendJson(package); manager.SendJson(package);
} }
...@@ -456,16 +449,12 @@ namespace VIZ.FGOUT.Module ...@@ -456,16 +449,12 @@ namespace VIZ.FGOUT.Module
#endregion #endregion
#region 音频停止命令 #region 音频停止命令
public VCommand VideoStopCommand { get; set; } public VCommand VideoStopCommand { get; set; }
#endregion #endregion
#region Replay 命令 #region Replay 命令
public VCommand ReplayCommand { get; set; } public VCommand ReplayCommand { get; set; }
/// <summary> /// <summary>
/// replay 播控功能 /// replay 播控功能
/// </summary> /// </summary>
...@@ -511,27 +500,17 @@ namespace VIZ.FGOUT.Module ...@@ -511,27 +500,17 @@ namespace VIZ.FGOUT.Module
private void MatImageCommand() private void MatImageCommand()
{ {
ReplayPackage replayPackage = new ReplayPackage(); ReplayPackage replayPackage = new ReplayPackage();
replayPackage.type = "LOADMASK"; replayPackage.type = "LOADMASK";
VideoData data = new VideoData(); VideoData data = new VideoData();
if(IsMatImage) if(IsMatImage)
{
data.loadFlag = 1; data.loadFlag = 1;
}
else else
{
data.loadFlag = 0; data.loadFlag = 0;
}
replayPackage.data = data; replayPackage.data = data;
// 发送UDP命令 // 发送UDP命令
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager($"CAM_1__CLIP"); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager($"CAM_1__CLIP");
if (manager == null) return; if (manager == null) return;
manager.SendJson(replayPackage); manager.SendJson(replayPackage);
} }
private bool isMatImage = false; private bool isMatImage = false;
...@@ -966,13 +945,11 @@ namespace VIZ.FGOUT.Module ...@@ -966,13 +945,11 @@ namespace VIZ.FGOUT.Module
{ {
// 获取视图服务 // 获取视图服务
List<INDIViewService> services = ApplicationDomainEx.ServiceManager.GetServiceList<INDIViewService>(); List<INDIViewService> services = ApplicationDomainEx.ServiceManager.GetServiceList<INDIViewService>();
if (services.Count != NDIViewModel.NDI_VIEW_MODEL_COUNT) if (services.Count != NDIViewModel.NDI_VIEW_MODEL_COUNT)
{ {
Thread.Sleep(1000); Thread.Sleep(1000);
continue; continue;
} }
foreach (INDIViewService service in services) foreach (INDIViewService service in services)
{ {
// 算法服务 // 算法服务
...@@ -983,9 +960,7 @@ namespace VIZ.FGOUT.Module ...@@ -983,9 +960,7 @@ namespace VIZ.FGOUT.Module
service.ClipFPS.OnFpsChanged -= ClipFpsChanged; service.ClipFPS.OnFpsChanged -= ClipFpsChanged;
service.ClipFPS.OnFpsChanged += ClipFpsChanged; service.ClipFPS.OnFpsChanged += ClipFpsChanged;
} }
this.NDIViewServices = services.OrderBy(p => p.ViewKey).ToList(); this.NDIViewServices = services.OrderBy(p => p.ViewKey).ToList();
break; break;
} }
} }
......
<UserControl x:Class="VIZ.FGOUT.Module.NDISettingPanelView" <UserControl
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" x:Class="VIZ.FGOUT.Module.NDISettingPanelView"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:local="clr-namespace:VIZ.FGOUT.Module" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" xmlns:local="clr-namespace:VIZ.FGOUT.Module"
xmlns:toolkit="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DataContext="{d:DesignInstance Type=local:NDISettingPanelViewModel}" xmlns:toolkit="http://schemas.xceed.com/wpf/xaml/toolkit"
mc:Ignorable="d" d:DataContext="{d:DesignInstance Type=local:NDISettingPanelViewModel}"
d:DesignHeight="600" d:DesignWidth="800"> d:DesignHeight="600"
d:DesignWidth="800"
mc:Ignorable="d">
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/ComboBox/ComboBox_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/ComboBox/ComboBox_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/Button/Button_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml" />
<ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/CheckBox/CheckBox_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.FGOUT.Module.Resource;component/Style/CheckBox/CheckBox_Setting.xaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
...@@ -28,55 +30,74 @@ ...@@ -28,55 +30,74 @@
</behaviors:Interaction.Triggers> </behaviors:Interaction.Triggers>
<Border> <Border>
<Grid Margin="45,60,40,0" Grid.Row="1"> <Grid Grid.Row="1" Margin="45,60,40,0">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60" />
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60" />
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60" />
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60" />
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60" />
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60" />
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60" />
<RowDefinition Height="*"></RowDefinition> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- 输入源 --> <!-- 输入源 -->
<TextBlock Text="源视频输入" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock> <TextBlock
VerticalAlignment="Center"
FontSize="18"
Foreground="White"
Text="源视频输入" />
<!--<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right"> <!--<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right">
<TextBlock Text="仅显示本机视频输入" Foreground="#aaffffff" VerticalAlignment="Center"></TextBlock> <TextBlock Text="仅显示本机视频输入" Foreground="#aaffffff" VerticalAlignment="Center"></TextBlock>
<CheckBox Style="{StaticResource CheckBox_Setting}" VerticalAlignment="Center" <CheckBox Style="{StaticResource CheckBox_Setting}" VerticalAlignment="Center"
HorizontalAlignment="Right" Margin="10,0,0,0" HorizontalAlignment="Right" Margin="10,0,0,0"
IsChecked="{Binding Path=IsShowLocalStream,Mode=TwoWay}"></CheckBox> IsChecked="{Binding Path=IsShowLocalStream,Mode=TwoWay}"></CheckBox>
</StackPanel>--> </StackPanel>-->
<ComboBox Grid.Row="1" Style="{StaticResource ComboBox_Setting}" Height="40" <ComboBox
ItemsSource="{Binding Path=NDIStreamInfosView,Mode=OneWay}" Grid.Row="1"
SelectedValue="{Binding Path=SelectedNDIStreamInfo,Mode=TwoWay}"> Height="40"
ItemsSource="{Binding Path=NDIStreamInfosView, Mode=OneWay}"
SelectedValue="{Binding Path=SelectedNDIStreamInfo, Mode=TwoWay}"
Style="{StaticResource ComboBox_Setting}">
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<Border Background="Transparent" IsHitTestVisible="False"> <Border Background="Transparent" IsHitTestVisible="False">
<TextBlock Text="{Binding Path=FullName}" Foreground="White" FontSize="16"></TextBlock> <TextBlock
FontSize="16"
Foreground="White"
Text="{Binding Path=FullName}" />
</Border> </Border>
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
<TextBlock
Grid.Row="2"
VerticalAlignment="Center"
FontSize="18"
Foreground="White"
Text="预览视频输入" />
<TextBlock Text="预览视频输入" Foreground="White" FontSize="18" Grid.Row="2" VerticalAlignment="Center"></TextBlock>
<!--<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right"> <!--<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right">
<TextBlock Text="仅显示本机视频输入" Foreground="#aaffffff" VerticalAlignment="Center"></TextBlock> <TextBlock Text="仅显示本机视频输入" Foreground="#aaffffff" VerticalAlignment="Center"></TextBlock>
<CheckBox Style="{StaticResource CheckBox_Setting}" VerticalAlignment="Center" <CheckBox Style="{StaticResource CheckBox_Setting}" VerticalAlignment="Center"
HorizontalAlignment="Right" Margin="10,0,0,0" HorizontalAlignment="Right" Margin="10,0,0,0"
IsChecked="{Binding Path=IsShowLocalStream,Mode=TwoWay}"></CheckBox> IsChecked="{Binding Path=IsShowLocalStream,Mode=TwoWay}"></CheckBox>
</StackPanel>--> </StackPanel>-->
<ComboBox Grid.Row="3" Style="{StaticResource ComboBox_Setting}" Height="40" <ComboBox
ItemsSource="{Binding Path=NDIPreStreamInfosView,Mode=OneWay}" Grid.Row="3"
SelectedValue="{Binding Path=SelectedNDIPreStreamInfo,Mode=TwoWay}"> Height="40"
ItemsSource="{Binding Path=NDIPreStreamInfosView, Mode=OneWay}"
SelectedValue="{Binding Path=SelectedNDIPreStreamInfo, Mode=TwoWay}"
Style="{StaticResource ComboBox_Setting}">
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<Border Background="Transparent" IsHitTestVisible="False"> <Border Background="Transparent" IsHitTestVisible="False">
<TextBlock Text="{Binding Path=FullName}" Foreground="White" FontSize="16"></TextBlock> <TextBlock
FontSize="16"
Foreground="White"
Text="{Binding Path=FullName}" />
</Border> </Border>
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
...@@ -84,11 +105,18 @@ ...@@ -84,11 +105,18 @@
<TextBlock Text="赛事" Foreground="White" FontSize="18" Grid.Row="4" VerticalAlignment="Center"></TextBlock> <TextBlock
<ComboBox Grid.Row="5" Style="{StaticResource ComboBox_Setting}" Height="40" Grid.Row="4"
ItemsSource="{Binding Path=MatchTypes,Mode=OneWay}" VerticalAlignment="Center"
SelectedValue="{Binding Path=SelectedMatchType,Mode=TwoWay}"> FontSize="18"
</ComboBox> Foreground="White"
Text="赛事" />
<ComboBox
Grid.Row="5"
Height="40"
ItemsSource="{Binding Path=MatchTypes, Mode=OneWay}"
SelectedValue="{Binding Path=SelectedMatchType, Mode=TwoWay}"
Style="{StaticResource ComboBox_Setting}" />
</Grid> </Grid>
</Border> </Border>
......
...@@ -253,8 +253,6 @@ namespace VIZ.FGOUT.Module ...@@ -253,8 +253,6 @@ namespace VIZ.FGOUT.Module
context.TriggerScene = NDIViewScene.SettingPanel; context.TriggerScene = NDIViewScene.SettingPanel;
service.ChangeStrategyMode(context); service.ChangeStrategyMode(context);
} }
#endregion #endregion
......
using System; using VIZ.FGOUT.Domain;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
{ {
......
using System; using SharpDX.Mathematics.Interop;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Media;
using log4net;
using SharpDX.Mathematics.Interop;
using VIZ.Framework.Common;
using VIZ.Framework.Connection;
using VIZ.Framework.Core;
using VIZ.FGOUT.Connection;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.FGOUT.Module; using VIZ.Framework.Common;
using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
{ {
......
using System; using SharpDX.Mathematics.Interop;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Interop;
using System.Windows.Media;
using log4net;
using Newtonsoft.Json;
using SharpDX.Mathematics.Interop;
using VIZ.Framework.Common;
using VIZ.Framework.Connection;
using VIZ.Framework.Core;
using VIZ.FGOUT.Connection; using VIZ.FGOUT.Connection;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.Framework.Common;
using VIZ.Framework.Connection;
using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
{ {
...@@ -23,6 +16,7 @@ namespace VIZ.FGOUT.Module ...@@ -23,6 +16,7 @@ namespace VIZ.FGOUT.Module
/// </summary> /// </summary>
public partial class NDIViewModel public partial class NDIViewModel
{ {
private FrameBuffer _frameBuffer = new FrameBuffer(TimeSpan.FromSeconds(10));
/// <summary> /// <summary>
/// 重置3D鼠标 /// 重置3D鼠标
/// </summary> /// </summary>
...@@ -38,7 +32,6 @@ namespace VIZ.FGOUT.Module ...@@ -38,7 +32,6 @@ namespace VIZ.FGOUT.Module
view.video.ClearClipBox(); view.video.ClearClipBox();
return; return;
} }
this.ManualController.Reset(this.ClipBoxX); this.ManualController.Reset(this.ClipBoxX);
} }
...@@ -122,8 +115,11 @@ namespace VIZ.FGOUT.Module ...@@ -122,8 +115,11 @@ namespace VIZ.FGOUT.Module
if (view == null) if (view == null)
return; return;
//缓存策略
//_frameBuffer.AddFrame(e.Frame);
//时间戳获取 //时间戳获取
timecode= e.Frame.TimeStamp; timecode = e.Frame.TimeStamp;
// 更新画面 // 更新画面
view.video.UpdateVideoFrame(e.Frame); view.video.UpdateVideoFrame(e.Frame);
...@@ -166,14 +162,40 @@ namespace VIZ.FGOUT.Module ...@@ -166,14 +162,40 @@ namespace VIZ.FGOUT.Module
// ClipSender.CropRoi(manager_clip, 0, this.GetManulRoi((int)sendValue.Value), ApplicationDomainEx.VIDEO_CLIP_BOX_WIDTH, e.Frame.Height, sendValue.TimeCode); // ClipSender.CropRoi(manager_clip, 0, this.GetManulRoi((int)sendValue.Value), ApplicationDomainEx.VIDEO_CLIP_BOX_WIDTH, e.Frame.Height, sendValue.TimeCode);
// } // }
//} //}
}
// 统计裁切FPS
this.ClipFPS.CalcFps();
}
}
public class FrameBuffer
{
private Queue<IVideoFrame> buffer;
private int bufferSize;
private TimeSpan bufferDuration;
public FrameBuffer(TimeSpan duration)
{
bufferDuration = duration;
//bufferSize = (int)(duration.TotalMilliseconds / TimeSpan.FromSeconds(0.1).TotalMilliseconds);
bufferSize = duration.Seconds * 50;
buffer = new Queue<IVideoFrame>(bufferSize);
}
public void AddFrame(IVideoFrame frame)
{
buffer.Enqueue(frame);
// 如果缓冲区超过容量,则移除最旧的帧
if (buffer.Count > bufferSize)
{
buffer.Dequeue();
} }
}
// 统计裁切FPS public IEnumerable<IVideoFrame> GetFrames()
this.ClipFPS.CalcFps(); {
return buffer;
} }
} }
} }
...@@ -187,7 +187,6 @@ namespace VIZ.FGOUT.Module ...@@ -187,7 +187,6 @@ namespace VIZ.FGOUT.Module
if (!RawRectangleFExpand.IsEffective(rect)) if (!RawRectangleFExpand.IsEffective(rect))
{ {
view.video.ClearClipBox(); view.video.ClearClipBox();
return; return;
} }
......
using log4net; using log4net;
using OpenCvSharp;
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.Linq;
using System.Windows;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Shapes; using System.Windows.Shapes;
using VIZ.FGOUT.Connection; using VIZ.FGOUT.Connection;
...@@ -685,12 +683,10 @@ namespace VIZ.FGOUT.Module ...@@ -685,12 +683,10 @@ namespace VIZ.FGOUT.Module
foreach (var points in setPlaceNewConfig.InvlidPlace) foreach (var points in setPlaceNewConfig.InvlidPlace)
AddPoints(view, points, Brushes.Red); AddPoints(view, points, Brushes.Red);
} }
//view.myPath.Data = view.aa; //view.myPath.Data = view.aa;
} }
} }
private void AddPoints(NDIView view, PointCollection points, Brush brush) private void AddPoints(NDIView view, PointCollection points, Brush brush)
{ {
Polygon polygon = new Polygon Polygon polygon = new Polygon
...@@ -726,8 +722,6 @@ namespace VIZ.FGOUT.Module ...@@ -726,8 +722,6 @@ namespace VIZ.FGOUT.Module
return; return;
view.video.UpdateClipBoxBorderColor(this.ClipBoxStrokeColor_Normal); view.video.UpdateClipBoxBorderColor(this.ClipBoxStrokeColor_Normal);
} }
/// <summary> /// <summary>
......
...@@ -84,6 +84,6 @@ ...@@ -84,6 +84,6 @@
VerticalAlignment="Center" VerticalAlignment="Center"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
FontSize="18" FontSize="18"
Text="{Binding ReplaySencond, Mode=TwoWay}" /> Text="{Binding ReplaySecond, Mode=TwoWay}" />
</Grid> </Grid>
</Window> </Window>
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.FGOUT.Connection; using VIZ.FGOUT.Connection;
using VIZ.Framework.Connection; using VIZ.Framework.Connection;
using VIZ.Framework.Core; using VIZ.Framework.Core;
...@@ -12,7 +8,7 @@ namespace VIZ.FGOUT.Module ...@@ -12,7 +8,7 @@ namespace VIZ.FGOUT.Module
/// <summary> /// <summary>
/// Replay功能 /// Replay功能
/// </summary> /// </summary>
public class RePlayPanelViewModel: ViewModelBase public class RePlayPanelViewModel: ViewModelBase
{ {
public RePlayPanelViewModel() public RePlayPanelViewModel()
{ {
...@@ -37,7 +33,7 @@ namespace VIZ.FGOUT.Module ...@@ -37,7 +33,7 @@ namespace VIZ.FGOUT.Module
ReplayPackage replayPackage = new ReplayPackage(); ReplayPackage replayPackage = new ReplayPackage();
replayPackage.type = "REPLAY"; replayPackage.type = "REPLAY";
VideoData data = new VideoData(); VideoData data = new VideoData();
data.backTimes = Convert.ToInt32(ReplaySencond); data.backTimes = Convert.ToInt32(ReplaySecond);
//timecode //timecode
data.timecode = timecode; data.timecode = timecode;
data.status = 1; data.status = 1;
...@@ -61,7 +57,7 @@ namespace VIZ.FGOUT.Module ...@@ -61,7 +57,7 @@ namespace VIZ.FGOUT.Module
ReplayPackage replayPackage = new ReplayPackage(); ReplayPackage replayPackage = new ReplayPackage();
replayPackage.type = "REPLAY"; replayPackage.type = "REPLAY";
VideoData data = new VideoData(); VideoData data = new VideoData();
data.backTimes = Convert.ToInt32(ReplaySencond); data.backTimes = Convert.ToInt32(ReplaySecond);
//timecode //timecode
data.timecode = timecode; data.timecode = timecode;
data.status = 2; //重新开始 data.status = 2; //重新开始
...@@ -97,7 +93,7 @@ namespace VIZ.FGOUT.Module ...@@ -97,7 +93,7 @@ namespace VIZ.FGOUT.Module
VideoData data = new VideoData(); VideoData data = new VideoData();
replayPackage.type = "REPLAY"; replayPackage.type = "REPLAY";
data.backTimes = Convert.ToInt32(ReplaySencond); data.backTimes = Convert.ToInt32(ReplaySecond);
//timecode //timecode
data.timecode = timecode; data.timecode = timecode;
data.status = 0;//停止 data.status = 0;//停止
...@@ -108,17 +104,17 @@ namespace VIZ.FGOUT.Module ...@@ -108,17 +104,17 @@ namespace VIZ.FGOUT.Module
/// <summary> /// <summary>
/// 秒数 /// 秒数
/// </summary> /// </summary>
private string replaySencond; private string _replaySecond;
public string ReplaySencond public string ReplaySecond
{ {
get get
{ {
return replaySencond; return _replaySecond;
} }
set set
{ {
replaySencond = value; _replaySecond = value;
this.RaisePropertyChanged(nameof(ReplaySencond)); this.RaisePropertyChanged(nameof(ReplaySecond));
} }
} }
......
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath> <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime" /> <Reference Include="System.Runtime" />
<Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath> <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference> </Reference>
......
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FD1F6337557D223D6F1A9FC0FEEA569CD34FDB1F72FAF5ED59ECEFB9C5263F93" #pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BD03401B7717F42ADA77CFE11FC4479C9EDCD8CA7560D6ECA9A9B2B57700C4FE"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
#pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FD1F6337557D223D6F1A9FC0FEEA569CD34FDB1F72FAF5ED59ECEFB9C5263F93" #pragma checksum "..\..\..\..\..\NDISettingView\View\NDISettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BD03401B7717F42ADA77CFE11FC4479C9EDCD8CA7560D6ECA9A9B2B57700C4FE"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
c06ad4f67c04544275e4cbc38d47657f165b740a bb45dc7862f5677ab2cd5a3afa72c7ae1c5fd285
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
22-1559853185 22-808211288
90-1236168610 90-747441034
150-2097665076 151130447140
NDIMainView\View\NDIMainView.xaml;NDIPreviewView\View\NDIPreviewView.xaml;NDISettingView\View\AlgorithmSettingPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;NDISettingView\View\NDISettingPanelView.xaml;NDISettingView\View\NDISettingView.xaml;NDIView\View\NDIView.xaml;SystemSetting\View\AboutPanelView.xaml;SystemSetting\View\CheckDataPanelView.xaml;SystemSetting\View\HotkeySettingPanelView.xaml;SystemSetting\View\MattingImagePanelView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml; NDIMainView\View\NDIMainView.xaml;NDIPreviewView\View\NDIPreviewView.xaml;NDISettingView\View\AlgorithmSettingPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;NDISettingView\View\NDISettingPanelView.xaml;NDISettingView\View\NDISettingView.xaml;NDIView\View\NDIView.xaml;SystemSetting\View\AboutPanelView.xaml;SystemSetting\View\CheckDataPanelView.xaml;SystemSetting\View\HotkeySettingPanelView.xaml;SystemSetting\View\MattingImagePanelView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml;
True False
...@@ -13,7 +13,7 @@ DEBUG;TRACE ...@@ -13,7 +13,7 @@ DEBUG;TRACE
22-808211288 22-808211288
91978002453 91978002453
150-1446398279 151130447140
NDIMainView\View\NDIMainView.xaml;NDIPreviewView\View\NDIPreviewView.xaml;NDISettingView\View\AlgorithmSettingPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;NDISettingView\View\NDISettingPanelView.xaml;NDISettingView\View\NDISettingView.xaml;NDIView\View\NDIView.xaml;SystemSetting\View\AboutPanelView.xaml;SystemSetting\View\CheckDataPanelView.xaml;SystemSetting\View\HotkeySettingPanelView.xaml;SystemSetting\View\MattingImagePanelView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml; NDIMainView\View\NDIMainView.xaml;NDIPreviewView\View\NDIPreviewView.xaml;NDISettingView\View\AlgorithmSettingPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;NDISettingView\View\NDISettingPanelView.xaml;NDISettingView\View\NDISettingView.xaml;NDIView\View\NDIView.xaml;SystemSetting\View\AboutPanelView.xaml;SystemSetting\View\CheckDataPanelView.xaml;SystemSetting\View\HotkeySettingPanelView.xaml;SystemSetting\View\MattingImagePanelView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml;
True True
......
2023-02-15 10:52:37,205 [1] ERROR VIZ.Framework.Module.AppSetup - System.BadImageFormatException: 未能加载文件或程序集“NDILibDotNet2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null”或它的某一个依赖项。试图加载格式不正确的程序。 2023-09-04 18:43:20,756 [1] ERROR VIZ.Framework.Module.AppSetup - System.BadImageFormatException: 未能加载文件或程序集“NDILibDotNet2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null”或它的某一个依赖项。试图加载格式不正确的程序。
文件名:“NDILibDotNet2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null” 文件名:“NDILibDotNet2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null”
在 VIZ.FGOUT.Module.AppSetup_InitNDI.Setup(AppSetupContext context) 在 VIZ.FGOUT.Module.AppSetup_InitNDI.Setup(AppSetupContext context)
在 VIZ.Framework.Module.AppSetup.Setup() 位置 D:\wyh\FGOUT\VIZ.Framework\VIZ.Framework.Module\Setup\AppSetup.cs:行号 112 在 VIZ.Framework.Module.AppSetup.Setup() 位置 D:\wyh\FGOUT\VIZ.Framework\VIZ.Framework.Module\Setup\AppSetup.cs:行号 112
=== 预绑定状态信息 === 警告: 程序集绑定日志记录被关闭。
日志: DisplayName = NDILibDotNet2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null 要启用程序集绑定失败日志记录,请将注册表值 [HKLM\Software\Microsoft\Fusion!EnableLog] (DWORD)设置为 1。
(Fully-specified) 注意: 会有一些与程序集绑定失败日志记录关联的性能损失。
日志: Appbase = file:///D:/wyh/FGOUT/VIZ.FGOUT/VIZ.FGOUT/bin/Debug/ 要关闭此功能,请移除注册表值 [HKLM\Software\Microsoft\Fusion!EnableLog]。
日志: 初始 PrivatePath = NULL
调用程序集: VIZ.Framework.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null。
===
日志: 此绑定从 default 加载上下文开始。
日志: 正在使用应用程序配置文件: D:\wyh\FGOUT\VIZ.FGOUT\VIZ.FGOUT\bin\Debug\VIZ.FGOUT.exe.Config
日志: 使用主机配置文件:
日志: 使用 C:\Windows\Microsoft.NET\Framework\v4.0.30319\config\machine.config 的计算机配置文件。
日志: 此时没有为引用应用策略(私有、自定义、分部或基于位置的程序集绑定)。
日志: 尝试下载新的 URL file:///D:/wyh/FGOUT/VIZ.FGOUT/VIZ.FGOUT/bin/Debug/NDILibDotNet2.DLL。
错误: 未能完成程序集的安装(hr = 0x8007000b)。探测终止。
2023-09-01 10:11:58,072 [11] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确! 2023-09-05 10:33:01,935 [11] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-01 10:12:56,370 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确! 2023-09-05 11:11:54,548 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-01 10:27:37,170 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-01 14:20:59,317 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-01 14:28:49,711 [8] ERROR VIZ.Framework.Connection.UdpConnection - System.Net.Sockets.SocketException (0x80004005): 远程主机强迫关闭了一个现有的连接。
在 System.Net.Sockets.Socket.ReceiveFrom(Byte[] buffer, Int32 offset, Int32 size, SocketFlags socketFlags, EndPoint& remoteEP)
在 System.Net.Sockets.UdpClient.Receive(IPEndPoint& remoteEP)
在 VIZ.Framework.Connection.UdpConnection.ReceiveMessage() 位置 D:\wyh\FGOUT\FGOUT\VIZ.Framework\VIZ.Framework.Connection\Protocol\UDP\UdpConnection.cs:行号 163
2023-09-01 14:40:30,653 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-01 14:41:51,751 [8] ERROR VIZ.Framework.Connection.UdpConnection - System.Net.Sockets.SocketException (0x80004005): 远程主机强迫关闭了一个现有的连接。
在 System.Net.Sockets.Socket.ReceiveFrom(Byte[] buffer, Int32 offset, Int32 size, SocketFlags socketFlags, EndPoint& remoteEP)
在 System.Net.Sockets.UdpClient.Receive(IPEndPoint& remoteEP)
在 VIZ.Framework.Connection.UdpConnection.ReceiveMessage() 位置 D:\wyh\FGOUT\FGOUT\VIZ.Framework\VIZ.Framework.Connection\Protocol\UDP\UdpConnection.cs:行号 163
2023-09-01 14:48:32,169 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-01 14:51:10,214 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-01 14:58:06,564 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-01 15:36:34,647 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-01 16:14:07,684 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-09-01 16:15:31,979 [8] ERROR VIZ.Framework.Connection.UdpConnection - System.Net.Sockets.SocketException (0x80004005): 远程主机强迫关闭了一个现有的连接。
在 System.Net.Sockets.Socket.ReceiveFrom(Byte[] buffer, Int32 offset, Int32 size, SocketFlags socketFlags, EndPoint& remoteEP)
在 System.Net.Sockets.UdpClient.Receive(IPEndPoint& remoteEP)
在 VIZ.Framework.Connection.UdpConnection.ReceiveMessage() 位置 D:\wyh\FGOUT\FGOUT\VIZ.Framework\VIZ.Framework.Connection\Protocol\UDP\UdpConnection.cs:行号 163
2023-09-01 17:22:50,813 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
D:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml D:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml
21265083526 2-1347366880
6-790135758 6968741766
42-1902222901 431254803023
CloseAlgorithmWindow.xaml;MainWindow.xaml; CloseAlgorithmWindow.xaml;MainWindow.xaml;
True False
...@@ -10,10 +10,10 @@ none ...@@ -10,10 +10,10 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
9-721875057 91711917753
3-630027162 3-1719726047
192063791830 19-915820474
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
......
using SharpDX; using SharpDX.Direct2D1;
using SharpDX.Direct2D1;
using SharpDX.Direct3D; using SharpDX.Direct3D;
using SharpDX.Direct3D11; using SharpDX.Direct3D11;
using SharpDX.DXGI; using SharpDX.DXGI;
...@@ -8,7 +7,6 @@ using System.Collections.Generic; ...@@ -8,7 +7,6 @@ using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Diagnostics; using System.Diagnostics;
using System.Windows; using System.Windows;
using System.Windows.Threading;
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;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
using SharpDX.Direct2D1; using log4net;
using SharpDX.Direct2D1;
using SharpDX.DXGI; using SharpDX.DXGI;
using SharpDX.Mathematics.Interop; using SharpDX.Mathematics.Interop;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Imaging;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Input;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.Framework.Domain; using VIZ.Framework.Domain;
using VIZ.Framework.Storage; using VIZ.Framework.Storage;
using log4net;
namespace VIZ.Framework.Common namespace VIZ.Framework.Common
{ {
......
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