Commit b99a49b6 by 鲁志-悦动

视频流的深拷贝

parent 269220f4
b77ab2f7b49389b9182c7f81f043501dbd1f28bc
fba8dc5b9b837464b22019519439fe1b9f969740
......@@ -4,7 +4,7 @@
library
C#
.cs
D:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\obj\x64\Debug\
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\obj\x64\Debug\
VIZ.FGOUT.Common
none
false
......@@ -13,7 +13,7 @@ false
21870986562
31364711570
171166775462
171121717210
Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
False
......
D:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs
FD:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Themes\Generic.xaml;;
FD:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Widgets\FootballFieldPanel\FootballFieldPanel.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Themes\Generic.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Widgets\FootballFieldPanel\FootballFieldPanel.xaml;;
fdabdd16b89e6e5e7c9f808ae8e6503a5aab99e9
47cca392853111971d94a0d2c7f46eca4658dc87
......@@ -6,6 +6,6 @@
/// </summary>
public class ReplayModel
{
public bool IsReplay { get; set; }
}
}
1565ec4cef60aa46d7212ff978cf49d7d3fe3743
a374a7f17b3bff0c3c028efbfc085fc4a1015b5b
......@@ -498,3 +498,5 @@ D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Mo
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.pdb
D:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\ToogleButton\ToogleButton_Setting.baml
D:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\TextBlock\TextBlock_Setting.baml
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\TextBlock\TextBlock_Setting.baml
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\ToogleButton\ToogleButton_Setting.baml
......@@ -4,7 +4,7 @@
library
C#
.cs
D:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\
VIZ.FGOUT.Module.Resource
none
false
......@@ -13,7 +13,7 @@ DEBUG;TRACE
18560433975
1470602451
11-350624472
241319896476
24771590698
Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_Setting.xaml;Style\CheckBox\CheckBox_WindowTop.xaml;Style\ComboBox\ComboBox_Setting.xaml;Style\HotkeyBox\HotkeyBox_Setting.xaml;Style\MessageBox\MessageBoxEx.xaml;Style\RadioButton\RadioButton_FootballSide.xaml;Style\RadioButton\RadioButton_NdiView.xaml;Style\RadioButton\RadioButton_Setting.xaml;Style\Slider\Slider_Setting.xaml;Style\TextBlock\TextBlock_Setting.xaml;Style\TextBox\TextBox_Setting.xaml;Style\ToogleButton\ToogleButton_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml;
False
......
......@@ -4,7 +4,7 @@
library
C#
.cs
D:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\
VIZ.FGOUT.Module.Resource
none
false
......@@ -13,8 +13,8 @@ DEBUG;TRACE
18560433975
1470602451
121374819015
23-676971786
23-1225277564
Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_Setting.xaml;Style\CheckBox\CheckBox_WindowTop.xaml;Style\ComboBox\ComboBox_Setting.xaml;Style\HotkeyBox\HotkeyBox_Setting.xaml;Style\MessageBox\MessageBoxEx.xaml;Style\RadioButton\RadioButton_FootballSide.xaml;Style\RadioButton\RadioButton_NdiView.xaml;Style\RadioButton\RadioButton_Setting.xaml;Style\Slider\Slider_Setting.xaml;Style\TextBlock\TextBlock_Setting.xaml;Style\TextBox\TextBox_Setting.xaml;Style\ToogleButton\ToogleButton_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml;
False
True

FD:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\Themes\Generic.xaml;;
FD:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\Themes\Generic.xaml;;
......@@ -124,15 +124,13 @@
<WrapPanel
Grid.Row="1"
Grid.Column="0"
Grid.Column="1"
Margin="135,0,0,0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<GroupBox Foreground="White" Header="自动检测">
<CheckBox
Margin="15"
......@@ -178,9 +176,7 @@
Grid.Column="0"
Margin="0,0,40,0"
HorizontalAlignment="Right">
<Grid>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
......@@ -204,7 +200,7 @@
<Button
Grid.Column="1"
Width="100"
Width="100" IsEnabled="{Binding ReplayEnable, Mode=TwoWay}"
Height="40"
Margin="10"
Command="{Binding ReplayCommand}"
......
......@@ -455,12 +455,17 @@ namespace VIZ.FGOUT.Module
#region Replay 命令
public VCommand ReplayCommand { get; set; }
private bool _replayButtonIsEnable = true;
/// <summary>
/// replay 播控功能
/// </summary>
private void Replay()
{
ReplayModel replayModel = new ReplayModel();
if (_replayButtonIsEnable)
ReplayEnable = _replayButtonIsEnable = false;
else
ReplayEnable = _replayButtonIsEnable = true;
ReplayModel replayModel = new ReplayModel() { IsReplay = !_replayButtonIsEnable };
ApplicationDomainEx.MessageManager.Send(replayModel);
}
......@@ -664,6 +669,19 @@ namespace VIZ.FGOUT.Module
#region 按钮可用性
/// <summary>
/// 开始位置可用性
/// </summary>
private bool replayEnable = true;
public bool ReplayEnable
{
get { return replayEnable; }
set { replayEnable = value; this.RaisePropertyChanged(nameof(ReplayEnable)); }
}
/// <summary>
/// 开始位置可用性
/// </summary>
......
using System.Collections.Generic;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Shapes;
using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage;
using VIZ.Framework.Core;
......@@ -16,7 +14,7 @@ namespace VIZ.FGOUT.Module
/// </summary>
public partial class NDIView : UserControl
{
NDIViewModel vm = new NDIViewModel();
public NDIViewModel vm = new NDIViewModel();
//Rectangle rectStart = new Rectangle();
......@@ -100,94 +98,94 @@ namespace VIZ.FGOUT.Module
private void Border_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
this.manualConfig = ApplicationDomainEx.LiteDbContext.SetManualConfig.FindAll().FirstOrDefault();
if (!this.manualConfig.IsManual) return;
isMouseDown = false;
//if (vm.IsDrawStartPlace)
//{
// rectStart.Stroke = Brushes.Red;
// rectStart.StrokeThickness = 0;
// //if (!this.canvas1.Children.Contains(rectStart))
// //{
// // this.canvas1.Children.Add(rectStart);
// //}
//}
//if (vm.IsDrawEndPlace)
//{
// rectEnd.Stroke = Brushes.Green;
// rectEnd.StrokeThickness = 0;
// //if (!this.canvas1.Children.Contains(rectEnd))
// //{
// // this.canvas1.Children.Add(rectEnd);
// //}
//}
double width= this.video.ActualWidth;
double height = this.video.ActualHeight;
double cans1width = this.canvas1.ActualWidth;
double cans1height = this.canvas1.ActualHeight;
if (vm.IsDrawStartPlace)
{
///aa = new PathGeometry();
///
//if (aa == null)
//{
aa = new PathGeometry();
//RectangleGeometry temp1 = new RectangleGeometry(rectStart);
// temp1.StrokeContains
//foreach (var rectStart in rectStarts)
//{
// aa.AddGeometry(new RectangleGeometry(rectStart));
//}
//aa.AddGeometry(new RectangleGeometry(rectStart));
aa.AddGeometry(new RectangleGeometry(rectEnd));
aa.AddGeometry(new RectangleGeometry(rectInvalid));
// }
}
else if(vm.IsDrawEndPlace)
{
//if (aa == null)
//{
// bb = new PathGeometry();
// bb.AddGeometry(new RectangleGeometry(rectEnd));
// }
aa = new PathGeometry();
//foreach (var rectStart in rectStarts)
//{
// aa.AddGeometry(new RectangleGeometry(rectStart));
//}
//aa.AddGeometry(new RectangleGeometry(rectStart));
aa.AddGeometry(new RectangleGeometry(rectEnd));
aa.AddGeometry(new RectangleGeometry(rectInvalid));
}
else if(vm.IsDrawInvalidPlace)
{
aa = new PathGeometry();
//foreach (var rectStart in rectStarts)
//{
// aa.AddGeometry(new RectangleGeometry(rectStart));
//}
//aa.AddGeometry(new RectangleGeometry(rectStart));
aa.AddGeometry(new RectangleGeometry(rectEnd));
aa.AddGeometry(new RectangleGeometry(rectInvalid));
}
myPath.Data = aa;
// this.manualConfig = ApplicationDomainEx.LiteDbContext.SetManualConfig.FindAll().FirstOrDefault();
// if (!this.manualConfig.IsManual) return;
// isMouseDown = false;
// //if (vm.IsDrawStartPlace)
// //{
// // rectStart.Stroke = Brushes.Red;
// // rectStart.StrokeThickness = 0;
// // //if (!this.canvas1.Children.Contains(rectStart))
// // //{
// // // this.canvas1.Children.Add(rectStart);
// // //}
// //}
// //if (vm.IsDrawEndPlace)
// //{
// // rectEnd.Stroke = Brushes.Green;
// // rectEnd.StrokeThickness = 0;
// // //if (!this.canvas1.Children.Contains(rectEnd))
// // //{
// // // this.canvas1.Children.Add(rectEnd);
// // //}
// //}
// double width= this.video.ActualWidth;
// double height = this.video.ActualHeight;
// double cans1width = this.canvas1.ActualWidth;
// double cans1height = this.canvas1.ActualHeight;
// if (vm.IsDrawStartPlace)
// {
// ///aa = new PathGeometry();
// ///
// //if (aa == null)
// //{
// aa = new PathGeometry();
// //RectangleGeometry temp1 = new RectangleGeometry(rectStart);
// // temp1.StrokeContains
// //foreach (var rectStart in rectStarts)
// //{
// // aa.AddGeometry(new RectangleGeometry(rectStart));
// //}
// //aa.AddGeometry(new RectangleGeometry(rectStart));
// aa.AddGeometry(new RectangleGeometry(rectEnd));
// aa.AddGeometry(new RectangleGeometry(rectInvalid));
// // }
// }
// else if(vm.IsDrawEndPlace)
// {
// //if (aa == null)
// //{
// // bb = new PathGeometry();
// // bb.AddGeometry(new RectangleGeometry(rectEnd));
// // }
// aa = new PathGeometry();
// //foreach (var rectStart in rectStarts)
// //{
// // aa.AddGeometry(new RectangleGeometry(rectStart));
// //}
// //aa.AddGeometry(new RectangleGeometry(rectStart));
// aa.AddGeometry(new RectangleGeometry(rectEnd));
// aa.AddGeometry(new RectangleGeometry(rectInvalid));
// }
//else if(vm.IsDrawInvalidPlace)
// {
// aa = new PathGeometry();
// //foreach (var rectStart in rectStarts)
// //{
// // aa.AddGeometry(new RectangleGeometry(rectStart));
// //}
// //aa.AddGeometry(new RectangleGeometry(rectStart));
// aa.AddGeometry(new RectangleGeometry(rectEnd));
// aa.AddGeometry(new RectangleGeometry(rectInvalid));
// }
// myPath.Data = aa;
}
private void Border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
......
......@@ -69,7 +69,6 @@ namespace VIZ.FGOUT.Module
//初始化算法
// this.InitAlgorithm();
}
/// <summary>
......@@ -160,20 +159,20 @@ namespace VIZ.FGOUT.Module
ueControlPanelView.Show();
}
public bool IsReplay =false;
/// <summary>
/// replay 命令
/// </summary>
private void Replay(ReplayModel replayModel)
{
if (this.ViewKey != "CAM_1")
{
return;
}
ReplayPanelView replayPanelView = new ReplayPanelView();
RePlayPanelViewModel rePlayPanelViewModel = replayPanelView.DataContext as RePlayPanelViewModel;
rePlayPanelViewModel.timecode = timecode;
replayPanelView.Show();
IsReplay = replayModel.IsReplay;
//ReplayPanelView replayPanelView = new ReplayPanelView();
//RePlayPanelViewModel rePlayPanelViewModel = replayPanelView.DataContext as RePlayPanelViewModel;
//rePlayPanelViewModel.timecode = timecode;
//replayPanelView.Show();
}
/// <summary>
......@@ -235,7 +234,6 @@ namespace VIZ.FGOUT.Module
IsDrawStartPlace = false;
IsDrawEndPlace = false;
IsCleanPlace = false;
}
......@@ -255,8 +253,8 @@ namespace VIZ.FGOUT.Module
IsDrawInvalidPlace = false;
//nDIView.rectStart = new System.Windows.Rect(0, 0, 0, 0);
nDIView.rectEnd = new System.Windows.Rect(0, 0, 0, 0);
nDIView.rectInvalid = new System.Windows.Rect(0, 0, 0, 0);
//nDIView.rectEnd = new System.Windows.Rect(0, 0, 0, 0);
//nDIView.rectInvalid = new System.Windows.Rect(0, 0, 0, 0);
nDIView.polygonsStart.Clear();
nDIView.polygonsEnd.Clear();
......@@ -394,9 +392,7 @@ namespace VIZ.FGOUT.Module
this.manualConfig = ApplicationDomainEx.LiteDbContext.SetManualConfig.FindAll().FirstOrDefault();
if (this.manualConfig==null)
{
this.manualConfig = new SetManualConfig();
}
this.manualConfig.IsManual = savePlaceModel.IsManual;
this.manualConfig.IsStartMat = savePlaceModel.IsStartMat;
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "01435BBE89EC4DCDB63849DA92F11980D271587C3E8D98E3488B2A1580DCC915"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0B309E3F95FE48A88A7C889AA393045A6B4CE3C6BEE153A0005C54FD0A0F5904"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 306 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 302 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 324 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 320 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "01435BBE89EC4DCDB63849DA92F11980D271587C3E8D98E3488B2A1580DCC915"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0B309E3F95FE48A88A7C889AA393045A6B4CE3C6BEE153A0005C54FD0A0F5904"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 306 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 302 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1;
......@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 324 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 320 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......
bb45dc7862f5677ab2cd5a3afa72c7ae1c5fd285
804b778db4c457a134cf20855d93b6ed1d83d406
......@@ -4,7 +4,7 @@
library
C#
.cs
D:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\
VIZ.FGOUT.Module
none
false
......@@ -13,7 +13,7 @@ DEBUG;TRACE
22-808211288
90-747441034
151130447140
151697787199
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\MattingImagePanelView.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;
False
......
......@@ -4,7 +4,7 @@
library
C#
.cs
D:\wyh\FGOUT\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\
D:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\
VIZ.FGOUT.Module
none
false
......@@ -13,7 +13,7 @@ DEBUG;TRACE
22-808211288
91978002453
151130447140
151697787199
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\MattingImagePanelView.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;
True
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment