Commit 1359d5ee by 鲁志-悦动

“手动模式”下除“开始位置”、“结束位置”不可用之外,其他都放开 And 双滑块Slider

parent b9d8a1f5
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为,并且如果
// 重新生成代码,这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace XamlGeneratedNamespace {
/// <summary>
/// GeneratedInternalTypeHelper
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
/// <summary>
/// CreateInstance
/// </summary>
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
}
/// <summary>
/// GetPropertyValue
/// </summary>
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// SetPropertyValue
/// </summary>
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// CreateDelegate
/// </summary>
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
delegateType,
handler}, null)));
}
/// <summary>
/// AddEventHandler
/// </summary>
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
eventInfo.AddEventHandler(target, handler);
}
}
}

......@@ -10,11 +10,11 @@ none
false
2-725104376
21870986562
3947974750
17-1462717611
31364711570
17-1683084370
Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
True
False
......@@ -153,66 +153,7 @@
FontSize="24"
Style="{StaticResource TextBlockStyle}"
Text="输出视频" />
<!--<Canvas
Grid.Row="2"
Width="740"
Height="90">
<Slider
Width="740"
Height="90"
AutoToolTipPlacement="BottomRight"
AutoToolTipPrecision="0"
IsMoveToPointEnabled="True"
IsSnapToTickEnabled="True"
Maximum="{Binding SliderMaxValue, Mode=TwoWay}"
TickFrequency="1"
TickPlacement="BottomRight"
Visibility="{Binding SliderVisibility, Mode=TwoWay}"
Value="{Binding SliderValue, Mode=TwoWay}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="ValueChanged">
<b:InvokeCommandAction Command="{Binding SliderValueChangedCommand}" />
</b:EventTrigger>
</b:Interaction.Triggers>
</Slider>
<Slider
Width="740"
Height="90"
AutoToolTipPlacement="BottomRight"
AutoToolTipPrecision="0"
IsMoveToPointEnabled="True"
IsSnapToTickEnabled="True"
Maximum="{Binding SliderMaxValue, Mode=TwoWay}"
TickFrequency="1"
TickPlacement="BottomRight"
Visibility="{Binding SliderVisibility, Mode=TwoWay}"
Value="{Binding SliderValue2, Mode=TwoWay}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="ValueChanged">
<b:InvokeCommandAction Command="{Binding SliderValueChangedCommand}" />
</b:EventTrigger>
</b:Interaction.Triggers>
</Slider>
</Canvas>-->
<Slider
Grid.Row="3"
Width="Auto"
Height="30"
AutoToolTipPlacement="BottomRight"
AutoToolTipPrecision="0"
IsMoveToPointEnabled="True"
IsSnapToTickEnabled="True"
Maximum="{Binding SliderMaxValue, Mode=TwoWay}"
TickFrequency="1"
TickPlacement="BottomRight"
Visibility="{Binding SliderVisibility}"
Value="{Binding SliderValue, Mode=TwoWay}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="ValueChanged">
<b:InvokeCommandAction Command="{Binding SliderValueChangedCommand}" />
</b:EventTrigger>
</b:Interaction.Triggers>
</Slider>
<WrapPanel
Grid.Row="2"
Grid.Column="1"
......@@ -589,7 +530,7 @@
Margin="10"
Command="{Binding Path=RefreshPositionCommand}"
Content="刷新位置"
IsEnabled="{Binding StartEnable}"
IsEnabled="{Binding SendEnable}"
Style="{StaticResource ButtonStyle}" />
......@@ -1088,19 +1029,6 @@
NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_1}"
VideoBorderBrush="#46AFA0" />
<!-- Replay窗口 -->
<Grid
Grid.Row="2"
Grid.Column="0"
Visibility="{Binding SliderVisibility}">
<local:NDIView
x:Name="cam3"
Margin="0"
IsHiddenSetting="True"
NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_3}"
VideoBorderBrush="#378CFF" />
</Grid>
<!--<StackPanel Grid.Row="1" Grid.Column="1">
<Button
Width="130"
......@@ -1150,6 +1078,93 @@
MouseLeftButtonDown="cam2_MouseLeftButtonDown"
NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_2}"
VideoBorderBrush="Red" />
<!-- Replay窗口 -->
<Grid
Grid.Row="2"
Grid.Column="0"
Visibility="{Binding SliderVisibility}">
<local:NDIView
x:Name="cam3"
Margin="0"
IsHiddenSetting="True"
NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_3}"
VideoBorderBrush="#378CFF" />
</Grid>
<!--<Canvas
Grid.Row="2"
Width="740"
Height="90">
<Slider
Width="740"
Height="90"
AutoToolTipPlacement="BottomRight"
AutoToolTipPrecision="0"
IsMoveToPointEnabled="True"
IsSnapToTickEnabled="True"
Maximum="{Binding SliderMaxValue, Mode=TwoWay}"
TickFrequency="1"
TickPlacement="BottomRight"
Visibility="{Binding SliderVisibility, Mode=TwoWay}"
Value="{Binding SliderValue, Mode=TwoWay}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="ValueChanged">
<b:InvokeCommandAction Command="{Binding SliderValueChangedCommand}" />
</b:EventTrigger>
</b:Interaction.Triggers>
</Slider>
<Slider
Width="740"
Height="90"
AutoToolTipPlacement="BottomRight"
AutoToolTipPrecision="0"
IsMoveToPointEnabled="True"
IsSnapToTickEnabled="True"
Maximum="{Binding SliderMaxValue, Mode=TwoWay}"
TickFrequency="1"
TickPlacement="BottomRight"
Visibility="{Binding SliderVisibility, Mode=TwoWay}"
Value="{Binding SliderValue2, Mode=TwoWay}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="ValueChanged">
<b:InvokeCommandAction Command="{Binding SliderValueChangedCommand}" />
</b:EventTrigger>
</b:Interaction.Triggers>
</Slider>
</Canvas>-->
<!--<Slider
Grid.Row="3"
Width="Auto"
Height="30"
AutoToolTipPlacement="BottomRight"
AutoToolTipPrecision="0"
IsMoveToPointEnabled="True"
IsSnapToTickEnabled="True"
Maximum="{Binding SliderMaxValue, Mode=TwoWay}"
TickFrequency="1"
TickPlacement="BottomRight"
Visibility="{Binding SliderVisibility}"
Value="{Binding SliderValue, Mode=TwoWay}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="ValueChanged">
<b:InvokeCommandAction Command="{Binding SliderValueChangedCommand}" />
</b:EventTrigger>
</b:Interaction.Triggers>
</Slider>-->
<Grid
Grid.Row="3"
Grid.Column="0"
Visibility="{Binding SliderVisibility}">
<local:SliderArrange
EndValue="240"
Maximum="500"
Minimum="0"
SliderHeight="30"
SliderWidth="810"
StartValue="120"
Visibility="{Binding SliderVisibility}" />
</Grid>
</Grid>
<!-- 底部 -->
<Border Grid.Row="2" Background="{StaticResource TitleBarBackground}">
......
......@@ -487,9 +487,11 @@ namespace VIZ.FGOUT.Module
private void PositionButtonDisEnable()
{
//6个位置相关按钮都不可用
InvalidEnable = EndEnable = StartEnable = false;
SaveEnable = SendEnable = CleanEnable = false;
////6个位置相关按钮都不可用
//InvalidEnable = EndEnable = StartEnable = false;
//SaveEnable = SendEnable = CleanEnable = false;
//2个位置相关按钮都不可用
EndEnable = StartEnable = false;
StartIsChecked = EndIsChecked = InvalidIsChecked = false;
}
......
<UserControl
x:Class="VIZ.FGOUT.Module.SliderArrange"
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"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Name="UC_Arrange"
d:DesignHeight="450"
d:DesignWidth="800"
Loaded="UC_Arrange_Loaded"
mc:Ignorable="d">
<StackPanel
Width="{Binding ElementName=UC_Arrange, Path=SliderWidth}"
Height="{Binding ElementName=UC_Arrange, Path=SliderHeight}"
Orientation="Horizontal">
<!--<TextBox
Width="35"
Margin="0,3"
BorderBrush="CornflowerBlue"
KeyUp="TextBox_KeyUp1"
Text="{Binding ElementName=SL_Bat1, Path=Value}" />-->
<Canvas Width="{Binding ElementName=UC_Arrange, Path=SliderWidth}" Margin="0,0,5,0">
<Slider
Name="SL_Bat1"
Width="{Binding ElementName=UC_Arrange, Path=SliderWidth}"
Margin="2"
VerticalAlignment="Center"
CacheMode="BitmapCache"
FocusVisualStyle="{x:Null}"
IsSelectionRangeEnabled="True"
IsSnapToTickEnabled="True"
Maximum="{Binding ElementName=UC_Arrange, Path=Maximum}"
Minimum="{Binding ElementName=UC_Arrange, Path=Minimum}"
SelectionEnd="{Binding ElementName=UC_Arrange, Path=EndValue}"
SelectionStart="{Binding ElementName=UC_Arrange, Path=StartValue}"
TickFrequency="{Binding ElementName=UC_Arrange, Path=SliderTickFrequency}"
TickPlacement="BottomRight"
ValueChanged="SL_Bat1_ValueChanged"
Value="{Binding ElementName=UC_Arrange, Path=StartValue}">
<Slider.Clip>
<RectangleGeometry Rect="{Binding ElementName=UC_Arrange, Path=StartRect}" />
</Slider.Clip>
</Slider>
<Slider
Name="SL_Bat2"
Width="{Binding ElementName=UC_Arrange, Path=SliderWidth}"
Margin="2"
VerticalAlignment="Center"
CacheMode="BitmapCache"
FocusVisualStyle="{x:Null}"
IsSelectionRangeEnabled="True"
IsSnapToTickEnabled="True"
Maximum="{Binding ElementName=UC_Arrange, Path=Maximum}"
Minimum="{Binding ElementName=UC_Arrange, Path=Minimum}"
SelectionEnd="{Binding ElementName=UC_Arrange, Path=EndValue}"
SelectionStart="{Binding ElementName=UC_Arrange, Path=StartValue}"
TickFrequency="{Binding ElementName=UC_Arrange, Path=SliderTickFrequency}"
TickPlacement="BottomRight"
ValueChanged="SL_Bat2_ValueChanged"
Value="{Binding ElementName=UC_Arrange, Path=EndValue}">
<Slider.Clip>
<RectangleGeometry Rect="{Binding ElementName=UC_Arrange, Path=EndRect}" />
</Slider.Clip>
</Slider>
</Canvas>
<!--<TextBox Text="{Binding ElementName=SL_Bat2,Path=Value}" KeyUp="TextBox_KeyUp2" Width="35" Margin="0,3" BorderBrush="CornflowerBlue"/>-->
</StackPanel>
</UserControl>
using System;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
namespace VIZ.FGOUT.Module
{
/// <summary>
/// SilderArrange.xaml 的交互逻辑
/// </summary>
public partial class SliderArrange : UserControl
{
#region 私有变量
private static int _width = 150; // 拖动条初始宽度
private static int _height = 30; // 高度
private static int _min = 0; // 最小值
private static int _max = 100; // 最大值
private static int _freq = 1; // 出现刻度的间距
#endregion
// 构造函数
public SliderArrange()
{
InitializeComponent();
}
#region 私有属性
/// <summary>
/// 裁剪矩阵(头)
/// </summary>
private Rect StartRect
{
get
{
return (Rect)GetValue(StartRectProperty);
}
set { SetValue(StartRectProperty, value); }
}
private static readonly DependencyProperty StartRectProperty =
DependencyProperty.Register("StartRect", typeof(Rect), typeof(SliderArrange));
/// <summary>
/// 裁剪矩阵(尾)
/// </summary>
private Rect EndRect
{
get { return (Rect)GetValue(EndRectProperty); }
set { SetValue(EndRectProperty, value); }
}
private static readonly DependencyProperty EndRectProperty =
DependencyProperty.Register("EndRect", typeof(Rect), typeof(SliderArrange));
#endregion
#region 公开依赖属性
/// <summary>
/// 刻度间距,默认为10
/// </summary>
public int SliderTickFrequency
{
get { return (int)GetValue(SliderTickFrequencyProperty); }
set { SetValue(SliderTickFrequencyProperty, value); }
}
public static readonly DependencyProperty SliderTickFrequencyProperty =
DependencyProperty.Register("SliderTickFrequency", typeof(int), typeof(SliderArrange), new PropertyMetadata(_freq));
/// <summary>
/// 控件高度,默认为30
/// </summary>
public int SliderHeight
{
get { return (int)GetValue(SliderHeightProperty); }
set { SetValue(SliderHeightProperty, value); }
}
public static readonly DependencyProperty SliderHeightProperty =
DependencyProperty.Register(nameof(SliderHeight), typeof(int), typeof(SliderArrange), new PropertyMetadata(_height));
/// <summary>
/// 拖动条宽度,默认为150
/// </summary>
public int SliderWidth
{
get { return (int)GetValue(SliderWidthProperty); }
set { SetValue(SliderWidthProperty, value); }
}
public static readonly DependencyProperty SliderWidthProperty =
DependencyProperty.Register(nameof(SliderWidth), typeof(int), typeof(SliderArrange), new PropertyMetadata(_width));
/// <summary>
/// 最小值,默认为0
/// </summary>
public int Minimum
{
get { return (int)GetValue(MinimumProperty); }
set { SetValue(MinimumProperty, value); }
}
public static readonly DependencyProperty MinimumProperty =
DependencyProperty.Register("Minimum", typeof(int), typeof(SliderArrange), new PropertyMetadata(_min));
/// <summary>
/// 最大值,默认为100
/// </summary>
public int Maximum
{
get { return (int)GetValue(MaximumProperty); }
set { SetValue(MaximumProperty, value); }
}
public static readonly DependencyProperty MaximumProperty =
DependencyProperty.Register("Maximum", typeof(int), typeof(SliderArrange), new PropertyMetadata(_max));
/// <summary>/// 选中开始值,默认为0
/// </summary>
public int StartValue
{
get { return (int)GetValue(StartValueProperty); }
set { SetValue(StartValueProperty, value); }
}
public static readonly DependencyProperty StartValueProperty =
DependencyProperty.Register("StartValue", typeof(int), typeof(SliderArrange));
/// <summary>
/// 选中结束值,默认为100
/// </summary>
public int EndValue
{
get { return (int)GetValue(EndValueProperty); }
set { SetValue(EndValueProperty, value); }
}
public static readonly DependencyProperty EndValueProperty =
DependencyProperty.Register("EndValue", typeof(int), typeof(SliderArrange), new PropertyMetadata(_max));
#endregion
#region 前台交互
/// <summary>
/// 对两个拖动条进行裁剪
/// </summary>
private void ClipSilder()
{
int selectedValue = EndValue - StartValue;
int totalValue = Maximum - Minimum;
double sliderClipWidth = SliderWidth * (StartValue - Minimum + selectedValue / 2) / totalValue;
// 对第一个拖动条进行裁剪
StartRect = new Rect(0, 0, sliderClipWidth, SliderHeight);
// 对第二个拖动条进行裁剪
EndRect = new Rect(sliderClipWidth, 0, SliderWidth, SliderHeight);
}
/// <summary>
/// 初始化裁剪
/// </summary>
private void UC_Arrange_Loaded(object sender, RoutedEventArgs e)
{
ClipSilder();
}
private void SL_Bat1_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
{
if (e.NewValue > EndValue) // 检查值范围
StartValue = EndValue; // 超出,重设为最大值
ClipSilder();
}
private void SL_Bat2_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
{
if (e.NewValue < StartValue)
EndValue = StartValue;
ClipSilder();
}
private void TextBox_KeyUp1(object sender, System.Windows.Input.KeyEventArgs e)
{
try
{
if (e.Key == Key.Enter) // 按回车时确认输入
StartValue = Convert.ToInt32(((TextBox)sender).Text);
}
catch
{
}
}
private void TextBox_KeyUp2(object sender, KeyEventArgs e)
{
try
{
if (e.Key == Key.Enter)
EndValue = Convert.ToInt32(((TextBox)sender).Text);
}
catch
{
}
}
#endregion
}
}
......@@ -265,6 +265,9 @@
<Compile Include="SystemSetting\View\UESettingPanelView.xaml.cs">
<DependentUpon>UESettingPanelView.xaml</DependentUpon>
</Compile>
<Compile Include="Themes\SliderArrange.xaml.cs">
<DependentUpon>SliderArrange.xaml</DependentUpon>
</Compile>
<Compile Include="Themes\TextBoxEnterKeyUpdateBehavior.cs" />
</ItemGroup>
<ItemGroup>
......@@ -418,6 +421,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Themes\SliderArrange.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "841D2ADFBDE7B19B7DFA60A2653D5E0D29FEC0AE46BB26DAD0A13D7DCCB89417"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "44CC33A548CF90A5FEB7A51A31499592C3E1B0D6727A9B025968B75518C6D5C8"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 273 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 214 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _AutoMode_;
......@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 284 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 225 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _ManualMode_;
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1083 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1024 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -82,17 +82,17 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1097 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1073 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
internal VIZ.FGOUT.Module.NDIView cam2;
#line default
#line hidden
#line 1145 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1088 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
internal VIZ.FGOUT.Module.NDIView cam3;
#line default
#line hidden
......@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2:
this._AutoMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 277 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 218 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default
......@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module {
case 3:
this._ManualMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 288 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 229 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default
......@@ -159,10 +159,10 @@ namespace VIZ.FGOUT.Module {
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 5:
this.cam3 = ((VIZ.FGOUT.Module.NDIView)(target));
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 6:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
this.cam3 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
}
this._contentLoaded = true;
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "841D2ADFBDE7B19B7DFA60A2653D5E0D29FEC0AE46BB26DAD0A13D7DCCB89417"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "44CC33A548CF90A5FEB7A51A31499592C3E1B0D6727A9B025968B75518C6D5C8"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 273 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 214 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _AutoMode_;
......@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 284 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 225 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _ManualMode_;
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1083 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1024 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -82,17 +82,17 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1097 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1073 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3;
internal VIZ.FGOUT.Module.NDIView cam2;
#line default
#line hidden
#line 1145 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1088 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
internal VIZ.FGOUT.Module.NDIView cam3;
#line default
#line hidden
......@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2:
this._AutoMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 277 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 218 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default
......@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module {
case 3:
this._ManualMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 288 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 229 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default
......@@ -159,10 +159,10 @@ namespace VIZ.FGOUT.Module {
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 5:
this.cam3 = ((VIZ.FGOUT.Module.NDIView)(target));
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 6:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
this.cam3 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
}
this._contentLoaded = true;
......
68293d47dc9d4ef0487262e0c0e9f91b238e2de6
69436a2e992008153b5ec637b10b2846c6374a85
......@@ -913,3 +913,5 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\dll\x64\OpenCvSharpEx
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\bin\x64\Debug\dll\x64\opencv_videoio_ffmpeg480_64.dll
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\SystemSetting\View\NewWindowView.g.cs
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\SystemSetting\View\NewWindowView.baml
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\Themes\SliderArrange.g.cs
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\Themes\SliderArrange.baml
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
23-1787007427
241325682082
4-699044453
931949589485
94542122908
151674092382
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\NewWindowView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml;
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\NewWindowView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml;Themes\SliderArrange.xaml;
False
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs

FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;
......@@ -23,4 +23,5 @@ FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\StyleSettingPan
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\SystemSettingView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\UEControlPanelView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\SystemSetting\View\UESettingPanelView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\Themes\SliderArrange.xaml;;
This source diff could not be displayed because it is too large. You can view the blob instead.
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