Skip to content

V
VIZ.GimbalAI
Commit 184ebf26 by liulongfei
Options

更新轴跟踪逻辑

parent c2b96bb8
Showing with 101 additions and 110 deletions
VIZ.GimbalAI.Client/config/config.ini
......@@ -23,8 +23,8 @@ CLIENT_BINDING_IP=192.168.0.124
;客户端UDP绑定端口
CLIENT_BINDING_PORT=8000
;算法UDP绑定IP
ALGORITHM_BINDING_IP=192.168.0.117
;ALGORITHM_BINDING_IP=127.0.0.1
;ALGORITHM_BINDING_IP=192.168.0.117
ALGORITHM_BINDING_IP=127.0.0.1
;算法UDP绑定端口
ALGORITHM_BINDING_PORT=8001
;云台UDP绑定IP
......@@ -55,7 +55,7 @@ ALGORITHM_CMD_WINDOW_STYLE=Minimized
; ============================================================
[Gimbal]
;云台中心轴移动速度
GIMBAL_CENTER_AXIS_SPEED=2
GIMBAL_CENTER_AXIS_SPEED=3
;云台中心轴X值
GIMBAL_CENTER_AXIS_X=960
;云台中心轴Y值
......
VIZ.GimbalAI.Connection/UDP/Gimbal/Provider/GimbalCenterAxisProvider.cs
......@@ -37,22 +37,22 @@ namespace VIZ.GimbalAI.Connection
return;
// 更新坐标位置
double x = ApplicationDomainEx.GimbalControlModel.CenterAxisX + (package.h > 0 ? 1 : -1) * GIMBAL_CENTER_AXIS_SPEED;
double y = ApplicationDomainEx.GimbalControlModel.CenterAxisY + (package.v > 0 ? 1 : -1) * GIMBAL_CENTER_AXIS_SPEED;
x = MathHelper.Clip(0, 1920, x);
y = MathHelper.Clip(0, 1080, y);
ApplicationDomainEx.GimbalControlModel.CenterAxisX = x;
ApplicationDomainEx.GimbalControlModel.CenterAxisY = y;
double x = ApplicationDomainEx.GimbalControlModel.TargetCenterAxisX;
double y = ApplicationDomainEx.GimbalControlModel.TargetCenterAxisY;
// 向算法发送最新的中心轴位置
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(UdpEndpointKeys.algorithm);
AlgorithmSender.CenterAxis(manager);
if (package.h != 0)
{
x += (package.h > 0 ? -1 : 1) * GIMBAL_CENTER_AXIS_SPEED;
}
if (package.v != 0)
{
y += (package.v > 0 ? -1 : 1) * GIMBAL_CENTER_AXIS_SPEED;
}
// 向界面发送更新轴信息消息
GimbalCenterAxisMessage message = new GimbalCenterAxisMessage();
message.X = x;
message.Y = y;
ApplicationDomainEx.MessageManager.Send(message);
x = MathHelper.Clip(0, 1920, x);
y = MathHelper.Clip(0, 1080, y);
ApplicationDomainEx.GimbalControlModel.TargetCenterAxisX = x;
ApplicationDomainEx.GimbalControlModel.TargetCenterAxisY = y;
}
}
}
VIZ.GimbalAI.Domain/Message/Gimbal/GimbalCenterAxisMessage.cs deleted 100644 → 0
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.GimbalAI.Domain
{
/// <summary>
/// 云台中心轴消息
/// </summary>
public class GimbalCenterAxisMessage
{
/// <summary>
/// 中心轴X坐标
/// </summary>
public double X { get; set; }
/// <summary>
/// 中心轴Y坐标
/// </summary>
public double Y { get; set; }
}
}
VIZ.GimbalAI.Domain/Model/Gimbal/GimbalControlModel.cs
......@@ -13,13 +13,38 @@ namespace VIZ.GimbalAI.Domain
public class GimbalControlModel : ModelBase
{
/// <summary>
/// 目标中心轴X坐标
/// </summary>
public double TargetCenterAxisX { get; set; } = 1920 / 2;
/// <summary>
/// 中心轴X坐标
/// </summary>
public double CenterAxisX { get; set; } = 1920 / 2;
/// <summary>
/// 目标中心轴Y坐标
/// </summary>
public double TargetCenterAxisY { get; set; } = 1080 / 2;
/// <summary>
/// 中心轴Y坐标
/// </summary>
public double CenterAxisY { get; set; } = 1080 / 2;
/// <summary>
/// 更新中心轴
/// </summary>
/// <returns>中心轴是否有变化</returns>
public bool UpdateCenterAxis()
{
if (this.CenterAxisX == this.TargetCenterAxisX && this.CenterAxisY == this.TargetCenterAxisY)
return false;
this.CenterAxisX = this.TargetCenterAxisX;
this.CenterAxisY = this.TargetCenterAxisY;
return true;
}
}
}
VIZ.GimbalAI.Domain/VIZ.GimbalAI.Domain.csproj
......@@ -85,7 +85,6 @@
<ItemGroup>
<Compile Include="Enum\NDIViewKeys.cs" />
<Compile Include="Enum\ServiceKeys.cs" />
<Compile Include="Message\Gimbal\GimbalCenterAxisMessage.cs" />
<Compile Include="Message\Gimbal\GimbalInitCompleteMessage.cs" />
<Compile Include="Model\Gimbal\GimbalControlModel.cs" />
<Compile Include="Model\NDI\NdiStreamGroupModel.cs" />
......
VIZ.GimbalAI.Module/ControlView/View/ControlView.xaml
......@@ -25,7 +25,6 @@
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*"></RowDefinition>
<RowDefinition Height="300"></RowDefinition>
</Grid.RowDefinitions>
<Grid IsEnabled="{Binding Path=IsEnabled,Mode=OneWay}">
<Grid.RowDefinitions>
......@@ -115,8 +114,8 @@
</Grid>
<!-- 控制台输出 -->
<Border Grid.Row="1">
<!--<Border Grid.Row="1">
<local:ConsoleView></local:ConsoleView>
</Border>
</Border>-->
</Grid>
</UserControl>
VIZ.GimbalAI.Module/MainView/Controller/Hotkey/HotkeyController.cs
......@@ -48,8 +48,8 @@ namespace VIZ.GimbalAI.Module
/// <param name="e">事件参数</param>
public void MoveCenterAxis(KeyEventArgs e)
{
double x = ApplicationDomainEx.GimbalControlModel.CenterAxisX;
double y = ApplicationDomainEx.GimbalControlModel.CenterAxisY;
double x = ApplicationDomainEx.GimbalControlModel.TargetCenterAxisX;
double y = ApplicationDomainEx.GimbalControlModel.TargetCenterAxisY;
if (e.KeyCode == Keys.Left)
{
......@@ -70,18 +70,8 @@ namespace VIZ.GimbalAI.Module
x = MathHelper.Clip(0, 1920, x);
y = MathHelper.Clip(0, 1080, y);
ApplicationDomainEx.GimbalControlModel.CenterAxisX = x;
ApplicationDomainEx.GimbalControlModel.CenterAxisY = y;
// 向算法发送最新的中心轴位置
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(UdpEndpointKeys.algorithm);
AlgorithmSender.CenterAxis(manager);
// 向界面发送更新轴信息消息
GimbalCenterAxisMessage message = new GimbalCenterAxisMessage();
message.X = x;
message.Y = y;
ApplicationDomainEx.MessageManager.Send(message);
ApplicationDomainEx.GimbalControlModel.TargetCenterAxisX = x;
ApplicationDomainEx.GimbalControlModel.TargetCenterAxisY = y;
}
}
}
VIZ.GimbalAI.Module/MainView/View/MainView.xaml
......@@ -44,9 +44,9 @@
<TextBlock Text="调试信息 --" FontSize="20" Foreground="Red" Margin="0,0,10,0"></TextBlock>
<TextBlock Text="算法FPS:" FontSize="20" Foreground="Red" Margin="0,0,10,0"></TextBlock>
<TextBlock Text="{Binding Path=AlgorithmFPS.FPS,Mode=OneWay}" FontSize="20" Foreground="Red" Margin="0,0,10,0"></TextBlock>
<TextBlock Text="云台FPS:" FontSize="20" Foreground="Red" Margin="0,0,10,0"></TextBlock>
<TextBlock Text="{Binding Path=GimbalFPS.FPS,Mode=OneWay}" FontSize="20" Foreground="Red" Margin="0,0,10,0"></TextBlock>
<Button Width="120" Height="30" Margin="10,0,10,0" Content="重启算法" Command="{Binding Path=RestartAlgorithmCommand}"></Button>
<Button Width="120" Height="30" Margin="10,0,10,0" Content="重启算法"
IsEnabled="{Binding Path=IsRestartAlgorithmEnabled,Mode=OneWay}"
Command="{Binding Path=RestartAlgorithmCommand,Mode=OneWay}"></Button>
</StackPanel>
</common:DebugBorder>
</StackPanel>
......
VIZ.GimbalAI.Module/MainView/ViewModel/MainViewModel.cs
......@@ -52,7 +52,6 @@ namespace VIZ.GimbalAI.Module
private void InitFPS()
{
this.AlgorithmFPS.Start();
this.GimbalFPS.Start();
}
/// <summary>
......@@ -74,7 +73,7 @@ namespace VIZ.GimbalAI.Module
private void InitMessage()
{
ApplicationDomainEx.MessageManager.Register<VideoRenderRectangleMessage>(this, this.VideoRenderRectangle);
ApplicationDomainEx.MessageManager.Register<GimbalCenterAxisMessage>(this, this.GimbalCenterAxis);
ApplicationDomainEx.MessageManager.Register<AlgorithmInitCompleteMessage>(this, this.AlgorithmInitComplete);
}
/// <summary>
......@@ -151,30 +150,30 @@ namespace VIZ.GimbalAI.Module
#endregion
#region AlgorithmFPS -- 算法FPS模型
#region IsRestartAlgorithmEnabled -- 重启算法按钮是否可用
private FPSHelper algorithmFPS = new FPSHelper();
private bool isRestartAlgorithmEnabled;
/// <summary>
/// 算法FPS模型
/// 重启算法按钮是否可用
/// </summary>
public FPSHelper AlgorithmFPS
public bool IsRestartAlgorithmEnabled
{
get { return algorithmFPS; }
set { algorithmFPS = value; this.RaisePropertyChanged(nameof(AlgorithmFPS)); }
get { return isRestartAlgorithmEnabled; }
set { isRestartAlgorithmEnabled = value; this.RaisePropertySaveChanged(nameof(IsRestartAlgorithmEnabled)); }
}
#endregion
#region GimbalFPS -- 云台FPS模型
#region AlgorithmFPS -- 算法FPS模型
private FPSHelper gimbalFPS = new FPSHelper();
private FPSHelper algorithmFPS = new FPSHelper();
/// <summary>
/// 云台FPS模型
/// 算法FPS模型
/// </summary>
public FPSHelper GimbalFPS
public FPSHelper AlgorithmFPS
{
get { return gimbalFPS; }
set { gimbalFPS = value; this.RaisePropertyChanged(nameof(GimbalFPS)); }
get { return algorithmFPS; }
set { algorithmFPS = value; this.RaisePropertyChanged(nameof(AlgorithmFPS)); }
}
#endregion
......@@ -321,6 +320,7 @@ namespace VIZ.GimbalAI.Module
/// </summary>
private void RestartAlgorithm()
{
this.IsRestartAlgorithmEnabled = false;
this.AlgorithmController.Restart();
}
......@@ -371,20 +371,18 @@ namespace VIZ.GimbalAI.Module
#endregion
#region GimbalCenterAxisMessage -- 云台中心轴改变消息
#region AlgorithmInitCompleteMessage -- 算法初始化完成消息
/// <summary>
/// 云台中心轴改变消息
/// 算法初始化完成
/// </summary>
/// <param name="msg">消息</param>
private void GimbalCenterAxis(GimbalCenterAxisMessage msg)
public void AlgorithmInitComplete(AlgorithmInitCompleteMessage msg)
{
// 统计FPS
this.GimbalFPS.CalcFps();
this.IsRestartAlgorithmEnabled = true;
}
#endregion
// ======================================================================================
// === Private Function ===
// ======================================================================================
......
VIZ.GimbalAI.Module/Setup/Provider/Setup/AppSetup_InitCenterAxis.cs
......@@ -33,8 +33,8 @@ namespace VIZ.GimbalAI.Module
/// <returns>是否成功执行</returns>
public override bool Setup(AppSetupContext context)
{
ApplicationDomainEx.GimbalControlModel.CenterAxisX = ApplicationDomainEx.IniStorage.GetValue<GimbalConfig, int>(p => p.GIMBAL_CENTER_AXIS_X);
ApplicationDomainEx.GimbalControlModel.CenterAxisY = ApplicationDomainEx.IniStorage.GetValue<GimbalConfig, int>(p => p.GIMBAL_CENTER_AXIS_Y);
ApplicationDomainEx.GimbalControlModel.TargetCenterAxisX = ApplicationDomainEx.IniStorage.GetValue<GimbalConfig, int>(p => p.GIMBAL_CENTER_AXIS_X);
ApplicationDomainEx.GimbalControlModel.TargetCenterAxisY = ApplicationDomainEx.IniStorage.GetValue<GimbalConfig, int>(p => p.GIMBAL_CENTER_AXIS_Y);
ApplicationDomainEx.LoopManager.Register("AppSetup_InitCenterAxis.Setup", 30, () =>
{
......@@ -60,8 +60,8 @@ namespace VIZ.GimbalAI.Module
{
try
{
ApplicationDomainEx.IniStorage.SetValue<GimbalConfig>(p => p.GIMBAL_CENTER_AXIS_X, ApplicationDomainEx.GimbalControlModel.CenterAxisX);
ApplicationDomainEx.IniStorage.SetValue<GimbalConfig>(p => p.GIMBAL_CENTER_AXIS_Y, ApplicationDomainEx.GimbalControlModel.CenterAxisY);
ApplicationDomainEx.IniStorage.SetValue<GimbalConfig>(p => p.GIMBAL_CENTER_AXIS_X, ApplicationDomainEx.GimbalControlModel.TargetCenterAxisX);
ApplicationDomainEx.IniStorage.SetValue<GimbalConfig>(p => p.GIMBAL_CENTER_AXIS_Y, ApplicationDomainEx.GimbalControlModel.TargetCenterAxisY);
}
catch (Exception ex)
{
......
VIZ.GimbalAI.Module/VideoView/ViewModel/VideoViewModel.cs
......@@ -18,6 +18,7 @@ using OpenCvSharp.WpfExtensions;
using OpenCvSharp.Extensions;
using SharpDX.Mathematics.Interop;
using VIZ.Framework.Storage;
using System.Windows.Interop;
namespace VIZ.GimbalAI.Module
{
......@@ -84,7 +85,7 @@ namespace VIZ.GimbalAI.Module
CenterAxisInfo centerAxisInfo = new CenterAxisInfo();
centerAxisInfo.AxisWidth = this.VIDEO_CENTER_AXIS_WIDTH;
centerAxisInfo.AxisColor = this.VIDEO_CENTER_AXIS_COLOR;
centerAxisInfo.SrcCenter = new RawVector2((float)ApplicationDomainEx.GimbalControlModel.CenterAxisX, (float)ApplicationDomainEx.GimbalControlModel.CenterAxisY);
centerAxisInfo.SrcCenter = new RawVector2((float)ApplicationDomainEx.GimbalControlModel.TargetCenterAxisX, (float)ApplicationDomainEx.GimbalControlModel.TargetCenterAxisY);
this.centerAxisPlugin.Update(centerAxisInfo);
}
......@@ -102,7 +103,6 @@ namespace VIZ.GimbalAI.Module
private void InitMessage()
{
ApplicationDomainEx.MessageManager.Register<VideoRenderRectangleMessage>(this, this.VideoRenderRectangle);
ApplicationDomainEx.MessageManager.Register<GimbalCenterAxisMessage>(this, this.GimbalCenterAxis);
}
/// <summary>
......@@ -342,28 +342,6 @@ namespace VIZ.GimbalAI.Module
#endregion
#region GimbalCenterAxisMessage -- 中心轴更新消息
/// <summary>
/// 中心轴更新消息
/// </summary>
/// <param name="msg">消息</param>
private void GimbalCenterAxis(GimbalCenterAxisMessage msg)
{
VideoView view = this.GetView<VideoView>();
if (view == null)
return;
CenterAxisInfo info = new CenterAxisInfo();
info.SrcCenter = new RawVector2((float)msg.X, (float)msg.Y);
info.AxisWidth = this.VIDEO_CENTER_AXIS_WIDTH;
info.AxisColor = this.VIDEO_CENTER_AXIS_COLOR;
view.videoControl.UpdateCenterAxis(info);
}
#endregion
// ======================================================================================
// === Public Function ===
// ======================================================================================
......@@ -440,7 +418,33 @@ namespace VIZ.GimbalAI.Module
if (view == null)
return;
// 更新视频
view.videoControl.UpdateVideoFrame(e.Frame);
// 更新中心轴
this.UpdateCenterAxis(view);
}
/// <summary>
/// 更新中心轴
/// </summary>
/// <param name="view">视图</param>
private void UpdateCenterAxis(VideoView view)
{
if (!ApplicationDomainEx.GimbalControlModel.UpdateCenterAxis())
return;
// 界面更新
CenterAxisInfo info = new CenterAxisInfo();
info.SrcCenter = new RawVector2((float)ApplicationDomainEx.GimbalControlModel.CenterAxisX, (float)ApplicationDomainEx.GimbalControlModel.CenterAxisY);
info.AxisWidth = this.VIDEO_CENTER_AXIS_WIDTH;
info.AxisColor = this.VIDEO_CENTER_AXIS_COLOR;
view.videoControl.UpdateCenterAxis(info);
// 向算法发送最新的中心轴位置
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(UdpEndpointKeys.algorithm);
AlgorithmSender.CenterAxis(manager);
}
/// <summary>
......
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