Skip to content

F
FGOUT
Commit 3733b996 by 鲁志-悦动
Options

把新加的算法参数同步到详细参数设置里 And 入点框红色、出点框绿色

parent 02481b14
Showing with 198 additions and 159 deletions
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Signal/Send/AlgorithmPackage_Figout_sports_model.cs
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
/// <summary> /// <summary>
/// 是否保留最高点 /// 是否保留最高点
/// </summary> /// </summary>
public bool Keep_highest { get; set; } = false; public bool Is_Keep_highest { get; set; } = false;
/// <summary> /// <summary>
/// 是否是大模型 /// 是否是大模型
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Resources/StringResource.en.xaml
...@@ -57,6 +57,8 @@ ...@@ -57,6 +57,8 @@
<sys:String x:Key="EndingFigureNumber">Ending figure number</sys:String> <sys:String x:Key="EndingFigureNumber">Ending figure number</sys:String>
<sys:String x:Key="IntervalFrame">Interval frame</sys:String> <sys:String x:Key="IntervalFrame">Interval frame</sys:String>
<sys:String x:Key="IntervalPixel">Interval pixel</sys:String> <sys:String x:Key="IntervalPixel">Interval pixel</sys:String>
<sys:String x:Key="RemoveOutPointPixel">Remove out point pixel</sys:String>
<sys:String x:Key="KeepHighest">Keep highest</sys:String>
<sys:String x:Key="DetectZoneX">Detect zone X</sys:String> <sys:String x:Key="DetectZoneX">Detect zone X</sys:String>
<sys:String x:Key="DetectZoneY">Detect zone Y</sys:String> <sys:String x:Key="DetectZoneY">Detect zone Y</sys:String>
<sys:String x:Key="TrackingZone">Tracking zone</sys:String> <sys:String x:Key="TrackingZone">Tracking zone</sys:String>
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Resources/StringResource.zh-cn.xaml
...@@ -56,6 +56,8 @@ ...@@ -56,6 +56,8 @@
<sys:String x:Key="EndingFigureNumber">出点后抠像数量</sys:String> <sys:String x:Key="EndingFigureNumber">出点后抠像数量</sys:String>
<sys:String x:Key="IntervalFrame">间隔帧率</sys:String> <sys:String x:Key="IntervalFrame">间隔帧率</sys:String>
<sys:String x:Key="IntervalPixel">间隔像素</sys:String> <sys:String x:Key="IntervalPixel">间隔像素</sys:String>
<sys:String x:Key="RemoveOutPointPixel">出点像素</sys:String>
<sys:String x:Key="KeepHighest">保留最高点</sys:String>
<sys:String x:Key="DetectZoneX">检测区域X值</sys:String> <sys:String x:Key="DetectZoneX">检测区域X值</sys:String>
<sys:String x:Key="DetectZoneY">检测区域Y值</sys:String> <sys:String x:Key="DetectZoneY">检测区域Y值</sys:String>
<sys:String x:Key="TrackingZone">跟踪区域值</sys:String> <sys:String x:Key="TrackingZone">跟踪区域值</sys:String>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -815,13 +815,12 @@ ...@@ -815,13 +815,12 @@
IsChecked="{Binding IsAutoSend, Mode=TwoWay}" IsChecked="{Binding IsAutoSend, Mode=TwoWay}"
Style="{StaticResource CheckBox_RaidoButtonStyle}" /> Style="{StaticResource CheckBox_RaidoButtonStyle}" />
<TextBox <TextBox
x:Name="_AutoSendIntervalTime_"
Width="30" Width="30"
Margin="5,0,0,0" Margin="5,0,0,0"
Background="#378CFF" Background="#378CFF"
FontSize="14" FontSize="14"
InputMethod.IsInputMethodEnabled="False" InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="AutoSendIntervalTime_OnPreviewTextInput" PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}" Style="{StaticResource TextBoxStyle}"
Text="{Binding AutoSendIntervalTime, Mode=TwoWay}" Text="{Binding AutoSendIntervalTime, Mode=TwoWay}"
Visibility="{Binding AutoSendVisibility}"> Visibility="{Binding AutoSendVisibility}">
...@@ -956,10 +955,9 @@ ...@@ -956,10 +955,9 @@
Foreground="White" Foreground="White"
Text="{DynamicResource IntervalFrame}" /> Text="{DynamicResource IntervalFrame}" />
<TextBox <TextBox
x:Name="_Matting_interval_"
Width="60" Width="60"
InputMethod.IsInputMethodEnabled="False" InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="Matting_interval_OnPreviewTextInput" PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}" Style="{StaticResource TextBoxStyle}"
Text="{Binding Matting_interval, Mode=TwoWay}"> Text="{Binding Matting_interval, Mode=TwoWay}">
<b:Interaction.Behaviors> <b:Interaction.Behaviors>
...@@ -985,10 +983,9 @@ ...@@ -985,10 +983,9 @@
Foreground="White" Foreground="White"
Text="{DynamicResource IntervalPixel}" /> Text="{DynamicResource IntervalPixel}" />
<TextBox <TextBox
x:Name="_Moving_pixel_"
Width="60" Width="60"
InputMethod.IsInputMethodEnabled="False" InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="Moving_pixel_OnPreviewTextInput" PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}" Style="{StaticResource TextBoxStyle}"
Text="{Binding Moving_pixel, Mode=TwoWay}"> Text="{Binding Moving_pixel, Mode=TwoWay}">
<b:Interaction.Behaviors> <b:Interaction.Behaviors>
...@@ -1012,12 +1009,11 @@ ...@@ -1012,12 +1009,11 @@
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="14" FontSize="14"
Foreground="White" Foreground="White"
Text="出点像素" /> Text="{DynamicResource RemoveOutPointPixel}" />
<TextBox <TextBox
x:Name="_Remove_out_point_pixel_"
Width="60" Width="60"
InputMethod.IsInputMethodEnabled="False" InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="Moving_pixel_OnPreviewTextInput" PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}" Style="{StaticResource TextBoxStyle}"
Text="{Binding Remove_out_point_pixel, Mode=TwoWay}"> Text="{Binding Remove_out_point_pixel, Mode=TwoWay}">
<b:Interaction.Behaviors> <b:Interaction.Behaviors>
...@@ -1033,10 +1029,9 @@ ...@@ -1033,10 +1029,9 @@
<CheckBox <CheckBox
Grid.Column="4" Grid.Column="4"
Margin="0,12"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Command="{Binding KeepHighestCommand}" Command="{Binding KeepHighestCommand}"
Content="保留最高点" Content="{DynamicResource KeepHighest}"
FontSize="14" FontSize="14"
Foreground="White" Foreground="White"
IsChecked="{Binding Path=IsKeepHighest, Mode=TwoWay}" IsChecked="{Binding Path=IsKeepHighest, Mode=TwoWay}"
...@@ -1044,7 +1039,6 @@ ...@@ -1044,7 +1039,6 @@
<CheckBox <CheckBox
Grid.Column="5" Grid.Column="5"
Margin="0,12"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Command="{Binding BigModelCommand}" Command="{Binding BigModelCommand}"
Content="{DynamicResource LargeModel}" Content="{DynamicResource LargeModel}"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml.cs
...@@ -49,21 +49,6 @@ namespace VIZ.FGOUT.Module ...@@ -49,21 +49,6 @@ namespace VIZ.FGOUT.Module
_AutoMode_.IsChecked = true; _AutoMode_.IsChecked = true;
} }
private void AutoSendIntervalTime_OnPreviewTextInput(object sender, TextCompositionEventArgs e)
{
OnPreviewTextInputCommon(sender, e);
}
private void Matting_interval_OnPreviewTextInput(object sender, TextCompositionEventArgs e)
{
OnPreviewTextInputCommon(sender, e);
}
private void Moving_pixel_OnPreviewTextInput(object sender, TextCompositionEventArgs e)
{
OnPreviewTextInputCommon(sender, e);
}
private void OnPreviewTextInputCommon(object sender, TextCompositionEventArgs e) private void OnPreviewTextInputCommon(object sender, TextCompositionEventArgs e)
{ {
var textBox = sender as TextBox; var textBox = sender as TextBox;
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -455,7 +455,7 @@ namespace VIZ.FGOUT.Module ...@@ -455,7 +455,7 @@ namespace VIZ.FGOUT.Module
Matting_interval = alPackage.Matting_interval; Matting_interval = alPackage.Matting_interval;
Moving_pixel = alPackage.Moving_pixel; Moving_pixel = alPackage.Moving_pixel;
Remove_out_point_pixel = alPackage.Remove_out_point_pixel; Remove_out_point_pixel = alPackage.Remove_out_point_pixel;
IsKeepHighest = alPackage.Keep_highest; IsKeepHighest = alPackage.Is_Keep_highest;
IsBigModel = alPackage.Is_Big_Model; IsBigModel = alPackage.Is_Big_Model;
} }
} }
...@@ -496,7 +496,7 @@ namespace VIZ.FGOUT.Module ...@@ -496,7 +496,7 @@ namespace VIZ.FGOUT.Module
alPackage.Matting_interval = Matting_interval; alPackage.Matting_interval = Matting_interval;
alPackage.Moving_pixel = Moving_pixel; alPackage.Moving_pixel = Moving_pixel;
alPackage.Remove_out_point_pixel = Remove_out_point_pixel; alPackage.Remove_out_point_pixel = Remove_out_point_pixel;
alPackage.Keep_highest = IsKeepHighest; alPackage.Is_Keep_highest = IsKeepHighest;
alPackage.Is_Big_Model = IsBigModel; alPackage.Is_Big_Model = IsBigModel;
//发送给算法 //发送给算法
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/View/AlgorithmSettingPanelView.xaml
...@@ -179,11 +179,6 @@ ...@@ -179,11 +179,6 @@
InputMethod.IsInputMethodEnabled="False" InputMethod.IsInputMethodEnabled="False"
Style="{StaticResource TextBoxStyle}" Style="{StaticResource TextBoxStyle}"
Text="{Binding Maintain_matting_n, Mode=TwoWay}"> Text="{Binding Maintain_matting_n, Mode=TwoWay}">
<!--<b:Interaction.Triggers>
<b:EventTrigger EventName="TextChanged">
<b:InvokeCommandAction Command="{Binding Maintain_matting_nTextChangedCommand}" PassEventArgsToCommand="True" />
</b:EventTrigger>
</b:Interaction.Triggers>-->
<b:Interaction.Behaviors> <b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior /> <local:TextBoxEnterKeyUpdateBehavior />
</b:Interaction.Behaviors> </b:Interaction.Behaviors>
...@@ -328,10 +323,35 @@ ...@@ -328,10 +323,35 @@
</b:Interaction.Behaviors> </b:Interaction.Behaviors>
</TextBox> </TextBox>
<TextBlock
Grid.Row="4"
Grid.Column="2"
Text="{DynamicResource RemoveOutPointPixel}" />
<TextBox
Grid.Row="4"
Grid.Column="3"
InputMethod.IsInputMethodEnabled="False"
Style="{StaticResource TextBoxStyle}"
Text="{Binding Remove_out_point_pixel, Mode=TwoWay}">
<b:Interaction.Behaviors>
<local:TextBoxEnterKeyUpdateBehavior />
</b:Interaction.Behaviors>
</TextBox>
<CheckBox
Grid.Row="4"
Grid.Column="4"
HorizontalAlignment="Center"
Content="{DynamicResource KeepHighest}"
FontSize="16"
Foreground="White"
IsChecked="{Binding Path=IsKeepHighest, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" />
<CheckBox <CheckBox
Grid.Row="4" Grid.Row="4"
Grid.Column="5" Grid.Column="5"
Margin="0,12" HorizontalAlignment="Center"
Content="{DynamicResource LargeModel}" Content="{DynamicResource LargeModel}"
FontSize="16" FontSize="16"
Foreground="White" Foreground="White"
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDISettingView/ViewModel/AlgorithmSettingPanelViewModel.cs
...@@ -618,6 +618,20 @@ namespace VIZ.FGOUT.Module ...@@ -618,6 +618,20 @@ namespace VIZ.FGOUT.Module
} }
} }
private int _remove_out_point_pixel = 100;
/// <summary>
/// 出点像素
/// </summary>
public int Remove_out_point_pixel
{
get => _remove_out_point_pixel;
set
{
_remove_out_point_pixel = value;
this.RaisePropertyChanged(nameof(Remove_out_point_pixel));
}
}
private bool _isBigModel; private bool _isBigModel;
/// <summary> /// <summary>
/// 是否是大模型 /// 是否是大模型
...@@ -632,6 +646,20 @@ namespace VIZ.FGOUT.Module ...@@ -632,6 +646,20 @@ namespace VIZ.FGOUT.Module
} }
} }
private bool _isKeepHighest;
/// <summary>
/// 是否保留最高点
/// </summary>
public bool IsKeepHighest
{
get => _isKeepHighest;
set
{
_isKeepHighest = value;
this.RaisePropertyChanged(nameof(IsKeepHighest));
}
}
//要存库的算法数据 //要存库的算法数据
private string _algorithmMessage = ""; private string _algorithmMessage = "";
private void SendAlgorithmParameters() private void SendAlgorithmParameters()
...@@ -657,6 +685,8 @@ namespace VIZ.FGOUT.Module ...@@ -657,6 +685,8 @@ namespace VIZ.FGOUT.Module
Scale = AScale, Scale = AScale,
Bbox_min_h = Bbox_min_h, Bbox_min_h = Bbox_min_h,
Bbox_min_w = Bbox_min_w, Bbox_min_w = Bbox_min_w,
Remove_out_point_pixel = Remove_out_point_pixel,
Is_Keep_highest = IsKeepHighest,
Is_Big_Model = IsBigModel Is_Big_Model = IsBigModel
}; };
...@@ -816,6 +846,8 @@ namespace VIZ.FGOUT.Module ...@@ -816,6 +846,8 @@ namespace VIZ.FGOUT.Module
AScale = alPackage.Scale; AScale = alPackage.Scale;
Bbox_min_h = alPackage.Bbox_min_h; Bbox_min_h = alPackage.Bbox_min_h;
Bbox_min_w = alPackage.Bbox_min_w; Bbox_min_w = alPackage.Bbox_min_w;
Remove_out_point_pixel = alPackage.Remove_out_point_pixel;
IsKeepHighest = alPackage.Is_Keep_highest;
IsBigModel = alPackage.Is_Big_Model; IsBigModel = alPackage.Is_Big_Model;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml.cs
...@@ -37,7 +37,9 @@ namespace VIZ.FGOUT.Module ...@@ -37,7 +37,9 @@ namespace VIZ.FGOUT.Module
public Rect rectReplay; public Rect rectReplay;
public static List<Rect> rectsReplay = new List<Rect>(); public static List<Rect> rectsReplay = new List<Rect>();
public static TrackingBoxInfo saveInfo = new TrackingBoxInfo(); public static TrackingBoxInfo saveInfo = new TrackingBoxInfo();
public static TrackingBoxInfo saveOutPointInfo = new TrackingBoxInfo();
public static List<TrackingBoxInfo> saveInfos = new List<TrackingBoxInfo>(); public static List<TrackingBoxInfo> saveInfos = new List<TrackingBoxInfo>();
public static List<TrackingBoxInfo> saveOutPointInfos = new List<TrackingBoxInfo>();
public NDIView() public NDIView()
{ {
...@@ -372,7 +374,15 @@ namespace VIZ.FGOUT.Module ...@@ -372,7 +374,15 @@ namespace VIZ.FGOUT.Module
//最小距离 //最小距离
double minDistance = 3840; double minDistance = 3840;
saveInfo = new TrackingBoxInfo(); if (vm.IsStartValue)
{
saveInfo = new TrackingBoxInfo();
}
else if (vm.IsEndValue)
{
saveOutPointInfo = new TrackingBoxInfo();
}
if (NDIViewModel._cam3StaticInfos == null) return; if (NDIViewModel._cam3StaticInfos == null) return;
//当有跟踪框的时候，就不用拖一个出来了 //当有跟踪框的时候，就不用拖一个出来了
if (NDIViewModel._cam3StaticInfos.Count > 0) if (NDIViewModel._cam3StaticInfos.Count > 0)
...@@ -390,7 +400,14 @@ namespace VIZ.FGOUT.Module ...@@ -390,7 +400,14 @@ namespace VIZ.FGOUT.Module
Math.Pow(((info.SrcRect.Bottom + info.SrcRect.Top) / 2 - y), 2.0)); Math.Pow(((info.SrcRect.Bottom + info.SrcRect.Top) / 2 - y), 2.0));
if (difference < minDistance) if (difference < minDistance)
{ {
saveInfo = info; if (vm.IsStartValue)
{
saveInfo = info;
}
else if (vm.IsEndValue)
{
saveOutPointInfo = info;
}
minDistance = difference; minDistance = difference;
} }
} }
...@@ -406,13 +423,30 @@ namespace VIZ.FGOUT.Module ...@@ -406,13 +423,30 @@ namespace VIZ.FGOUT.Module
//当双人3m跳水,双人10m跳水,双人速度攀岩时，保存2个入点框 //当双人3m跳水,双人10m跳水,双人速度攀岩时，保存2个入点框
if (gameName.Equals(SportsProjectCodes.SS) || gameName.Equals(SportsProjectCodes.ST) || gameName.Equals(SportsProjectCodes.SP)) if (gameName.Equals(SportsProjectCodes.SS) || gameName.Equals(SportsProjectCodes.ST) || gameName.Equals(SportsProjectCodes.SP))
{ {
if (saveInfos.Count == 2) if (vm.IsStartValue)
{
if (saveInfos.Count == 2)
{
saveInfos[0] = saveInfos[1];
saveInfos[1] = saveInfo;
}
else
{
saveInfos.Add(saveInfo);
}
}
else if (vm.IsEndValue)
{ {
saveInfos[0] = saveInfos[1]; if (saveOutPointInfos.Count == 2)
saveInfos[1] = saveInfo; {
saveOutPointInfos[0] = saveOutPointInfos[1];
saveOutPointInfos[1] = saveInfo;
}
else
{
saveOutPointInfos.Add(saveInfo);
}
} }
else
saveInfos.Add(saveInfo);
} }
} }
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs
...@@ -192,11 +192,11 @@ namespace VIZ.FGOUT.Module ...@@ -192,11 +192,11 @@ namespace VIZ.FGOUT.Module
if (matExtend.TimeStamp == StartTime) if (matExtend.TimeStamp == StartTime)
{ {
SliderStartValue = index; SliderStartValue = index;
} }
else if (matExtend.TimeStamp == EndTime) else if (matExtend.TimeStamp == EndTime)
{
break; break;
}
index++; index++;
} }
SliderEndValue = index; SliderEndValue = index;
...@@ -284,21 +284,22 @@ namespace VIZ.FGOUT.Module ...@@ -284,21 +284,22 @@ namespace VIZ.FGOUT.Module
foreach (var saveInfo in _cam3BInfos) foreach (var saveInfo in _cam3BInfos)
{ {
//更新红色点中框
saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
//把选中框的信息也加到这个集合里 //把选中框的信息也加到这个集合里
_cam3Infos.Add(saveInfo); _cam3Infos.Add(saveInfo);
//赋值
if (view.vm.IsStartValue) if (view.vm.IsStartValue)
{ {
//更新红色点中框
saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
//记录标红框时入点时间戳 //记录标红框时入点时间戳
_RecordStartTime = saveInfo.TimeCode; _RecordStartTime = saveInfo.TimeCode;
_twoInfos.Add(saveInfo); _twoInfos.Add(saveInfo);
} }
else if (view.vm.IsEndValue) else if (view.vm.IsEndValue)
{ {
//记录标红框时入点时间戳 //更新绿色点中框
saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR_GREEN;
//记录标绿框时入点时间戳
_RecordEndTime = saveInfo.TimeCode; _RecordEndTime = saveInfo.TimeCode;
_twoOutPointInfos.Add(saveInfo); _twoOutPointInfos.Add(saveInfo);
} }
...@@ -309,21 +310,22 @@ namespace VIZ.FGOUT.Module ...@@ -309,21 +310,22 @@ namespace VIZ.FGOUT.Module
} }
else else
{ {
//单人更新红色点中框
info2.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
//把选中框的信息也加到这个集合里 //把选中框的信息也加到这个集合里
_cam3Infos.Add(info2); _cam3Infos.Add(info2);
//赋值
if (view.vm.IsStartValue) if (view.vm.IsStartValue)
{ {
//单人更新红色点中框
info2.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
//记录标红框时入点时间戳 //记录标红框时入点时间戳
_RecordStartTime = info2.TimeCode; _RecordStartTime = info2.TimeCode;
_singleInfo = info2; _singleInfo = info2;
} }
else if (view.vm.IsEndValue) else if (view.vm.IsEndValue)
{ {
//记录标红框时出点时间戳 //单人更新绿色点中框
info2.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR_GREEN;
//记录标绿框时出点时间戳
_RecordEndTime = info2.TimeCode; _RecordEndTime = info2.TimeCode;
_singleOutPointInfo = info2; _singleOutPointInfo = info2;
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Property.cs
...@@ -50,6 +50,11 @@ namespace VIZ.FGOUT.Module ...@@ -50,6 +50,11 @@ namespace VIZ.FGOUT.Module
private readonly RawColor4 TRACKING_BOX_BORDER_COLOR = ApplicationDomainEx.IniStorage.GetValue<VideoConfig, RawColor4>(p => p.VIDEO_TRACKING_BOX_BORDER_COLOR); private readonly RawColor4 TRACKING_BOX_BORDER_COLOR = ApplicationDomainEx.IniStorage.GetValue<VideoConfig, RawColor4>(p => p.VIDEO_TRACKING_BOX_BORDER_COLOR);
/// <summary> /// <summary>
/// 追踪框颜色绿色
/// </summary>
private readonly RawColor4 TRACKING_BOX_BORDER_COLOR_GREEN = ApplicationDomainEx.IniStorage.GetValue<VideoConfig, RawColor4>(p => p.VIDEO_TRACKING_BOX_BORDER_COLOR_GREEN);
/// <summary>
/// 追踪框宽度 /// 追踪框宽度
/// </summary> /// </summary>
private readonly int TRACKING_BOX_BORDER_WIDTH = ApplicationDomainEx.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_TRACKING_BOX_BORDER_WIDTH); private readonly int TRACKING_BOX_BORDER_WIDTH = ApplicationDomainEx.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_TRACKING_BOX_BORDER_WIDTH);
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
...@@ -241,7 +241,7 @@ namespace VIZ.FGOUT.Module ...@@ -241,7 +241,7 @@ namespace VIZ.FGOUT.Module
List<List<List<int>>> inPoints = new List<List<List<int>>>(); List<List<List<int>>> inPoints = new List<List<List<int>>>();
List<List<List<int>>> outPoints = new List<List<List<int>>>(); List<List<List<int>>> outPoints = new List<List<List<int>>>();
bool isInPoint = false; bool isInPoint = false;
bool isOutPoint = true; bool isOutPoint = false;
//前三个手拖框、双人项目、单人项目都是判断是否有值 //前三个手拖框、双人项目、单人项目都是判断是否有值
//手拖框 //手拖框
...@@ -250,7 +250,7 @@ namespace VIZ.FGOUT.Module ...@@ -250,7 +250,7 @@ namespace VIZ.FGOUT.Module
inPoints = Coordinate(NDIView.rectsReplay, srcWidth, srcHeight); inPoints = Coordinate(NDIView.rectsReplay, srcWidth, srcHeight);
isInPoint = true; isInPoint = true;
} }
//双人项目 //双人项目入点
else if (NDIView.saveInfos.Count > 0) else if (NDIView.saveInfos.Count > 0)
{ {
if (NDIView.saveInfos.Count == 2) if (NDIView.saveInfos.Count == 2)
...@@ -268,13 +268,40 @@ namespace VIZ.FGOUT.Module ...@@ -268,13 +268,40 @@ namespace VIZ.FGOUT.Module
return; return;
} }
} }
//单人项目 //单人项目入点
else if (NDIView.saveInfo.SrcRect.Left > 0) else if (NDIView.saveInfo.SrcRect.Left > 0)
{ {
if (InPointIsMoved()) return; if (InPointIsMoved()) return;
inPoints = CoordinateTrackingBoxInfo(NDIView.saveInfo.SrcRect, srcWidth, srcHeight); inPoints = CoordinateTrackingBoxInfo(NDIView.saveInfo.SrcRect, srcWidth, srcHeight);
isInPoint = true; isInPoint = true;
} }
//双人项目出点
if (NDIView.saveOutPointInfos.Count > 0)
{
if (NDIView.saveOutPointInfos.Count == 2)
{
if (OutPointIsMoved()) return;
outPoints = CoordinateTrackingBoxInfos(NDIView.saveOutPointInfos, srcWidth, srcHeight);
isOutPoint = true;
}
else
{
WPFHelper.BeginInvoke(() =>
{
MessageBoxEx.ShowDialog("双人比赛项目应选择两个出点.");
});
return;
}
}
//单人项目出点
else if (NDIView.saveOutPointInfo.SrcRect.Left > 0)
{
if (OutPointIsMoved()) return;
outPoints = CoordinateTrackingBoxInfo(NDIView.saveOutPointInfo.SrcRect, srcWidth, srcHeight);
isOutPoint = true;
}
#region 算法识别到人的情况下 #region 算法识别到人的情况下
else if (_twoInfos.Count > 0) else if (_twoInfos.Count > 0)
...@@ -311,11 +338,11 @@ namespace VIZ.FGOUT.Module ...@@ -311,11 +338,11 @@ namespace VIZ.FGOUT.Module
return; return;
} }
//if (!isOutPoint) if (!isOutPoint)
//{ {
// WPFHelper.BeginInvoke(() => { MessageBoxEx.ShowDialog("没有获取到出点跟踪框信息。"); }); WPFHelper.BeginInvoke(() => { MessageBoxEx.ShowDialog("没有获取到出点跟踪框信息。"); });
// return; return;
//} }
var replayPackage = new ReplayPackage() var replayPackage = new ReplayPackage()
{ {
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C3550BEED45BB1BC0138F61A55E3DD7167F45B363988F253B8A523E28F38FE59" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BC6F5F4A9DD24CFDC33C7497FB5A8A82DC67BD3798FCFAB85378F3EDC73D416A"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -74,39 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,39 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 818 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1435 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _AutoSendIntervalTime_;
#line default
#line hidden
#line 959 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Matting_interval_;
#line default
#line hidden
#line 988 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Moving_pixel_;
#line default
#line hidden
#line 1017 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Remove_out_point_pixel_;
#line default
#line hidden
#line 1441 "..\..\..\..\..\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;
...@@ -114,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -114,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1626 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1620 "..\..\..\..\..\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;
...@@ -122,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -122,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1641 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1635 "..\..\..\..\..\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;
...@@ -188,37 +156,33 @@ namespace VIZ.FGOUT.Module { ...@@ -188,37 +156,33 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
return; return;
case 4: case 4:
this._AutoSendIntervalTime_ = ((System.Windows.Controls.TextBox)(target));
#line 824 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 823 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoSendIntervalTime_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.AutoSendIntervalTime_OnPreviewTextInput); ((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default #line default
#line hidden #line hidden
return; return;
case 5: case 5:
this._Matting_interval_ = ((System.Windows.Controls.TextBox)(target));
#line 962 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 960 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Matting_interval_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Matting_interval_OnPreviewTextInput); ((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default #line default
#line hidden #line hidden
return; return;
case 6: case 6:
this._Moving_pixel_ = ((System.Windows.Controls.TextBox)(target));
#line 991 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 988 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Moving_pixel_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Moving_pixel_OnPreviewTextInput); ((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default #line default
#line hidden #line hidden
return; return;
case 7: case 7:
this._Remove_out_point_pixel_ = ((System.Windows.Controls.TextBox)(target));
#line 1020 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1016 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Remove_out_point_pixel_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Moving_pixel_OnPreviewTextInput); ((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default #line default
#line hidden #line hidden
......
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}" "C3550BEED45BB1BC0138F61A55E3DD7167F45B363988F253B8A523E28F38FE59" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BC6F5F4A9DD24CFDC33C7497FB5A8A82DC67BD3798FCFAB85378F3EDC73D416A"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -74,39 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,39 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 818 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1435 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _AutoSendIntervalTime_;
#line default
#line hidden
#line 959 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Matting_interval_;
#line default
#line hidden
#line 988 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Moving_pixel_;
#line default
#line hidden
#line 1017 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox _Remove_out_point_pixel_;
#line default
#line hidden
#line 1441 "..\..\..\..\..\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;
...@@ -114,7 +82,7 @@ namespace VIZ.FGOUT.Module { ...@@ -114,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1626 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1620 "..\..\..\..\..\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;
...@@ -122,7 +90,7 @@ namespace VIZ.FGOUT.Module { ...@@ -122,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1641 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1635 "..\..\..\..\..\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;
...@@ -188,37 +156,33 @@ namespace VIZ.FGOUT.Module { ...@@ -188,37 +156,33 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
return; return;
case 4: case 4:
this._AutoSendIntervalTime_ = ((System.Windows.Controls.TextBox)(target));
#line 824 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 823 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._AutoSendIntervalTime_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.AutoSendIntervalTime_OnPreviewTextInput); ((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default #line default
#line hidden #line hidden
return; return;
case 5: case 5:
this._Matting_interval_ = ((System.Windows.Controls.TextBox)(target));
#line 962 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 960 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Matting_interval_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Matting_interval_OnPreviewTextInput); ((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default #line default
#line hidden #line hidden
return; return;
case 6: case 6:
this._Moving_pixel_ = ((System.Windows.Controls.TextBox)(target));
#line 991 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 988 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Moving_pixel_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Moving_pixel_OnPreviewTextInput); ((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default #line default
#line hidden #line hidden
return; return;
case 7: case 7:
this._Remove_out_point_pixel_ = ((System.Windows.Controls.TextBox)(target));
#line 1020 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1016 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
this._Remove_out_point_pixel_.PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.Moving_pixel_OnPreviewTextInput); ((System.Windows.Controls.TextBox)(target)).PreviewTextInput += new System.Windows.Input.TextCompositionEventHandler(this.OnPreviewTextInputCommon);
#line default #line default
#line hidden #line hidden
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/AlgorithmSettingPanelView.g.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "17980243579D49F07043562A5F0651F8C8A199D6FB45472A859DBAB5493FF918" #pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0B3E6CB266435A45208836AAB95FB222C0FD554383AA89DA48C9E4CFACB0DC11"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDISettingView/View/AlgorithmSettingPanelView.g.i.cs
#pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "17980243579D49F07043562A5F0651F8C8A199D6FB45472A859DBAB5493FF918" #pragma checksum "..\..\..\..\..\NDISettingView\View\AlgorithmSettingPanelView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0B3E6CB266435A45208836AAB95FB222C0FD554383AA89DA48C9E4CFACB0DC11"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
VIZ.FGOUT/VIZ.FGOUT/config/config.ini
...@@ -24,6 +24,8 @@ VIDEO_RECTANGLE_BORDER_COLOR=#FFFF0000 ...@@ -24,6 +24,8 @@ VIDEO_RECTANGLE_BORDER_COLOR=#FFFF0000
VIDEO_TRACKING_BOX_BORDER_WIDTH=2 VIDEO_TRACKING_BOX_BORDER_WIDTH=2
;视频跟踪框边框颜色 ;视频跟踪框边框颜色
VIDEO_TRACKING_BOX_BORDER_COLOR=#FFFF0000 VIDEO_TRACKING_BOX_BORDER_COLOR=#FFFF0000
;视频跟踪框边框颜色绿色
VIDEO_TRACKING_BOX_BORDER_COLOR_GREEN=#FF00FF00
;检测边框宽度（单位：像素） ;检测边框宽度（单位：像素）
VIDEO_DETECT_BOX_BORDER_WIDTH=2 VIDEO_DETECT_BOX_BORDER_WIDTH=2
;检测框边框颜色（格式：#AARRGGBB） ;检测框边框颜色（格式：#AARRGGBB）
......
VIZ.Framework/VIZ.Framework.Storage/Ini/Config/VideoConfig.cs
...@@ -38,6 +38,12 @@ namespace VIZ.Framework.Storage ...@@ -38,6 +38,12 @@ namespace VIZ.Framework.Storage
public string VIDEO_TRACKING_BOX_BORDER_COLOR { get; set; } public string VIDEO_TRACKING_BOX_BORDER_COLOR { get; set; }
/// <summary> /// <summary>
/// 跟踪框边框颜色（格式：#AARRGGBB）
/// </summary>
[Ini(Section = "Video", DefaultValue = "#FF00FF00", Type = typeof(RawColor4))]
public string VIDEO_TRACKING_BOX_BORDER_COLOR_GREEN { get; set; }
/// <summary>
/// 检测边框宽度（单位：像素） /// 检测边框宽度（单位：像素）
/// </summary> /// </summary>
[Ini(Section = "Video", DefaultValue = "2", Type = typeof(int))] [Ini(Section = "Video", DefaultValue = "2", Type = typeof(int))]
......
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