Skip to content

V
VIZ.H2V
Commit 6aca751b by liulongfei
Options

算法重启调整为常住功能

parent 2dc9fb79
Showing with 44 additions and 6 deletions
VIZ.H2V.Module.Resource/Style/Button/Button_NdiView.xaml 0 → 100644
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style x:Key="Button_Restart" TargetType="Button">
<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter>
<Setter Property="Foreground" Value="#88ffc000"></Setter>
<Setter Property="FontSize" Value="14"></Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Button">
<Border x:Name="border" BorderBrush="#88ffc000" BorderThickness="2" Background="Transparent">
<ContentPresenter VerticalAlignment="Center" HorizontalAlignment="Center"></ContentPresenter>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="border" Property="BorderBrush" Value="#aaffc000"></Setter>
<Setter TargetName="border" Property="Background" Value="#11ffffff"></Setter>
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value="0.7"></Setter>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
\ No newline at end of file
VIZ.H2V.Module.Resource/VIZ.H2V.Module.Resource.csproj
...@@ -66,6 +66,10 @@ ...@@ -66,6 +66,10 @@
<Reference Include="PresentationFramework" /> <Reference Include="PresentationFramework" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Page Include="Style\Button\Button_NdiView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Style\Button\Button_Setting.xaml"> <Page Include="Style\Button\Button_Setting.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
......
VIZ.H2V.Module/NDIView/View/NDIView.xaml
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Button/Button_NdiView.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Button/Button_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Button/Button_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/CheckBox/CheckBox_NdiView.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/CheckBox/CheckBox_NdiView.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/RadioButton/RadioButton_NdiView.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/RadioButton/RadioButton_NdiView.xaml"></ResourceDictionary>
...@@ -68,9 +69,6 @@ ...@@ -68,9 +69,6 @@
<!-- =================================================================================================== --> <!-- =================================================================================================== -->
<fcommon:DebugBorder VerticalAlignment="Top" Grid.ColumnSpan="2"> <fcommon:DebugBorder VerticalAlignment="Top" Grid.ColumnSpan="2">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Button Width="60" Height="30" Margin="0,0,30,0" Content="算法重启"
IsEnabled="{Binding Path=ViewStatus,Converter={StaticResource NDIViewStatus2IsEnabledConverter_SettingButton}}"
Command="{Binding RestartCommand}"></Button>
<TextBlock Text="裁切FPS:" Foreground="Red" FontSize="16" Margin="0,0,0,0" Opacity="0.86" VerticalAlignment="Center"></TextBlock> <TextBlock Text="裁切FPS:" Foreground="Red" FontSize="16" Margin="0,0,0,0" Opacity="0.86" VerticalAlignment="Center"></TextBlock>
<TextBlock Foreground="Red" FontSize="16" Margin="10,0,0,0" VerticalAlignment="Center" <TextBlock Foreground="Red" FontSize="16" Margin="10,0,0,0" VerticalAlignment="Center"
Text="{Binding ClipFPS.FPS}" Width="30"></TextBlock> Text="{Binding ClipFPS.FPS}" Width="30"></TextBlock>
...@@ -129,6 +127,10 @@ ...@@ -129,6 +127,10 @@
</Grid> </Grid>
</Grid> </Grid>
</Grid> </Grid>
<Button Width="80" Height="30" Content="算法重启" Style="{StaticResource Button_Restart}"
Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,20,0,0"
IsEnabled="{Binding Path=ViewStatus,Converter={StaticResource NDIViewStatus2IsEnabledConverter_SettingButton}}"
Command="{Binding RestartCommand}"></Button>
<!-- 机位对应特殊面板区域 --> <!-- 机位对应特殊面板区域 -->
<Grid Grid.Row="1"> <Grid Grid.Row="1">
......
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Command.cs
...@@ -102,6 +102,9 @@ namespace VIZ.H2V.Module ...@@ -102,6 +102,9 @@ namespace VIZ.H2V.Module
this.StrategyType = this.ViewConfig.StrategyType; this.StrategyType = this.ViewConfig.StrategyType;
// 裁切模式 // 裁切模式
this.StrategyMode = this.ViewConfig.StrategyMode; this.StrategyMode = this.ViewConfig.StrategyMode;
// 记录档期操作日志
this.WriteLogOperation();
} }
/// <summary> /// <summary>
......
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.cs
...@@ -116,7 +116,7 @@ namespace VIZ.H2V.Module ...@@ -116,7 +116,7 @@ namespace VIZ.H2V.Module
try try
{ {
// 记录操作日志 // 记录操作日志
this.WriteLogOperation(context); this.WriteLogOperation();
// 停止3D鼠标更新 // 停止3D鼠标更新
Navigation3DManager.Navigation3DModel.IsReady = false; Navigation3DManager.Navigation3DModel.IsReady = false;
...@@ -312,8 +312,7 @@ namespace VIZ.H2V.Module ...@@ -312,8 +312,7 @@ namespace VIZ.H2V.Module
/// <summary> /// <summary>
/// 操作日志 /// 操作日志
/// </summary> /// </summary>
/// <param name="context">切换算法上下文</param> private void WriteLogOperation()
private void WriteLogOperation(ChangeStrategyContext context)
{ {
AlgorithmStrategyMode last_mode = this.StrategyMode; AlgorithmStrategyMode last_mode = this.StrategyMode;
...@@ -330,6 +329,7 @@ namespace VIZ.H2V.Module ...@@ -330,6 +329,7 @@ namespace VIZ.H2V.Module
LogOperation log = new LogOperation(); LogOperation log = new LogOperation();
log.ViewKey = this.ViewKey; log.ViewKey = this.ViewKey;
log.StrategyType = this.StrategyType.GetDescription();
log.Operation = last_mode.GetDescription(); log.Operation = last_mode.GetDescription();
log.BeginTime = now; log.BeginTime = now;
......
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