Skip to content

F
FGOUT
Commit 1fd4c769 by 鲁志-悦动
Options

眼睛图标一键关闭跟踪框和标记 And 双人项目Replay入点要有两个选中框

parent 959fd547
Showing with 69 additions and 29 deletions
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -69,8 +69,10 @@ ...@@ -69,8 +69,10 @@
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Top" VerticalAlignment="Top"
Orientation="Horizontal"> Orientation="Horizontal">
<!--<CheckBox Height="30" Style="{StaticResource ResourceKey=CheckBox_Eye}" <CheckBox
IsChecked="{Binding Path=IsShowAlgorithmTargetBox,Mode=TwoWay}"></CheckBox>--> Height="30"
IsChecked="{Binding Path=IsShowAlgorithmTargetBox, Mode=TwoWay}"
Style="{StaticResource ResourceKey=CheckBox_Eye}" />
<!--<Rectangle Width="2" Fill="#88FFFFFF" Height="18" Margin="20,0,20,0"></Rectangle>--> <!--<Rectangle Width="2" Fill="#88FFFFFF" Height="18" Margin="20,0,20,0"></Rectangle>-->
<!--<Button Command="{Binding Path=InitTallyCommand}" ToolTip="初始Tally" <!--<Button Command="{Binding Path=InitTallyCommand}" ToolTip="初始Tally"
Style="{StaticResource Button_Tally}" Height="30"></Button>--> Style="{StaticResource Button_Tally}" Height="30"></Button>-->
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -354,6 +354,15 @@ namespace VIZ.FGOUT.Module ...@@ -354,6 +354,15 @@ namespace VIZ.FGOUT.Module
// 更新至每个视图 // 更新至每个视图
List<INDIViewService> services = ApplicationDomainEx.ServiceManager.GetServiceList<INDIViewService>(); List<INDIViewService> services = ApplicationDomainEx.ServiceManager.GetServiceList<INDIViewService>();
services.ForEach(p => p.UpdateIsShowAlgorithmTargetBox(this.IsShowAlgorithmTargetBox)); services.ForEach(p => p.UpdateIsShowAlgorithmTargetBox(this.IsShowAlgorithmTargetBox));
//显示、清除标记
if (IsShowAlgorithmTargetBox)
ShowPlace();
else
{
HidePlace();
CleanInPoint();
}
} }
#endregion #endregion
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml.cs
...@@ -41,6 +41,7 @@ namespace VIZ.FGOUT.Module ...@@ -41,6 +41,7 @@ namespace VIZ.FGOUT.Module
// public Rectangle rectInvalid; // public Rectangle rectInvalid;
public List<Rect> rectsReplay = new List<Rect>(); public List<Rect> rectsReplay = new List<Rect>();
public TrackingBoxInfo saveInfo = new TrackingBoxInfo(); public TrackingBoxInfo saveInfo = new TrackingBoxInfo();
public List<TrackingBoxInfo> saveInfos = new List<TrackingBoxInfo>();
// public Path myPath = new Path(); // public Path myPath = new Path();
// public Path myPath1 = new Path(); // public Path myPath1 = new Path();
...@@ -372,6 +373,19 @@ namespace VIZ.FGOUT.Module ...@@ -372,6 +373,19 @@ namespace VIZ.FGOUT.Module
} }
} }
} }
var gameName = this.vm.ViewConfig.GameName;
//当双人3m跳水,双人10m跳水,双人速度攀岩时，保存2个入点框
if (gameName.Equals("SS") || gameName.Equals("ST") || gameName.Equals("SP"))
{
if (saveInfos.Count == 2)
{
saveInfos.RemoveAt(0);
saveInfos[0] = saveInfos[1];
saveInfos[1] = saveInfo;
}
else
saveInfos.Add(saveInfo);
}
} }
} }
else else
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs
...@@ -291,12 +291,29 @@ namespace VIZ.FGOUT.Module ...@@ -291,12 +291,29 @@ namespace VIZ.FGOUT.Module
if (_cam3Infos.Count > 0) if (_cam3Infos.Count > 0)
{ {
_cam3StaticInfos = _cam3Infos; _cam3StaticInfos = _cam3Infos;
var gameName = this.ViewConfig.GameName;
//当双人3m跳水,双人10m跳水,双人速度攀岩时，保存2个入点框
if (gameName.Equals("SS") || gameName.Equals("ST") || gameName.Equals("SP"))
{
foreach (var saveInfo in view3.saveInfos)
{
//更新红色点中框
if (saveInfo.SrcRect.Left > 0)
{
saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
_cam3Infos.Add(saveInfo);
}
}
}
else
{
//更新红色点中框 //更新红色点中框
if (view3.saveInfo.SrcRect.Left > 0) if (view3.saveInfo.SrcRect.Left > 0)
{ {
view3.saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR; view3.saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
_cam3Infos.Add(view3.saveInfo); _cam3Infos.Add(view3.saveInfo);
} }
}
view3.video.UpdateTrackingBox(_cam3Infos); view3.video.UpdateTrackingBox(_cam3Infos);
} }
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
...@@ -150,7 +150,7 @@ namespace VIZ.FGOUT.Module ...@@ -150,7 +150,7 @@ namespace VIZ.FGOUT.Module
// 无效区域的注册 // 无效区域的注册
ApplicationDomain.MessageManager.Register<InvalidPlaceModel>(this, this.InvalidPlaceModel); ApplicationDomain.MessageManager.Register<InvalidPlaceModel>(this, this.InvalidPlaceModel);
// （清空位置）清除开始、结束、无效位置 //（清空位置）清除开始、结束、无效位置
ApplicationDomain.MessageManager.Register<CleanPlaceModel>(this, this.CleanPlace); ApplicationDomain.MessageManager.Register<CleanPlaceModel>(this, this.CleanPlace);
// 显示无效位置 // 显示无效位置
......
VIZ.FGOUT/VIZ.FGOUT.Module/Themes/SliderArrange.xaml.cs
...@@ -51,10 +51,8 @@ namespace VIZ.FGOUT.Module ...@@ -51,10 +51,8 @@ namespace VIZ.FGOUT.Module
private static readonly DependencyProperty EndRectProperty = private static readonly DependencyProperty EndRectProperty =
DependencyProperty.Register(nameof(EndRect), typeof(Rect), typeof(SliderArrange)); DependencyProperty.Register(nameof(EndRect), typeof(Rect), typeof(SliderArrange));
#endregion #endregion
#region 公开依赖属性 #region 公开依赖属性
/// <summary> /// <summary>
...@@ -133,7 +131,6 @@ namespace VIZ.FGOUT.Module ...@@ -133,7 +131,6 @@ namespace VIZ.FGOUT.Module
public static readonly DependencyProperty EndValueProperty = public static readonly DependencyProperty EndValueProperty =
DependencyProperty.Register(nameof(EndValue), typeof(int), typeof(SliderArrange), new PropertyMetadata(_max)); DependencyProperty.Register(nameof(EndValue), typeof(int), typeof(SliderArrange), new PropertyMetadata(_max));
#endregion #endregion
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1BC6005DEC97683699E8BC1C488098071D060F2AB82985E25ABCD6F8877D0638" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B3844A2B1C255A8777FBAF2CF55118D580EB3828BE185CD94EF48DC215051450"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module { ...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 203 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 205 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _AutoMode_; internal System.Windows.Controls.CheckBox _AutoMode_;
...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module { ...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 214 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 216 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _ManualMode_; internal System.Windows.Controls.CheckBox _ManualMode_;
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1018 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1020 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1067 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1069 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1082 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1084 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3; internal VIZ.FGOUT.Module.NDIView cam3;
...@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module { ...@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2: case 2:
this._AutoMode_ = ((System.Windows.Controls.CheckBox)(target)); this._AutoMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 207 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 209 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick); this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default #line default
...@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module { ...@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module {
case 3: case 3:
this._ManualMode_ = ((System.Windows.Controls.CheckBox)(target)); this._ManualMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 218 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 220 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick); this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default #line default
......
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}" "1BC6005DEC97683699E8BC1C488098071D060F2AB82985E25ABCD6F8877D0638" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B3844A2B1C255A8777FBAF2CF55118D580EB3828BE185CD94EF48DC215051450"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module { ...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 203 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 205 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _AutoMode_; internal System.Windows.Controls.CheckBox _AutoMode_;
...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module { ...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 214 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 216 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.CheckBox _ManualMode_; internal System.Windows.Controls.CheckBox _ManualMode_;
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1018 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1020 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1067 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1069 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1082 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1084 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam3; internal VIZ.FGOUT.Module.NDIView cam3;
...@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module { ...@@ -140,7 +140,7 @@ namespace VIZ.FGOUT.Module {
case 2: case 2:
this._AutoMode_ = ((System.Windows.Controls.CheckBox)(target)); this._AutoMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 207 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 209 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick); this._AutoMode_.Click += new System.Windows.RoutedEventHandler(this.AutoMode_OnClick);
#line default #line default
...@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module { ...@@ -149,7 +149,7 @@ namespace VIZ.FGOUT.Module {
case 3: case 3:
this._ManualMode_ = ((System.Windows.Controls.CheckBox)(target)); this._ManualMode_ = ((System.Windows.Controls.CheckBox)(target));
#line 218 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 220 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick); this._ManualMode_.Click += new System.Windows.RoutedEventHandler(this.ManualMode_OnClick);
#line default #line default
......
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\NDIMainView\View\NDIMainView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.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.
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/info.log
 2024-03-12 11:02:20,975 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"type":"REPLAY","start_time":0,"end_time":0,"status":1}
\ No newline at end of file 2024-03-12 11:05:44,885 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"type":"REPLAY","start_time":0,"end_time":0,"status":1}
2024-03-12 11:06:01,203 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串：{"type":"REPLAY","start_time":0,"end_time":0,"status":0}
VIZ.FGOUT/VIZ.FGOUT/obj/x64/Debug/VIZ.FGOUT_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml
2-1347366880 21265083526
6968741766 6-790135758
43-1958993781 421356718200
CloseAlgorithmWindow.xaml;MainWindow.xaml; CloseAlgorithmWindow.xaml;MainWindow.xaml;
False True
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