Skip to content

F
FGOUT
Commit 8a823501 by 鲁志-悦动
Options

开始、结束、无效位置控件由Button改为ToggleButton实现

parent 59ed7de6
Showing with 191 additions and 106 deletions
VIZ.FGOUT/VIZ.FGOUT.Common/obj/x64/Debug/GeneratedInternalTypeHelper.g.cs

//------------------------------------------------------------------------------
// <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);
}
}
}
VIZ.FGOUT/VIZ.FGOUT.Common/obj/x64/Debug/VIZ.FGOUT.Common_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
21870986562
2-725104376
31364711570
17-1683084370
3947974750
17-1462717611
Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
False
True
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/ToogleButton/ToogleButton_Setting.xaml
......@@ -129,7 +129,7 @@
<Style x:Key="ToggleButtonStyle" TargetType="{x:Type ToggleButton}">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Foreground" Value="White" />
<Setter Property="FontSize" Value="16" />
<Setter Property="FontSize" Value="14" />
<Setter Property="Background" Value="#626669" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="BorderThickness" Value="1" />
......@@ -168,8 +168,9 @@
<Setter Property="Background" Value="#22ffffff" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Background" Value="Gray" />
<Setter Property="Foreground" Value="LightGray" />
<!--<Setter Property="Background" Value="Gray" />-->
<!--<Setter Property="Foreground" Value="LightGray" />-->
<Setter Property="Foreground" Value="Gray" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
......@@ -348,7 +348,7 @@
Content="Live"
Style="{StaticResource ButtonStyle}" />
<Button
<!--<Button
x:Name="_StartPositionBtn_"
Grid.Row="1"
Grid.Column="0"
......@@ -359,14 +359,15 @@
Command="{Binding Path=StartRegionCommand}"
Content="开始位置"
IsEnabled="{Binding StartEnable}"
Style="{StaticResource ButtonStyle}" />
<!--<ToggleButton
Style="{StaticResource ButtonStyle}" />-->
<ToggleButton
Grid.Row="1"
Grid.Column="0"
Width="100"
Height="40"
Margin="10"
Margin="-10,10,10,10"
Content="开始位置"
IsChecked="{Binding StartIsChecked}"
IsEnabled="{Binding StartEnable}"
Style="{StaticResource ToggleButtonStyle}">
<b:Interaction.Triggers>
......@@ -374,9 +375,9 @@
<b:InvokeCommandAction Command="{Binding StartRegionCommand}" />
</b:EventTrigger>
</b:Interaction.Triggers>
</ToggleButton>-->
</ToggleButton>
<Button
<!--<Button
Grid.Row="1"
Grid.Column="1"
Width="100"
......@@ -385,9 +386,26 @@
Command="{Binding Path=EndRegionCommand}"
Content="结束位置"
IsEnabled="{Binding EndEnable}"
Style="{StaticResource ButtonStyle}" />
Style="{StaticResource ButtonStyle}" />-->
<Button
<ToggleButton
Grid.Row="1"
Grid.Column="1"
Width="100"
Height="40"
Margin="10"
Content="结束位置"
IsChecked="{Binding EndIsChecked}"
IsEnabled="{Binding EndEnable}"
Style="{StaticResource ToggleButtonStyle}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="Checked">
<b:InvokeCommandAction Command="{Binding EndRegionCommand}" />
</b:EventTrigger>
</b:Interaction.Triggers>
</ToggleButton>
<!--<Button
Grid.Row="1"
Grid.Column="2"
Width="100"
......@@ -396,7 +414,23 @@
Command="{Binding Path=InvalidRegionCommand}"
Content="无效位置"
IsEnabled="{Binding InvalidEnable}"
Style="{StaticResource ButtonStyle}" />
Style="{StaticResource ButtonStyle}" />-->
<ToggleButton
Grid.Row="1"
Grid.Column="2"
Width="100"
Height="40"
Margin="10"
Content="无效位置"
IsChecked="{Binding InvalidIsChecked}"
IsEnabled="{Binding InvalidEnable}"
Style="{StaticResource ToggleButtonStyle}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="Checked">
<b:InvokeCommandAction Command="{Binding InvalidRegionCommand}" />
</b:EventTrigger>
</b:Interaction.Triggers>
</ToggleButton>
<Button
Grid.Row="1"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -458,14 +458,11 @@ namespace VIZ.FGOUT.Module
private void HidePlace()
{
cleanPlaceModel.CleanPlace = true;
ApplicationDomainEx.MessageManager.Send(cleanPlaceModel);
ApplicationDomain.MessageManager.Send(cleanPlaceModel);
//6个位置相关按钮都不可用
StartEnable = false;
EndEnable = false;
InvalidEnable = false;
CleanEnable = false;
SendEnable = false;
SaveEnable = false;
InvalidEnable = EndEnable = StartEnable = false;
SaveEnable = SendEnable = CleanEnable = false;
StartIsChecked = EndIsChecked = InvalidIsChecked = false;
}
#endregion
......@@ -936,11 +933,13 @@ namespace VIZ.FGOUT.Module
public InvalidPlaceModel invalidPlaceModel = new InvalidPlaceModel();
private void Invalid()
{
endPlaceModel.EndPlace = startPlaceModel.StartPlace =false;
invalidPlaceModel.IsInvalid = true;
ApplicationDomain.MessageManager.Send(invalidPlaceModel);
EndEnable = true;
InvalidEnable = false;
StartEnable = true;
//EndEnable = true;
//InvalidEnable = false;
//StartEnable = true;
EndIsChecked = StartIsChecked = false;
}
/// <summary>
......@@ -955,14 +954,16 @@ namespace VIZ.FGOUT.Module
/// </summary>
private void StartRegion()
{
NDIMainView nDIMainView=this.GetView<NDIMainView>();
//NDIMainView nDIMainView=this.GetView<NDIMainView>();
startPlaceModel.StartPlace = true;
//endPlaceModel.EndPlace = false;
endPlaceModel.EndPlace = false;
invalidPlaceModel.IsInvalid = false;
ApplicationDomainEx.MessageManager.Send(startPlaceModel);
EndEnable = true;
InvalidEnable = true;
StartEnable = false;
ApplicationDomain.MessageManager.Send(startPlaceModel);
//EndEnable = true;
//InvalidEnable = true;
//StartEnable = false;
EndIsChecked = false;
InvalidIsChecked = false;
}
/// <summary>
......@@ -972,12 +973,15 @@ namespace VIZ.FGOUT.Module
private void EndRegion()
{
startPlaceModel.StartPlace =false;
endPlaceModel.EndPlace = true;
invalidPlaceModel.IsInvalid = false;
ApplicationDomainEx.MessageManager.Send(endPlaceModel);
EndEnable = false;
InvalidEnable = true;
StartEnable = true;
ApplicationDomain.MessageManager.Send(endPlaceModel);
//EndEnable = false;
//InvalidEnable = true;
//StartEnable = true;
StartIsChecked = false;
InvalidIsChecked = false;
}
/// <summary>
......@@ -999,11 +1003,10 @@ namespace VIZ.FGOUT.Module
private void CleanRect()
{
cleanPlaceModel.CleanPlace = true;
ApplicationDomainEx.MessageManager.Send(cleanPlaceModel);
//三个按钮恢复可用
StartEnable = true;
EndEnable = true;
InvalidEnable = true;
ApplicationDomain.MessageManager.Send(cleanPlaceModel);
//三个按钮取消选中
//InvalidEnable = EndEnable = StartEnable = true;
InvalidIsChecked = EndIsChecked = StartIsChecked = false;
}
public DisplayPlaceModel displayPlaceModel = new DisplayPlaceModel();
......@@ -1012,14 +1015,10 @@ namespace VIZ.FGOUT.Module
/// </summary>
private void DisplayPlace()
{
ApplicationDomainEx.MessageManager.Send(displayPlaceModel);
ApplicationDomain.MessageManager.Send(displayPlaceModel);
//6个位置相关按钮都可用
StartEnable = true;
EndEnable = true;
InvalidEnable = true;
CleanEnable = true;
SendEnable = true;
SaveEnable = true;
InvalidEnable = EndEnable = StartEnable = true;
SaveEnable = SendEnable = CleanEnable = true;
}
/// <summary>
......@@ -1029,7 +1028,7 @@ namespace VIZ.FGOUT.Module
public SendPlaceModel sendPlaceModel = new SendPlaceModel();
private void SendPlace()
{
ApplicationDomainEx.MessageManager.Send(sendPlaceModel);
ApplicationDomain.MessageManager.Send(sendPlaceModel);
}
public VCommand SavePalceCommand { get; set; }
......@@ -1088,66 +1087,91 @@ namespace VIZ.FGOUT.Module
set { _sliderMaxValue = value; this.RaisePropertyChanged(nameof(SliderMaxValue)); }
}
private bool _startIsChecked;
/// <summary>
/// 开始位置可用性
/// 开始位置是否选中
/// </summary>
private bool startEnable=true;
public bool StartIsChecked
{
get => _startIsChecked;
set { _startIsChecked = value; this.RaisePropertyChanged(nameof(StartIsChecked)); }
}
private bool startEnable = true;
/// <summary>
/// 开始位置可用性
/// </summary>
public bool StartEnable
{
get { return startEnable; }
set { startEnable = value;this.RaisePropertyChanged(nameof(StartEnable)); }
set { startEnable = value; this.RaisePropertyChanged(nameof(StartEnable)); }
}
private bool _endIsChecked;
/// <summary>
/// 结束位置按钮可用性
/// 结束位置是否选中
/// </summary>
private bool endEnable = false;
public bool EndIsChecked
{
get => _endIsChecked;
set { _endIsChecked = value; this.RaisePropertyChanged(nameof(EndIsChecked)); }
}
private bool endEnable = false;
/// <summary>
/// 结束位置按钮可用性
/// </summary>
public bool EndEnable
{
get { return endEnable; }
set { endEnable = value; this.RaisePropertyChanged(nameof(EndEnable)); }
}
private bool _invalidIsChecked;
/// <summary>
/// 无效位置按钮可用性
/// 无效位置是否选中
/// </summary>
private bool invalidEnable = false;
public bool InvalidIsChecked
{
get => _invalidIsChecked;
set { _invalidIsChecked = value; this.RaisePropertyChanged(nameof(InvalidIsChecked)); }
}
private bool invalidEnable = false;
/// <summary>
/// 无效位置按钮可用性
/// </summary>
public bool InvalidEnable
{
get { return invalidEnable; }
set { invalidEnable = value; this.RaisePropertyChanged(nameof(InvalidEnable)); }
}
private bool cleanEnable = false;
/// <summary>
/// 清空位置按钮可用性
/// </summary>
private bool cleanEnable = false;
public bool CleanEnable
{
get { return cleanEnable; }
set { cleanEnable = value; this.RaisePropertyChanged(nameof(CleanEnable)); }
}
private bool sendEnable = false;
/// <summary>
/// 发送位置按钮可用性
/// </summary>
private bool sendEnable = false;
public bool SendEnable
{
get { return sendEnable; }
set { sendEnable = value; this.RaisePropertyChanged(nameof(SendEnable)); }
}
private bool saveEnable = false;
/// <summary>
/// 保存位置按钮可用性
/// </summary>
private bool saveEnable = false;
public bool SaveEnable
{
get { return saveEnable; }
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "EE25C3BCB9FC7EBF4091D6539AF533F5B17D4964C8313C4EDA49C8812F206263"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3666A946C7196E449FAA4B0E95C5B6AB99C597FE2A94AE2287080714D0CF9B42"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -74,15 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 352 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _StartPositionBtn_;
#line default
#line hidden
#line 521 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 555 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -90,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 568 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 602 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......@@ -156,18 +148,9 @@ namespace VIZ.FGOUT.Module {
#line hidden
return;
case 4:
this._StartPositionBtn_ = ((System.Windows.Controls.Button)(target));
#line 358 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._StartPositionBtn_.Click += new System.Windows.RoutedEventHandler(this.StartPositionBtn_OnClick);
#line default
#line hidden
return;
case 5:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 6:
case 5:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.i.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "EE25C3BCB9FC7EBF4091D6539AF533F5B17D4964C8313C4EDA49C8812F206263"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3666A946C7196E449FAA4B0E95C5B6AB99C597FE2A94AE2287080714D0CF9B42"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -74,15 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 352 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button _StartPositionBtn_;
#line default
#line hidden
#line 521 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 555 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -90,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 568 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 602 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......@@ -156,18 +148,9 @@ namespace VIZ.FGOUT.Module {
#line hidden
return;
case 4:
this._StartPositionBtn_ = ((System.Windows.Controls.Button)(target));
#line 358 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._StartPositionBtn_.Click += new System.Windows.RoutedEventHandler(this.StartPositionBtn_OnClick);
#line default
#line hidden
return;
case 5:
this.cam1 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
case 6:
case 5:
this.cam2 = ((VIZ.FGOUT.Module.NDIView)(target));
return;
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.lref
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;;
......
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/err.log
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