Skip to content

F
FGOUT
Commit 3e92d33b by 鲁志-悦动
Options

修复出点框残留的问题 And “保留最高点”不可用时置灰 And 音视频发来的消息弹窗后结束Replay And 修复双人10米跳水，先选入点再选出点点击播放提示“没有获取到入点跟踪框信息”的缺陷

parent efb9c1c3
Showing with 287 additions and 323 deletions
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Resources/StringResource.en.xaml
...@@ -51,14 +51,14 @@ ...@@ -51,14 +51,14 @@
<sys:String x:Key="VideoInput">VideoInput</sys:String> <sys:String x:Key="VideoInput">VideoInput</sys:String>
<sys:String x:Key="SourceVideoInput">SourceVideoInput</sys:String> <sys:String x:Key="SourceVideoInput">SourceVideoInput</sys:String>
<sys:String x:Key="ParameterSettings">ParameterSetting</sys:String> <sys:String x:Key="ParameterSettings">ParameterSetting</sys:String>
<sys:String x:Key="AlgorithmParameter">AlgorithmParameter</sys:String> <sys:String x:Key="AlgorithmParameter">AlgParam</sys:String>
<sys:String x:Key="Match">Match</sys:String> <sys:String x:Key="Match">Match</sys:String>
<sys:String x:Key="Tips">Tips</sys:String> <sys:String x:Key="Tips">Tips</sys:String>
<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">IntFram</sys:String>
<sys:String x:Key="IntervalPixel">Interval pixel</sys:String> <sys:String x:Key="IntervalPixel">IntPixel</sys:String>
<sys:String x:Key="RemoveOutPointPixel">Remove out point pixel</sys:String> <sys:String x:Key="RemoveOutPointPixel">OutPixel</sys:String>
<sys:String x:Key="KeepHighest">Keep highest</sys:String> <sys:String x:Key="KeepHighest">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/Style/CheckBox/CheckBox_Setting.xaml
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<Style x:Key="CheckBox_Setting" TargetType="CheckBox"> <Style x:Key="CheckBox_Setting" TargetType="CheckBox">
<Setter Property="FocusVisualStyle" Value="{x:Null}" /> <Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Height" Value="20" /> <Setter Property="Height" Value="20" />
<Setter Property="Foreground" Value="White" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="CheckBox"> <ControlTemplate TargetType="CheckBox">
...@@ -39,10 +40,13 @@ ...@@ -39,10 +40,13 @@
<Setter TargetName="border" Property="Background" Value="#ffffc000" /> <Setter TargetName="border" Property="Background" Value="#ffffc000" />
<Setter TargetName="img" Property="Visibility" Value="Visible" /> <Setter TargetName="img" Property="Visibility" Value="Visible" />
</Trigger> </Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Foreground" Value="Gray" />
<Setter TargetName="border" Property="BorderBrush" Value="Gray" />
</Trigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
</ResourceDictionary> </ResourceDictionary>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -955,7 +955,7 @@ ...@@ -955,7 +955,7 @@
Foreground="White" Foreground="White"
Text="{DynamicResource IntervalFrame}" /> Text="{DynamicResource IntervalFrame}" />
<TextBox <TextBox
Width="60" Width="57"
InputMethod.IsInputMethodEnabled="False" InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="OnPreviewTextInputCommon" PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}" Style="{StaticResource TextBoxStyle}"
...@@ -983,7 +983,7 @@ ...@@ -983,7 +983,7 @@
Foreground="White" Foreground="White"
Text="{DynamicResource IntervalPixel}" /> Text="{DynamicResource IntervalPixel}" />
<TextBox <TextBox
Width="60" Width="57"
InputMethod.IsInputMethodEnabled="False" InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="OnPreviewTextInputCommon" PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}" Style="{StaticResource TextBoxStyle}"
...@@ -1011,7 +1011,7 @@ ...@@ -1011,7 +1011,7 @@
Foreground="White" Foreground="White"
Text="{DynamicResource RemoveOutPointPixel}" /> Text="{DynamicResource RemoveOutPointPixel}" />
<TextBox <TextBox
Width="60" Width="57"
InputMethod.IsInputMethodEnabled="False" InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="OnPreviewTextInputCommon" PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}" Style="{StaticResource TextBoxStyle}"
...@@ -1033,7 +1033,6 @@ ...@@ -1033,7 +1033,6 @@
Command="{Binding KeepHighestCommand}" Command="{Binding KeepHighestCommand}"
Content="{DynamicResource KeepHighest}" Content="{DynamicResource KeepHighest}"
FontSize="14" FontSize="14"
Foreground="White"
IsChecked="{Binding Path=IsKeepHighest, Mode=TwoWay}" IsChecked="{Binding Path=IsKeepHighest, Mode=TwoWay}"
IsEnabled="{Binding KeepHighestIsEnabled}" IsEnabled="{Binding KeepHighestIsEnabled}"
Style="{StaticResource CheckBox_Setting}" /> Style="{StaticResource CheckBox_Setting}" />
...@@ -1044,7 +1043,6 @@ ...@@ -1044,7 +1043,6 @@
Command="{Binding BigModelCommand}" Command="{Binding BigModelCommand}"
Content="{DynamicResource LargeModel}" Content="{DynamicResource LargeModel}"
FontSize="14" FontSize="14"
Foreground="White"
IsChecked="{Binding Path=IsBigModel, Mode=TwoWay}" IsChecked="{Binding Path=IsBigModel, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" /> Style="{StaticResource CheckBox_Setting}" />
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -278,6 +278,8 @@ namespace VIZ.FGOUT.Module ...@@ -278,6 +278,8 @@ namespace VIZ.FGOUT.Module
WPFHelper.BeginInvoke(() => WPFHelper.BeginInvoke(() =>
{ {
MessageBoxEx.ShowDialog(message); MessageBoxEx.ShowDialog(message);
//关闭Replay
ReplayStop();
}); });
} }
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml.cs
...@@ -464,11 +464,11 @@ namespace VIZ.FGOUT.Module ...@@ -464,11 +464,11 @@ namespace VIZ.FGOUT.Module
if (saveOutPointInfos.Count == 2) if (saveOutPointInfos.Count == 2)
{ {
saveOutPointInfos[0] = saveOutPointInfos[1]; saveOutPointInfos[0] = saveOutPointInfos[1];
saveOutPointInfos[1] = saveInfo; saveOutPointInfos[1] = saveOutPointInfo;
} }
else else
{ {
saveOutPointInfos.Add(saveInfo); saveOutPointInfos.Add(saveOutPointInfo);
} }
} }
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs
...@@ -295,6 +295,9 @@ namespace VIZ.FGOUT.Module ...@@ -295,6 +295,9 @@ namespace VIZ.FGOUT.Module
//记录标红框时入点时间戳 //记录标红框时入点时间戳
_RecordStartTime = saveInfo.TimeCode; _RecordStartTime = saveInfo.TimeCode;
_twoInfos.Add(saveInfo); _twoInfos.Add(saveInfo);
//清除点选跟踪框的数据
NDIView.saveInfos = new List<TrackingBoxInfo>();
} }
else if (view.vm.IsEndValue) else if (view.vm.IsEndValue)
{ {
...@@ -303,12 +306,16 @@ namespace VIZ.FGOUT.Module ...@@ -303,12 +306,16 @@ namespace VIZ.FGOUT.Module
//记录标绿框时入点时间戳 //记录标绿框时入点时间戳
_RecordEndTime = saveInfo.TimeCode; _RecordEndTime = saveInfo.TimeCode;
_twoOutPointInfos.Add(saveInfo); _twoOutPointInfos.Add(saveInfo);
}
//清除点选跟踪框的数据 //清除点选跟踪框的数据
NDIView.saveInfos = new List<TrackingBoxInfo>(); NDIView.saveOutPointInfos = new List<TrackingBoxInfo>();
} }
} }
////清除点选跟踪框的数据
//NDIView.saveInfos = new List<TrackingBoxInfo>();
//NDIView.saveOutPointInfos = new List<TrackingBoxInfo>();
}
else else
{ {
//把选中框的信息也加到这个集合里 //把选中框的信息也加到这个集合里
...@@ -321,6 +328,9 @@ namespace VIZ.FGOUT.Module ...@@ -321,6 +328,9 @@ namespace VIZ.FGOUT.Module
//记录标红框时入点时间戳 //记录标红框时入点时间戳
_RecordStartTime = info2.TimeCode; _RecordStartTime = info2.TimeCode;
_singleInfo = info2; _singleInfo = info2;
//清除点选跟踪框的数据
NDIView.saveInfo = new TrackingBoxInfo();
} }
else if (view.vm.IsEndValue) else if (view.vm.IsEndValue)
{ {
...@@ -329,12 +339,16 @@ namespace VIZ.FGOUT.Module ...@@ -329,12 +339,16 @@ namespace VIZ.FGOUT.Module
//记录标绿框时出点时间戳 //记录标绿框时出点时间戳
_RecordEndTime = info2.TimeCode; _RecordEndTime = info2.TimeCode;
_singleOutPointInfo = info2; _singleOutPointInfo = info2;
}
}
//清除点选跟踪框的数据 //清除点选跟踪框的数据
NDIView.saveInfo = new TrackingBoxInfo();
NDIView.saveOutPointInfo = new TrackingBoxInfo(); NDIView.saveOutPointInfo = new TrackingBoxInfo();
}
}
////清除点选跟踪框的数据
//NDIView.saveInfo = new TrackingBoxInfo();
//NDIView.saveOutPointInfo = new TrackingBoxInfo();
//清除拖框的数据 //清除拖框的数据
NDIView.rectsReplay.Clear(); NDIView.rectsReplay.Clear();
NDIView.rectsOutReplay.Clear(); NDIView.rectsOutReplay.Clear();
...@@ -386,7 +400,7 @@ namespace VIZ.FGOUT.Module ...@@ -386,7 +400,7 @@ namespace VIZ.FGOUT.Module
} }
foreach (var saveOutInfo in NDIView.saveOutPointInfos) foreach (var saveOutInfo in NDIView.saveOutPointInfos)
{ {
//更新红绿色点中框 //更新绿色点中框
if (saveOutInfo.SrcRect.Left > 0) if (saveOutInfo.SrcRect.Left > 0)
{ {
saveOutInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR_GREEN; saveOutInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR_GREEN;
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
...@@ -313,6 +313,7 @@ namespace VIZ.FGOUT.Module ...@@ -313,6 +313,7 @@ namespace VIZ.FGOUT.Module
#region 算法识别到人的情况下 #region 算法识别到人的情况下
//入点
if (_twoInfos.Count > 0) if (_twoInfos.Count > 0)
{ {
if (InPointIsMoved()) return; if (InPointIsMoved()) return;
...@@ -326,6 +327,7 @@ namespace VIZ.FGOUT.Module ...@@ -326,6 +327,7 @@ namespace VIZ.FGOUT.Module
isInPoint = true; isInPoint = true;
} }
//出点
if (_twoOutPointInfos.Count > 0) if (_twoOutPointInfos.Count > 0)
{ {
if (OutPointIsMoved()) return; if (OutPointIsMoved()) return;
...@@ -406,7 +408,9 @@ namespace VIZ.FGOUT.Module ...@@ -406,7 +408,9 @@ namespace VIZ.FGOUT.Module
ndiView.canvas1.Children.Clear(); ndiView.canvas1.Children.Clear();
//清除跟踪框的数据 //清除跟踪框的数据
NDIView.saveInfo = new TrackingBoxInfo(); NDIView.saveInfo = new TrackingBoxInfo();
NDIView.saveOutPointInfo = new TrackingBoxInfo();
NDIView.saveInfos = new List<TrackingBoxInfo>(); NDIView.saveInfos = new List<TrackingBoxInfo>();
NDIView.saveOutPointInfos = new List<TrackingBoxInfo>();
_singleInfo = new TrackingBoxInfo(); _singleInfo = new TrackingBoxInfo();
_singleOutPointInfo = new TrackingBoxInfo(); _singleOutPointInfo = new TrackingBoxInfo();
_twoInfos = new List<TrackingBoxInfo>(); _twoInfos = new List<TrackingBoxInfo>();
...@@ -549,7 +553,9 @@ namespace VIZ.FGOUT.Module ...@@ -549,7 +553,9 @@ namespace VIZ.FGOUT.Module
//nDIView.saveInfo = new TrackingBoxInfo(); //nDIView.saveInfo = new TrackingBoxInfo();
//nDIView.saveInfos = new List<TrackingBoxInfo>(); //nDIView.saveInfos = new List<TrackingBoxInfo>();
NDIView.saveInfo = new TrackingBoxInfo(); NDIView.saveInfo = new TrackingBoxInfo();
NDIView.saveOutPointInfo = new TrackingBoxInfo();
NDIView.saveInfos = new List<TrackingBoxInfo>(); NDIView.saveInfos = new List<TrackingBoxInfo>();
NDIView.saveOutPointInfos = new List<TrackingBoxInfo>();
_singleInfo = new TrackingBoxInfo(); _singleInfo = new TrackingBoxInfo();
_singleOutPointInfo = new TrackingBoxInfo(); _singleOutPointInfo = new TrackingBoxInfo();
_twoInfos = new List<TrackingBoxInfo>(); _twoInfos = new List<TrackingBoxInfo>();
...@@ -557,245 +563,246 @@ namespace VIZ.FGOUT.Module ...@@ -557,245 +563,246 @@ namespace VIZ.FGOUT.Module
} }
} }
private void ReplayMethod() //private void ReplayMethod()
{ //{
//在Replay状态下 // //在Replay状态下
Queue<MatExtend> buffer = _frameBuffer.GetFrames();
//只生效一次
if (IsReplayStarted)
{
IsReplayStarted = false;
if (buffer.Count > 0) // Queue<MatExtend> buffer = _frameBuffer.GetFrames();
{ // //只生效一次
foreach (var matExtend in buffer) // if (IsReplayStarted)
{ // {
//遍历队列集合，先遍历到入点帧 // IsReplayStarted = false;
if (matExtend.TimeStamp == StartTime)
{
SliderStartValue = index;
}
else if (matExtend.TimeStamp == EndTime)
{
break;
}
index++;
}
SliderEndValue = index;
}
}
//如果是Start滑块在动
else if (IsStartValue)
{
SliderStartValue = index = SliderValue;
}
//如果是End滑块在动
else if (IsEndValue)
{
SliderEndValue = index = SliderValue;
}
#region 公共代码 // if (buffer.Count > 0)
// {
// foreach (var matExtend in buffer)
// {
// //遍历队列集合，先遍历到入点帧
// if (matExtend.TimeStamp == StartTime)
// {
// SliderStartValue = index;
// }
// else if (matExtend.TimeStamp == EndTime)
// {
// break;
// }
// index++;
// }
// SliderEndValue = index;
// }
// }
// //如果是Start滑块在动
// else if (IsStartValue)
// {
// SliderStartValue = index = SliderValue;
// }
// //如果是End滑块在动
// else if (IsEndValue)
// {
// SliderEndValue = index = SliderValue;
// }
if (index >= (50 * STREAM_CACHEED_TIME)) index = (50 * STREAM_CACHEED_TIME - 1); // #region 公共代码
if ((buffer.Count - 1) >= index && index >= 0)
{
var dse = buffer.ElementAt(index);
var lowResolutionData = new byte[dse.Mat.Width * dse.Mat.Height * 4];
var newLength = lowResolutionData.Length;
Marshal.Copy(dse.Mat.Data, lowResolutionData, 0, newLength);
var dsExtend = new DataStreamExtend()
{
DataStream = new DataStream((int)newLength, true, true),
Width = dse.Mat.Width,
Height = dse.Mat.Height,
Length = newLength,
TimeStamp = ReplayTimeStamp = dse.TimeStamp
};
dsExtend.DataStream.Write(lowResolutionData, 0, newLength);
dsExtend.DataStream.Position = 0;
//遍历跟踪框队列 // if (index >= (50 * STREAM_CACHEED_TIME)) index = (50 * STREAM_CACHEED_TIME - 1);
Queue<TrackingBoxInfo> infoBuffers = _trackingBoxInfoBuffer.GetInfos(); // if ((buffer.Count - 1) >= index && index >= 0)
Queue<TrackingBoxInfo> infoBBuffers = _trackingBBoxInfoBuffer.GetInfos(); // {
_cam3Infos = new List<TrackingBoxInfo>(); // var dse = buffer.ElementAt(index);
_cam3BInfos = new List<TrackingBoxInfo>(); // var lowResolutionData = new byte[dse.Mat.Width * dse.Mat.Height * 4];
//跟踪框全显示 // var newLength = lowResolutionData.Length;
if (infoBuffers.Count > 0) // Marshal.Copy(dse.Mat.Data, lowResolutionData, 0, newLength);
{ // var dsExtend = new DataStreamExtend()
foreach (var info in infoBuffers) // {
{ // DataStream = new DataStream((int)newLength, true, true),
if (info == null) continue; // Width = dse.Mat.Width,
if (info.TimeCode == dse.TimeStamp) // Height = dse.Mat.Height,
_cam3Infos.Add(info); // Length = newLength,
} // TimeStamp = ReplayTimeStamp = dse.TimeStamp
} // };
//匹配的时候只匹配BBox下的 // dsExtend.DataStream.Write(lowResolutionData, 0, newLength);
if (infoBBuffers.Count > 0) // dsExtend.DataStream.Position = 0;
{
foreach (var info in infoBBuffers) // //遍历跟踪框队列
{ // Queue<TrackingBoxInfo> infoBuffers = _trackingBoxInfoBuffer.GetInfos();
if (info == null) continue; // Queue<TrackingBoxInfo> infoBBuffers = _trackingBBoxInfoBuffer.GetInfos();
if (info.TimeCode == dse.TimeStamp) // _cam3Infos = new List<TrackingBoxInfo>();
_cam3BInfos.Add(info); // _cam3BInfos = new List<TrackingBoxInfo>();
} // //跟踪框全显示
// if (infoBuffers.Count > 0)
// {
// foreach (var info in infoBuffers)
// {
// if (info == null) continue;
// if (info.TimeCode == dse.TimeStamp)
// _cam3Infos.Add(info);
// }
// }
// //匹配的时候只匹配BBox下的
// if (infoBBuffers.Count > 0)
// {
// foreach (var info in infoBBuffers)
// {
// if (info == null) continue;
// if (info.TimeCode == dse.TimeStamp)
// _cam3BInfos.Add(info);
// }
#region 算法track到人的情况下跟踪框标红 // #region 算法track到人的情况下跟踪框标红
if (_cam3BInfos.Count > 0) // if (_cam3BInfos.Count > 0)
//if (_cam3BInfos.Count > 0 && view.vm.IsStartValue) // //if (_cam3BInfos.Count > 0 && view.vm.IsStartValue)
{ // {
var info2 = _cam3BInfos[0]; // var info2 = _cam3BInfos[0];
if (info2.BboxType != null && info2.BboxType.Equals(AlgorithmPackageSignal.track)) // if (info2.BboxType != null && info2.BboxType.Equals(AlgorithmPackageSignal.track))
{ // {
var gameName = ApplicationDomainEx.LiteDbContext.ViewConfig // var gameName = ApplicationDomainEx.LiteDbContext.ViewConfig
.FindOne(p => p.ViewKey == NDIViewKeys.CAM_1).GameName; // .FindOne(p => p.ViewKey == NDIViewKeys.CAM_1).GameName;
//当双人3m跳水,双人10m跳水,双人速度攀岩时，保存2个入点框 // //当双人3m跳水,双人10m跳水,双人速度攀岩时，保存2个入点框
if (gameName.Equals(SportsProjectCodes.SS) || // if (gameName.Equals(SportsProjectCodes.SS) ||
gameName.Equals(SportsProjectCodes.ST) || // gameName.Equals(SportsProjectCodes.ST) ||
gameName.Equals(SportsProjectCodes.SP)) // gameName.Equals(SportsProjectCodes.SP))
{ // {
if (IsStartValue) // if (IsStartValue)
{ // {
_twoInfos = new List<TrackingBoxInfo>(); // _twoInfos = new List<TrackingBoxInfo>();
} // }
else if (IsEndValue) // else if (IsEndValue)
{ // {
_twoOutPointInfos = new List<TrackingBoxInfo>(); // _twoOutPointInfos = new List<TrackingBoxInfo>();
} // }
foreach (var saveInfo in _cam3BInfos) // foreach (var saveInfo in _cam3BInfos)
{ // {
//把选中框的信息也加到这个集合里 // //把选中框的信息也加到这个集合里
_cam3Infos.Add(saveInfo); // _cam3Infos.Add(saveInfo);
if (IsStartValue) // if (IsStartValue)
{ // {
//更新红色点中框 // //更新红色点中框
saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR; // saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
//记录标红框时入点时间戳 // //记录标红框时入点时间戳
_RecordStartTime = saveInfo.TimeCode; // _RecordStartTime = saveInfo.TimeCode;
_twoInfos.Add(saveInfo); // _twoInfos.Add(saveInfo);
} // }
else if (IsEndValue) // else if (IsEndValue)
{ // {
//更新绿色点中框 // //更新绿色点中框
saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR_GREEN; // saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR_GREEN;
//记录标绿框时入点时间戳 // //记录标绿框时入点时间戳
_RecordEndTime = saveInfo.TimeCode; // _RecordEndTime = saveInfo.TimeCode;
_twoOutPointInfos.Add(saveInfo); // _twoOutPointInfos.Add(saveInfo);
} // }
//清除点选跟踪框的数据 // //清除点选跟踪框的数据
NDIView.saveInfos = new List<TrackingBoxInfo>(); // NDIView.saveInfos = new List<TrackingBoxInfo>();
} // }
} // }
else // else
{ // {
//把选中框的信息也加到这个集合里 // //把选中框的信息也加到这个集合里
_cam3Infos.Add(info2); // _cam3Infos.Add(info2);
if (IsStartValue) // if (IsStartValue)
{ // {
//单人更新红色点中框 // //单人更新红色点中框
info2.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR; // info2.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
//记录标红框时入点时间戳 // //记录标红框时入点时间戳
_RecordStartTime = info2.TimeCode; // _RecordStartTime = info2.TimeCode;
_singleInfo = info2; // _singleInfo = info2;
} // }
else if (IsEndValue) // else if (IsEndValue)
{ // {
//单人更新绿色点中框 // //单人更新绿色点中框
info2.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR_GREEN; // info2.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR_GREEN;
//记录标绿框时出点时间戳 // //记录标绿框时出点时间戳
_RecordEndTime = info2.TimeCode; // _RecordEndTime = info2.TimeCode;
_singleOutPointInfo = info2; // _singleOutPointInfo = info2;
} // }
} // }
//清除点选跟踪框的数据 // //清除点选跟踪框的数据
NDIView.saveInfo = new TrackingBoxInfo(); // NDIView.saveInfo = new TrackingBoxInfo();
//清除拖框的数据 // NDIView.saveOutPointInfo = new TrackingBoxInfo();
NDIView.rectsReplay.Clear(); // //清除拖框的数据
// NDIView.rectsReplay.Clear();
} // }
} // }
#endregion // #endregion
} // }
//如果是Start滑块在动 // //如果是Start滑块在动
if (IsStartValue) // if (IsStartValue)
StartTime = dse.TimeStamp; // StartTime = dse.TimeStamp;
else if (IsEndValue) // else if (IsEndValue)
EndTime = dse.TimeStamp; // EndTime = dse.TimeStamp;
// Replay更新画面 // // Replay更新画面
WPFHelper.BeginInvoke(() => // WPFHelper.BeginInvoke(() =>
{ // {
try // try
{ // {
var view3 = this.FindChild<NDIView>(Application.Current.MainWindow, NDIViewKeys.cam3); // var view3 = this.FindChild<NDIView>(Application.Current.MainWindow, NDIViewKeys.cam3);
if (view3 != null) // if (view3 != null)
{ // {
// 更新视频流 // // 更新视频流
view3.video.UpdateVideoFrame(dsExtend, true); // view3.video.UpdateVideoFrame(dsExtend, true);
// 更新视频控件跟踪框信息，现在_cam3BInfos里是缓存的跟踪框信息 // // 更新视频控件跟踪框信息，现在_cam3BInfos里是缓存的跟踪框信息
if (_cam3BInfos.Count > 0) // if (_cam3BInfos.Count > 0)
{ // {
_cam3StaticInfos = _cam3BInfos; // _cam3StaticInfos = _cam3BInfos;
var gameName = ApplicationDomainEx.LiteDbContext.ViewConfig // var gameName = ApplicationDomainEx.LiteDbContext.ViewConfig
.FindOne(p => p.ViewKey == NDIViewKeys.CAM_1).GameName; // .FindOne(p => p.ViewKey == NDIViewKeys.CAM_1).GameName;
//当双人3m跳水,双人10m跳水,双人速度攀岩时，保存2个入点框 // //当双人3m跳水,双人10m跳水,双人速度攀岩时，保存2个入点框
if (gameName.Equals(SportsProjectCodes.SS) || // if (gameName.Equals(SportsProjectCodes.SS) ||
gameName.Equals(SportsProjectCodes.ST) || // gameName.Equals(SportsProjectCodes.ST) ||
gameName.Equals(SportsProjectCodes.SP)) // gameName.Equals(SportsProjectCodes.SP))
{ // {
foreach (var saveInfo in NDIView.saveInfos) // foreach (var saveInfo in NDIView.saveInfos)
{ // {
//更新红色点中框 // //更新红色点中框
if (saveInfo.SrcRect.Left > 0) // if (saveInfo.SrcRect.Left > 0)
{ // {
saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR; // saveInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
//把选中框的信息也加到这个集合里 // //把选中框的信息也加到这个集合里
_cam3Infos.Add(saveInfo); // _cam3Infos.Add(saveInfo);
//记录标红框时入点时间戳 // //记录标红框时入点时间戳
_RecordStartTime = saveInfo.TimeCode; // _RecordStartTime = saveInfo.TimeCode;
} // }
} // }
} // }
else // else
{ // {
//单人 // //单人
var info = NDIView.saveInfo; // var info = NDIView.saveInfo;
//更新红色点中框 // //更新红色点中框
if (info.SrcRect.Left > 0) // if (info.SrcRect.Left > 0)
{ // {
info.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR; // info.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR;
//把选中框的信息也加到这个集合里 // //把选中框的信息也加到这个集合里
_cam3Infos.Add(info); // _cam3Infos.Add(info);
//记录标红框时入点时间戳 // //记录标红框时入点时间戳
_RecordStartTime = info.TimeCode; // _RecordStartTime = info.TimeCode;
} // }
} // }
//再更新跟踪框信息 // //再更新跟踪框信息
view3.video.UpdateTrackingBox(_cam3Infos); // view3.video.UpdateTrackingBox(_cam3Infos);
} // }
} // }
} // }
catch (Exception ex) // catch (Exception ex)
{ // {
log.Error(ex); // log.Error(ex);
} // }
}); // });
} // }
IsStartValue = false; // IsStartValue = false;
IsEndValue = false; // IsEndValue = false;
#endregion // #endregion
} //}
public bool IsDrawStartPlace; public bool IsDrawStartPlace;
/// <summary> /// <summary>
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "27D273E06DFA15F6D27EB8C64BF9DA66E94CD4CD54532517742A535F99BE11A0" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A25B7FBA0B84B088564252FE23AF3AAB986E09C2E387816A9C3A8CB1206B638C"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1436 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1434 "..\..\..\..\..\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 1621 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1619 "..\..\..\..\..\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 1636 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1634 "..\..\..\..\..\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;
......
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}" "27D273E06DFA15F6D27EB8C64BF9DA66E94CD4CD54532517742A535F99BE11A0" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A25B7FBA0B84B088564252FE23AF3AAB986E09C2E387816A9C3A8CB1206B638C"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module { ...@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 1436 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1434 "..\..\..\..\..\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 1621 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1619 "..\..\..\..\..\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 1636 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 1634 "..\..\..\..\..\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;
......
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.Resource/obj/x64/Release/VIZ.Framework.Common.Resource_MarkupCompile.cache
...@@ -10,10 +10,10 @@ none ...@@ -10,10 +10,10 @@ none
false false
TRACE TRACE
9-721875057 91711917753
3-630027162 3-1719726047
19468308608 20-2028247964
Path\ArrowPathResource.xaml;Style\Button\Button_MessageBox.xaml;Style\Button\Button_Normal.xaml;Style\Button\Button_WindowTop.xaml;Style\GridSplitter\GridSplitter_None.xaml;Style\ListBox\ListBox_None.xaml;Style\ScrollView\ScrollView_Default.xaml;Style\TextBox\TextBox_None.xaml;Themes\Generic.xaml; Path\ArrowPathResource.xaml;Style\Button\Button_MessageBox.xaml;Style\Button\Button_Normal.xaml;Style\Button\Button_WindowTop.xaml;Style\GridSplitter\GridSplitter_None.xaml;Style\ListBox\ListBox_None.xaml;Style\ScrollView\ScrollView_Default.xaml;Style\TextBox\TextBox_None.xaml;Themes\Generic.xaml;
False False
......
VIZ.Framework/VIZ.Framework.Common/obj/x64/Release/GeneratedInternalTypeHelper.g.cs
//------------------------------------------------------------------------------ 
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace XamlGeneratedNamespace {
/// <summary>
/// GeneratedInternalTypeHelper
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
/// <summary>
/// CreateInstance
/// </summary>
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
}
/// <summary>
/// GetPropertyValue
/// </summary>
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// SetPropertyValue
/// </summary>
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// CreateDelegate
/// </summary>
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
delegateType,
handler}, null)));
}
/// <summary>
/// AddEventHandler
/// </summary>
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
eventInfo.AddEventHandler(target, handler);
}
}
}
VIZ.Framework/VIZ.Framework.Common/obj/x64/Release/VIZ.Framework.Common_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
TRACE TRACE
15-721109437 15488264905
121-1133520871 1212046750213
150-762123096 150-875198046
MessageBox\MessageBoxEx.xaml;MessageBox\MessageBoxExWindow.xaml;Themes\Generic.xaml;VideoControl\Control\VideoControl.xaml;Widgets\ColorPickButton\ColorPickButton.xaml;Widgets\ColorPickButton\ColorPickWindow.xaml;Widgets\GPIOPinTestControl\GPIOPinTestControl.xaml;Widgets\HotkeyBox\HotkeyBox.xaml;Widgets\IconButton\IconButton.xaml;Widgets\LabelValue\LabelValue.xaml;Widgets\NavigationControl\NavigationControl.xaml;Widgets\ResizeImageControl\ResizeImageControl.xaml;Widgets\ShowMessageControl\ShowMessageControl.xaml;Widgets\VideoTimeBar\VideoTimeBar.xaml;Widgets\ViewLoader\ViewLoader.xaml; MessageBox\MessageBoxEx.xaml;MessageBox\MessageBoxExWindow.xaml;Themes\Generic.xaml;VideoControl\Control\VideoControl.xaml;Widgets\ColorPickButton\ColorPickButton.xaml;Widgets\ColorPickButton\ColorPickWindow.xaml;Widgets\GPIOPinTestControl\GPIOPinTestControl.xaml;Widgets\HotkeyBox\HotkeyBox.xaml;Widgets\IconButton\IconButton.xaml;Widgets\LabelValue\LabelValue.xaml;Widgets\NavigationControl\NavigationControl.xaml;Widgets\ResizeImageControl\ResizeImageControl.xaml;Widgets\ShowMessageControl\ShowMessageControl.xaml;Widgets\VideoTimeBar\VideoTimeBar.xaml;Widgets\ViewLoader\ViewLoader.xaml;
True False
VIZ.Framework/VIZ.Framework.Module/obj/x64/Release/VIZ.Framework.Module_MarkupCompile.cache
...@@ -10,11 +10,11 @@ none ...@@ -10,11 +10,11 @@ none
false false
TRACE TRACE
1-731644535 11882902973
212002329545 212023628146
25-1969161261 26917618797
Themes\Generic.xaml; Themes\Generic.xaml;
True False
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