Skip to content

F
FGOUT
Commit 30db6f45 by 鲁志-悦动
Options

点击“选择目标”重启算法的时候应该发模式为手动 And 修复发送命令发空数据的缺陷 And 修正SetManualConfig表IsManual字段在代码中的逻辑反了的问题

parent 413872d1
Showing with 260 additions and 85 deletions
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Sender/AlgorithmSender.cs
...@@ -90,7 +90,8 @@ namespace VIZ.FGOUT.Connection ...@@ -90,7 +90,8 @@ namespace VIZ.FGOUT.Connection
manager.SendJson(package); manager.SendJson(package);
} }
public static void AutoMode(UdpEndpointManager manager, AlgorithmPackage_Figout_model package, AlgorithmSenderOption option, bool isAutoMode = true) //, bool isAutoMode = true
public static void AutoMode(UdpEndpointManager manager, AlgorithmPackage_Figout_model package, AlgorithmSenderOption option)
{ {
package.id = option.id; package.id = option.id;
...@@ -98,11 +99,11 @@ namespace VIZ.FGOUT.Connection ...@@ -98,11 +99,11 @@ namespace VIZ.FGOUT.Connection
//package.track_xy = option.target_bbox; //package.track_xy = option.target_bbox;
//package.signal = AlgorithmPackageSignal.track; //package.signal = AlgorithmPackageSignal.track;
//自动模式 ////自动模式
package.mode = AlgorithmPackageSignal.auto_mode; //package.mode = AlgorithmPackageSignal.auto_mode;
//手动模式 ////手动模式
if(isAutoMode == false) //if(isAutoMode == false)
package.mode = AlgorithmPackageSignal.manual_mode; // package.mode = AlgorithmPackageSignal.manual_mode;
package.timecode = option.timecode; package.timecode = option.timecode;
manager.SendJson(package); manager.SendJson(package);
......
VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/Signal/Send/AlgorithmPackage_Figout_model.cs
...@@ -18,24 +18,22 @@ namespace VIZ.FGOUT.Connection ...@@ -18,24 +18,22 @@ namespace VIZ.FGOUT.Connection
/// signal 信号 /// signal 信号
/// </summary> /// </summary>
public override string signal { get; set; } = "auto_Place"; //public override string signal { get; set; } = "auto_Place";
public override string signal { get; set; } = AlgorithmPackageSignal.auto_Place;
/// <summary> /// <summary>
/// startPlace /// startPlace
/// </summary> /// </summary>
public List<List<int>> startPlace { get; set; } public List<List<int>> startPlace { get; set; }
/// <summary> /// <summary>
/// endPalce /// endPalce
/// </summary> /// </summary>
public List<List<int>> endPlace { get; set; } public List<List<int>> endPlace { get; set; }
/// <summary> /// <summary>
/// InValidPalce /// InValidPalce
/// </summary> /// </summary>
public List<List<int>> invalidPlace { get; set; } public List<List<int>> invalidPlace { get; set; }
/// <summary> /// <summary>
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/Controller/Hotkey/HotkeyController.cs
...@@ -118,8 +118,10 @@ namespace VIZ.FGOUT.Module ...@@ -118,8 +118,10 @@ namespace VIZ.FGOUT.Module
{ {
//INDIViewService service = null; //INDIViewService service = null;
//if (ApplicationDomainEx.LiteDbContext.SetManualConfig.FindAll().FirstOrDefault().IsManual) return false;
if (ApplicationDomainEx.LiteDbContext.SetManualConfig.FindAll().FirstOrDefault().IsManual) return false; //如果是自动，返回false
var manualConfig = ApplicationDomainEx.LiteDbContext.SetManualConfig.FindAll().FirstOrDefault();
if (manualConfig == null || !manualConfig.IsManual) return false;
if (string.Equals(this.Support.HotkeyConfig.StartCmd, hotkey)) if (string.Equals(this.Support.HotkeyConfig.StartCmd, hotkey))
{ {
...@@ -130,7 +132,7 @@ namespace VIZ.FGOUT.Module ...@@ -130,7 +132,7 @@ namespace VIZ.FGOUT.Module
AlgorithmPackage__MatCmd algorithmPackage__MatCmd = new AlgorithmPackage__MatCmd(); AlgorithmPackage__MatCmd algorithmPackage__MatCmd = new AlgorithmPackage__MatCmd();
algorithmPackage__MatCmd.mode = "manual"; algorithmPackage__MatCmd.mode = AlgorithmPackageSignal.manual_mode;
algorithmPackage__MatCmd.signal = AlgorithmPackageSignal.matt_start; algorithmPackage__MatCmd.signal = AlgorithmPackageSignal.matt_start;
log.Info(hotkey+"发送开始命令：" + algorithmPackage__MatCmd.mode+"" + algorithmPackage__MatCmd.signal); log.Info(hotkey+"发送开始命令：" + algorithmPackage__MatCmd.mode+"" + algorithmPackage__MatCmd.signal);
...@@ -146,7 +148,7 @@ namespace VIZ.FGOUT.Module ...@@ -146,7 +148,7 @@ namespace VIZ.FGOUT.Module
AlgorithmPackage__MatCmd algorithmPackage__MatCmd = new AlgorithmPackage__MatCmd(); AlgorithmPackage__MatCmd algorithmPackage__MatCmd = new AlgorithmPackage__MatCmd();
algorithmPackage__MatCmd.mode = "manual"; algorithmPackage__MatCmd.mode = AlgorithmPackageSignal.manual_mode;
algorithmPackage__MatCmd.signal = AlgorithmPackageSignal.matt_end; algorithmPackage__MatCmd.signal = AlgorithmPackageSignal.matt_end;
log.Info(hotkey+"发送结束命令：" + algorithmPackage__MatCmd.mode+""+algorithmPackage__MatCmd.signal); log.Info(hotkey+"发送结束命令：" + algorithmPackage__MatCmd.mode+""+algorithmPackage__MatCmd.signal);
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/View/NDIMainView.xaml
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
Margin="15" Margin="15"
Content="启用自动检测" Content="启用自动检测"
Foreground="White" Foreground="White"
IsChecked="{Binding Path=IsAutoEnbale, Mode=TwoWay}" IsChecked="{Binding Path=IsAutoEnable, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" /> Style="{StaticResource CheckBox_Setting}" />
</GroupBox> </GroupBox>
<GroupBox <GroupBox
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
Margin="14" Margin="14"
Content="选择目标" Content="选择目标"
Foreground="White" Foreground="White"
IsChecked="{Binding Path=IsEnbaleTarget, Mode=TwoWay}" IsChecked="{Binding Path=IsEnableTarget, Mode=TwoWay}"
Style="{StaticResource CheckBox_Setting}" /> Style="{StaticResource CheckBox_Setting}" />
<CheckBox <CheckBox
Grid.Column="1" Grid.Column="1"
...@@ -375,8 +375,8 @@ ...@@ -375,8 +375,8 @@
Width="100" Width="100"
Height="40" Height="40"
Margin="10" Margin="10"
Command="{Binding Path=SavePalceCommand}" Command="{Binding Path=SendPlaceCommand}"
Content="保存" Content="发送命令"
Style="{StaticResource ButtonStyle}" /> Style="{StaticResource ButtonStyle}" />
<Button <Button
...@@ -385,8 +385,8 @@ ...@@ -385,8 +385,8 @@
Width="100" Width="100"
Height="40" Height="40"
Margin="10" Margin="10"
Command="{Binding Path=SendPlaceCommand}" Command="{Binding Path=SavePalceCommand}"
Content="发送命令" Content="保存"
Style="{StaticResource ButtonStyle}" /> Style="{StaticResource ButtonStyle}" />
<!--<Button Content="UE设置" Grid.Row="2" Grid.Column="2" Margin="10" Style="{StaticResource ButtonStyle}" Command="{Binding Path=UESettingCommand}" Height="40"/>--> <!--<Button Content="UE设置" Grid.Row="2" Grid.Column="2" Margin="10" Style="{StaticResource ButtonStyle}" Command="{Binding Path=UESettingCommand}" Height="40"/>-->
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs
...@@ -114,32 +114,45 @@ namespace VIZ.FGOUT.Module ...@@ -114,32 +114,45 @@ namespace VIZ.FGOUT.Module
{ {
//获取抠像的配置文件是否自动，还是手动模式 //获取抠像的配置文件是否自动，还是手动模式
this.manualConfig = ApplicationDomainEx.LiteDbContext.SetManualConfig.FindAll().FirstOrDefault(); this.manualConfig = ApplicationDomainEx.LiteDbContext.SetManualConfig.FindAll().FirstOrDefault();
if (manualConfig == null) return; if (manualConfig == null) return;
IsStartImaget = this.manualConfig.IsStartMat; IsStartImaget = this.manualConfig.IsStartMat;
//这个字段和逻辑肯定反了，所以我给他改过来
//if (this.manualConfig.IsManual)
//{
// IsAutoEnbale = true;
// IsEnbaleTarget = false;
// SendIsManual(AlgorithmPackageSignal.auto_mode);//自动模式
//}
//else
//{
// IsEnbaleTarget = true;
// IsAutoEnbale = false;
// SendIsManual(AlgorithmPackageSignal.manual_mode);//手动模式
//}
if (this.manualConfig.IsManual) if (this.manualConfig.IsManual)
{ {
IsAutoEnbale = true; IsEnableTarget = true;
IsEnbaleTarget = false; IsAutoEnable = false;
SendIsManual("auto");//自动模式 SendIsManual(AlgorithmPackageSignal.manual_mode);//手动模式
} }
else else
{ {
IsEnbaleTarget = true; IsEnableTarget = false;
IsAutoEnbale = false; IsAutoEnable = true;
SendIsManual("manual");//手动模式 SendIsManual(AlgorithmPackageSignal.auto_mode);//自动模式
} }
} }
private void SendIsManual(string model) private void SendIsManual(string model)
{ {
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
//如果manager等于null 返回掉
if (manager == null) return; if (manager == null) return;
AlgorithmPackage_Figout_model package = new AlgorithmPackage_Figout_model(); AlgorithmPackage_Figout_model package = new AlgorithmPackage_Figout_model();
package.mode = model; package.mode = model;
package.signal = AlgorithmPackageSignal.detect;
manager.SendJson(package); manager.SendJson(package);
} }
...@@ -378,21 +391,22 @@ namespace VIZ.FGOUT.Module ...@@ -378,21 +391,22 @@ namespace VIZ.FGOUT.Module
//ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(this.manualConfig); //ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(this.manualConfig);
private bool isAutoEnbale = true; private bool isAutoEnable = true;
public bool IsAutoEnbale public bool IsAutoEnable
{ {
get { return isAutoEnbale; } get { return isAutoEnable; }
set set
{ {
isAutoEnbale = value; isAutoEnable = value;
RaisePropertyChanged(nameof(IsAutoEnbale)); RaisePropertyChanged(nameof(IsAutoEnable));
if(value) if(value)
{ {
IsEnbaleTarget = false; IsEnableTarget = false;
IsStartImaget = false; IsStartImaget = false;
SendIsManual("auto"); SendIsManual(AlgorithmPackageSignal.auto_mode);
manualConfig.IsManual = true; //manualConfig.IsManual = true;
manualConfig.IsManual = false;
ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(manualConfig); ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(manualConfig);
CleanRect(); CleanRect();
} }
...@@ -403,22 +417,24 @@ namespace VIZ.FGOUT.Module ...@@ -403,22 +417,24 @@ namespace VIZ.FGOUT.Module
#region 选择目标 #region 选择目标
private bool isEnbaleTarget=false; private bool isEnableTarget;
// ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(this.manualConfig); // ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(this.manualConfig);
public bool IsEnbaleTarget public bool IsEnableTarget
{ {
get { return isEnbaleTarget; } get { return isEnableTarget; }
set set
{ {
isEnbaleTarget = value; isEnableTarget = value;
this.RaisePropertyChanged(nameof(IsEnbaleTarget)); this.RaisePropertyChanged(nameof(IsEnableTarget));
if(value) if(value)
{ {
IsAutoEnbale = false; IsAutoEnable = false;
SendIsManual("manual"); SendIsManual(AlgorithmPackageSignal.manual_mode);
manualConfig.IsManual = false; //manualConfig.IsManual = false;
manualConfig.IsManual = true;
ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(manualConfig); ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(manualConfig);
CleanRect();
} }
} }
} }
...@@ -952,7 +968,7 @@ namespace VIZ.FGOUT.Module ...@@ -952,7 +968,7 @@ namespace VIZ.FGOUT.Module
public SavePlaceModel savePlaceModel = new SavePlaceModel(); public SavePlaceModel savePlaceModel = new SavePlaceModel();
private void SavePlace() private void SavePlace()
{ {
if(IsAutoEnbale) if(IsAutoEnable)
savePlaceModel.IsManual = true; savePlaceModel.IsManual = true;
else else
savePlaceModel.IsManual = false; savePlaceModel.IsManual = false;
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/Controller/Algorithm/Strategy/AlgoritmController_FiguerOut.cs
...@@ -7,7 +7,6 @@ using VIZ.FGOUT.Domain; ...@@ -7,7 +7,6 @@ using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.Framework.Common; using VIZ.Framework.Common;
using VIZ.Framework.Connection; using VIZ.Framework.Connection;
using VIZ.Framework.Domain;
namespace VIZ.FGOUT.Module namespace VIZ.FGOUT.Module
{ {
...@@ -79,7 +78,7 @@ namespace VIZ.FGOUT.Module ...@@ -79,7 +78,7 @@ namespace VIZ.FGOUT.Module
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
AlgorithmSenderOption option = new AlgorithmSenderOption(); AlgorithmSenderOption option = new AlgorithmSenderOption();
option.id = this.Support.ID; option.id = this.Support.ID;
AlgorithmSender.AutoMode(manager, this.bulidPackage(AlgorithmAutoModeCmd.detect, null), option, false); AlgorithmSender.AutoMode(manager, this.bulidPackage(AlgorithmAutoModeCmd.detect, null), option);
} }
/// <summary> /// <summary>
...@@ -115,10 +114,21 @@ namespace VIZ.FGOUT.Module ...@@ -115,10 +114,21 @@ namespace VIZ.FGOUT.Module
public override void InitAlgorithm() public override void InitAlgorithm()
{ {
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
if(manager == null) return;
AlgorithmSenderOption option = new AlgorithmSenderOption(); AlgorithmSenderOption option = new AlgorithmSenderOption();
AlgorithmPackage_Figout_model package = this.bulid(null, null); AlgorithmPackage_Figout_model package = this.bulid(null, null);
//获取抠像的配置文件是否自动，还是手动模式
this.manualConfig = ApplicationDomainEx.LiteDbContext.SetManualConfig.FindAll().FirstOrDefault();
if (this.manualConfig == null) return;
//if (this.manualConfig.IsManual)
// package.mode = AlgorithmPackageSignal.auto_mode;
//else
// package.mode = AlgorithmPackageSignal.manual_mode;
if (this.manualConfig.IsManual)
package.mode = AlgorithmPackageSignal.manual_mode;
else
package.mode = AlgorithmPackageSignal.auto_mode; package.mode = AlgorithmPackageSignal.auto_mode;
AlgorithmSender.AutoMode(manager,package,option); AlgorithmSender.AutoMode(manager, package, option);
} }
/// <summary> /// <summary>
...@@ -191,7 +201,7 @@ namespace VIZ.FGOUT.Module ...@@ -191,7 +201,7 @@ namespace VIZ.FGOUT.Module
public AlgorithmPackage_Figout_model bulidPackage(string cmd, TrackingBoxInfo box) public AlgorithmPackage_Figout_model bulidPackage(string cmd, TrackingBoxInfo box)
{ {
AlgorithmPackage_Figout_model package = new AlgorithmPackage_Figout_model(); AlgorithmPackage_Figout_model package = new AlgorithmPackage_Figout_model();
package.mode = "manual"; package.mode = AlgorithmPackageSignal.manual_mode;
package.signal = AlgorithmPackageSignal.detect; package.signal = AlgorithmPackageSignal.detect;
//package.track_xy = box == null ? null : new List<int> { (int)box.SrcRect.Left, (int)box.SrcRect.Top, (int)box.SrcRect.Right, (int)box.SrcRect.Bottom }; //package.track_xy = box == null ? null : new List<int> { (int)box.SrcRect.Left, (int)box.SrcRect.Top, (int)box.SrcRect.Right, (int)box.SrcRect.Bottom };
//package.track_xy = box == null ? null : new List<int> { (int)box.X, (int)box.Y }; //package.track_xy = box == null ? null : new List<int> { (int)box.X, (int)box.Y };
...@@ -212,7 +222,8 @@ namespace VIZ.FGOUT.Module ...@@ -212,7 +222,8 @@ namespace VIZ.FGOUT.Module
public override void Tracking(Point center) public override void Tracking(Point center)
{ {
this.manualConfig = ApplicationDomainEx.LiteDbContext.SetManualConfig.FindAll().FirstOrDefault(); this.manualConfig = ApplicationDomainEx.LiteDbContext.SetManualConfig.FindAll().FirstOrDefault();
if (this.manualConfig.IsManual) return; //if (manualConfig.IsManual) return;
if (!manualConfig.IsManual) return;
UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1); UdpEndpointManager manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1);
AlgorithmSenderOption option = new AlgorithmSenderOption(); AlgorithmSenderOption option = new AlgorithmSenderOption();
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml.cs
...@@ -121,7 +121,7 @@ namespace VIZ.FGOUT.Module ...@@ -121,7 +121,7 @@ namespace VIZ.FGOUT.Module
} }
#endregion #endregion
// 配置文件添加config // 配置文件添加config
private SetManualConfig manualConfig; //private SetManualConfig manualConfig;
/// <summary> /// <summary>
/// 鼠标左键抬起 /// 鼠标左键抬起
...@@ -303,6 +303,11 @@ namespace VIZ.FGOUT.Module ...@@ -303,6 +303,11 @@ namespace VIZ.FGOUT.Module
DrawPolygon(e.GetPosition(this.canvas1), Brushes.Green); DrawPolygon(e.GetPosition(this.canvas1), Brushes.Green);
//else if (vm.IsDrawInvalidPlace) //else if (vm.IsDrawInvalidPlace)
// DrawPolygon(e.GetPosition(this.canvas1), Brushes.Red); // DrawPolygon(e.GetPosition(this.canvas1), Brushes.Red);
//else if (vm.IsManualDetect)
//{
//}
} }
} }
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Command.cs
...@@ -133,10 +133,14 @@ namespace VIZ.FGOUT.Module ...@@ -133,10 +133,14 @@ namespace VIZ.FGOUT.Module
{ {
// 注册视频控件插件 // 注册视频控件插件
//CAM_1、CAM_2都会调用这个方法，在CAM_1的时候注册一次就可以
if (view.NDIKey == NDIViewKeys.CAM_1)
{
// 跟踪框插件 // 跟踪框插件
TrackingBoxPlugin trackingBoxPlugin = new TrackingBoxPlugin(view.video); TrackingBoxPlugin trackingBoxPlugin = new TrackingBoxPlugin(view.video);
trackingBoxPlugin.TrackingBoxClick += TrackingBoxPlugin_TrackingBoxClick; trackingBoxPlugin.TrackingBoxClick += TrackingBoxPlugin_TrackingBoxClick;
view.video.AttachPlugin(trackingBoxPlugin); view.video.AttachPlugin(trackingBoxPlugin);
}
// 裁切框插件 // 裁切框插件
//ClipBoxPlugin clipBoxPlugin = new ClipBoxPlugin(view.video); //ClipBoxPlugin clipBoxPlugin = new ClipBoxPlugin(view.video);
...@@ -174,9 +178,8 @@ namespace VIZ.FGOUT.Module ...@@ -174,9 +178,8 @@ namespace VIZ.FGOUT.Module
/// </summary> /// </summary>
private void TrackingBoxPlugin_TrackingBoxClick(object sender, TrackingBoxClickEventArgs e) private void TrackingBoxPlugin_TrackingBoxClick(object sender, TrackingBoxClickEventArgs e)
{ {
//在没有HitTrackingBoxInfo信息的时候也发送坐标 if (e.HitTrackingBoxInfo == null)
//if (e.HitTrackingBoxInfo == null) return;
// return;
this.AlgorithmControllerDic[this.StrategyType].Tracking(e.VideoPointCenter); this.AlgorithmControllerDic[this.StrategyType].Tracking(e.VideoPointCenter);
} }
...@@ -335,9 +338,14 @@ namespace VIZ.FGOUT.Module ...@@ -335,9 +338,14 @@ namespace VIZ.FGOUT.Module
context.IsNeedRestart = false; context.IsNeedRestart = false;
context.TriggerScene = NDIViewScene.VideoPanel; context.TriggerScene = NDIViewScene.VideoPanel;
//IsManualDetect = true;
this.AlgorithmControllerDic[this.StrategyType].ChangeAutoMode(context); this.AlgorithmControllerDic[this.StrategyType].ChangeAutoMode(context);
} }
//手动选择检测
//public bool IsManualDetect;
#endregion #endregion
#region RestartCommand -- 算法重启命令 #region RestartCommand -- 算法重启命令
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Message.cs
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Windows.Media;
using VIZ.FGOUT.Domain; using VIZ.FGOUT.Domain;
using VIZ.FGOUT.Storage; using VIZ.FGOUT.Storage;
using VIZ.Framework.Common; using VIZ.Framework.Common;
...@@ -25,6 +26,7 @@ namespace VIZ.FGOUT.Module ...@@ -25,6 +26,7 @@ namespace VIZ.FGOUT.Module
ApplicationDomainEx.LiteDbContext.AlgorithmSaveMatImage.Upsert(config); ApplicationDomainEx.LiteDbContext.AlgorithmSaveMatImage.Upsert(config);
} }
//CleanPlaceModel cpModel = new CleanPlaceModel{ CleanPlace = true };
/// <summary> /// <summary>
/// 处理算法初始化完成消息 /// 处理算法初始化完成消息
/// </summary> /// </summary>
...@@ -66,6 +68,46 @@ namespace VIZ.FGOUT.Module ...@@ -66,6 +68,46 @@ namespace VIZ.FGOUT.Module
} }
} }
////清除开始、结束、无效位置标记
//this.CleanPlace(cpModel);
////目前来看这段代码没起作用
//SystemConfig config = ApplicationDomainEx.LiteDbContext.SystemConfig.FindAll().FirstOrDefault();
//if (this.ViewKey == NDIViewKeys.CAM_1)
//{
// // 是否显示目标裁切框
// this.IsShowAlgorithmTargetBox = config.IsShowAlgorithmTargetBox;
// SetPlaceNewConfig setPlaceNewConfig =
// ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.FindOne(p =>
// p.SportCode == this.viewConfig.GameName);
// if (setPlaceNewConfig == null) return;
// NDIView view = this.GetView<NDIView>();
// if (view == null)
// return;
// if (setPlaceNewConfig.StartPlace.Count > 0)
// {
// view.polygonsStart = setPlaceNewConfig.StartPlace;
// foreach (var points in setPlaceNewConfig.StartPlace)
// AddPoints(view, points, Brushes.Blue);
// }
// if (setPlaceNewConfig.EndPlace.Count > 0)
// {
// view.polygonsEnd = setPlaceNewConfig.EndPlace;
// foreach (var points in setPlaceNewConfig.EndPlace)
// AddPoints(view, points, Brushes.Green);
// }
// if (setPlaceNewConfig.InvlidPlace.Count > 0)
// {
// view.rectsInvalid = setPlaceNewConfig.InvlidPlace;
// foreach (var points in setPlaceNewConfig.InvlidPlace)
// AddRects(view, points, Brushes.Red);
// }
//}
//==================================================================== //====================================================================
// CODE: SYSTEM_LOG | 记录日志 // CODE: SYSTEM_LOG | 记录日志
//==================================================================== //====================================================================
...@@ -95,9 +137,10 @@ namespace VIZ.FGOUT.Module ...@@ -95,9 +137,10 @@ namespace VIZ.FGOUT.Module
if (view == null) if (view == null)
return; return;
VideoRenderInfo renderInfo = view.video.GetRenderInfo(); //20231122 由于下面的更新裁切框信息注释掉，所以先注释
if (renderInfo == null) //VideoRenderInfo renderInfo = view.video.GetRenderInfo();
return; //if (renderInfo == null)
// return;
// 刷新跟踪框 // 刷新跟踪框
List<TrackingBoxInfo> infos = new List<TrackingBoxInfo>(); List<TrackingBoxInfo> infos = new List<TrackingBoxInfo>();
......
VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs
...@@ -164,6 +164,98 @@ namespace VIZ.FGOUT.Module ...@@ -164,6 +164,98 @@ namespace VIZ.FGOUT.Module
ApplicationDomainEx.MessageManager.Register<StopAlgorithmModel>(this, this.CloseAlgorithm); ApplicationDomainEx.MessageManager.Register<StopAlgorithmModel>(this, this.CloseAlgorithm);
} }
//CleanPlaceModel cpModel = new CleanPlaceModel { CleanPlace = true };
/// <summary>
/// 处理算法初始化完成消息
/// 把在message里的方法拿过来试一下
/// </summary>
/// <param name="msg">消息</param>
//private void OnAlgorithmMessage__checked_ok(AlgorithmMessage__checked_ok msg)
//{
// // 算法ID与视图绑定一一对应
// if (msg.AlgorithmID != this.ID)
// return;
// // 执行初始化完成
// if (!this.AlgorithmControllerDic.TryGetValue(this.StrategyType, out IAlgorithmController controller))
// return;
// // 初始化算法
// controller.InitAlgorithm();
// if (!this.IsUseClip)
// {
// this.ViewStatus = NDIViewStatus.CropRoi;
// controller.ChangeNoMode();
// }
// else
// {
// // 根据当前模式处理
// switch (this.StrategyMode)
// {
// //case AlgorithmStrategyMode.center_mode:
// // controller.ChangeCenterMode();
// // this.ViewStatus = NDIViewStatus.CropRoi;
// // break;
// case AlgorithmStrategyMode.manual_mode:
// controller.ChangeManualMode();
// this.ViewStatus = NDIViewStatus.CropRoi;
// break;
// case AlgorithmStrategyMode.auto_mode:
// controller.CheckOk();
// break;
// }
// }
// //清除开始、结束、无效位置标记
// this.CleanPlace(cpModel);
// //目前来看这段代码没起作用
// SystemConfig config = ApplicationDomainEx.LiteDbContext.SystemConfig.FindAll().FirstOrDefault();
// if (this.ViewKey == NDIViewKeys.CAM_1)
// {
// // 是否显示目标裁切框
// this.IsShowAlgorithmTargetBox = config.IsShowAlgorithmTargetBox;
// SetPlaceNewConfig setPlaceNewConfig =
// ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.FindOne(p =>
// p.SportCode == this.viewConfig.GameName);
// if (setPlaceNewConfig == null) return;
// NDIView view = this.GetView<NDIView>();
// if (view == null)
// return;
// if (setPlaceNewConfig.StartPlace.Count > 0)
// {
// view.polygonsStart = setPlaceNewConfig.StartPlace;
// foreach (var points in setPlaceNewConfig.StartPlace)
// AddPoints(view, points, Brushes.Blue);
// }
// if (setPlaceNewConfig.EndPlace.Count > 0)
// {
// view.polygonsEnd = setPlaceNewConfig.EndPlace;
// foreach (var points in setPlaceNewConfig.EndPlace)
// AddPoints(view, points, Brushes.Green);
// }
// if (setPlaceNewConfig.InvlidPlace.Count > 0)
// {
// view.rectsInvalid = setPlaceNewConfig.InvlidPlace;
// foreach (var points in setPlaceNewConfig.InvlidPlace)
// AddRects(view, points, Brushes.Red);
// }
// }
// //====================================================================
// // CODE: SYSTEM_LOG | 记录日志
// //====================================================================
// // 记录日志： 算法初始化完成
// string system_log = string.Format(SystemLogStringFormats.ALGORITHM_CHECKED_OK, this.StrategyType.GetDescription(), this.ViewKey);
// ApplicationDomainEx.CsvContext.AppendSystemLog(this.ViewKey, this.DisplayName, system_log);
// //====================================================================
//}
private void UESetting(UESettingModel ueSettingModel) private void UESetting(UESettingModel ueSettingModel)
{ {
if (this.ViewKey != NDIViewKeys.CAM_1) if (this.ViewKey != NDIViewKeys.CAM_1)
...@@ -203,7 +295,7 @@ namespace VIZ.FGOUT.Module ...@@ -203,7 +295,7 @@ namespace VIZ.FGOUT.Module
//replayPanelView.Show(); //replayPanelView.Show();
} }
public bool IsDrawStartPlace = false; public bool IsDrawStartPlace;
/// <summary> /// <summary>
/// 开始位置命令 /// 开始位置命令
/// </summary> /// </summary>
...@@ -220,7 +312,7 @@ namespace VIZ.FGOUT.Module ...@@ -220,7 +312,7 @@ namespace VIZ.FGOUT.Module
IsCleanPlace = false; IsCleanPlace = false;
} }
public bool IsDrawEndPlace = false; public bool IsDrawEndPlace;
/// <summary> /// <summary>
/// 结束位置命令 /// 结束位置命令
/// </summary> /// </summary>
...@@ -237,7 +329,7 @@ namespace VIZ.FGOUT.Module ...@@ -237,7 +329,7 @@ namespace VIZ.FGOUT.Module
IsCleanPlace = false; IsCleanPlace = false;
} }
public bool IsDrawInvalidPlace = false; public bool IsDrawInvalidPlace;
/// <summary> /// <summary>
/// 无效位置 /// 无效位置
/// </summary> /// </summary>
...@@ -261,6 +353,8 @@ namespace VIZ.FGOUT.Module ...@@ -261,6 +353,8 @@ namespace VIZ.FGOUT.Module
IsCleanPlace = cleanPlaceModel.CleanPlace; IsCleanPlace = cleanPlaceModel.CleanPlace;
NDIView nDIView = this.GetView<NDIView>(); NDIView nDIView = this.GetView<NDIView>();
if(nDIView == null)
return;
//nDIView.aa = null; //nDIView.aa = null;
//nDIView.myPath.Data = null; //nDIView.myPath.Data = null;
...@@ -313,7 +407,7 @@ namespace VIZ.FGOUT.Module ...@@ -313,7 +407,7 @@ namespace VIZ.FGOUT.Module
AlgorithmPackage_Figout_new_model package = new AlgorithmPackage_Figout_new_model(); AlgorithmPackage_Figout_new_model package = new AlgorithmPackage_Figout_new_model();
package.start = Coordinate(nDIView.polygonsStart, srcWidth, srcHeight); package.start = Coordinate(nDIView.polygonsStart, srcWidth, srcHeight);
package.end = Coordinate(nDIView.polygonsEnd, srcWidth, srcHeight); package.end = Coordinate(nDIView.polygonsEnd, srcWidth, srcHeight);
package.ignore = Coordinate(nDIView.polygonsInvalid, srcWidth, srcHeight); //package.ignore = Coordinate(nDIView.polygonsInvalid, srcWidth, srcHeight);
package.ignore = Coordinate(nDIView.rectsInvalid, srcWidth, srcHeight); package.ignore = Coordinate(nDIView.rectsInvalid, srcWidth, srcHeight);
//if (rectStart.Width == 0 && rectStart.Height == 0) //if (rectStart.Width == 0 && rectStart.Height == 0)
...@@ -403,11 +497,11 @@ namespace VIZ.FGOUT.Module ...@@ -403,11 +497,11 @@ namespace VIZ.FGOUT.Module
} }
/// <summary> /// <summary>
/// 保存配置命令 /// 保存位置命令
/// </summary> /// </summary>
private SetPlaceConfig setPlaceConfig; //private SetPlaceConfig setPlaceConfig;
private SetPlaceNewConfig setPlaceNewConfig; private SetPlaceNewConfig setPlaceNewConfig;
private SetManualConfig manualConfig; //private SetManualConfig manualConfig;
private void SavePlace(SavePlaceModel savePlaceModel) private void SavePlace(SavePlaceModel savePlaceModel)
{ {
if (this.ViewKey != NDIViewKeys.CAM_1) if (this.ViewKey != NDIViewKeys.CAM_1)
...@@ -440,13 +534,13 @@ namespace VIZ.FGOUT.Module ...@@ -440,13 +534,13 @@ namespace VIZ.FGOUT.Module
//ApplicationDomainEx.LiteDbContext.SetPlaceConfig.Upsert(setPlaceConfig); //ApplicationDomainEx.LiteDbContext.SetPlaceConfig.Upsert(setPlaceConfig);
ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.Upsert(setPlaceNewConfig); ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.Upsert(setPlaceNewConfig);
this.manualConfig = ApplicationDomainEx.LiteDbContext.SetManualConfig.FindAll().FirstOrDefault(); //在保存位置的时候保存是否手动和是否抠图我是不理解的，所以先给他注释掉
if (this.manualConfig==null) //this.manualConfig = ApplicationDomainEx.LiteDbContext.SetManualConfig.FindAll().FirstOrDefault();
this.manualConfig = new SetManualConfig(); //if (this.manualConfig == null)
this.manualConfig.IsManual = savePlaceModel.IsManual; // this.manualConfig = new SetManualConfig();
this.manualConfig.IsStartMat = savePlaceModel.IsStartMat; //this.manualConfig.IsManual = savePlaceModel.IsManual;
//this.manualConfig.IsStartMat = savePlaceModel.IsStartMat;
ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(this.manualConfig); //ApplicationDomainEx.LiteDbContext.SetManualConfig.Upsert(this.manualConfig);
MessageBoxEx.ShowDialog("保存成功"); MessageBoxEx.ShowDialog("保存成功");
} }
...@@ -693,11 +787,11 @@ namespace VIZ.FGOUT.Module ...@@ -693,11 +787,11 @@ namespace VIZ.FGOUT.Module
//SetPlaceConfig setPlaceConfig = ApplicationDomainEx.LiteDbContext.SetPlaceConfig.FindAll().FirstOrDefault(); //SetPlaceConfig setPlaceConfig = ApplicationDomainEx.LiteDbContext.SetPlaceConfig.FindAll().FirstOrDefault();
//SetPlaceNewConfig setPlaceNewConfig = ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.FindAll().FirstOrDefault(); //SetPlaceNewConfig setPlaceNewConfig = ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.FindAll().FirstOrDefault();
SetPlaceNewConfig setPlaceNewConfig = SetPlaceNewConfig setPlaceNewConfig = ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.FindOne(p =>
ApplicationDomainEx.LiteDbContext.SetPlaceNewConfig.FindOne(p =>
p.SportCode == this.viewConfig.GameName); p.SportCode == this.viewConfig.GameName);
//if (setPlaceConfig == null) return; //if (setPlaceConfig == null) return;
if (setPlaceNewConfig == null) return; if (setPlaceNewConfig == null) return;
if(setPlaceNewConfig.EndPlace.Count ==0) return;
//points.Add(point); //points.Add(point);
//polygon.Points = points; //polygon.Points = points;
......
VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/NDIMainView/View/NDIMainView.g.cs
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8DF38DA67C14C333B3C04ED7B4E10F4CFC79EF5C2171AC26520812DD04450C6A" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "088F7A4814CCB3C687D13BFF70E8228CC099DEF6DCF28EBAFEC111EC0A56CB00"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
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}" "8DF38DA67C14C333B3C04ED7B4E10F4CFC79EF5C2171AC26520812DD04450C6A" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "088F7A4814CCB3C687D13BFF70E8228CC099DEF6DCF28EBAFEC111EC0A56CB00"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
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\NDIMainView\View\NDIMainView.xaml;;
FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;; FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;
......
VIZ.FGOUT/VIZ.FGOUT.Storage/LiteDB/System/SetManualConfig.cs
using System; namespace VIZ.FGOUT.Storage
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VIZ.FGOUT.Storage
{ {
public class SetManualConfig public class SetManualConfig
{ {
...@@ -15,11 +9,10 @@ namespace VIZ.FGOUT.Storage ...@@ -15,11 +9,10 @@ namespace VIZ.FGOUT.Storage
public int Id { get; set; } public int Id { get; set; }
/// <summary> /// <summary>
/// 是 /// 是 手动
/// </summary> /// </summary>
public bool IsManual { get; set; } public bool IsManual { get; set; }
/// <summary> /// <summary>
/// 是否开始抠图 /// 是否开始抠图
/// </summary> /// </summary>
......
VIZ.FGOUT/VIZ.FGOUT/bin/x64/Debug/Logs/err.log
This source diff could not be displayed because it is too large. You can view the blob instead.
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