Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
V
VIZ.H2V
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘龙飞
VIZ.H2V
Commits
1d0922c8
Commit
1d0922c8
authored
Sep 05, 2022
by
liulongfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复裁切框发送配置bug
parent
d24d5195
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
VIZ.H2V.Module/NDISettingView/ViewModel/NDISettingPanelViewModel.cs
+10
-5
VIZ.H2V.Module/SystemSetting/View/StyleSettingPanelView.xaml
+2
-2
No files found.
VIZ.H2V.Module/NDISettingView/ViewModel/NDISettingPanelViewModel.cs
View file @
1d0922c8
...
...
@@ -289,6 +289,9 @@ namespace VIZ.H2V.Module
/// </summary>
public
bool
Save
()
{
if
(!
this
.
CheckIsSendToCrop
())
return
false
;
string
streamName
=
this
.
SelectedNDIStreamInfo
==
null
?
string
.
Empty
:
this
.
SelectedNDIStreamInfo
.
FullName
;
int
delay
=
this
.
SelectedNDIDelayInfo
==
null
?
0
:
this
.
SelectedNDIDelayInfo
.
Value
;
...
...
@@ -331,11 +334,12 @@ namespace VIZ.H2V.Module
/// <summary>
/// 校验是否可以发送坐标给裁切程序
/// </summary>
private
void
CheckIsSendToCrop
()
/// <returns>是否通过检测</returns>
private
bool
CheckIsSendToCrop
()
{
// 当前设置的值为不需要向裁切程序发送坐标那么不处理
if
(!
this
.
IsSendToCrop
)
return
;
return
true
;
// 如果当前没有选中NDI流,那么不能设置该参数为True
if
(
this
.
SelectedNDIStreamInfo
==
null
)
...
...
@@ -347,7 +351,7 @@ namespace VIZ.H2V.Module
MessageBoxEx
.
ShowDialog
(
$"请先选择NDI流"
,
this
.
GetWindow
());
});
return
;
return
false
;
}
// 如果除了当前视图外还有别的视图向选中的NDI流发送裁切坐标那么不能设置为True
...
...
@@ -358,7 +362,7 @@ namespace VIZ.H2V.Module
&&
p
.
ViewKey
!=
this
.
ViewKey
);
if
(
viewConfig
==
null
)
return
;
return
true
;
this
.
IsSendToCrop
=
false
;
...
...
@@ -367,7 +371,7 @@ namespace VIZ.H2V.Module
MessageBoxEx
.
ShowDialog
(
$"视图:
{
viewConfig
.
DisplayName
}
, 已经配置了NDI流:
{
this
.
SelectedNDIStreamInfo
.
FullName
}
,的裁切源"
,
this
.
GetWindow
());
});
return
;
return
false
;
}
}
}
\ No newline at end of file
VIZ.H2V.Module/SystemSetting/View/StyleSettingPanelView.xaml
View file @
1d0922c8
...
...
@@ -8,7 +8,7 @@
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
d:DataContext="{d:DesignInstance Type=local:StyleSettingPanelViewModel}"
mc:Ignorable="d"
d:DesignHeight="
45
0" d:DesignWidth="800">
d:DesignHeight="
80
0" d:DesignWidth="800">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
...
...
@@ -83,7 +83,7 @@
<fcommon:ColorPickButton Grid.Column="1" Color="{Binding Path=ManualCorrectionColor,Mode=TwoWay}" Height="30" Grid.Row="2"></fcommon:ColorPickButton>
</Grid>
<!-- 裁切框移动 -->
<TextBlock Text="裁切框移动" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="4"></TextBlock>
<TextBlock Text="
手动
裁切框移动" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="4"></TextBlock>
<Grid Grid.Row="5">
<Grid.RowDefinitions>
<RowDefinition Height="30"></RowDefinition>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment