Skip to content

F
FGOUT
Commit c589ffb2 by 鲁志-悦动
Options

主页面右下角功能区域垂直方向元素对齐 And 适配算法跟踪到人的数据 And 自动模式下发送标记判断开始标记由不少于2个改为不少于1个

parent 6243e93a
Showing with 302 additions and 152 deletions
VIZ.FGOUT/VIZ.FGOUT.Domain/Message/Algorithm/Implementation/AlgorithmMessage__detect.cs
...@@ -37,5 +37,7 @@ namespace VIZ.FGOUT.Domain ...@@ -37,5 +37,7 @@ namespace VIZ.FGOUT.Domain
/// </summary> /// </summary>
public long timecode { get; set; } public long timecode { get; set; }
public string bbox_type { get; set; } = "detect";
} }
} }
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -271,7 +271,6 @@ ...@@ -271,7 +271,6 @@
Grid.Column="1" Grid.Column="1"
Width="100" Width="100"
Height="40" Height="40"
Margin="-50,0,0,0"
Content="{DynamicResource Start}" Content="{DynamicResource Start}"
IsChecked="{Binding StartIsChecked}" IsChecked="{Binding StartIsChecked}"
IsEnabled="{Binding StartEnable}" IsEnabled="{Binding StartEnable}"
...@@ -291,7 +290,6 @@ ...@@ -291,7 +290,6 @@
Grid.Column="2" Grid.Column="2"
Width="100" Width="100"
Height="40" Height="40"
Margin="-50,0,0,0"
Content="{DynamicResource End}" Content="{DynamicResource End}"
IsChecked="{Binding EndIsChecked}" IsChecked="{Binding EndIsChecked}"
IsEnabled="{Binding EndEnable}" IsEnabled="{Binding EndEnable}"
...@@ -311,7 +309,6 @@ ...@@ -311,7 +309,6 @@
<Border <Border
Grid.Row="1" Grid.Row="1"
Grid.ColumnSpan="3" Grid.ColumnSpan="3"
Margin="0,10,0,0"
BorderBrush="Gray" BorderBrush="Gray"
BorderThickness="1"> BorderThickness="1">
<Grid> <Grid>
...@@ -345,6 +342,7 @@ ...@@ -345,6 +342,7 @@
Grid.Column="1" Grid.Column="1"
Width="100" Width="100"
Height="40" Height="40"
HorizontalAlignment="Center"
Command="{Binding Path=MattStartCommand}" Command="{Binding Path=MattStartCommand}"
Content="{DynamicResource Start}" Content="{DynamicResource Start}"
IsEnabled="{Binding MattStartIsEnabled}" IsEnabled="{Binding MattStartIsEnabled}"
...@@ -353,6 +351,7 @@ ...@@ -353,6 +351,7 @@
Grid.Column="2" Grid.Column="2"
Width="100" Width="100"
Height="40" Height="40"
HorizontalAlignment="Center"
Command="{Binding Path=MattEndCommand}" Command="{Binding Path=MattEndCommand}"
Content="{DynamicResource End}" Content="{DynamicResource End}"
IsEnabled="{Binding MattStartIsEnabled}" IsEnabled="{Binding MattStartIsEnabled}"
...@@ -515,7 +514,6 @@ ...@@ -515,7 +514,6 @@
Grid.RowSpan="2" Grid.RowSpan="2"
Grid.Column="3" Grid.Column="3"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Margin="10,0,0,0"
BorderBrush="Gray" BorderBrush="Gray"
BorderThickness="0.25" BorderThickness="0.25"
Foreground="White" Foreground="White"
...@@ -553,7 +551,7 @@ ...@@ -553,7 +551,7 @@
Grid.Column="0" Grid.Column="0"
Width="100" Width="100"
Height="40" Height="40"
Margin="20,0,0,0" HorizontalAlignment="Center"
Command="{Binding Path=CleanCommand}" Command="{Binding Path=CleanCommand}"
Content="{DynamicResource Clear}" Content="{DynamicResource Clear}"
IsEnabled="{Binding CleanEnable}" IsEnabled="{Binding CleanEnable}"
...@@ -564,6 +562,7 @@ ...@@ -564,6 +562,7 @@
Grid.Column="1" Grid.Column="1"
Width="100" Width="100"
Height="40" Height="40"
HorizontalAlignment="Center"
Command="{Binding Path=SendPlaceCommand}" Command="{Binding Path=SendPlaceCommand}"
Content="{DynamicResource Send}" Content="{DynamicResource Send}"
IsEnabled="{Binding SendEnable}" IsEnabled="{Binding SendEnable}"
...@@ -585,6 +584,7 @@ ...@@ -585,6 +584,7 @@
Grid.Column="1" Grid.Column="1"
Width="100" Width="100"
Height="40" Height="40"
HorizontalAlignment="Center"
Command="{Binding Path=RefreshPositionCommand}" Command="{Binding Path=RefreshPositionCommand}"
Content="{DynamicResource Recover}" Content="{DynamicResource Recover}"
IsEnabled="{Binding SendEnable}" IsEnabled="{Binding SendEnable}"
...@@ -685,7 +685,6 @@ ...@@ -685,7 +685,6 @@
<Border <Border
Grid.Row="2" Grid.Row="2"
Margin="0,10,0,0"
BorderBrush="Gray" BorderBrush="Gray"
BorderThickness="1"> BorderThickness="1">
<CheckBox <CheckBox
...@@ -759,28 +758,34 @@ ...@@ -759,28 +758,34 @@
Grid.Row="2" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
Grid.ColumnSpan="4" Grid.ColumnSpan="4"
Margin="0,10,0,0"
BorderBrush="Gray" BorderBrush="Gray"
BorderThickness="1"> BorderThickness="1">
<StackPanel Orientation="Horizontal"> <Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock <TextBlock
Margin="15,0,0,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="14" FontSize="14"
Foreground="White" Foreground="White"
Text="{DynamicResource Reconfirm}" /> Text="{DynamicResource Reconfirm}" />
<Button <Button
Grid.Column="1"
Width="100" Width="100"
Height="40" Height="40"
Margin="60,0,0,0" HorizontalAlignment="Center"
Command="{Binding Path=AbandonCommand}" Command="{Binding Path=AbandonCommand}"
Content="{DynamicResource Abandon}" Content="{DynamicResource Abandon}"
Style="{StaticResource ButtonStyle}" /> Style="{StaticResource ButtonStyle}" />
<Button <Button
Grid.Column="2"
Width="100" Width="100"
Height="40" Height="40"
Margin="60,0,0,0" HorizontalAlignment="Center"
Command="{Binding Path=SendCommand}" Command="{Binding Path=SendCommand}"
Content="{DynamicResource Send}" Content="{DynamicResource Send}"
Style="{StaticResource ButtonStyle}" /> Style="{StaticResource ButtonStyle}" />
...@@ -791,33 +796,37 @@ ...@@ -791,33 +796,37 @@
FontSize="14" FontSize="14"
Foreground="White" Foreground="White"
Text="{DynamicResource AutoSend}" />--> Text="{DynamicResource AutoSend}" />-->
<CheckBox <StackPanel
Width="110" Grid.Column="3"
Height="40" HorizontalAlignment="Center"
Margin="110,0,0,0" Orientation="Horizontal">
VerticalContentAlignment="Center" <CheckBox
Command="{Binding AutoSendCommand}" Width="110"
Content="{DynamicResource AutoSend}" Height="40"
Foreground="White" VerticalContentAlignment="Center"
IsChecked="{Binding IsAutoSend, Mode=TwoWay}" Command="{Binding AutoSendCommand}"
Style="{StaticResource CheckBox_RaidoButtonStyle}" /> Content="{DynamicResource AutoSend}"
<TextBox Foreground="White"
x:Name="_AutoSendIntervalTime_" IsChecked="{Binding IsAutoSend, Mode=TwoWay}"
Width="30" Style="{StaticResource CheckBox_RaidoButtonStyle}" />
Margin="5,0" <TextBox
Background="#378CFF" x:Name="_AutoSendIntervalTime_"
FontSize="14" Width="30"
InputMethod.IsInputMethodEnabled="False" Margin="5,0,0,0"
PreviewTextInput="AutoSendIntervalTime_OnPreviewTextInput" Background="#378CFF"
Style="{StaticResource TextBoxStyle}" FontSize="14"
Text="{Binding AutoSendIntervalTime, Mode=TwoWay}" InputMethod.IsInputMethodEnabled="False"
Visibility="{Binding AutoSendVisibility}"> PreviewTextInput="AutoSendIntervalTime_OnPreviewTextInput"
<b:Interaction.Triggers> Style="{StaticResource TextBoxStyle}"
<b:EventTrigger EventName="TextChanged"> Text="{Binding AutoSendIntervalTime, Mode=TwoWay}"
<b:InvokeCommandAction Command="{Binding AutoSendIntervalTimeChangedCommand}" PassEventArgsToCommand="True" /> Visibility="{Binding AutoSendVisibility}">
</b:EventTrigger> <b:Interaction.Triggers>
</b:Interaction.Triggers> <b:EventTrigger EventName="TextChanged">
</TextBox> <b:InvokeCommandAction Command="{Binding AutoSendIntervalTimeChangedCommand}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
</StackPanel>
<!--<TextBox <!--<TextBox
Width="30" Width="30"
...@@ -864,7 +873,7 @@ ...@@ -864,7 +873,7 @@
TempNumText="{Binding AutoSendIntervalTime}" TempNumText="{Binding AutoSendIntervalTime}"
TextAlignment="Center" TextAlignment="Center"
Visibility="{Binding TimeCountActVisibility}" />--> Visibility="{Binding TimeCountActVisibility}" />-->
</StackPanel> </Grid>
</Border> </Border>
<!--<Button <!--<Button
...@@ -912,18 +921,22 @@ ...@@ -912,18 +921,22 @@
<Border <Border
Grid.Row="3" Grid.Row="3"
Grid.ColumnSpan="5" Grid.ColumnSpan="5"
Margin="0,10,0,0"
BorderBrush="Gray" BorderBrush="Gray"
BorderThickness="1"> BorderThickness="1">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="1.5*" /> <!--<ColumnDefinition Width="1.5*" />
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition Width="1.1*" /> <ColumnDefinition Width="1.1*" />
<ColumnDefinition Width="1.1*" /> <ColumnDefinition Width="1.1*" />-->
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock <TextBlock
HorizontalAlignment="Center" HorizontalAlignment="Center"
...@@ -931,59 +944,67 @@ ...@@ -931,59 +944,67 @@
FontSize="14" FontSize="14"
Foreground="White" Foreground="White"
Text="{DynamicResource AlgorithmParameter}" /> Text="{DynamicResource AlgorithmParameter}" />
<TextBlock <StackPanel
Grid.Column="1" Grid.Column="1"
Margin="0,0,3,0" HorizontalAlignment="Center"
HorizontalAlignment="Right" Orientation="Horizontal">
VerticalAlignment="Center" <TextBlock
FontSize="14" Margin="0,0,3,0"
Foreground="White" HorizontalAlignment="Right"
Text="{DynamicResource IntervalFrame}" /> VerticalAlignment="Center"
<TextBox FontSize="14"
x:Name="_Matting_interval_" Foreground="White"
Text="{DynamicResource IntervalFrame}" />
<TextBox
x:Name="_Matting_interval_"
Width="60"
InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="Matting_interval_OnPreviewTextInput"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Matting_interval, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdatePreBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
<b:InvokeCommandAction Command="{Binding Matting_intervalKeyDownCommand}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
</StackPanel>
<StackPanel
Grid.Column="2" Grid.Column="2"
Width="60" HorizontalAlignment="Center"
InputMethod.IsInputMethodEnabled="False" Orientation="Horizontal">
PreviewTextInput="Matting_interval_OnPreviewTextInput" <TextBlock
Style="{StaticResource TextBoxStyle}" Margin="0,0,3,0"
Text="{Binding Matting_interval, Mode=TwoWay}"> HorizontalAlignment="Right"
<b:Interaction.Behaviors> VerticalAlignment="Center"
<local:TextBoxEnterKeyUpdatePreBehavior /> FontSize="14"
</b:Interaction.Behaviors> Foreground="White"
<b:Interaction.Triggers> Text="{DynamicResource IntervalPixel}" />
<b:EventTrigger EventName="KeyDown"> <TextBox
<b:InvokeCommandAction Command="{Binding Matting_intervalKeyDownCommand}" PassEventArgsToCommand="True" /> x:Name="_Moving_pixel_"
</b:EventTrigger> Width="60"
</b:Interaction.Triggers> InputMethod.IsInputMethodEnabled="False"
</TextBox> PreviewTextInput="Moving_pixel_OnPreviewTextInput"
<TextBlock Style="{StaticResource TextBoxStyle}"
Grid.Column="3" Text="{Binding Moving_pixel, Mode=TwoWay}">
Margin="0,0,3,0" <b:Interaction.Behaviors>
HorizontalAlignment="Right" <local:TextBoxEnterKeyUpdateBehavior />
VerticalAlignment="Center" </b:Interaction.Behaviors>
FontSize="14" <b:Interaction.Triggers>
Foreground="White" <b:EventTrigger EventName="KeyDown">
Text="{DynamicResource IntervalPixel}" /> <b:InvokeCommandAction Command="{Binding Moving_pixelKeyDownCommand}" PassEventArgsToCommand="True" />
<TextBox </b:EventTrigger>
x:Name="_Moving_pixel_" </b:Interaction.Triggers>
Grid.Column="4" </TextBox>
Width="60" </StackPanel>
InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="Moving_pixel_OnPreviewTextInput"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Moving_pixel, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
</b:Interaction.Behaviors>
<b:Interaction.Triggers>
<b:EventTrigger EventName="KeyDown">
<b:InvokeCommandAction Command="{Binding Moving_pixelKeyDownCommand}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>
</TextBox>
<CheckBox <CheckBox
Grid.Column="5" Grid.Column="3"
Margin="0,12" Margin="0,12"
HorizontalAlignment="Center"
Command="{Binding BigModelCommand}" Command="{Binding BigModelCommand}"
Content="{DynamicResource LargeModel}" Content="{DynamicResource LargeModel}"
FontSize="14" FontSize="14"
...@@ -991,10 +1012,10 @@ ...@@ -991,10 +1012,10 @@
IsChecked="{Binding Path=IsBigModel, Mode=TwoWay}" IsChecked="{Binding Path=IsBigModel, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" /> Style="{StaticResource CheckBox_Setting}" />
<Button <Button
Grid.Column="6" Grid.Column="4"
Width="100" Width="100"
Height="40" Height="40"
Margin="0,0,3,0" HorizontalAlignment="Center"
Command="{Binding Path=AlgorithmSendCommand}" Command="{Binding Path=AlgorithmSendCommand}"
Content="{DynamicResource Save}" Content="{DynamicResource Save}"
Style="{StaticResource ButtonStyle}" /> Style="{StaticResource ButtonStyle}" />
...@@ -1004,7 +1025,6 @@ ...@@ -1004,7 +1025,6 @@
<Border <Border
Grid.Row="4" Grid.Row="4"
Grid.ColumnSpan="5" Grid.ColumnSpan="5"
Margin="0,10,0,0"
BorderBrush="Gray" BorderBrush="Gray"
BorderThickness="1"> BorderThickness="1">
<Grid> <Grid>
...@@ -1035,8 +1055,7 @@ ...@@ -1035,8 +1055,7 @@
Grid.Column="1" Grid.Column="1"
Width="100" Width="100"
Height="40" Height="40"
Margin="0,0,0,0" HorizontalAlignment="Center"
HorizontalAlignment="Stretch"
Command="{Binding Path=CleanInPointCommand}" Command="{Binding Path=CleanInPointCommand}"
Content="{DynamicResource CleanInPoint}" Content="{DynamicResource CleanInPoint}"
Style="{StaticResource ButtonStyle}" Style="{StaticResource ButtonStyle}"
...@@ -1045,7 +1064,7 @@ ...@@ -1045,7 +1064,7 @@
Grid.Column="2" Grid.Column="2"
Width="100" Width="100"
Height="40" Height="40"
Margin="0,0,0,0" HorizontalAlignment="Center"
Command="{Binding Path=ReplayStartCommand}" Command="{Binding Path=ReplayStartCommand}"
Content="{DynamicResource Play}" Content="{DynamicResource Play}"
Style="{StaticResource ButtonStyle}" Style="{StaticResource ButtonStyle}"
...@@ -1054,7 +1073,7 @@ ...@@ -1054,7 +1073,7 @@
Grid.Column="3" Grid.Column="3"
Width="100" Width="100"
Height="40" Height="40"
Margin="0,0,0,0" HorizontalAlignment="Center"
Command="{Binding Path=ReplayStopCommand}" Command="{Binding Path=ReplayStopCommand}"
Content="{DynamicResource Stop}" Content="{DynamicResource Stop}"
Style="{StaticResource ButtonStyle}" Style="{StaticResource ButtonStyle}"
...@@ -1062,6 +1081,43 @@ ...@@ -1062,6 +1081,43 @@
</Grid> </Grid>
</Border> </Border>
<!--<Border
Grid.Row="5"
Grid.Column="0"
Grid.ColumnSpan="3"
BorderBrush="Gray"
BorderThickness="1">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="14"
Foreground="White"
Text="裁切区域" />
<Button
Grid.Column="1"
Width="100"
Height="40"
HorizontalAlignment="Center"
Command="{Binding Path=Command}"
Content="选择"
Style="{StaticResource ButtonStyle}" />
<Button
Grid.Column="2"
Width="100"
Height="40"
HorizontalAlignment="Center"
Command="{Binding Path=Command}"
Content="{DynamicResource Send}"
Style="{StaticResource ButtonStyle}" />
</Grid>
</Border>-->
<!-- 系统版本 --> <!-- 系统版本 -->
<StackPanel <StackPanel
Grid.Row="5" Grid.Row="5"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs
...@@ -293,6 +293,45 @@ namespace VIZ.FGOUT.Module ...@@ -293,6 +293,45 @@ namespace VIZ.FGOUT.Module
if (info.TimeCode == dse.TimeStamp) if (info.TimeCode == dse.TimeStamp)
_cam3BInfos.Add(info); _cam3BInfos.Add(info);
} }
#region 算法track到人的情况下跟踪框标红
var info2 = _cam3BInfos[0];
if (info2.BboxType.Equals("track"))
{
var gameName = ApplicationDomainEx.LiteDbContext.ViewConfig
.FindOne(p => p.ViewKey == NDIViewKeys.CAM_1).GameName;
//当双人3m跳水,双人10m跳水,双人速度攀岩时，保存2个入点框
if (gameName.Equals(SportsProjectCodes.SS) || gameName.Equals(SportsProjectCodes.ST) ||
gameName.Equals(SportsProjectCodes.SP))
{
_twoInfos = new List<TrackingBoxInfo>();
foreach (var saveInfo in _cam3BInfos)
{
//更新红色点中框
saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
//把选中框的信息也加到这个集合里
_cam3Infos.Add(saveInfo);
//记录标红框时入点时间戳
_RecordStartTime = saveInfo.TimeCode;
_twoInfos.Add(saveInfo);
}
}
else
{
//单人更新红色点中框
info2.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
//把选中框的信息也加到这个集合里
_cam3Infos.Add(info2);
//记录标红框时入点时间戳
_RecordStartTime = info2.TimeCode;
_singleInfo = info2;
}
}
#endregion
} }
//如果是Start滑块在动 //如果是Start滑块在动
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Message.cs
using SharpDX.Mathematics.Interop; using SharpDX.Mathematics.Interop;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.Framework.Common; using VIZ.Framework.Common;
...@@ -152,6 +151,7 @@ namespace VIZ.FGOUT.Module ...@@ -152,6 +151,7 @@ namespace VIZ.FGOUT.Module
// 检测框在显示目标框时显示，否则采用透明色 // 检测框在显示目标框时显示，否则采用透明色
info.DrawingBorderColor = this.IsShowAlgorithmTargetBox ? this.DETECT_BOX_BORDER_COLOR : this.DETECT_BOX_BORDER_COLOR_TRANSPARENT; info.DrawingBorderColor = this.IsShowAlgorithmTargetBox ? this.DETECT_BOX_BORDER_COLOR : this.DETECT_BOX_BORDER_COLOR_TRANSPARENT;
info.TimeCode = msg.timecode; info.TimeCode = msg.timecode;
info.BboxType = msg.bbox_type;
infos.Add(info); infos.Add(info);
if (!view.vm.IsReplay) if (!view.vm.IsReplay)
{ {
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
...@@ -260,6 +260,8 @@ namespace VIZ.FGOUT.Module ...@@ -260,6 +260,8 @@ namespace VIZ.FGOUT.Module
List<List<List<int>>> inPoints = new List<List<List<int>>>(); List<List<List<int>>> inPoints = new List<List<List<int>>>();
bool isInPoint = false; bool isInPoint = false;
//前三个手拖框、双人项目、单人项目都是判断是否有值
//手拖框 //手拖框
if (nDIView.rectsReplay.Count > 0 && nDIView.rectsReplay[0].Width > 0 && nDIView.rectsReplay[0].Height > 0) if (nDIView.rectsReplay.Count > 0 && nDIView.rectsReplay[0].Width > 0 && nDIView.rectsReplay[0].Height > 0)
{ {
...@@ -285,16 +287,36 @@ namespace VIZ.FGOUT.Module ...@@ -285,16 +287,36 @@ namespace VIZ.FGOUT.Module
} }
} }
//单人项目 //单人项目
else //else
//{
// if(nDIView.saveInfo.SrcRect.Left > 0)
// {
// if (InPointIsMoved()) return; //入点和入点标记框位置不一致，返回
// inPoints = CoordinateTrackingBoxInfo(nDIView.saveInfo.SrcRect, srcWidth, srcHeight);
// isInPoint = true;
// }
//}
else if (nDIView.saveInfo.SrcRect.Left > 0)
{ {
if(nDIView.saveInfo.SrcRect.Left > 0) if (InPointIsMoved()) return; //入点和入点标记框位置不一致，返回
{ inPoints = CoordinateTrackingBoxInfo(nDIView.saveInfo.SrcRect, srcWidth, srcHeight);
if (InPointIsMoved()) return; //入点和入点标记框位置不一致，返回 isInPoint = true;
inPoints = CoordinateTrackingBoxInfo(nDIView.saveInfo.SrcRect, srcWidth, srcHeight); }
isInPoint = true; #region 算法识别到人的情况下
}
else if (_twoInfos.Count > 0)
{
inPoints = CoordinateTrackingBoxInfos(_twoInfos, srcWidth, srcHeight);
isInPoint = true;
}
else if (_singleInfo.SrcRect.Left > 0)
{
inPoints = CoordinateTrackingBoxInfo(_singleInfo.SrcRect, srcWidth, srcHeight);
isInPoint = true;
} }
#endregion
if (!isInPoint) if (!isInPoint)
{ {
WPFHelper.BeginInvoke(() => { MessageBoxEx.ShowDialog("没有获取到入点跟踪框信息。"); }); WPFHelper.BeginInvoke(() => { MessageBoxEx.ShowDialog("没有获取到入点跟踪框信息。"); });
...@@ -344,7 +366,10 @@ namespace VIZ.FGOUT.Module ...@@ -344,7 +366,10 @@ namespace VIZ.FGOUT.Module
//清除跟踪框的数据 //清除跟踪框的数据
ndiView.saveInfo = new TrackingBoxInfo(); ndiView.saveInfo = new TrackingBoxInfo();
ndiView.saveInfos = new List<TrackingBoxInfo>(); ndiView.saveInfos = new List<TrackingBoxInfo>();
//清除跟踪框 _singleInfo = new TrackingBoxInfo();
_twoInfos = new List<TrackingBoxInfo>();
//清除跟踪框(没啥用)
//ndiView.video.ClearTrackingBox(); //ndiView.video.ClearTrackingBox();
} }
...@@ -444,6 +469,14 @@ namespace VIZ.FGOUT.Module ...@@ -444,6 +469,14 @@ namespace VIZ.FGOUT.Module
public static long _RecordStartTime; public static long _RecordStartTime;
#region Replay算法识别到人的情况下保存跟踪框信息
public static TrackingBoxInfo _singleInfo = new TrackingBoxInfo();
public static List<TrackingBoxInfo> _twoInfos = new List<TrackingBoxInfo>();
#endregion
/// <summary> /// <summary>
/// Replay选中和SliderValueChanged传值共用这一个方法 /// Replay选中和SliderValueChanged传值共用这一个方法
/// </summary> /// </summary>
...@@ -465,19 +498,37 @@ namespace VIZ.FGOUT.Module ...@@ -465,19 +498,37 @@ namespace VIZ.FGOUT.Module
// _autoSend_Timer.Stop();//自动发送计时器取消 // _autoSend_Timer.Stop();//自动发送计时器取消
//} //}
//else //else
if(!IsReplay)
//if(!IsReplay)
//{
// if(this.ViewKey == NDIViewKeys.CAM_3)
// {
// NDIView nDIView = this.GetView<NDIView>();
// if(nDIView == null) return;
// //清除拖框的数据
// nDIView.rectsReplay.Clear();
// nDIView.canvas1.Children.Clear();
// //清除跟踪框的数据
// nDIView.saveInfo = new TrackingBoxInfo();
// nDIView.saveInfos = new List<TrackingBoxInfo>();
// _singleInfo = new TrackingBoxInfo();
// _twoInfos = new List<TrackingBoxInfo>();
// }
//}
//当UnChecked时
if (!IsReplay && this.ViewKey == NDIViewKeys.CAM_3)
{ {
if(this.ViewKey == NDIViewKeys.CAM_3) NDIView nDIView = this.GetView<NDIView>();
{ if (nDIView == null) return;
NDIView nDIView = this.GetView<NDIView>(); //清除拖框的数据
if(nDIView == null) return; nDIView.rectsReplay.Clear();
//清除拖框的数据 nDIView.canvas1.Children.Clear();
nDIView.rectsReplay.Clear(); //清除跟踪框的数据
nDIView.canvas1.Children.Clear(); nDIView.saveInfo = new TrackingBoxInfo();
//清除跟踪框的数据 nDIView.saveInfos = new List<TrackingBoxInfo>();
nDIView.saveInfo = new TrackingBoxInfo(); _singleInfo = new TrackingBoxInfo();
nDIView.saveInfos = new List<TrackingBoxInfo>(); _twoInfos = new List<TrackingBoxInfo>();
}
} }
} }
...@@ -719,12 +770,12 @@ namespace VIZ.FGOUT.Module ...@@ -719,12 +770,12 @@ namespace VIZ.FGOUT.Module
}); });
return; return;
} }
if (nDIView.polygonsStart.Count < 2) if (nDIView.polygonsStart.Count < 1)
{ {
WPFHelper.BeginInvoke(() => WPFHelper.BeginInvoke(() =>
{ {
MessageBoxEx.ShowDialog("开始标记不足2个，" + message); MessageBoxEx.ShowDialog("开始标记没有数据，" + message);
}); });
return; return;
} }
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FECE7EC3BCF545ACA0597EA45D753BB9E33A03F9E1E228A91ECC7BFC72BC6952" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4BC8D1A0429685A17E6810578D9774A941940B15D2023C28322D103B8EDBFD70"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module { ...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 324 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 321 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _ManualMode_; internal System.Windows.Controls.RadioButton _ManualMode_;
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 805 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 813 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _AutoSendIntervalTime_; internal System.Windows.Controls.TextBox _AutoSendIntervalTime_;
...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 943 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 959 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Matting_interval_; internal System.Windows.Controls.TextBox _Matting_interval_;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 968 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 988 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Moving_pixel_; internal System.Windows.Controls.TextBox _Moving_pixel_;
...@@ -98,7 +98,7 @@ namespace VIZ.FGOUT.Module { ...@@ -98,7 +98,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1341 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1397 "..\..\..\..\..\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;
...@@ -106,7 +106,7 @@ namespace VIZ.FGOUT.Module { ...@@ -106,7 +106,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1526 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1582 "..\..\..\..\..\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;
...@@ -114,7 +114,7 @@ namespace VIZ.FGOUT.Module { ...@@ -114,7 +114,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1541 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1597 "..\..\..\..\..\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;
...@@ -173,7 +173,7 @@ namespace VIZ.FGOUT.Module { ...@@ -173,7 +173,7 @@ namespace VIZ.FGOUT.Module {
case 3: case 3:
this._ManualMode_ = ((System.Windows.Controls.RadioButton)(target)); this._ManualMode_ = ((System.Windows.Controls.RadioButton)(target));
#line 328 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 325 "..\..\..\..\..\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
...@@ -182,7 +182,7 @@ namespace VIZ.FGOUT.Module { ...@@ -182,7 +182,7 @@ namespace VIZ.FGOUT.Module {
case 4: case 4:
this._AutoSendIntervalTime_ = ((System.Windows.Controls.TextBox)(target)); this._AutoSendIntervalTime_ = ((System.Windows.Controls.TextBox)(target));
#line 811 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 819 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoSendIntervalTime_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.AutoSendIntervalTime_OnPreviewTextInput); this._AutoSendIntervalTime_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.AutoSendIntervalTime_OnPreviewTextInput);
#line default #line default
...@@ -191,7 +191,7 @@ namespace VIZ.FGOUT.Module { ...@@ -191,7 +191,7 @@ namespace VIZ.FGOUT.Module {
case 5: case 5:
this._Matting_interval_ = ((System.Windows.Controls.TextBox)(target)); this._Matting_interval_ = ((System.Windows.Controls.TextBox)(target));
#line 947 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 962 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Matting_interval_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Matting_interval_OnPreviewTextInput); this._Matting_interval_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Matting_interval_OnPreviewTextInput);
#line default #line default
...@@ -200,7 +200,7 @@ namespace VIZ.FGOUT.Module { ...@@ -200,7 +200,7 @@ namespace VIZ.FGOUT.Module {
case 6: case 6:
this._Moving_pixel_ = ((System.Windows.Controls.TextBox)(target)); this._Moving_pixel_ = ((System.Windows.Controls.TextBox)(target));
#line 972 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 991 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Moving_pixel_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Moving_pixel_OnPreviewTextInput); this._Moving_pixel_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Moving_pixel_OnPreviewTextInput);
#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}" "FECE7EC3BCF545ACA0597EA45D753BB9E33A03F9E1E228A91ECC7BFC72BC6952" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4BC8D1A0429685A17E6810578D9774A941940B15D2023C28322D103B8EDBFD70"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module { ...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 324 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 321 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton _ManualMode_; internal System.Windows.Controls.RadioButton _ManualMode_;
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 805 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 813 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _AutoSendIntervalTime_; internal System.Windows.Controls.TextBox _AutoSendIntervalTime_;
...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 943 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 959 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Matting_interval_; internal System.Windows.Controls.TextBox _Matting_interval_;
...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 968 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 988 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Moving_pixel_; internal System.Windows.Controls.TextBox _Moving_pixel_;
...@@ -98,7 +98,7 @@ namespace VIZ.FGOUT.Module { ...@@ -98,7 +98,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1341 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1397 "..\..\..\..\..\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;
...@@ -106,7 +106,7 @@ namespace VIZ.FGOUT.Module { ...@@ -106,7 +106,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1526 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1582 "..\..\..\..\..\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;
...@@ -114,7 +114,7 @@ namespace VIZ.FGOUT.Module { ...@@ -114,7 +114,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1541 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1597 "..\..\..\..\..\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;
...@@ -173,7 +173,7 @@ namespace VIZ.FGOUT.Module { ...@@ -173,7 +173,7 @@ namespace VIZ.FGOUT.Module {
case 3: case 3:
this._ManualMode_ = ((System.Windows.Controls.RadioButton)(target)); this._ManualMode_ = ((System.Windows.Controls.RadioButton)(target));
#line 328 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 325 "..\..\..\..\..\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
...@@ -182,7 +182,7 @@ namespace VIZ.FGOUT.Module { ...@@ -182,7 +182,7 @@ namespace VIZ.FGOUT.Module {
case 4: case 4:
this._AutoSendIntervalTime_ = ((System.Windows.Controls.TextBox)(target)); this._AutoSendIntervalTime_ = ((System.Windows.Controls.TextBox)(target));
#line 811 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 819 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoSendIntervalTime_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.AutoSendIntervalTime_OnPreviewTextInput); this._AutoSendIntervalTime_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.AutoSendIntervalTime_OnPreviewTextInput);
#line default #line default
...@@ -191,7 +191,7 @@ namespace VIZ.FGOUT.Module { ...@@ -191,7 +191,7 @@ namespace VIZ.FGOUT.Module {
case 5: case 5:
this._Matting_interval_ = ((System.Windows.Controls.TextBox)(target)); this._Matting_interval_ = ((System.Windows.Controls.TextBox)(target));
#line 947 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 962 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Matting_interval_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Matting_interval_OnPreviewTextInput); this._Matting_interval_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Matting_interval_OnPreviewTextInput);
#line default #line default
...@@ -200,7 +200,7 @@ namespace VIZ.FGOUT.Module { ...@@ -200,7 +200,7 @@ namespace VIZ.FGOUT.Module {
case 6: case 6:
this._Moving_pixel_ = ((System.Windows.Controls.TextBox)(target)); this._Moving_pixel_ = ((System.Windows.Controls.TextBox)(target));
#line 972 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 991 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Moving_pixel_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Moving_pixel_OnPreviewTextInput); this._Moving_pixel_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Moving_pixel_OnPreviewTextInput);
#line default #line default
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
DEBUG;TRACE DEBUG;TRACE
25-429057470 25-1434354873
4-1529606353 4-699044453
98391250289 98-1634640143
151915249285 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\LanguagePanelView.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; 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\LanguagePanelView.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;
True False
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.Framework/VIZ.Framework.Common/VideoControl/Control/Plugin/TrackingBox/Info/TrackingBoxInfo.cs
...@@ -36,5 +36,7 @@ namespace VIZ.Framework.Common ...@@ -36,5 +36,7 @@ namespace VIZ.Framework.Common
/// 时间码 /// 时间码
/// </summary> /// </summary>
public long TimeCode { get; set; } public long TimeCode { get; set; }
public string BboxType { get; set; } = "detect";
} }
} }
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