Commit 1acd09de by 鲁志-悦动

Replay调试点击跟踪框发送数据并优化程序完成

parent a5ef0d5e
C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs 
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Themes\Generic.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Themes\Generic.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Widgets\FootballFieldPanel\FootballFieldPanel.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Widgets\FootballFieldPanel\FootballFieldPanel.xaml;;
......
...@@ -6,8 +6,6 @@ using System.Windows.Media; ...@@ -6,8 +6,6 @@ using System.Windows.Media;
using System.Windows.Shapes; using System.Windows.Shapes;
using VIZ.Framework.Common; using VIZ.Framework.Common;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.Framework.Domain;
using VIZ.Framework.Storage;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
{ {
...@@ -306,6 +304,28 @@ namespace VIZ.FGOUT.Module ...@@ -306,6 +304,28 @@ namespace VIZ.FGOUT.Module
if (vm.IsReplay) if (vm.IsReplay)
{ {
if (_isMove)
{
_isMove = false;
aa = new PathGeometry();
if (!rectsReplay.Contains(rectReplay))
{
aa.AddGeometry(new RectangleGeometry(rectReplay));
rectsReplay.Add(rectReplay);
//if (rectsReplay.Count == 2)
// rectsReplay.RemoveAt(0);
var myPath = new Path()
{
Fill = Brushes.Transparent,
Stroke = Brushes.Green,
StrokeThickness = 1,
Data = aa
};
canvas1.Children.Add(myPath);
}
}
else
{
startPoint = e.GetPosition(this.canvas1); startPoint = e.GetPosition(this.canvas1);
//// 视频的宽度 //// 视频的宽度
//int resWith = ApplicationDomain.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_WIDTH); //int resWith = ApplicationDomain.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_WIDTH);
...@@ -314,10 +334,12 @@ namespace VIZ.FGOUT.Module ...@@ -314,10 +334,12 @@ namespace VIZ.FGOUT.Module
//最小距离 //最小距离
double minDistance = 10000; double minDistance = 10000;
saveInfo = new TrackingBoxInfo(); saveInfo = new TrackingBoxInfo();
//当有跟踪狂的时候,就不用拖一个出来了 //当有跟踪框的时候,就不用拖一个出来了
if (vm._cam3Infos.Count > 0) if (NDIViewModel._cam3StaticInfos.Count > 0)
{
foreach (var info in NDIViewModel._cam3StaticInfos)
{ {
foreach (var info in vm._cam3Infos) if (info.SrcRect.Left > 0 && info.SrcRect.Right > 0 && info.SrcRect.Top > 0 && info.SrcRect.Bottom > 0)
{ {
var difference = (startPoint.X - info.SrcRect.Left) + (info.SrcRect.Right - startPoint.X); var difference = (startPoint.X - info.SrcRect.Left) + (info.SrcRect.Right - startPoint.X);
if (difference < minDistance) if (difference < minDistance)
...@@ -327,26 +349,13 @@ namespace VIZ.FGOUT.Module ...@@ -327,26 +349,13 @@ namespace VIZ.FGOUT.Module
} }
} }
} }
else
{
aa = new PathGeometry();
if (!rectsReplay.Contains(rectReplay))
{
aa.AddGeometry(new RectangleGeometry(rectReplay));
rectsReplay.Add(rectReplay);
//if (rectsReplay.Count == 2)
// rectsReplay.RemoveAt(0);
var myPath = new Path()
{
Fill = Brushes.Transparent,
Stroke = Brushes.Green,
StrokeThickness = 1,
Data = aa
};
canvas1.Children.Add(myPath);
} }
} }
} }
else
{
rectsReplay.Clear();
}
} }
/// <summary> /// <summary>
...@@ -433,6 +442,7 @@ namespace VIZ.FGOUT.Module ...@@ -433,6 +442,7 @@ namespace VIZ.FGOUT.Module
} }
} }
bool _isMove;
/// <summary> /// <summary>
/// 鼠标移动 /// 鼠标移动
/// </summary> /// </summary>
...@@ -472,6 +482,7 @@ namespace VIZ.FGOUT.Module ...@@ -472,6 +482,7 @@ namespace VIZ.FGOUT.Module
if (vm.IsReplay) if (vm.IsReplay)
{ {
rectReplay = new Rect(startPoint, e.GetPosition(this.canvas1)); rectReplay = new Rect(startPoint, e.GetPosition(this.canvas1));
_isMove = true;
} }
} }
} }
......
...@@ -261,10 +261,28 @@ namespace VIZ.FGOUT.Module ...@@ -261,10 +261,28 @@ namespace VIZ.FGOUT.Module
} }
List<List<List<int>>> inPoints = new List<List<List<int>>>(); List<List<List<int>>> inPoints = new List<List<List<int>>>();
if (_cam3Infos.Count > 0) bool isInPoint = false;
inPoints = CoordinateTrackingBoxInfo(nDIView.saveInfo.SrcRect, srcWidth, srcHeight); if (nDIView.rectsReplay.Count > 0 && nDIView.rectsReplay[0].Width > 0 && nDIView.rectsReplay[0].Height > 0)
else {
inPoints = Coordinate(nDIView.rectsReplay, srcWidth, srcHeight); inPoints = Coordinate(nDIView.rectsReplay, srcWidth, srcHeight);
isInPoint = true;
}
else if(nDIView.saveInfo.SrcRect.Left > 0)
{
inPoints = CoordinateTrackingBoxInfo(nDIView.saveInfo.SrcRect, srcWidth, srcHeight);
isInPoint = true;
nDIView.saveInfo = new TrackingBoxInfo();
}
//if (_cam3StaticInfos.Count > 0)
// inPoints = CoordinateTrackingBoxInfo(nDIView.saveInfo.SrcRect, srcWidth, srcHeight);
//else
// inPoints = Coordinate(nDIView.rectsReplay, srcWidth, srcHeight);
if (!isInPoint)
{
MessageBoxEx.ShowDialog("没有获取到入点跟踪框信息。");
return;
}
var replayPackage = new ReplayPackage() var replayPackage = new ReplayPackage()
{ {
...@@ -394,6 +412,8 @@ namespace VIZ.FGOUT.Module ...@@ -394,6 +412,8 @@ namespace VIZ.FGOUT.Module
public static long StartTime { get; set; } public static long StartTime { get; set; }
public static long EndTime { get; set; } public static long EndTime { get; set; }
public static List<TrackingBoxInfo> _cam3StaticInfos;
/// <summary> /// <summary>
/// Replay选中和SliderValueChanged传值共用这一个方法 /// Replay选中和SliderValueChanged传值共用这一个方法
/// </summary> /// </summary>
...@@ -789,31 +809,35 @@ namespace VIZ.FGOUT.Module ...@@ -789,31 +809,35 @@ namespace VIZ.FGOUT.Module
private List<List<List<int>>> CoordinateTrackingBoxInfo(RawRectangleF rect, double srcWidth, double srcHeight) private List<List<List<int>>> CoordinateTrackingBoxInfo(RawRectangleF rect, double srcWidth, double srcHeight)
{ {
// 视频的宽度 //// 视频的宽度
int resWith = ApplicationDomain.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_WIDTH); //int resWith = ApplicationDomain.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_WIDTH);
// 视频的高度 //// 视频的高度
int resHeight = ApplicationDomain.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_HEIGHT); //int resHeight = ApplicationDomain.IniStorage.GetValue<VideoConfig, int>(p => p.VIDEO_HEIGHT);
double xp = srcWidth / resWith; //double xp = srcWidth / resWith;
double xy = srcHeight / resHeight; //double xy = srcHeight / resHeight;
var listOuterMost = new List<List<List<int>>>(); var listOuterMost = new List<List<List<int>>>();
int dx = Convert.ToInt32(rect.Left / xp); // int dx = Convert.ToInt32(rect.Left / xp);
int dy = Convert.ToInt32(rect.Top / xy); // int dy = Convert.ToInt32(rect.Top / xy);
int width = Convert.ToInt32((rect.Right - rect.Left) / xp); // int width = Convert.ToInt32((rect.Right - rect.Left) / xp);
int height = Convert.ToInt32((rect.Bottom - rect.Top) / xy); // int height = Convert.ToInt32((rect.Bottom - rect.Top) / xy);
int x2 = dx + width; // int x2 = dx + width;
int y2 = dy; // int y2 = dy;
int x3 = dx + width; // int x3 = dx + width;
int y3 = dy + height; // int y3 = dy + height;
int x4 = dx; // int x4 = dx;
int y4 = dy + height; // int y4 = dy + height;
List<List<int>> coordinates = new List<List<int>>() { new List<int>() { dx, dy }, new List<int>() { x2, y2 }, new List<int>() { x3, y3 }, new List<int>() { x4, y4 } }; // List<List<int>> coordinates = new List<List<int>>() { new List<int>() { dx, dy }, new List<int>() { x2, y2 }, new List<int>() { x3, y3 }, new List<int>() { x4, y4 } };
// listOuterMost.Add(coordinates);
List<List<int>> coordinates = new List<List<int>>() { new List<int>() { (int)rect.Left, (int)rect.Top }, new List<int>() { (int)rect.Right, (int)rect.Top },
new List<int>() { (int)rect.Right, (int)rect.Bottom }, new List<int>() { (int)rect.Left, (int)rect.Bottom } };
listOuterMost.Add(coordinates); listOuterMost.Add(coordinates);
return listOuterMost; return listOuterMost;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
2024-02-29 18:12:43,372 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:I 
2024-02-29 18:12:44,249 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:O \ No newline at end of file
2024-02-29 18:12:46,839 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串:{"type":"REPLAY","start_time":0,"end_time":0,"status":1}
2024-02-29 18:12:46,840 [1] INFO VIZ.Framework.Connection.UdpEndpointManagerExpand - 发送UDPJosn串:{"type":"REPLAY","start_time":0,"end_time":0,"status":1}
2024-02-29 18:12:51,014 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:W
2024-02-29 18:12:52,440 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Up
2024-02-29 18:12:56,459 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Down
2024-02-29 18:12:59,525 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:00,707 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:01,829 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Up
2024-02-29 18:13:03,451 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Down
2024-02-29 18:13:04,134 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:04,590 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:04,657 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:04,715 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:04,719 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:04,746 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:04,808 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:04,867 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:04,870 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:04,871 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:04,897 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:04,997 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:05,001 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:05,001 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:05,029 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:05,090 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:05,150 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:05,153 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:05,215 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:05,219 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:05,277 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:05,281 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:05,340 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:05,345 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:05,406 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:05,467 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:05,471 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:05,471 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:05,947 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:06,440 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:06,501 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:06,574 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:06,579 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:06,646 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:06,649 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:06,649 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:06,710 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:06,715 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:06,715 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:06,746 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:06,804 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:06,869 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:06,927 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:06,933 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:06,933 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:06,960 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:07,018 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:07,084 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:07,143 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:07,148 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Left
2024-02-29 18:13:07,463 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:07,963 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:08,022 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:08,082 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:08,087 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:08,156 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:08,157 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:08,215 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:08,219 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:08,279 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:08,284 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:08,344 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:08,348 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:08,788 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Right
2024-02-29 18:13:10,284 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Up
2024-02-29 18:13:11,580 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Down
2024-02-29 18:13:12,088 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Up
2024-02-29 18:13:12,486 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Down
2024-02-29 18:13:12,783 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Up
2024-02-29 18:13:13,073 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Down
2024-02-29 18:13:13,366 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Up
2024-02-29 18:13:13,654 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Down
2024-02-29 18:13:13,968 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Up
2024-02-29 18:13:14,217 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Down
2024-02-29 18:13:14,557 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Up
2024-02-29 18:13:15,151 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Down
2024-02-29 18:13:15,554 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Up
2024-02-29 18:13:16,237 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Down
2024-02-29 18:13:16,814 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:Up
2024-02-29 18:13:20,576 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:W
2024-02-29 18:13:20,956 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:A
2024-02-29 18:30:14,592 [1] INFO VIZ.FGOUT.Module.NDIMainViewModel - 快捷键:
...@@ -84,7 +84,7 @@ UDP_UESETTING_PORT=8888 ...@@ -84,7 +84,7 @@ UDP_UESETTING_PORT=8888
;UDP算法端口 ;UDP算法端口
UDP_Algorithm_PORT=8001 UDP_Algorithm_PORT=8001
;UDP音视频流IP, 如果该值不配置,那么会从流中获取 ;UDP音视频流IP, 如果该值不配置,那么会从流中获取
UDP_Stream_IP=192.168.31.83 ;UDP_Stream_IP=192.168.31.83
; ============================================================ ; ============================================================
; === Algorithm === ; === Algorithm ===
; ============================================================ ; ============================================================
......
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