Skip to content

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

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

parent efb9c1c3
Showing with 59 additions and 102 deletions
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Resources/StringResource.en.xaml
......@@ -51,14 +51,14 @@
<sys:String x:Key="VideoInput">VideoInput</sys:String>
<sys:String x:Key="SourceVideoInput">SourceVideoInput</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="Tips">Tips</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="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="IntervalFrame">IntFram</sys:String>
<sys:String x:Key="IntervalPixel">IntPixel</sys:String>
<sys:String x:Key="RemoveOutPointPixel">OutPixel</sys:String>
<sys:String x:Key="KeepHighest">Highest</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="TrackingZone">Tracking zone</sys:String>
......
VIZ.FGOUT/VIZ.FGOUT.Module.Resource/Style/CheckBox/CheckBox_Setting.xaml
......@@ -3,6 +3,7 @@
<Style x:Key="CheckBox_Setting" TargetType="CheckBox">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Height" Value="20" />
<Setter Property="Foreground" Value="White" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="CheckBox">
......@@ -39,10 +40,13 @@
<Setter TargetName="border" Property="Background" Value="#ffffc000" />
<Setter TargetName="img" Property="Visibility" Value="Visible" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Foreground" Value="Gray" />
<Setter TargetName="border" Property="BorderBrush" Value="Gray" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
\ No newline at end of file
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
......@@ -955,7 +955,7 @@
Foreground="White"
Text="{DynamicResource IntervalFrame}" />
<TextBox
Width="60"
Width="57"
InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
......@@ -983,7 +983,7 @@
Foreground="White"
Text="{DynamicResource IntervalPixel}" />
<TextBox
Width="60"
Width="57"
InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
......@@ -1011,7 +1011,7 @@
Foreground="White"
Text="{DynamicResource RemoveOutPointPixel}" />
<TextBox
Width="60"
Width="57"
InputMethod.IsInputMethodEnabled="False"
PreviewTextInput="OnPreviewTextInputCommon"
Style="{StaticResource TextBoxStyle}"
......@@ -1033,7 +1033,6 @@
Command="{Binding KeepHighestCommand}"
Content="{DynamicResource KeepHighest}"
FontSize="14"
Foreground="White"
IsChecked="{Binding Path=IsKeepHighest, Mode=TwoWay}"
IsEnabled="{Binding KeepHighestIsEnabled}"
Style="{StaticResource CheckBox_Setting}" />
......@@ -1044,7 +1043,6 @@
Command="{Binding BigModelCommand}"
Content="{DynamicResource LargeModel}"
FontSize="14"
Foreground="White"
IsChecked="{Binding Path=IsBigModel, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" />
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
......@@ -278,6 +278,8 @@ namespace VIZ.FGOUT.Module
WPFHelper.BeginInvoke(() =>
{
MessageBoxEx.ShowDialog(message);
//关闭Replay
ReplayStop();
});
}
}
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml.cs
......@@ -464,11 +464,11 @@ namespace VIZ.FGOUT.Module
if (saveOutPointInfos.Count == 2)
{
saveOutPointInfos[0] = saveOutPointInfos[1];
saveOutPointInfos[1] = saveInfo;
saveOutPointInfos[1] = saveOutPointInfo;
}
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
//记录标红框时入点时间戳
_RecordStartTime = saveInfo.TimeCode;
_twoInfos.Add(saveInfo);
//清除点选跟踪框的数据
NDIView.saveInfos = new List<TrackingBoxInfo>();
}
else if (view.vm.IsEndValue)
{
......@@ -303,11 +306,15 @@ namespace VIZ.FGOUT.Module
//记录标绿框时入点时间戳
_RecordEndTime = saveInfo.TimeCode;
_twoOutPointInfos.Add(saveInfo);
}
//清除点选跟踪框的数据
NDIView.saveInfos = new List<TrackingBoxInfo>();
//清除点选跟踪框的数据
NDIView.saveOutPointInfos = new List<TrackingBoxInfo>();
}
}
////清除点选跟踪框的数据
//NDIView.saveInfos = new List<TrackingBoxInfo>();
//NDIView.saveOutPointInfos = new List<TrackingBoxInfo>();
}
else
{
......@@ -321,6 +328,9 @@ namespace VIZ.FGOUT.Module
//记录标红框时入点时间戳
_RecordStartTime = info2.TimeCode;
_singleInfo = info2;
//清除点选跟踪框的数据
NDIView.saveInfo = new TrackingBoxInfo();
}
else if (view.vm.IsEndValue)
{
......@@ -329,12 +339,16 @@ namespace VIZ.FGOUT.Module
//记录标绿框时出点时间戳
_RecordEndTime = info2.TimeCode;
_singleOutPointInfo = info2;
//清除点选跟踪框的数据
NDIView.saveOutPointInfo = new TrackingBoxInfo();
}
}
//清除点选跟踪框的数据
NDIView.saveInfo = new TrackingBoxInfo();
NDIView.saveOutPointInfo = new TrackingBoxInfo();
////清除点选跟踪框的数据
//NDIView.saveInfo = new TrackingBoxInfo();
//NDIView.saveOutPointInfo = new TrackingBoxInfo();
//清除拖框的数据
NDIView.rectsReplay.Clear();
NDIView.rectsOutReplay.Clear();
......@@ -386,7 +400,7 @@ namespace VIZ.FGOUT.Module
}
foreach (var saveOutInfo in NDIView.saveOutPointInfos)
{
//更新红绿色点中框
//更新绿色点中框
if (saveOutInfo.SrcRect.Left > 0)
{
saveOutInfo.DrawingBorderColor = this.TRACKING_BOX_BORDER_COLOR_GREEN;
......
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>
// 此代码由工具生成。
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1436 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1434 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1621 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1619 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1636 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1634 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
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>
// 此代码由工具生成。
......@@ -74,7 +74,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1436 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1434 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -82,7 +82,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1621 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1619 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......@@ -90,7 +90,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 1636 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 1634 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
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\NDIPreviewView\View\NDIPreviewView.xaml;;
......
VIZ.Framework/VIZ.Framework.Common.Resource/obj/x64/Release/VIZ.Framework.Common.Resource_MarkupCompile.cache
......@@ -10,10 +10,10 @@ none
false
TRACE
9-721875057
91711917753
3-630027162
19468308608
3-1719726047
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;
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
false
TRACE
15-721109437
15488264905
121-1133520871
150-762123096
1212046750213
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;
True
False
VIZ.Framework/VIZ.Framework.Module/obj/x64/Release/VIZ.Framework.Module_MarkupCompile.cache
......@@ -10,11 +10,11 @@ none
false
TRACE
1-731644535
11882902973
212002329545
25-1969161261
212023628146
26917618797
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