Skip to content

V
VIZ.H2V
Commit 85f2863b by liulongfei
Options

bug 修复

parent 1ce93e0a
Showing with 7 additions and 25 deletions
VIZ.H2V.Module/NDIMainView/Controller/Hotkey/HotkeyController.cs
...@@ -47,21 +47,6 @@ namespace VIZ.H2V.Module ...@@ -47,21 +47,6 @@ namespace VIZ.H2V.Module
this.focusNDIViewModel.IsFocus = true; this.focusNDIViewModel.IsFocus = true;
// 先将出自身外手动模式的视图切换为自动模式
ApplicationDomainEx.ServiceManager.GetServiceList<INDIViewService>()
.Where(p => p.StrategyMode == AlgorithmStrategyMode.manual_mode && p != this.focusNDIViewModel)
.ToList()
.ForEach(p =>
{
ChangeStrategyContext cxt = new ChangeStrategyContext();
cxt.IsUseClip = p.IsUseClip;
cxt.Mode = AlgorithmStrategyMode.auto_mode;
cxt.IsNeedRestart = false;
cxt.TriggerScene = NDIViewScene.Hotkey;
p.ChangeStrategyMode(cxt);
});
// 切换为手动模式 // 切换为手动模式
ChangeStrategyContext context = new ChangeStrategyContext(); ChangeStrategyContext context = new ChangeStrategyContext();
context.IsUseClip = this.focusNDIViewModel.IsUseClip; context.IsUseClip = this.focusNDIViewModel.IsUseClip;
......
VIZ.H2V.Module/NDIView/View/NDIView.xaml
...@@ -150,26 +150,23 @@ ...@@ -150,26 +150,23 @@
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border ToolTip="{Binding Path=StrategyDisplayName,Mode=OneWay}" Background="Transparent">
<RadioButton FontSize="16" Foreground="White" <RadioButton FontSize="16" Foreground="White"
ToolTip="{Binding Path=StrategyDisplayName,Mode=OneWay}"
Style="{StaticResource RadioButton_NdiView}" Style="{StaticResource RadioButton_NdiView}"
IsChecked="{Binding IsAutoModeChecked,Mode=TwoWay}"> IsChecked="{Binding IsAutoModeChecked,Mode=TwoWay}">
<TextBlock Text="{Binding Path=StrategyDisplayName,Mode=OneWay}" Margin="0,0,10,0" TextWrapping="NoWrap" <TextBlock Text="{Binding Path=StrategyDisplayName,Mode=OneWay}" Margin="0,0,10,0" TextWrapping="NoWrap"
TextTrimming="CharacterEllipsis"></TextBlock> TextTrimming="CharacterEllipsis"></TextBlock>
</RadioButton> </RadioButton>
</Border>
<Border ToolTip="居中" Grid.Row="1" Background="Transparent">
<RadioButton Content="居中" FontSize="16" Foreground="White" <RadioButton Content="居中" FontSize="16" Foreground="White"
ToolTip="居中" Grid.Row="1"
Style="{StaticResource RadioButton_NdiView}" Style="{StaticResource RadioButton_NdiView}"
IsChecked="{Binding IsCenterModeChecked,Mode=TwoWay}"> IsChecked="{Binding IsCenterModeChecked,Mode=TwoWay}">
</RadioButton> </RadioButton>
</Border>
<Border ToolTip="手动" Grid.Row="2" Background="Transparent">
<RadioButton Content="手动" FontSize="16" Foreground="White" <RadioButton Content="手动" FontSize="16" Foreground="White"
ToolTip="手动" Grid.Row="2"
IsChecked="{Binding Path=IsManualModeChecked,Mode=TwoWay}" IsChecked="{Binding Path=IsManualModeChecked,Mode=TwoWay}"
Style="{StaticResource RadioButton_NdiView}"> Style="{StaticResource RadioButton_NdiView}">
</RadioButton> </RadioButton>
</Border>
</Grid> </Grid>
</Border> </Border>
</Grid> </Grid>
......
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Manual_NDI.cs
...@@ -91,11 +91,11 @@ namespace VIZ.H2V.Module ...@@ -91,11 +91,11 @@ namespace VIZ.H2V.Module
ClipBoxInfo clipBox = new ClipBoxInfo(); ClipBoxInfo clipBox = new ClipBoxInfo();
clipBox.DrawingBorderWidth = this.CLIP_BOX_BORDER_WIDTH; clipBox.DrawingBorderWidth = this.CLIP_BOX_BORDER_WIDTH;
clipBox.SrcRect = new RawRectangleF((float)(this.ClipBoxX), 0, (float)(this.ClipBoxX) + (float)this.CLIP_BOX_WIDTH, renderInfo.Frame.Height); clipBox.SrcRect = new RawRectangleF((float)(this.ClipBoxX), 0, (float)(this.ClipBoxX) + (float)this.CLIP_BOX_WIDTH, renderInfo.Frame.Height);
clipBox.DrawingBorderColor = this.StrategyMode == AlgorithmStrategyMode.manual_mode ? this.ClipBoxStrokeColor_Manual : this.ClipBoxStrokeColor_Normal; clipBox.DrawingBorderColor = (this.StrategyMode == AlgorithmStrategyMode.manual_mode && this.IsActive) ? this.ClipBoxStrokeColor_Manual : this.ClipBoxStrokeColor_Normal;
clipBox.MaskColor = this.CLIP_BOX_MASK_COLOR; clipBox.MaskColor = this.CLIP_BOX_MASK_COLOR;
clipBox.CenterAxisWidth = (float)this.CLIP_BOX_CENTER_AXIS_WIDTH; clipBox.CenterAxisWidth = (float)this.CLIP_BOX_CENTER_AXIS_WIDTH;
clipBox.CenterAxisColor = this.ClipBoxCenterAxisColor; clipBox.CenterAxisColor = this.ClipBoxCenterAxisColor;
clipBox.IsCenterAxisEnabled = this.AlgorithmConfig.IsShowCenterAxis; clipBox.IsCenterAxisEnabled = (this.StrategyMode == AlgorithmStrategyMode.manual_mode && this.IsActive) ? this.AlgorithmConfig.IsShowCenterAxis : false;
view.video.UpdateClipBox(clipBox); view.video.UpdateClipBox(clipBox);
} }
......
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Property.cs
...@@ -352,7 +352,7 @@ namespace VIZ.H2V.Module ...@@ -352,7 +352,7 @@ namespace VIZ.H2V.Module
// CODE: SYSTEM_LOG | 记录日志 // CODE: SYSTEM_LOG | 记录日志
//==================================================================== //====================================================================
// 记录日志： 视图激活 // 记录日志： 视图激活
string system_log = string.Format(SystemLogStringFormats.VIEW_ACTIVE); string system_log = string.Format(SystemLogStringFormats.VIEW_ACTIVE, this.ViewKey);
ApplicationDomainEx.CsvContext.AppendSystemLog(this.ViewKey, this.DisplayName, system_log); ApplicationDomainEx.CsvContext.AppendSystemLog(this.ViewKey, this.DisplayName, system_log);
//==================================================================== //====================================================================
} }
......
VIZ.H2V.Storage/CSV/Log/SystemLogStringFormats.cs
...@@ -24,7 +24,7 @@ namespace VIZ.H2V.Storage ...@@ -24,7 +24,7 @@ namespace VIZ.H2V.Storage
/// <summary> /// <summary>
/// 视图激活 /// 视图激活
/// </summary> /// </summary>
public const string VIEW_ACTIVE = "视图激活"; public const string VIEW_ACTIVE = "视图激活, [视图 {0}]";
/// <summary> /// <summary>
/// 发送算法停止消息 /// 发送算法停止消息
......
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