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
352f4242
Commit
352f4242
authored
Jul 22, 2022
by
liulongfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复手动按钮是否可用异常问题
parent
780f3ea9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
10 deletions
+7
-10
VIZ.H2V.Module/NDIMainView/View/NDIMainView.xaml
+2
-2
VIZ.H2V.Module/NDIView/View/NDIView.xaml
+2
-1
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Property.cs
+3
-7
No files found.
VIZ.H2V.Module/NDIMainView/View/NDIMainView.xaml
View file @
352f4242
...
...
@@ -46,9 +46,9 @@
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<local:NDIView NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_1}" Grid.Row="0" Grid.Column="0" Margin="30"></local:NDIView>
<
!--<
local:NDIView NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_2}" Grid.Row="0" Grid.Column="1" Margin="30"></local:NDIView>
<local:NDIView NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_2}" Grid.Row="0" Grid.Column="1" Margin="30"></local:NDIView>
<local:NDIView NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_3}" Grid.Row="1" Grid.Column="0" Margin="30"></local:NDIView>
<local:NDIView NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_4}" Grid.Row="1" Grid.Column="1" Margin="30"></local:NDIView>
-->
<local:NDIView NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_4}" Grid.Row="1" Grid.Column="1" Margin="30"></local:NDIView>
</Grid>
<!-- 底部 -->
<Border Grid.Row="2" Background="#ff12202d">
...
...
VIZ.H2V.Module/NDIView/View/NDIView.xaml
View file @
352f4242
...
...
@@ -98,7 +98,8 @@
Style="{StaticResource RadioButton_NdiView}" IsChecked="{Binding IsCenterModeChecked,Mode=TwoWay}">
</RadioButton>
<RadioButton Content="手动" Grid.Row="2" FontSize="16" Foreground="White"
IsEnabled="{Binding Path=IsManualModeEnabled,Mode=OneWay}" IsChecked="{Binding Path=IsManualModeChecked,Mode=TwoWay}"
IsEnabled="{Binding Path=IsManualModeEnabled,Mode=OneWay}"
IsChecked="{Binding Path=IsManualModeChecked,Mode=TwoWay}"
Style="{StaticResource RadioButton_NdiView}">
</RadioButton>
</Grid>
...
...
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Property.cs
View file @
352f4242
...
...
@@ -191,11 +191,7 @@ namespace VIZ.H2V.Module
set
{
viewStatus
=
value
;
// 该属性在多个线程中进行修改,需要调整至UI线程处理
WPFHelper
.
Invoke
(()
=>
{
this
.
RaisePropertyChanged
(
nameof
(
ViewStatus
));
});
this
.
RaisePropertySaveChanged
(
nameof
(
ViewStatus
));
}
}
...
...
@@ -343,14 +339,14 @@ namespace VIZ.H2V.Module
#
region
IsManualModeEnabled
--
手动模式是否可用
private
bool
isManualModeEnabled
=
true
;
private
bool
isManualModeEnabled
;
/// <summary>
/// 手动模式是否可用
/// </summary>
public
bool
IsManualModeEnabled
{
get
{
return
isManualModeEnabled
;
}
set
{
isManualModeEnabled
=
value
;
this
.
RaisePropertyChanged
(
nameof
(
IsManualModeEnabled
));
}
set
{
isManualModeEnabled
=
value
;
this
.
RaiseProperty
Save
Changed
(
nameof
(
IsManualModeEnabled
));
}
}
#
endregion
...
...
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