Skip to content

F
FGOUT
Commit 9b7720cd by 王永辉
Options

UE设置JSON组装

parent 2fa227f9
Showing with 493 additions and 123 deletions
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Clip/Signal/Send/ReplayPackage.cs
......@@ -17,7 +17,7 @@ namespace VIZ.FGOUT.Connection
/// <summary>
/// 数据
/// </summary>
public VedioData data { get; set; }
public VideoData data { get; set; }
}
......
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Clip/Signal/Send/UEEvent.cs 0 → 100644
namespace VIZ.FGOUT.Connection.UDP.Clip.Signal.Send
{
public class UEEvent
{
public string UE_event { get; set; }
public Properties Properties { get; set; } = new Properties();
}
public class Properties
{
public ZoomSet ZoomSets { get; set; }= new ZoomSet();
}
public class ZoomSet
{
public string ZoomIn { get; set; } = "1";
}
}
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Clip/Signal/Send/UEPackage.cs 0 → 100644
using System.Collections.Generic;
namespace VIZ.FGOUT.Connection.UDP.Clip.Signal.Send
{
public class UEPackage
{
public UE_Presets UE_Presets { get; set; } = new UE_Presets();
}
public class UE_Presets
{
public StartSets StartSets { get; set; } = new StartSets();
}
public class StartSets
{
public string EventCode { get; set; } = "JT";
public int DualMode { get; set; } = 0;
public EnableStats EnableStats { get; set; } = new EnableStats();
public SplineSets SplineSets { get; set; } = new SplineSets();
public ZoomSets ZoomSets { get; set; } = new ZoomSets();
public Datas Datas { get; set; }= new Datas();
}
public class EnableStats
{
public int bEnableSpline { get; set; } = 1;
public int bShowHeight { get; set; } = 1;
public int bShowSpeed { get; set; } = 1;
public int bEnableZoom { get; set; } = 1;
}
public class SplineSets
{
public int bLineBehind { get; set; } = 0;
}
public class ZoomSets
{
public string ZoomEase { get; set; } = "SinusoidalInOut";
public string MoveEase { get; set; } = "SinusoidalInOut";
public int Scale { get; set; } = 50;
public double SafeScale { get; set; } = 0.9;
public double ZoomIn { get; set; } = 3;
public double ZoomOut { get; set; } = 3;
public double Move { get; set; } = 3;
public int bMovementOnlyX { get; set; } = 0;
public int MovementOnlyXPosition { get; set; } = 0;
public int bMovementOnlyY { get; set; } = 0;
public int MovementOnlyYPosition { get; set; } = 0;
}
public class Datas
{
public int bIsManualMode { get; set; } = 0;
public List<Position> Positions { get; set;} = new List<Position>();
}
public class Position
{
public string name { get; set; }
public int x { get; set; }
public int y { get; set; }
}
}
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Clip/Signal/Send/VedioData.cs → VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Clip/Signal/Send/VideoData.cs
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Connection
namespace VIZ.FGOUT.Connection
{
public class VedioData
public class VideoData
{
/// <summary>
/// 回退时间
/// </summary>
......
VIZ.FGOUT/VIZ.FGOUT.Connection/VIZ.FGOUT.Connection.csproj
......@@ -100,7 +100,9 @@
<Compile Include="UDP\Clip\Sender\ClipSender.cs" />
<Compile Include="UDP\Clip\Signal\Send\ClipPackage__crop_roi.cs" />
<Compile Include="UDP\Clip\Signal\Send\ReplayPackage.cs" />
<Compile Include="UDP\Clip\Signal\Send\VedioData.cs" />
<Compile Include="UDP\Clip\Signal\Send\UEEvent.cs" />
<Compile Include="UDP\Clip\Signal\Send\UEPackage.cs" />
<Compile Include="UDP\Clip\Signal\Send\VideoData.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\VIZ.Framework\VIZ.Framework.Connection\VIZ.Framework.Connection.csproj">
......
VIZ.FGOUT/VIZ.FGOUT.Connection/obj/x64/Debug/VIZ.FGOUT.Connection.csproj.CoreCompileInputs.cache
1f48619ef5384f47a6181b1bfde7007b2922160c
954a8f953ea0c9e58cbd7a4e88ffc6456f42311e
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/Button/Button_Setting.xaml
......@@ -110,7 +110,7 @@
</Setter>
</Style>
<Style x:Key="ButtonStyle" TargetType="Button">
<!--<Style x:Key="ButtonStyle" TargetType="Button">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Foreground" Value="White" />
<Setter Property="FontSize" Value="16" />
......@@ -130,7 +130,7 @@
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="border" Property="Background" Value="#378CFF " />
<Setter TargetName="border" Property="Background" Value="#378CFF" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value="0.7" />
......@@ -139,6 +139,62 @@
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>-->
<Style x:Key="ButtonStyle" TargetType="{x:Type Button}">
<!--<Setter Property="FontFamily" Value="{StaticResource SysFontFamily}" />-->
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Foreground" Value="White" />
<Setter Property="FontSize" Value="14" />
<Setter Property="Width" Value="110" />
<Setter Property="Height" Value="37" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Background" Value="#626669" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Grid>
<!--<Grid.Effect>
<DropShadowEffect
Direction="{StaticResource DropShadowEffectDirection}"
Opacity="{StaticResource SysOpacity}"
ShadowDepth="{DynamicResource ShadowDepth}"
Color="{StaticResource DropShadowEffectColor}" />
</Grid.Effect>-->
<Border
x:Name="border"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="6"
SnapsToDevicePixels="true">
<ContentPresenter
x:Name="contentPresenter"
Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Focusable="False"
RecognizesAccessKey="True"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Border>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#378CFF" />
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter Property="Background" Value="#378CFF" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Foreground" Value="Gray" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/TextBox/TextBox_Setting.xaml
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style x:Key="TextBox_Setting" TargetType="{x:Type TextBox}">
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
<Setter Property="Background" Value="#ff0e131e"/>
<Setter Property="BorderBrush" Value="#ff3d4758"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="FontSize" Value="16"></Setter>
<Setter Property="BorderThickness" Value="0,0,0,1"/>
<Setter Property="VerticalContentAlignment" Value="Center"></Setter>
<Setter Property="Padding" Value="5,0,5,0"></Setter>
<Setter Property="AcceptsReturn" Value="False"></Setter>
<Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
<Setter Property="HorizontalContentAlignment" Value="Left"/>
<Setter Property="AllowDrop" Value="true"/>
<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
<Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Background" Value="#ff0e131e" />
<Setter Property="BorderBrush" Value="#ff3d4758" />
<Setter Property="Foreground" Value="White" />
<Setter Property="FontSize" Value="16" />
<Setter Property="BorderThickness" Value="0,0,0,1" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="Padding" Value="5,0,5,0" />
<Setter Property="AcceptsReturn" Value="False" />
<Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
<Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="AllowDrop" Value="true" />
<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type TextBox}">
<Border x:Name="border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
<ScrollViewer x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" Margin="{TemplateBinding Padding}"/>
<Border
x:Name="border"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
SnapsToDevicePixels="True">
<ScrollViewer
x:Name="PART_ContentHost"
Margin="{TemplateBinding Padding}"
Focusable="false"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Hidden" />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Opacity" TargetName="border" Value="0.56"/>
<Setter TargetName="border" Property="Opacity" Value="0.56" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
......@@ -32,4 +41,51 @@
</Setter>
</Style>
<Style x:Key="TextBoxStyle" TargetType="{x:Type TextBox}">
<!--<Setter Property="FontFamily" Value="{StaticResource SysFontFamily}" />-->
<Setter Property="Foreground" Value="White" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Height" Value="30" />
<Setter Property="Width" Value="90" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="CaretBrush" Value="White" />
<Setter Property="Background" Value="#282A2C" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type TextBox}">
<Grid>
<!--<Grid.Effect>
<DropShadowEffect
Direction="{StaticResource DropShadowEffectDirection}"
Opacity="{StaticResource SysOpacity}"
ShadowDepth="{StaticResource SysShadowDepth}"
Color="{StaticResource DropShadowEffectColor}" />
</Grid.Effect>-->
<Border
x:Name="border"
Background="{TemplateBinding Background}"
BorderBrush="Gray"
BorderThickness="1"
SnapsToDevicePixels="True">
<ScrollViewer
x:Name="PART_ContentHost"
VerticalAlignment="Center"
Focusable="False" />
</Border>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsFocused" Value="True">
<Setter Property="Foreground" Value="White" />
<Setter Property="FontWeight" Value="Bold" />
<!--<Setter TargetName="border" Property="BorderBrush" Value="{StaticResource BorderHighLight}" />-->
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Foreground" Value="Gray" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
16153409119
1470602451
11-350624472
241319896476
16498493296
1-1441241311
11-1602666439
23304678694
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\TextBox\TextBox_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml;
False
True
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -505,7 +505,7 @@ namespace VIZ.FGOUT.Module
replayPackage.type = "LOADMASK";
VedioData data = new VedioData();
VideoData data = new VideoData();
if(IsMatImage)
{
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Command.cs
......@@ -186,7 +186,7 @@ namespace VIZ.FGOUT.Module
if (e.HitTrackingBoxInfo == null)
return;
this.AlgorithmControllerDic[this.StrategyType].Tracking(e.VedioPointCenter);
this.AlgorithmControllerDic[this.StrategyType].Tracking(e.VideoPointCenter);
}
/// <summary>
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/View/ReplayPanelView.xaml
......@@ -8,6 +8,7 @@
Title="Replay功能"
Width="518"
Height="518"
d:DataContext="{d:DesignInstance Type=local:RePlayPanelViewModel}"
WindowStartupLocation="CenterScreen"
mc:Ignorable="d">
......@@ -37,25 +38,25 @@
<Button
Grid.Row="0"
Grid.Column="0"
Command="{Binding ReplayVedioCommand}"
Command="{Binding ReplayVideoCommand}"
Content="Replay"
Style="{StaticResource ButtonStyle}" />
<Button
Grid.Row="0"
Grid.Column="1"
Command="{Binding CleanVedioCommand}"
Command="{Binding CleanVideoCommand}"
Content="Restart"
Style="{StaticResource ButtonStyle}" />
<Button
Grid.Row="0"
Grid.Column="2"
Command="{Binding LiveVedioCommand}"
Command="{Binding LiveVideoCommand}"
Content="Live"
Style="{StaticResource ButtonStyle}" />
<Button
Grid.Row="0"
Grid.Column="3"
Command="{Binding StopVedioCommand}"
Command="{Binding StopVideoCommand}"
Content="Stop"
Style="{StaticResource ButtonStyle}" />
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/View/UESettingPanelView.xaml
......@@ -3,13 +3,14 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:VIZ.FGOUT.Module.SystemSetting.View"
xmlns:local="clr-namespace:VIZ.FGOUT.Module"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
Title="UE设置"
Width="800"
Height="450"
Background="Black"
d:DataContext="{d:DesignInstance Type=local:UESettingPanelViewModel}"
Background="#383D41"
WindowStartupLocation="CenterScreen"
mc:Ignorable="d">
<Window.Resources>
......@@ -49,7 +50,7 @@
</x:Array>
</ResourceDictionary>
</Window.Resources>
<Grid Margin="10">
<Grid Margin="60,10,10,10">
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
......@@ -63,10 +64,10 @@
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition Width="2*" />
<ColumnDefinition Width="3*" />
<ColumnDefinition Width="2*" />
<ColumnDefinition Width="3*" />
</Grid.ColumnDefinitions>
<TextBlock
......@@ -76,8 +77,8 @@
<ComboBox
Grid.Column="1"
ItemsSource="{StaticResource Eases}"
SelectedIndex="2"
Style="{StaticResource ComboBox_Setting}" />
SelectedItem="{Binding ZoomEaseItem, Mode=TwoWay}"
Style="{StaticResource ComboBoxStyle}" />
<TextBlock
Grid.Column="2"
VerticalAlignment="Center"
......@@ -86,8 +87,8 @@
<ComboBox
Grid.Column="3"
ItemsSource="{StaticResource Eases}"
SelectedIndex="2"
Style="{StaticResource ComboBox_Setting}" />
SelectedItem="{Binding MoveEaseItem, Mode=TwoWay}"
Style="{StaticResource ComboBoxStyle}" />
<TextBlock
Grid.Row="1"
......@@ -97,7 +98,8 @@
<TextBox
Grid.Row="1"
Grid.Column="1"
Text="0.4" />
Style="{StaticResource TextBoxStyle}"
Text="{Binding Scale, Mode=TwoWay}" />
<TextBlock
Grid.Row="1"
Grid.Column="2"
......@@ -108,8 +110,8 @@
Grid.Row="1"
Grid.Column="3"
ItemsSource="{StaticResource LineFrontOrBehind}"
SelectedIndex="1"
Style="{StaticResource ComboBox_Setting}" />
SelectedIndex="{Binding Line, Mode=TwoWay}"
Style="{StaticResource ComboBoxStyle}" />
<TextBlock
Grid.Row="2"
......@@ -119,7 +121,8 @@
<TextBox
Grid.Row="2"
Grid.Column="1"
Text="3.0" />
Style="{StaticResource TextBoxStyle}"
Text="{Binding ZoomIn, Mode=TwoWay}" />
<TextBlock
Grid.Row="2"
Grid.Column="2"
......@@ -129,7 +132,8 @@
<TextBox
Grid.Row="2"
Grid.Column="3"
Text="4.0" />
Style="{StaticResource TextBoxStyle}"
Text="{Binding ZoomOut, Mode=TwoWay}" />
<TextBlock
Grid.Row="3"
......@@ -138,8 +142,9 @@
Text="Move:" />
<TextBox
Grid.Row="3"
Grid.Column="3"
Text="4.0" />
Grid.Column="1"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Move, Mode=TwoWay}" />
<TextBlock
Grid.Row="4"
......@@ -148,8 +153,9 @@
Text="SafeScale:" />
<TextBox
Grid.Row="4"
Grid.Column="3"
Text="0.96" />
Grid.Column="1"
Style="{StaticResource TextBoxStyle}"
Text="{Binding SafeScale, Mode=TwoWay}" />
<TextBlock
Grid.Row="5"
......@@ -160,8 +166,8 @@
Grid.Row="5"
Grid.Column="1"
ItemsSource="{StaticResource TrueOrFalse}"
SelectedIndex="1"
Style="{StaticResource ComboBox_Setting}" />
SelectedIndex="{Binding ShowHeight, Mode=TwoWay}"
Style="{StaticResource ComboBoxStyle}" />
<TextBlock
Grid.Row="5"
Grid.Column="2"
......@@ -172,8 +178,8 @@
Grid.Row="5"
Grid.Column="3"
ItemsSource="{StaticResource TrueOrFalse}"
SelectedIndex="1"
Style="{StaticResource ComboBox_Setting}" />
SelectedIndex="{Binding ShowSpeed, Mode=TwoWay}"
Style="{StaticResource ComboBoxStyle}" />
<TextBlock
Grid.Row="6"
......@@ -182,10 +188,10 @@
Text="UseZoom:" />
<ComboBox
Grid.Row="6"
Grid.Column="3"
Grid.Column="1"
ItemsSource="{StaticResource TrueOrFalse}"
SelectedIndex="0"
Style="{StaticResource ComboBox_Setting}" />
SelectedIndex="{Binding UseZoom, Mode=TwoWay}"
Style="{StaticResource ComboBoxStyle}" />
<TextBlock
Grid.Row="7"
......@@ -194,13 +200,14 @@
Text="MovementOnlyX:" />
<ComboBox
Grid.Row="7"
Grid.Column="2"
Grid.Column="1"
ItemsSource="{StaticResource IsEnable}"
SelectedIndex="1"
Style="{StaticResource ComboBox_Setting}" />
Style="{StaticResource ComboBoxStyle}" />
<TextBox
Grid.Row="7"
Grid.Column="3"
Grid.Column="2"
Style="{StaticResource TextBoxStyle}"
Text="0" />
<TextBlock
......@@ -210,13 +217,14 @@
Text="MovementOnlyY:" />
<ComboBox
Grid.Row="8"
Grid.Column="2"
Grid.Column="1"
ItemsSource="{StaticResource IsEnable}"
SelectedIndex="1"
Style="{StaticResource ComboBox_Setting}" />
Style="{StaticResource ComboBoxStyle}" />
<TextBox
Grid.Row="8"
Grid.Column="3"
Grid.Column="2"
Style="{StaticResource TextBoxStyle}"
Text="0" />
<Grid
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/View/UESettingPanelView.xaml.cs
using System;
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.Imaging;
using System.Windows.Shapes;
using System.Windows;
using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module.SystemSetting.View
{
......@@ -22,6 +11,9 @@ namespace VIZ.FGOUT.Module.SystemSetting.View
public UESettingPanelView()
{
InitializeComponent();
//view和viewModel进行绑定
WPFHelper.BindingViewModel(this, new UESettingPanelViewModel());
}
}
}
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/ViewModel/RePlayPanelViewModel.cs
......@@ -16,58 +16,51 @@ namespace VIZ.FGOUT.Module
{
public RePlayPanelViewModel()
{
ReplayVedioCommand = new VCommand(this.ReplayVedio);
StopVedioCommand = new VCommand(this.StopVedio);
CleanVedioCommand = new VCommand(this.CleanVedio);
ReplayVideoCommand = new VCommand(this.ReplayVideo);
StopVideoCommand = new VCommand(this.StopVideo);
CleanVideoCommand = new VCommand(this.CleanVideo);
}
/// <summary>
/// ReplayCommand
/// </summary>
public VCommand ReplayVedioCommand { get; set; }
public VCommand ReplayVideoCommand { get; set; }
/// <summary>
/// replay命令
/// </summary>
private void ReplayVedio()
private void ReplayVideo()
{
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager($"CAM_1__CLIP");
if (manager == null) return;
ReplayPackage replayPackage = new ReplayPackage();
VedioData data = new VedioData();
replayPackage.type = "REPLAY";
VideoData data = new VideoData();
data.backTimes = Convert.ToInt32(ReplaySencond);
//timecode
data.timecode = timecode;
data.status = 1;
replayPackage.data = data;
manager.SendJson(replayPackage);
}
/// <summary>
/// 清楚命令
/// 清除命令
/// </summary>
public VCommand CleanVedioCommand { get; set; }
public VCommand CleanVideoCommand { get; set; }
/// <summary>
/// 清楚视频命令
/// 清除视频命令
/// </summary>
private void CleanVedio()
private void CleanVideo()
{
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager($"CAM_1__CLIP");
if (manager == null) return;
ReplayPackage replayPackage = new ReplayPackage();
VedioData data = new VedioData();
replayPackage.type = "REPLAY";
VideoData data = new VideoData();
data.backTimes = Convert.ToInt32(ReplaySencond);
//timecode
data.timecode = timecode;
......@@ -76,14 +69,13 @@ namespace VIZ.FGOUT.Module
manager.SendJson(replayPackage);
}
/// <summary>
/// 返回直播Command命令
/// </summary>
public VCommand LiveVedioCommand { get; set; }
public VCommand LiveVideoCommand { get; set; }
private void LiveVedio()
private void LiveVideo()
{
}
......@@ -93,16 +85,16 @@ namespace VIZ.FGOUT.Module
public VCommand StopVedioCommand { get; set; }
public VCommand StopVideoCommand { get; set; }
private void StopVedio()
private void StopVideo()
{
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager($"CAM_1__CLIP");
if (manager == null) return;
ReplayPackage replayPackage = new ReplayPackage();
VedioData data = new VedioData();
VideoData data = new VideoData();
replayPackage.type = "REPLAY";
data.backTimes = Convert.ToInt32(ReplaySencond);
......@@ -123,7 +115,6 @@ namespace VIZ.FGOUT.Module
{
return replaySencond;
}
set
{
replaySencond = value;
......
VIZ.FGOUT/VIZ.FGOUT.Module/SystemSetting/ViewModel/UESettingPanelViewModel.cs 0 → 100644
using System.Collections.Generic;
using System.IO.Packaging;
using System.Xml.Linq;
using VIZ.FGOUT.Connection.UDP.Clip.Signal.Send;
using VIZ.Framework.Connection;
using VIZ.Framework.Core;
namespace VIZ.FGOUT.Module
{
public class UESettingPanelViewModel : ViewModelBase
{
public UESettingPanelViewModel()
{
CancelCommand = new VCommand(this.Cancel);
SaveCommand = new VCommand(this.Save);
ConnectionManager.UdpConnection.AddEndpointManager(new UdpEndpointManager("UE", "127.0.0.1", 8888));
}
public VCommand CancelCommand { get; set; }
public VCommand SaveCommand { get; set; }
private void Cancel()
{
this.GetWindow().Close();
}
private void Save()
{
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager($"UE");
if (manager == null) return;
UEEvent ueEvent = new UEEvent();
ueEvent.UE_event = "OnPlayStarted";
ueEvent.UE_event = "OnPlayEnd";
//ueEvent.UE_event = "GetProperty";
manager.SendJson(ueEvent);
//UEPackage uePackage = new UEPackage();
//var positions = new List<Position>
//{
// new Position() { name = "height", x = 230, y = 485 },
// new Position() { name = "speed", x = 1035, y = 1890 }
//};
//uePackage.UE_Presets.StartSets.Datas.Positions = positions;
//manager.SendJson(uePackage);
}
#region Property
private string _zoomEaseItem = "SinusoidalInOut";
public string ZoomEaseItem
{
get => _zoomEaseItem;
set
{
_zoomEaseItem = value;
this.RaisePropertyChanged(nameof(ZoomEaseItem));
}
}
private string _moveEaseItem = "SinusoidalInOut";
public string MoveEaseItem
{
get => _moveEaseItem;
set
{
_moveEaseItem = value;
this.RaisePropertyChanged(nameof(MoveEaseItem));
}
}
private double _scale = 50;
public double Scale
{
get => this._scale;
set
{
_scale = value;
this.RaisePropertyChanged(nameof(Scale));
}
}
private int _line = 1;
public int Line
{
get => (int)_line;
set
{
_line = value;
this.RaisePropertyChanged(nameof(Line));
}
}
private double _zoomIn = 3.0;
public double ZoomIn
{
get => _zoomIn;
set
{
_zoomIn = value;
this.RaisePropertyChanged(nameof(ZoomIn));
}
}
private double _zoomOut = 4.0;
public double ZoomOut
{
get => _zoomOut;
set
{
_zoomOut = value;
this.RaisePropertyChanged(nameof(ZoomOut));
}
}
private double _move = 4.0;
public double Move
{
get => _move;
set
{
_move = value;
this.RaisePropertyChanged(nameof(Move));
}
}
private double _safeScale = 0.96;
public double SafeScale
{
get => _safeScale;
set
{
_safeScale = value;
this.RaisePropertyChanged(nameof(SafeScale));
}
}
private int _showHeight = 1;
public int ShowHeight
{
get => _showHeight;
set
{
_showHeight = value;
this.RaisePropertyChanged(nameof(ShowHeight));
}
}
private int _showSpeed = 1;
public int ShowSpeed
{
get => _showSpeed;
set
{
_showSpeed = value;
this.RaisePropertyChanged(nameof(ShowSpeed));
}
}
private int _useZoom = 0;
public int UseZoom
{
get => _useZoom;
set
{
_useZoom = value;
this.RaisePropertyChanged(nameof(UseZoom));
}
}
#endregion
}
}
VIZ.FGOUT/VIZ.FGOUT.Module/VIZ.FGOUT.Module.csproj
......@@ -222,6 +222,7 @@
<Compile Include="SystemSetting\ViewModel\RePlayPanelViewModel.cs" />
<Compile Include="SystemSetting\ViewModel\StyleSettingPanelViewModel.cs" />
<Compile Include="SystemSetting\ViewModel\SystemSettingViewModel.cs" />
<Compile Include="SystemSetting\ViewModel\UESettingPanelViewModel.cs" />
<Compile Include="SystemSetting\View\AboutPanelView.xaml.cs">
<DependentUpon>AboutPanelView.xaml</DependentUpon>
</Compile>
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module.csproj.CoreCompileInputs.cache
69b9e7e612c5935b8c94690019085824545096aa
ee020f471cba112ce1bf31b69cebc80992ab8b44
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.cache
......@@ -12,7 +12,7 @@ DEBUG;TRACE
21-62725784
87-93054371
88770678874
150-1446398279
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\UESettingPanelView.xaml;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.i.cache
......@@ -12,7 +12,7 @@ DEBUG;TRACE
21-62725784
881632389116
89-1798844935
150-1446398279
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\UESettingPanelView.xaml;
......
VIZ.FGOUT/VIZ.FGOUT.Storage/VIZ.FGOUT.Storage.csproj
......@@ -137,9 +137,9 @@
<Compile Include="LiteDB\System\SetManualConfig.cs" />
<Compile Include="LiteDB\System\SetPlaceConfig.cs" />
<Compile Include="LiteDB\System\SystemConfig.cs" />
<Compile Include="LiteDB\Vedio\VideoEntity.cs" />
<Compile Include="LiteDB\Vedio\VideoGroupEntity.cs" />
<Compile Include="LiteDB\Vedio\VideoGroupLogEntity.cs" />
<Compile Include="LiteDB\Video\VideoEntity.cs" />
<Compile Include="LiteDB\Video\VideoGroupEntity.cs" />
<Compile Include="LiteDB\Video\VideoGroupLogEntity.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
......
VIZ.FGOUT/VIZ.FGOUT.Storage/obj/x64/Debug/VIZ.FGOUT.Storage.csproj.CoreCompileInputs.cache
e5f3e79318a875371dd68e25eaaaeccb131f6e6b
9c4eddba912ff83cd02038dba8eeaf41f123f475
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/info.log
This source diff could not be displayed because it is too large. You can view the blob instead.
VIZ.Framework/VIZ.Framework.Common/VideoControl/Control/Plugin/TrackingBox/EventArgs/TrackingBoxClickEventArgs.cs
......@@ -25,6 +25,6 @@ namespace VIZ.Framework.Common
/// <summary>
/// 中心点坐标
/// </summary>
public Point VedioPointCenter { get; set; }
public Point VideoPointCenter { get; set; }
}
}
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