Commit d2828c61 by 鲁志-悦动

ReplaySend发送timecode时间戳

parent 8d519fd0
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Collections.Generic;
namespace VIZ.FGOUT.Connection
{
......
using System.Dynamic;
namespace VIZ.FGOUT.Domain
namespace VIZ.FGOUT.Domain
{
/// <summary>
......@@ -9,7 +7,6 @@ namespace VIZ.FGOUT.Domain
public class ReplayModel
{
public bool IsReplay { get; set; }
public int SliderValue { get; set; }
public bool IsSliderValueChanged { get; set; }
}
......
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
181380438361
1-1441241311
11-1602666439
23-1982761867
18560433975
1470602451
11-350624472
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;
True
False
......@@ -200,7 +200,6 @@
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
......@@ -208,7 +207,6 @@
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Button
Width="120"
Height="40"
......@@ -330,6 +328,16 @@
Command="{Binding Path=UEControlCommand}"
Content="UE控制"
Style="{StaticResource Button_Setting}" />
<Button
Grid.Row="2"
Grid.Column="3"
Height="40"
Margin="10"
Command="{Binding Path=ReplaySendCommand}"
Content="Replay Send"
Style="{StaticResource Button_Setting}"
Visibility="{Binding ReplaySendVisibility, Mode=TwoWay}" />
</Grid>
</WrapPanel>
......
......@@ -74,6 +74,8 @@ namespace VIZ.FGOUT.Module
this.UESettingCommand = new VCommand(this.UESetting);
//UEControl
this.UEControlCommand = new VCommand(this.UEControl);
//ReplaySend
this.ReplaySendCommand = new VCommand(this.ReplaySend);
}
/// <summary>
......@@ -442,6 +444,39 @@ namespace VIZ.FGOUT.Module
#endregion
#region Replay发送
private Visibility _replaySendVisibility = Visibility.Hidden;
public Visibility ReplaySendVisibility
{
get => _replaySendVisibility;
set
{
_replaySendVisibility = value;
this.RaisePropertyChanged(nameof(ReplaySendVisibility));
}
}
public VCommand ReplaySendCommand { get; set; }
private void ReplaySend()
{
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager($"CAM_1__CLIP");
if (manager == null) return;
ReplayPackage replayPackage = new ReplayPackage();
replayPackage.type = "REPLAY";
VideoData data = new VideoData();
//data.backTimes = Convert.ToInt32(ReplaySecond);
//timecode时间戳
data.timecode = NDIViewModel.ReplayTimeStamp;
data.status = 1;
replayPackage.data = data;
manager.SendJson(replayPackage);
}
#endregion
#region 落盘开关
public VCommand SaveMatImageCommand { get; set; }
......@@ -534,6 +569,7 @@ namespace VIZ.FGOUT.Module
public VCommand ReplayUncheckedCommand { get; set; }
private void ReplayChecked()
{
ReplaySendVisibility = Visibility.Visible;
SliderVisibility = Visibility.Visible;
SliderValue = SliderMaxValue;
ReplayModel replayModel = new ReplayModel() { IsReplay = true };
......@@ -542,6 +578,7 @@ namespace VIZ.FGOUT.Module
private void ReplayUnchecked()
{
ReplaySendVisibility = Visibility.Hidden;
SliderVisibility = Visibility.Hidden;
ReplayModel replayModel = new ReplayModel() { IsReplay = false };
ApplicationDomain.MessageManager.Send(replayModel);
......
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.FGOUT.Domain;
using VIZ.Framework.Common;
using VIZ.Framework.Core;
using VIZ.FGOUT.Domain;
namespace VIZ.FGOUT.Module
{
......
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Collections.Generic;
using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Module;
using VIZ.FGOUT.Storage;
namespace VIZ.FGOUT.Module
......
......@@ -178,7 +178,7 @@ namespace VIZ.FGOUT.Module
dsExtend.Width = dse.Width;
dsExtend.Height = dse.Height;
dsExtend.Length = newLength;
dsExtend.TimeStamp = e.Frame.TimeStamp;
dsExtend.TimeStamp = NDIViewModel.ReplayTimeStamp = e.Frame.TimeStamp;
// 更新画面
view.video.UpdateVideoFrame(dsExtend, true);
//view.video.UpdateVideoFrame(dse, true);
......
......@@ -162,6 +162,9 @@ namespace VIZ.FGOUT.Module
ueControlPanelView.Show();
}
//Replay时间戳
public static long ReplayTimeStamp = 0;
//滑动条的值
public int SliderValue = 0;
public bool IsSliderValueChanged = false;
public bool IsReplay =false;
......
using log4net;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using VIZ.Framework.Module;
using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage;
using VIZ.Framework.Module;
namespace VIZ.FGOUT.Module
{
......
......@@ -5,7 +5,6 @@ using System.Windows;
using VIZ.FGOUT.Connection.UDP.Clip.Signal.Send;
using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage;
using VIZ.Framework.Common;
using VIZ.Framework.Connection;
using VIZ.Framework.Core;
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8FCDA1C31237DC58403A9103308D280A2E2A5FEA19851227240D8EC8A0B29CD4"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "905D633825395BD164CB053E511CEAA5581F7E816203BA8901F94D9D2FBC4F96"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 337 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 345 "..\..\..\..\..\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 356 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 364 "..\..\..\..\..\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}" "8FCDA1C31237DC58403A9103308D280A2E2A5FEA19851227240D8EC8A0B29CD4"
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "905D633825395BD164CB053E511CEAA5581F7E816203BA8901F94D9D2FBC4F96"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
......@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden
#line 337 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 345 "..\..\..\..\..\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 356 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
#line 364 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2;
......
......@@ -10,11 +10,11 @@ none
false
DEBUG;TRACE
22-1559853185
4-137960189
90-1236168610
151-737430311
22-808211288
4414250355
90-747441034
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
False
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Storage
namespace VIZ.FGOUT.Storage
{
/// <summary>
/// Ndi视图配置
......
2023-10-09 10:20:45,846 [13] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-09 14:29:44,378 [10] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-09 14:30:20,849 [10] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-09 14:31:37,164 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-09 14:32:37,731 [4] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-09 14:33:00,027 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-09 14:33:31,802 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-09 14:34:38,573 [4] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-09 14:35:00,639 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-09 15:32:33,231 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-09 16:12:36,526 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-09 16:14:47,613 [10] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-09 16:16:47,457 [13] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-09 16:23:32,196 [10] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-09 16:54:36,510 [10] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-10 10:37:58,925 [10] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-10 11:00:10,269 [10] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-10 14:20:10,068 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-10 14:38:55,243 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-10 14:46:03,275 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-10 15:00:44,734 [10] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-10 15:20:07,353 [10] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-10 15:23:11,764 [11] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-10 16:11:18,222 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-10 18:19:25,768 [12] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
2023-10-10 18:19:41,632 [3] ERROR VIZ.FGOUT.Module.AlgorithmControllerBase - 算法'Single'的启动路径:'C:\projects\org\person_v1.1.0.0\main_person_new22.py'不正确!
......@@ -4,16 +4,16 @@
winexe
C#
.cs
D:\Projects\VIZ.Framework\VIZ.Framework.ImageContrastTool\obj\x64\Debug\
D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.ImageContrastTool\obj\x64\Debug\
VIZ.Framework.ImageContrastTool
none
false
DEBUG;TRACE
D:\Projects\VIZ.Framework\VIZ.Framework.ImageContrastTool\App.xaml
2-1875362010
71714499303
14-1099584980
138372698274
D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.ImageContrastTool\App.xaml
2702257237
7-1106066769
131090348065
1381027574134
MainWindow.xaml;View\MainView.xaml;
True
......
D:\Projects\VIZ.Framework\VIZ.Framework.ImageContrastTool\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs

FD:\Projects\VIZ.Framework\VIZ.Framework.ImageContrastTool\MainWindow.xaml;;
FD:\Projects\VIZ.Framework\VIZ.Framework.ImageContrastTool\View\MainView.xaml;;
FD:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.ImageContrastTool\MainWindow.xaml;;
FD:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.ImageContrastTool\View\MainView.xaml;;
......@@ -4,16 +4,16 @@
winexe
C#
.cs
D:\Projects\VIZ.Framework\VIZ.Framework.MacTool\obj\x64\Debug\
D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.MacTool\obj\x64\Debug\
VIZ.Framework.MacTool
none
false
DEBUG;TRACE
D:\Projects\VIZ.Framework\VIZ.Framework.MacTool\App.xaml
1219584333
D:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.MacTool\App.xaml
11151548125
6-989869676
18-1154730033
5-2017746502
18-2126111727
MainWindow.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