Skip to content

V
VIZ.H2V
Commit ad452264 by liulongfei
Options

1. 算法配置增强 

2. 替换WPFToolkit 控件
parent c6959f2a
Showing with 412 additions and 261 deletions
VIZ.H2V.ClipTestTool/VIZ.H2V.ClipTestTool.csproj
...@@ -79,6 +79,21 @@ ...@@ -79,6 +79,21 @@
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" /> <Reference Include="PresentationFramework" />
<Reference Include="Xceed.Wpf.AvalonDock, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.Toolkit, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ApplicationDefinition Include="App.xaml"> <ApplicationDefinition Include="App.xaml">
......
VIZ.H2V.ClipTestTool/View/MainView.xaml
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:VIZ.H2V.ClipTestTool" xmlns:local="clr-namespace:VIZ.H2V.ClipTestTool"
xmlns:toolkit="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common" xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common"
mc:Ignorable="d" Background="White" Loaded="UserControl_Loaded" mc:Ignorable="d" Background="White" Loaded="UserControl_Loaded"
d:DesignHeight="800" d:DesignWidth="1200"> d:DesignHeight="800" d:DesignWidth="1200">
...@@ -46,8 +47,8 @@ ...@@ -46,8 +47,8 @@
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="60"></ColumnDefinition> <ColumnDefinition Width="60"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<fcommon:NumberBox MinValue="0" MaxValue="200" Interval="1" <toolkit:DoubleUpDown Minimum="0" Maximum="200" Increment="1"
Value="{Binding Path=MoveValue,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=MoveValue,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="像素" Foreground="Black" FontSize="18" VerticalAlignment="Center" Grid.Column="1" Margin="10,0,0,0"></TextBlock> <TextBlock Text="像素" Foreground="Black" FontSize="18" VerticalAlignment="Center" Grid.Column="1" Margin="10,0,0,0"></TextBlock>
</Grid> </Grid>
<Grid Grid.Row="1" Grid.Column="2"> <Grid Grid.Row="1" Grid.Column="2">
...@@ -55,8 +56,8 @@ ...@@ -55,8 +56,8 @@
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="80"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<fcommon:NumberBox MinValue="0.001" MaxValue="0.05" Interval="0.0001" <toolkit:DoubleUpDown Minimum="0.001" Maximum="0.05" Increment="0.0001"
Value="{Binding Path=SmoothValue,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=SmoothValue,Mode=TwoWay}"></toolkit:DoubleUpDown>
<Button Content="刷新平滑系数" Foreground="Black" FontSize="12" Grid.Column="1" Command="{Binding Path=UpdateSmoothCommand}"></Button> <Button Content="刷新平滑系数" Foreground="Black" FontSize="12" Grid.Column="1" Command="{Binding Path=UpdateSmoothCommand}"></Button>
</Grid> </Grid>
</Grid> </Grid>
......
VIZ.H2V.ClipTestTool/packages.config
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Extended.Wpf.Toolkit" version="4.4.0" targetFramework="net48" />
<package id="log4net" version="2.0.15" targetFramework="net48" /> <package id="log4net" version="2.0.15" targetFramework="net48" />
<package id="MouseKeyHook" version="5.6.0" targetFramework="net48" /> <package id="MouseKeyHook" version="5.6.0" targetFramework="net48" />
</packages> </packages>
\ No newline at end of file
VIZ.H2V.Domain/Model/Algorithm/AlgorithmProcessModel.cs
...@@ -40,20 +40,6 @@ namespace VIZ.H2V.Domain ...@@ -40,20 +40,6 @@ namespace VIZ.H2V.Domain
#endregion #endregion
#region ProcessID -- 进程ID
private int processID;
/// <summary>
/// 当前的算法进程ID
/// </summary>
public int ProcessID
{
get { return processID; }
set { processID = value; this.RaisePropertyChanged(nameof(ProcessID)); }
}
#endregion
#region IP -- IP地址 #region IP -- IP地址
private string ip; private string ip;
...@@ -82,16 +68,16 @@ namespace VIZ.H2V.Domain ...@@ -82,16 +68,16 @@ namespace VIZ.H2V.Domain
#endregion #endregion
#region Process -- 进程信息 #region MainProcess -- 主进程
private Process process; private Process mainProcess;
/// <summary> /// <summary>
/// 进程信息 /// 主进程
/// </summary> /// </summary>
public Process Process public Process MainProcess
{ {
get { return process; } get { return mainProcess; }
set { process = value; this.RaisePropertyChanged(nameof(Process)); } set { mainProcess = value; this.RaisePropertyChanged(nameof(MainProcess)); }
} }
#endregion #endregion
......
VIZ.H2V.Domain/Model/Algorithm/AlgorithmStrategyModel.cs
...@@ -4,6 +4,7 @@ using System.Linq; ...@@ -4,6 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VIZ.Framework.Core; using VIZ.Framework.Core;
using VIZ.H2V.Storage;
namespace VIZ.H2V.Domain namespace VIZ.H2V.Domain
{ {
...@@ -26,6 +27,34 @@ namespace VIZ.H2V.Domain ...@@ -26,6 +27,34 @@ namespace VIZ.H2V.Domain
#endregion #endregion
#region Type -- 算法类型
private AlgorithmStrategyType type;
/// <summary>
/// 算法类型
/// </summary>
public AlgorithmStrategyType Type
{
get { return type; }
set { type = value; this.RaisePropertyChanged(nameof(Type)); }
}
#endregion
#region Tag -- 标记
private string tag;
/// <summary>
/// 标记
/// </summary>
public string Tag
{
get { return tag; }
set { tag = value; this.RaisePropertyChanged(nameof(Tag)); }
}
#endregion
#region Name -- 名称 #region Name -- 名称
private string name; private string name;
...@@ -54,17 +83,17 @@ namespace VIZ.H2V.Domain ...@@ -54,17 +83,17 @@ namespace VIZ.H2V.Domain
#endregion #endregion
#region SetupPath -- 启动路径（绝对路径 or 相对路径） #region MainPath -- 主进程路径
private string setupPath; private string mainPath;
/// <summary> /// <summary>
/// 启动路径（绝对路径 or 相对路径） /// 主进程路径
/// </summary> /// </summary>
public string SetupPath public string MainPath
{ {
get { return setupPath; } get { return mainPath; }
set { setupPath = value; this.RaisePropertyChanged(nameof(SetupPath)); } set { mainPath = value; this.RaisePropertyChanged(nameof(MainPath)); }
} }
#endregion #endregion
......
VIZ.H2V.Module.Resource/Converter/AlgorithmStrategyTagStringConverter.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data;
namespace VIZ.H2V.Module.Resource
{
/// <summary>
/// 算法标记字符串转化器
/// </summary>
public class AlgorithmStrategyTagStringConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if (value == null)
return null;
string str = value.ToString();
if (string.IsNullOrWhiteSpace(str))
return null;
return $" ({str})";
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}
VIZ.H2V.Module.Resource/VIZ.H2V.Module.Resource.csproj
...@@ -64,6 +64,21 @@ ...@@ -64,6 +64,21 @@
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" /> <Reference Include="PresentationFramework" />
<Reference Include="Xceed.Wpf.AvalonDock, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.Toolkit, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Page Include="Style\Button\Button_NdiView.xaml"> <Page Include="Style\Button\Button_NdiView.xaml">
...@@ -122,8 +137,13 @@ ...@@ -122,8 +137,13 @@
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
<Page Include="Toolkit\NumericUpDown\NumericUpDown.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Converter\AlgorithmStrategyTagStringConverter.cs" />
<Compile Include="Converter\AlgorithmStrategyType2FootballFieldHeightConverter.cs" /> <Compile Include="Converter\AlgorithmStrategyType2FootballFieldHeightConverter.cs" />
<Compile Include="Converter\AlgorithmStrategyType2FootballFieldOrientationConverter.cs" /> <Compile Include="Converter\AlgorithmStrategyType2FootballFieldOrientationConverter.cs" />
<Compile Include="Converter\TallyColor2RadialGradientBrushConverter.cs" /> <Compile Include="Converter\TallyColor2RadialGradientBrushConverter.cs" />
...@@ -148,6 +168,7 @@ ...@@ -148,6 +168,7 @@
<LastGenOutput>Resources.Designer.cs</LastGenOutput> <LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource> </EmbeddedResource>
<None Include="app.config" /> <None Include="app.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <LastGenOutput>Settings.Designer.cs</LastGenOutput>
...@@ -216,5 +237,9 @@ ...@@ -216,5 +237,9 @@
<ItemGroup> <ItemGroup>
<Resource Include="Icons\tally_24x24.png" /> <Resource Include="Icons\tally_24x24.png" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Resource Include="Icons\triangle_down_16x16.png" />
<Resource Include="Icons\triangle_up_16x16.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>
\ No newline at end of file
VIZ.H2V.Module.Resource/packages.config 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Extended.Wpf.Toolkit" version="4.4.0" targetFramework="net48" />
</packages>
\ No newline at end of file
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmCablewayPanelView.xaml
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
xmlns:local="clr-namespace:VIZ.H2V.Module" xmlns:local="clr-namespace:VIZ.H2V.Module"
xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common" xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:toolkit="http://schemas.xceed.com/wpf/xaml/toolkit"
d:DataContext="{d:DesignInstance Type=local:AlgorithmCablewayPanelViewModel}" d:DataContext="{d:DesignInstance Type=local:AlgorithmCablewayPanelViewModel}"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="1000"> d:DesignHeight="800" d:DesignWidth="1000">
...@@ -17,7 +18,6 @@ ...@@ -17,7 +18,6 @@
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Slider/Slider_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Slider/Slider_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/CheckBox/CheckBox_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/CheckBox/CheckBox_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/NumberBox/NumberBox.xaml"></ResourceDictionary>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
...@@ -62,20 +62,20 @@ ...@@ -62,20 +62,20 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="权重(%)" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="0"></TextBlock> <TextBlock Text="权重(%)" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="0"></TextBlock>
<!-- 人物面积占比 --> <!-- 人物面积占比 -->
<fcommon:NumberBox Grid.Row="1" Height="40" MinValue="0" MaxValue="100" Interval="1" <toolkit:DoubleUpDown Grid.Row="1" Height="40" Minimum="0" Maximum="100" Increment="1"
Value="{Binding Path=PersonAreaProportionWeight,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=PersonAreaProportionWeight,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="人物面积占比" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="1" Grid.Column="1"></TextBlock> <TextBlock Text="人物面积占比" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="1" Grid.Column="1"></TextBlock>
<fcommon:NumberBox Grid.Row="1" Height="40" MinValue="0" MaxValue="100" Interval="0.1" Grid.Column="2" <toolkit:DoubleUpDown Grid.Row="1" Height="40" Minimum="0" Maximum="100" Increment="0.1" Grid.Column="2"
Value="{Binding Path=PersonAreaProportion,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=PersonAreaProportion,Mode=TwoWay}"></toolkit:DoubleUpDown>
<!-- 置信度 --> <!-- 置信度 -->
<fcommon:NumberBox Grid.Row="2" Height="40" MinValue="0" MaxValue="100" Interval="1" <toolkit:DoubleUpDown Grid.Row="2" Height="40" Minimum="0" Maximum="100" Increment="1"
Value="{Binding Path=ConfidenceWeight,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=ConfidenceWeight,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="置信度" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2" Grid.Column="1"></TextBlock> <TextBlock Text="置信度" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2" Grid.Column="1"></TextBlock>
<fcommon:NumberBox Grid.Row="2" Height="40" MinValue="0" MaxValue="100" Interval="0.1" Grid.Column="2" <toolkit:DoubleUpDown Grid.Row="2" Height="40" Minimum="0" Maximum="100" Increment="0.1" Grid.Column="2"
Value="{Binding Path=Confidence,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=Confidence,Mode=TwoWay}"></toolkit:DoubleUpDown>
<!-- 距离画面中心的位置 --> <!-- 距离画面中心的位置 -->
<fcommon:NumberBox Grid.Row="3" Height="40" MinValue="0" MaxValue="100" Interval="1" <toolkit:DoubleUpDown Grid.Row="3" Height="40" Minimum="0" Maximum="100" Increment="1"
Value="{Binding Path=PositionToCenterWeight,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=PositionToCenterWeight,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="距离画面中心的位置" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="3" Grid.Column="1"></TextBlock> <TextBlock Text="距离画面中心的位置" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="3" Grid.Column="1"></TextBlock>
</Grid> </Grid>
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="100"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="非常平滑，移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="18,0,0,0"></TextBlock> <TextBlock Text="非常平滑，移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="18,0,0,0"></TextBlock>
<TextBlock Text="一般平滑，移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,24,0"></TextBlock> <TextBlock Text="一般平滑，移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,24,0"></TextBlock>
...@@ -99,9 +99,9 @@ ...@@ -99,9 +99,9 @@
Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001" Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></Slider> Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></Slider>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2" Grid.Row="1"></TextBlock> <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2" Grid.Row="1"></TextBlock>
<fcommon:NumberBox Grid.Column="3" Height="40" IsShowUpAndDownButton="False" Grid.Row="1" <toolkit:DoubleUpDown Grid.Column="3" Height="40" Grid.Row="1"
MinValue="0.001" MaxValue="0.05" Interval="0.001" Minimum="0.001" Maximum="0.05" Increment="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></toolkit:DoubleUpDown>
</Grid> </Grid>
<!-- 默认策略 --> <!-- 默认策略 -->
<!-- 维持上一帧位置（帧） --> <!-- 维持上一帧位置（帧） -->
...@@ -114,8 +114,8 @@ ...@@ -114,8 +114,8 @@
<ColumnDefinition Width="40"></ColumnDefinition> <ColumnDefinition Width="40"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="维持上一帧位置（帧）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock> <TextBlock Text="维持上一帧位置（帧）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<fcommon:NumberBox Grid.Column="1" MinValue="0" MaxValue="1000000" Interval="1" Height="40" <toolkit:DoubleUpDown Grid.Column="1" Minimum="0" Maximum="1000000" Increment="1" Height="40"
Value="{Binding Path=KeepPrevFrame,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=KeepPrevFrame,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="内" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2" <TextBlock Text="内" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2"
HorizontalAlignment="Right"></TextBlock> HorizontalAlignment="Right"></TextBlock>
</Grid> </Grid>
...@@ -180,8 +180,8 @@ ...@@ -180,8 +180,8 @@
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="手动校准半径（像素）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock> <TextBlock Text="手动校准半径（像素）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<fcommon:NumberBox Grid.Column="1" MinValue="200" MaxValue="400" Interval="1" Height="40" <toolkit:DoubleUpDown Grid.Column="1" Minimum="200" Maximum="400" Increment="1" Height="40"
Value="{Binding Path=ManualCorrectionRadius,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=ManualCorrectionRadius,Mode=TwoWay}"></toolkit:DoubleUpDown>
</Grid> </Grid>
</Grid> </Grid>
</Border> </Border>
......
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmNearPanelView.xaml
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
xmlns:local="clr-namespace:VIZ.H2V.Module" xmlns:local="clr-namespace:VIZ.H2V.Module"
xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common" xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:toolkit="http://schemas.xceed.com/wpf/xaml/toolkit"
d:DataContext="{d:DesignInstance Type=local:AlgorithmNearPanelViewModel}" d:DataContext="{d:DesignInstance Type=local:AlgorithmNearPanelViewModel}"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="1000"> d:DesignHeight="800" d:DesignWidth="1000">
...@@ -17,7 +18,6 @@ ...@@ -17,7 +18,6 @@
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Slider/Slider_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Slider/Slider_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/CheckBox/CheckBox_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/CheckBox/CheckBox_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/NumberBox/NumberBox.xaml"></ResourceDictionary>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
...@@ -62,20 +62,20 @@ ...@@ -62,20 +62,20 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="权重(%)" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="0"></TextBlock> <TextBlock Text="权重(%)" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="0"></TextBlock>
<!-- 人物面积占比 --> <!-- 人物面积占比 -->
<fcommon:NumberBox Grid.Row="1" Height="40" MinValue="0" MaxValue="100" Interval="1" <toolkit:DoubleUpDown Grid.Row="1" Height="40" Minimum="0" Maximum="100" Increment="1"
Value="{Binding Path=PersonAreaProportionWeight,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=PersonAreaProportionWeight,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="人物面积占比" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="1" Grid.Column="1"></TextBlock> <TextBlock Text="人物面积占比" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="1" Grid.Column="1"></TextBlock>
<fcommon:NumberBox Grid.Row="1" Height="40" MinValue="0" MaxValue="100" Interval="0.1" Grid.Column="2" <toolkit:DoubleUpDown Grid.Row="1" Height="40" Minimum="0" Maximum="100" Increment="0.1" Grid.Column="2"
Value="{Binding Path=PersonAreaProportion,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=PersonAreaProportion,Mode=TwoWay}"></toolkit:DoubleUpDown>
<!-- 置信度 --> <!-- 置信度 -->
<fcommon:NumberBox Grid.Row="2" Height="40" MinValue="0" MaxValue="100" Interval="1" <toolkit:DoubleUpDown Grid.Row="2" Height="40" Minimum="0" Maximum="100" Increment="1"
Value="{Binding Path=ConfidenceWeight,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=ConfidenceWeight,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="置信度" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2" Grid.Column="1"></TextBlock> <TextBlock Text="置信度" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2" Grid.Column="1"></TextBlock>
<fcommon:NumberBox Grid.Row="2" Height="40" MinValue="0" MaxValue="100" Interval="0.1" Grid.Column="2" <toolkit:DoubleUpDown Grid.Row="2" Height="40" Minimum="0" Maximum="100" Increment="0.1" Grid.Column="2"
Value="{Binding Path=Confidence,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=Confidence,Mode=TwoWay}"></toolkit:DoubleUpDown>
<!-- 距离画面中心的位置 --> <!-- 距离画面中心的位置 -->
<fcommon:NumberBox Grid.Row="3" Height="40" MinValue="0" MaxValue="100" Interval="1" <toolkit:DoubleUpDown Grid.Row="3" Height="40" Minimum="0" Maximum="100" Increment="1"
Value="{Binding Path=PositionToCenterWeight,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=PositionToCenterWeight,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="距离画面中心的位置" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="3" Grid.Column="1"></TextBlock> <TextBlock Text="距离画面中心的位置" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="3" Grid.Column="1"></TextBlock>
</Grid> </Grid>
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="100"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="非常平滑，移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="18,0,0,0"></TextBlock> <TextBlock Text="非常平滑，移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="18,0,0,0"></TextBlock>
<TextBlock Text="一般平滑，移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,24,0"></TextBlock> <TextBlock Text="一般平滑，移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,24,0"></TextBlock>
...@@ -99,9 +99,9 @@ ...@@ -99,9 +99,9 @@
Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001" Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></Slider> Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></Slider>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2" Grid.Row="1"></TextBlock> <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2" Grid.Row="1"></TextBlock>
<fcommon:NumberBox Grid.Column="3" Height="40" IsShowUpAndDownButton="False" Grid.Row="1" <toolkit:DoubleUpDown Grid.Column="3" Height="40" Grid.Row="1"
MinValue="0.001" MaxValue="0.05" Interval="0.001" Minimum="0.001" Maximum="0.05" Increment="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></toolkit:DoubleUpDown>
</Grid> </Grid>
<!-- 默认策略 --> <!-- 默认策略 -->
<!-- 维持上一帧位置（帧） --> <!-- 维持上一帧位置（帧） -->
...@@ -114,8 +114,8 @@ ...@@ -114,8 +114,8 @@
<ColumnDefinition Width="40"></ColumnDefinition> <ColumnDefinition Width="40"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="维持上一帧位置（帧）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock> <TextBlock Text="维持上一帧位置（帧）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<fcommon:NumberBox Grid.Column="1" MinValue="0" MaxValue="1000000" Interval="1" Height="40" <toolkit:DoubleUpDown Grid.Column="1" Minimum="0" Maximum="1000000" Increment="1" Height="40"
Value="{Binding Path=KeepPrevFrame,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=KeepPrevFrame,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="内" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2" <TextBlock Text="内" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2"
Margin="10,0,0,0"></TextBlock> Margin="10,0,0,0"></TextBlock>
</Grid> </Grid>
...@@ -180,8 +180,8 @@ ...@@ -180,8 +180,8 @@
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="手动校准半径（像素）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock> <TextBlock Text="手动校准半径（像素）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<fcommon:NumberBox Grid.Column="1" MinValue="200" MaxValue="400" Interval="1" Height="40" <toolkit:DoubleUpDown Grid.Column="1" Minimum="200" Maximum="400" Increment="1" Height="40"
Value="{Binding Path=ManualCorrectionRadius,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=ManualCorrectionRadius,Mode=TwoWay}"></toolkit:DoubleUpDown>
</Grid> </Grid>
</Grid> </Grid>
</Border> </Border>
......
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmSinglePanelView.xaml
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
xmlns:local="clr-namespace:VIZ.H2V.Module" xmlns:local="clr-namespace:VIZ.H2V.Module"
xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common" xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:toolkit="http://schemas.xceed.com/wpf/xaml/toolkit"
d:DataContext="{d:DesignInstance Type=local:AlgorithmSinglePanelViewModel}" d:DataContext="{d:DesignInstance Type=local:AlgorithmSinglePanelViewModel}"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="450" d:DesignWidth="800">
...@@ -17,7 +18,6 @@ ...@@ -17,7 +18,6 @@
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Button/Button_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Button/Button_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Slider/Slider_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Slider/Slider_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/NumberBox/NumberBox.xaml"></ResourceDictionary>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="100"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="非常平滑，移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="18,0,0,0"></TextBlock> <TextBlock Text="非常平滑，移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="18,0,0,0"></TextBlock>
<TextBlock Text="一般平滑，移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,24,0"></TextBlock> <TextBlock Text="一般平滑，移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,24,0"></TextBlock>
...@@ -62,9 +62,9 @@ ...@@ -62,9 +62,9 @@
Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001" Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></Slider> Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></Slider>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2" Grid.Row="1"></TextBlock> <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2" Grid.Row="1"></TextBlock>
<fcommon:NumberBox Grid.Column="3" Height="40" IsShowUpAndDownButton="False" Grid.Row="1" <toolkit:DoubleUpDown Grid.Column="3" Height="40" Grid.Row="1"
MinValue="0.001" MaxValue="0.05" Interval="0.001" Minimum="0.001" Maximum="0.05" Increment="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></toolkit:DoubleUpDown>
</Grid> </Grid>
<!-- 默认策略 --> <!-- 默认策略 -->
<!-- 维持上一帧位置（帧） --> <!-- 维持上一帧位置（帧） -->
...@@ -77,8 +77,8 @@ ...@@ -77,8 +77,8 @@
<ColumnDefinition Width="40"></ColumnDefinition> <ColumnDefinition Width="40"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="维持上一帧位置（帧）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock> <TextBlock Text="维持上一帧位置（帧）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<fcommon:NumberBox Grid.Column="1" MinValue="0" MaxValue="1000000" Interval="1" Height="40" <toolkit:DoubleUpDown Grid.Column="1" Minimum="0" Maximum="1000000" Increment="1" Height="40"
Value="{Binding Path=KeepPrevFrame,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=KeepPrevFrame,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="内" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2" <TextBlock Text="内" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2"
Margin="10,0,0,0"></TextBlock> Margin="10,0,0,0"></TextBlock>
</Grid> </Grid>
...@@ -145,8 +145,8 @@ ...@@ -145,8 +145,8 @@
<ColumnDefinition Width="40"></ColumnDefinition> <ColumnDefinition Width="40"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="跟踪框面积占比小于x%时自动校准" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock> <TextBlock Text="跟踪框面积占比小于x%时自动校准" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<fcommon:NumberBox Grid.Column="1" MinValue="0" MaxValue="100" Interval="0.01" Height="40" <toolkit:DoubleUpDown Grid.Column="1" Minimum="0" Maximum="100" Increment="0.01" Height="40"
Value="{Binding Path=AreaCorrectionRatio,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=AreaCorrectionRatio,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="%" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2" <TextBlock Text="%" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2"
Margin="10,0,0,0"></TextBlock> Margin="10,0,0,0"></TextBlock>
</Grid> </Grid>
...@@ -158,8 +158,8 @@ ...@@ -158,8 +158,8 @@
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="自动校准置信度" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock> <TextBlock Text="自动校准置信度" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<fcommon:NumberBox Grid.Column="1" MinValue="0" MaxValue="100" Interval="0.01" Height="40" <toolkit:DoubleUpDown Grid.Column="1" Minimum="0" Maximum="100" Increment="0.01" Height="40"
Value="{Binding Path=AreaCorrectionConfidence,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=AreaCorrectionConfidence,Mode=TwoWay}"></toolkit:DoubleUpDown>
</Grid> </Grid>
</Grid> </Grid>
</Border> </Border>
......
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmSixteenPanelView.xaml
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
xmlns:local="clr-namespace:VIZ.H2V.Module" xmlns:local="clr-namespace:VIZ.H2V.Module"
xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common" xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:toolkit="http://schemas.xceed.com/wpf/xaml/toolkit"
d:DataContext="{d:DesignInstance Type=local:AlgorithmSixteenPanelViewModel}" d:DataContext="{d:DesignInstance Type=local:AlgorithmSixteenPanelViewModel}"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="1000"> d:DesignHeight="800" d:DesignWidth="1000">
...@@ -17,7 +18,6 @@ ...@@ -17,7 +18,6 @@
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Slider/Slider_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Slider/Slider_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/CheckBox/CheckBox_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/CheckBox/CheckBox_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/NumberBox/NumberBox.xaml"></ResourceDictionary>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
...@@ -62,20 +62,20 @@ ...@@ -62,20 +62,20 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="权重(%)" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="0"></TextBlock> <TextBlock Text="权重(%)" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="0"></TextBlock>
<!-- 人物面积占比 --> <!-- 人物面积占比 -->
<fcommon:NumberBox Grid.Row="1" Height="40" MinValue="0" MaxValue="100" Interval="1" <toolkit:DoubleUpDown Grid.Row="1" Height="40" Minimum="0" Maximum="100" Increment="1"
Value="{Binding Path=PersonAreaProportionWeight,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=PersonAreaProportionWeight,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="人物面积占比" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="1" Grid.Column="1"></TextBlock> <TextBlock Text="人物面积占比" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="1" Grid.Column="1"></TextBlock>
<fcommon:NumberBox Grid.Row="1" Height="40" MinValue="0" MaxValue="100" Interval="0.1" Grid.Column="2" <toolkit:DoubleUpDown Grid.Row="1" Height="40" Minimum="0" Maximum="100" Increment="0.1" Grid.Column="2"
Value="{Binding Path=PersonAreaProportion,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=PersonAreaProportion,Mode=TwoWay}"></toolkit:DoubleUpDown>
<!-- 置信度 --> <!-- 置信度 -->
<fcommon:NumberBox Grid.Row="2" Height="40" MinValue="0" MaxValue="100" Interval="1" <toolkit:DoubleUpDown Grid.Row="2" Height="40" Minimum="0" Maximum="100" Increment="1"
Value="{Binding Path=ConfidenceWeight,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=ConfidenceWeight,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="置信度" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2" Grid.Column="1"></TextBlock> <TextBlock Text="置信度" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2" Grid.Column="1"></TextBlock>
<fcommon:NumberBox Grid.Row="2" Height="40" MinValue="0" MaxValue="100" Interval="0.1" Grid.Column="2" <toolkit:DoubleUpDown Grid.Row="2" Height="40" Minimum="0" Maximum="100" Increment="0.1" Grid.Column="2"
Value="{Binding Path=Confidence,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=Confidence,Mode=TwoWay}"></toolkit:DoubleUpDown>
<!-- 距离画面中心的位置 --> <!-- 距离画面中心的位置 -->
<fcommon:NumberBox Grid.Row="3" Height="40" MinValue="0" MaxValue="100" Interval="1" <toolkit:DoubleUpDown Grid.Row="3" Height="40" Minimum="0" Maximum="100" Increment="1"
Value="{Binding Path=PositionToCenterWeight,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=PositionToCenterWeight,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="距离画面中心的位置" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="3" Grid.Column="1"></TextBlock> <TextBlock Text="距离画面中心的位置" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="3" Grid.Column="1"></TextBlock>
</Grid> </Grid>
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="100"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="非常平滑，移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="18,0,0,0"></TextBlock> <TextBlock Text="非常平滑，移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="18,0,0,0"></TextBlock>
<TextBlock Text="一般平滑，移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,24,0"></TextBlock> <TextBlock Text="一般平滑，移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,24,0"></TextBlock>
...@@ -99,9 +99,9 @@ ...@@ -99,9 +99,9 @@
Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001" Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></Slider> Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></Slider>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2" Grid.Row="1"></TextBlock> <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2" Grid.Row="1"></TextBlock>
<fcommon:NumberBox Grid.Column="3" Height="40" IsShowUpAndDownButton="False" Grid.Row="1" <toolkit:DoubleUpDown Grid.Column="3" Height="40" Grid.Row="1"
MinValue="0.001" MaxValue="0.05" Interval="0.001" Minimum="0.001" Maximum="0.05" Increment="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></toolkit:DoubleUpDown>
</Grid> </Grid>
<!-- 默认策略 --> <!-- 默认策略 -->
<!-- 维持上一帧位置（帧） --> <!-- 维持上一帧位置（帧） -->
...@@ -114,8 +114,8 @@ ...@@ -114,8 +114,8 @@
<ColumnDefinition Width="40"></ColumnDefinition> <ColumnDefinition Width="40"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="维持上一帧位置（帧）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock> <TextBlock Text="维持上一帧位置（帧）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<fcommon:NumberBox Grid.Column="1" MinValue="0" MaxValue="1000000" Interval="1" Height="40" <toolkit:DoubleUpDown Grid.Column="1" Minimum="0" Maximum="1000000" Increment="1" Height="40"
Value="{Binding Path=KeepPrevFrame,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=KeepPrevFrame,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="内" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2" <TextBlock Text="内" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2"
HorizontalAlignment="Right"></TextBlock> HorizontalAlignment="Right"></TextBlock>
</Grid> </Grid>
...@@ -180,8 +180,8 @@ ...@@ -180,8 +180,8 @@
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="手动校准半径（像素）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock> <TextBlock Text="手动校准半径（像素）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<fcommon:NumberBox Grid.Column="1" MinValue="200" MaxValue="400" Interval="1" Height="40" <toolkit:DoubleUpDown Grid.Column="1" Minimum="200" Maximum="400" Increment="1" Height="40"
Value="{Binding Path=ManualCorrectionRadius,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=ManualCorrectionRadius,Mode=TwoWay}"></toolkit:DoubleUpDown>
</Grid> </Grid>
</Grid> </Grid>
</Border> </Border>
......
VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmTacticsPanelView.xaml
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
xmlns:local="clr-namespace:VIZ.H2V.Module" xmlns:local="clr-namespace:VIZ.H2V.Module"
xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common" xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:toolkit="http://schemas.xceed.com/wpf/xaml/toolkit"
d:DataContext="{d:DesignInstance Type=local:AlgorithmTacticsPanelViewModel}" d:DataContext="{d:DesignInstance Type=local:AlgorithmTacticsPanelViewModel}"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="1000"> d:DesignHeight="800" d:DesignWidth="1000">
...@@ -17,7 +18,6 @@ ...@@ -17,7 +18,6 @@
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Slider/Slider_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Slider/Slider_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/CheckBox/CheckBox_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/CheckBox/CheckBox_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/NumberBox/NumberBox.xaml"></ResourceDictionary>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
...@@ -62,20 +62,20 @@ ...@@ -62,20 +62,20 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="权重(%)" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="0"></TextBlock> <TextBlock Text="权重(%)" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="0"></TextBlock>
<!-- 人物面积占比 --> <!-- 人物面积占比 -->
<fcommon:NumberBox Grid.Row="1" Height="40" MinValue="0" MaxValue="100" Interval="1" <toolkit:DoubleUpDown Grid.Row="1" Height="40" Minimum="0" Maximum="100" Increment="1"
Value="{Binding Path=PersonAreaProportionWeight,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=PersonAreaProportionWeight,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="人物面积占比" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="1" Grid.Column="1"></TextBlock> <TextBlock Text="人物面积占比" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="1" Grid.Column="1"></TextBlock>
<fcommon:NumberBox Grid.Row="1" Height="40" MinValue="0" MaxValue="100" Interval="0.1" Grid.Column="2" <toolkit:DoubleUpDown Grid.Row="1" Height="40" Minimum="0" Maximum="100" Increment="0.1" Grid.Column="2"
Value="{Binding Path=PersonAreaProportion,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=PersonAreaProportion,Mode=TwoWay}"></toolkit:DoubleUpDown>
<!-- 置信度 --> <!-- 置信度 -->
<fcommon:NumberBox Grid.Row="2" Height="40" MinValue="0" MaxValue="100" Interval="1" <toolkit:DoubleUpDown Grid.Row="2" Height="40" Minimum="0" Maximum="100" Increment="1"
Value="{Binding Path=ConfidenceWeight,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=ConfidenceWeight,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="置信度" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2" Grid.Column="1"></TextBlock> <TextBlock Text="置信度" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2" Grid.Column="1"></TextBlock>
<fcommon:NumberBox Grid.Row="2" Height="40" MinValue="0" MaxValue="100" Interval="0.1" Grid.Column="2" <toolkit:DoubleUpDown Grid.Row="2" Height="40" Minimum="0" Maximum="100" Increment="0.1" Grid.Column="2"
Value="{Binding Path=Confidence,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=Confidence,Mode=TwoWay}"></toolkit:DoubleUpDown>
<!-- 距离画面中心的位置 --> <!-- 距离画面中心的位置 -->
<fcommon:NumberBox Grid.Row="3" Height="40" MinValue="0" MaxValue="100" Interval="1" <toolkit:DoubleUpDown Grid.Row="3" Height="40" Minimum="0" Maximum="100" Increment="1"
Value="{Binding Path=PositionToCenterWeight,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=PositionToCenterWeight,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="距离画面中心的位置" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="3" Grid.Column="1"></TextBlock> <TextBlock Text="距离画面中心的位置" Margin="10,0,0,0" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="3" Grid.Column="1"></TextBlock>
</Grid> </Grid>
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="100"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="非常平滑，移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="18,0,0,0"></TextBlock> <TextBlock Text="非常平滑，移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="18,0,0,0"></TextBlock>
<TextBlock Text="一般平滑，移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,24,0"></TextBlock> <TextBlock Text="一般平滑，移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,24,0"></TextBlock>
...@@ -99,9 +99,9 @@ ...@@ -99,9 +99,9 @@
Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001" Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></Slider> Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></Slider>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2" Grid.Row="1"></TextBlock> <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.05" Foreground="White" FontSize="16" Grid.Column="2" Grid.Row="1"></TextBlock>
<fcommon:NumberBox Grid.Column="3" Height="40" IsShowUpAndDownButton="False" Grid.Row="1" <toolkit:DoubleUpDown Grid.Column="3" Height="40" Grid.Row="1"
MinValue="0.001" MaxValue="0.05" Interval="0.001" Minimum="0.001" Maximum="0.05" Increment="0.001"
Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=SmoothCoeff,Mode=TwoWay}"></toolkit:DoubleUpDown>
</Grid> </Grid>
<!-- 默认策略 --> <!-- 默认策略 -->
<!-- 维持上一帧位置（帧） --> <!-- 维持上一帧位置（帧） -->
...@@ -114,8 +114,8 @@ ...@@ -114,8 +114,8 @@
<ColumnDefinition Width="40"></ColumnDefinition> <ColumnDefinition Width="40"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="维持上一帧位置（帧）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock> <TextBlock Text="维持上一帧位置（帧）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<fcommon:NumberBox Grid.Column="1" MinValue="0" MaxValue="1000000" Interval="1" Height="40" <toolkit:DoubleUpDown Grid.Column="1" Minimum="0" Maximum="1000000" Increment="1" Height="40"
Value="{Binding Path=KeepPrevFrame,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=KeepPrevFrame,Mode=TwoWay}"></toolkit:DoubleUpDown>
<TextBlock Text="内" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2" <TextBlock Text="内" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2"
HorizontalAlignment="Right"></TextBlock> HorizontalAlignment="Right"></TextBlock>
</Grid> </Grid>
...@@ -180,8 +180,8 @@ ...@@ -180,8 +180,8 @@
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="手动校准半径（像素）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock> <TextBlock Text="手动校准半径（像素）" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<fcommon:NumberBox Grid.Column="1" MinValue="200" MaxValue="400" Interval="1" Height="40" <toolkit:DoubleUpDown Grid.Column="1" Minimum="200" Maximum="400" Increment="1" Height="40"
Value="{Binding Path=ManualCorrectionRadius,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=ManualCorrectionRadius,Mode=TwoWay}"></toolkit:DoubleUpDown>
</Grid> </Grid>
</Grid> </Grid>
</Border> </Border>
......
VIZ.H2V.Module/NDISettingView/View/AlgorithmSettingPanelView.xaml
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
xmlns:local="clr-namespace:VIZ.H2V.Module" xmlns:local="clr-namespace:VIZ.H2V.Module"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common" xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common"
xmlns:resource="clr-namespace:VIZ.H2V.Module.Resource;assembly=VIZ.H2V.Module.Resource"
d:DataContext="{d:DesignInstance Type=local:AlgorithmSettingPanelViewModel}" d:DataContext="{d:DesignInstance Type=local:AlgorithmSettingPanelViewModel}"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="450" d:DesignWidth="800">
...@@ -16,6 +17,8 @@ ...@@ -16,6 +17,8 @@
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Button/Button_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Button/Button_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml"></ResourceDictionary>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<resource:AlgorithmStrategyTagStringConverter x:Key="AlgorithmStrategyTagStringConverter"></resource:AlgorithmStrategyTagStringConverter>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
...@@ -40,15 +43,19 @@ ...@@ -40,15 +43,19 @@
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<Border Background="Transparent" IsHitTestVisible="False"> <Border Background="Transparent" IsHitTestVisible="False">
<TextBlock Text="{Binding Path=DisplayName}" Foreground="White" FontSize="16"></TextBlock> <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left">
<TextBlock Text="{Binding Path=DisplayName}" Foreground="White" FontSize="16"></TextBlock>
<TextBlock Text="{Binding Path=Tag,Mode=OneWay,Converter={StaticResource AlgorithmStrategyTagStringConverter}}"
Foreground="White" FontSize="16" Margin="10,0,0,0"></TextBlock>
</StackPanel>
</Border> </Border>
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
<fcommon:NavigationControl Grid.Row="3" <fcommon:NavigationControl Grid.Row="3"
ItemsSource="{Binding Path=AlgorithmStrategys}" ItemsSource="{Binding Path=AlgorithmStrategys}"
SelectedValue="{Binding Path=SelectedAlgorithmStrategy,Mode=OneWay}"> SelectedValue="{Binding Path=SelectedAlgorithmStrategy,Mode=OneWay}">
</fcommon:NavigationControl> </fcommon:NavigationControl>
</Grid> </Grid>
......
VIZ.H2V.Module/NDISettingView/View/NDISettingPanelView.xaml
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:VIZ.H2V.Module" xmlns:local="clr-namespace:VIZ.H2V.Module"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:toolkit="http://schemas.xceed.com/wpf/xaml/toolkit"
d:DataContext="{d:DesignInstance Type=local:NDISettingPanelViewModel}" d:DataContext="{d:DesignInstance Type=local:NDISettingPanelViewModel}"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="600" d:DesignWidth="800"> d:DesignHeight="600" d:DesignWidth="800">
......
VIZ.H2V.Module/NDISettingView/ViewModel/AlgorithmSettingPanelViewModel.cs
...@@ -109,10 +109,10 @@ namespace VIZ.H2V.Module ...@@ -109,10 +109,10 @@ namespace VIZ.H2V.Module
/// </summary> /// </summary>
private void Loaded() private void Loaded()
{ {
NDISettingView settingView = WPFHelper.GetAncestorByType<NDISettingView>(this.GetView<System.Windows.FrameworkElement>()); NDISettingView settingView = WPFHelper.GetAncestorByType<NDISettingView>(this.GetView<FrameworkElement>());
NDISettingViewModel vm = settingView.DataContext as NDISettingViewModel; NDISettingViewModel vm = settingView.DataContext as NDISettingViewModel;
this.ViewConfig = vm.ViewConfig; this.ViewConfig = vm.ViewConfig;
AlgorithmStrategyType StrategyType = this.ViewConfig.StrategyType; int strategyID = this.ViewConfig.StrategyID;
vm.Settings.Add(this); vm.Settings.Add(this);
// 加载算法分类信息 // 加载算法分类信息
...@@ -125,13 +125,15 @@ namespace VIZ.H2V.Module ...@@ -125,13 +125,15 @@ namespace VIZ.H2V.Module
{ {
AlgorithmStrategyModel model = new AlgorithmStrategyModel(); AlgorithmStrategyModel model = new AlgorithmStrategyModel();
model.ID = entity.ID; model.ID = entity.ID;
model.Type = entity.Type;
model.Tag = entity.Tag;
model.Name = entity.Name; model.Name = entity.Name;
model.DisplayName = entity.DisplayName; model.DisplayName = entity.DisplayName;
model.SetupPath = entity.SetupPath; model.MainPath = entity.MainPath;
model.ViewType = this.GetViewType((AlgorithmStrategyType)entity.ID); model.ViewType = this.GetViewType(entity.Type);
if (selected == null) if (selected == null)
{ {
selected = (AlgorithmStrategyType)entity.ID == StrategyType ? model : null; selected = (entity.ID == strategyID) ? model : null;
} }
list.Add(model); list.Add(model);
...@@ -203,7 +205,8 @@ namespace VIZ.H2V.Module ...@@ -203,7 +205,8 @@ namespace VIZ.H2V.Module
/// <returns>是否成功保存</returns> /// <returns>是否成功保存</returns>
public bool Save() public bool Save()
{ {
this.ViewConfig.StrategyType = (AlgorithmStrategyType)this.SelectedAlgorithmStrategy.ID; this.ViewConfig.StrategyID = this.SelectedAlgorithmStrategy.ID;
this.ViewConfig.StrategyType = this.SelectedAlgorithmStrategy.Type;
ApplicationDomainEx.LiteDbContext.ViewConfig.Update(this.ViewConfig); ApplicationDomainEx.LiteDbContext.ViewConfig.Update(this.ViewConfig);
return true; return true;
...@@ -219,10 +222,10 @@ namespace VIZ.H2V.Module ...@@ -219,10 +222,10 @@ namespace VIZ.H2V.Module
if (service == null) if (service == null)
return false; return false;
AlgorithmStrategy strategy = ApplicationDomainEx.CsvContext.AlgorithmStrategys.FirstOrDefault(p => p.ID == (int)this.ViewConfig.StrategyType); AlgorithmStrategy strategy = ApplicationDomainEx.CsvContext.AlgorithmStrategys.FirstOrDefault(p => p.ID == this.ViewConfig.StrategyID);
if (strategy != null) if (strategy != null)
{ {
// 设置算法显示名称 service.StrategyID = strategy.ID;
service.StrategyDisplayName = strategy.DisplayName; service.StrategyDisplayName = strategy.DisplayName;
service.StrategyType = this.ViewConfig.StrategyType; service.StrategyType = this.ViewConfig.StrategyType;
} }
......
VIZ.H2V.Module/NDIView/Service/INDIViewService.cs
...@@ -35,6 +35,11 @@ namespace VIZ.H2V.Module ...@@ -35,6 +35,11 @@ namespace VIZ.H2V.Module
bool IsActive { get; set; } bool IsActive { get; set; }
/// <summary> /// <summary>
/// 算法ID
/// </summary>
int StrategyID { get; set; }
/// <summary>
/// 算法类型 /// 算法类型
/// </summary> /// </summary>
AlgorithmStrategyType StrategyType { get; set; } AlgorithmStrategyType StrategyType { get; set; }
......
VIZ.H2V.Module/NDIView/View/NDIView.xaml
...@@ -182,42 +182,6 @@ ...@@ -182,42 +182,6 @@
<RowDefinition Height="auto"></RowDefinition> <RowDefinition Height="auto"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!--<RadioButton Content="手动校准" Foreground="White" FontSize="20"
Style="{StaticResource RadioButton_NdiView_Tool}"
IsChecked="{Binding Path=ToolPartViewModel.IsManualCorrectionChecked,Mode=TwoWay}"
GroupName="{Binding Path=ViewKey,Converter={StaticResource StringAppendConverter}, ConverterParameter=Tool}"
HorizontalContentAlignment="Center" VerticalContentAlignment="Center">
<RadioButton.Visibility>
<MultiBinding Converter="{StaticResource NDIViewProperty2VisibilityConverter_ManualCorrection}">
<Binding Path="DataContext.ViewStatus" ElementName="uc"></Binding>
<Binding Path="DataContext.StrategyMode" ElementName="uc"></Binding>
<Binding Path="DataContext.StrategyType" ElementName="uc"></Binding>
</MultiBinding>
</RadioButton.Visibility>
</RadioButton>-->
<!-- 近景机位 & 16米机位 & 战术机位 ===== 边线检测选择面板 -->
<!--<Border Grid.Row="1" Background="{x:Null}"
Visibility="{Binding Path=AlgorithmConfig.IsShowBorder,Mode=OneWay,Converter={StaticResource Bool2VisibilityConverter}}">
<RadioButton Style="{StaticResource RadioButton_NdiView_None}"
Height="{Binding ElementName=uc,Path=DataContext.StrategyType,Converter={StaticResource AlgorithmStrategyType2FootballFieldHeightConverter}}"
IsChecked="{Binding Path=ToolPartViewModel.IsSideCheckPolygonChecked,Mode=TwoWay}"
GroupName="{Binding Path=ViewKey,Converter={StaticResource StringAppendConverter}, ConverterParameter=Tool}"
HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
<RadioButton.Visibility>
<MultiBinding Converter="{StaticResource NDIViewProperty2VisibilityConverter_FootballFieldPanel}">
<Binding Path="DataContext.ViewStatus" ElementName="uc"></Binding>
<Binding Path="DataContext.StrategyMode" ElementName="uc"></Binding>
<Binding Path="DataContext.StrategyType" ElementName="uc"></Binding>
</MultiBinding>
</RadioButton.Visibility>
<common:FootballFieldPanel FootballFieldWidth="150" FootballFieldHeight="100"
DataContext="{Binding Path=FootballFieldPanelModel}"
Orientation="{Binding ElementName=uc,Path=DataContext.StrategyType,Converter={StaticResource AlgorithmStrategyType2FootballFieldOrientationConverter}}">
</common:FootballFieldPanel>
</RadioButton>
</Border>-->
<!-- 居中模式 按钮组--> <!-- 居中模式 按钮组-->
<Grid Grid.Row="1" Background="{x:Null}"> <Grid Grid.Row="1" Background="{x:Null}">
<Grid.Visibility> <Grid.Visibility>
......
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Command.cs
...@@ -91,7 +91,7 @@ namespace VIZ.H2V.Module ...@@ -91,7 +91,7 @@ namespace VIZ.H2V.Module
private void Loaded_Property() private void Loaded_Property()
{ {
SystemConfig systemConfig = ApplicationDomainEx.LiteDbContext.SystemConfig.FindAll().FirstOrDefault(); SystemConfig systemConfig = ApplicationDomainEx.LiteDbContext.SystemConfig.FindAll().FirstOrDefault();
AlgorithmStrategy strategy = ApplicationDomainEx.CsvContext.AlgorithmStrategys.FirstOrDefault(p => p.ID == (int)this.ViewConfig.StrategyType); AlgorithmStrategy strategy = ApplicationDomainEx.CsvContext.AlgorithmStrategys.FirstOrDefault(p => p.ID == this.ViewConfig.StrategyID);
// 算法ID // 算法ID
this.ID = $"{ApplicationDomainEx.LOCAL_LOGIC_MAC}__{this.ViewKey}"; this.ID = $"{ApplicationDomainEx.LOCAL_LOGIC_MAC}__{this.ViewKey}";
......
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Property.cs
...@@ -242,6 +242,20 @@ namespace VIZ.H2V.Module ...@@ -242,6 +242,20 @@ namespace VIZ.H2V.Module
#endregion #endregion
#region StrategyID -- 算法ID
private int strategyID;
/// <summary>
/// 算法ID
/// </summary>
public int StrategyID
{
get { return strategyID; }
set { strategyID = value; this.RaisePropertyChanged(nameof(StrategyID)); }
}
#endregion
#region StrategyType -- 算法类型 #region StrategyType -- 算法类型
private AlgorithmStrategyType strategyType = AlgorithmStrategyType.Single; private AlgorithmStrategyType strategyType = AlgorithmStrategyType.Single;
......
VIZ.H2V.Module/Setup/Provider/AppSetup_Algorithm.cs
...@@ -90,14 +90,13 @@ namespace VIZ.H2V.Module ...@@ -90,14 +90,13 @@ namespace VIZ.H2V.Module
{ {
foreach (AlgorithmProcessModel model in AlgorithmProcessModel.AllProcessModelList) foreach (AlgorithmProcessModel model in AlgorithmProcessModel.AllProcessModelList)
{ {
if (model.ProcessID <= 0 || model.Process == null) if (model.MainProcess == null)
continue; continue;
if (!model.Process.HasExited) if (!model.MainProcess.HasExited)
continue; continue;
model.ProcessID = 0; model.MainProcess = null;
model.Process = null;
WPFHelper.BeginInvoke(() => WPFHelper.BeginInvoke(() =>
{ {
......
VIZ.H2V.Module/Setup/Provider/AppSetup_InitCsv.cs
...@@ -41,7 +41,7 @@ namespace VIZ.H2V.Module ...@@ -41,7 +41,7 @@ namespace VIZ.H2V.Module
// CSV配置 // CSV配置
ApplicationDomainEx.CsvContext = new CsvContext(); ApplicationDomainEx.CsvContext = new CsvContext();
ApplicationDomainEx.CsvContext.LoadAlgorithmStrategys(algorithm_strategy_path); ApplicationDomainEx.CsvContext.LoadAlgorithmStrategys(algorithm_strategy_path, ApplicationDomainEx.IS_DEBUG);
ApplicationDomainEx.CsvContext.LoadAlgorithmBorderScenes(algorithm_border_scence_path); ApplicationDomainEx.CsvContext.LoadAlgorithmBorderScenes(algorithm_border_scence_path);
ApplicationDomainEx.CsvContext.LoadClipSystems(clip_system_path); ApplicationDomainEx.CsvContext.LoadClipSystems(clip_system_path);
ApplicationDomainEx.CsvContext.LoadNavigation3DMappings(navigation_3d_mapping_dir); ApplicationDomainEx.CsvContext.LoadNavigation3DMappings(navigation_3d_mapping_dir);
......
VIZ.H2V.Module/SystemSetting/View/StyleSettingPanelView.xaml
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
xmlns:local="clr-namespace:VIZ.H2V.Module" xmlns:local="clr-namespace:VIZ.H2V.Module"
xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common" xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:toolkit="http://schemas.xceed.com/wpf/xaml/toolkit"
d:DataContext="{d:DesignInstance Type=local:StyleSettingPanelViewModel}" d:DataContext="{d:DesignInstance Type=local:StyleSettingPanelViewModel}"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="800" d:DesignWidth="800"> d:DesignHeight="800" d:DesignWidth="800">
...@@ -17,7 +18,6 @@ ...@@ -17,7 +18,6 @@
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/TextBox/TextBox_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Slider/Slider_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/Slider/Slider_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/CheckBox/CheckBox_Setting.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/CheckBox/CheckBox_Setting.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/NumberBox/NumberBox.xaml"></ResourceDictionary>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="70"></RowDefinition>
<RowDefinition Height="60"></RowDefinition> <RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="*"></RowDefinition> <RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
...@@ -121,8 +121,8 @@ ...@@ -121,8 +121,8 @@
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="手动裁切框移动倍率" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock> <TextBlock Text="手动裁切框移动倍率" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock>
<fcommon:NumberBox Grid.Column="1" MinValue="0.1" MaxValue="5" Interval="0.1" Height="40" <toolkit:DoubleUpDown Grid.Column="1" Minimum="0.1" Maximum="5" Increment="0.1" Height="40"
Value="{Binding Path=Navigation3DMappingMultiple,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=Navigation3DMappingMultiple,Mode=TwoWay}"></toolkit:DoubleUpDown>
</Grid> </Grid>
<!-- 手动裁切框移动 --> <!-- 手动裁切框移动 -->
<TextBlock Text="手动裁切框移动平滑系数" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="7"></TextBlock> <TextBlock Text="手动裁切框移动平滑系数" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="7"></TextBlock>
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="100"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="非常平滑，移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="18,0,0,0"></TextBlock> <TextBlock Text="非常平滑，移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="18,0,0,0"></TextBlock>
<TextBlock Text="一般平滑，移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,24,0"></TextBlock> <TextBlock Text="一般平滑，移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,24,0"></TextBlock>
...@@ -144,11 +144,10 @@ ...@@ -144,11 +144,10 @@
Minimum="0.001" Maximum="0.2" IsSnapToTickEnabled="True" TickFrequency="0.001" Minimum="0.001" Maximum="0.2" IsSnapToTickEnabled="True" TickFrequency="0.001"
Value="{Binding Path=ManualSmoothCoeff,Mode=TwoWay}"></Slider> Value="{Binding Path=ManualSmoothCoeff,Mode=TwoWay}"></Slider>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.2" Foreground="White" FontSize="16" Grid.Column="2" Grid.Row="1"></TextBlock> <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.2" Foreground="White" FontSize="16" Grid.Column="2" Grid.Row="1"></TextBlock>
<fcommon:NumberBox Grid.Column="3" Height="40" IsShowUpAndDownButton="False" Grid.Row="1" <toolkit:DoubleUpDown Grid.Column="3" Height="40" Grid.Row="1"
MinValue="0.001" MaxValue="0.2" Interval="0.001" Minimum="0.001" Maximum="0.2" Increment="0.001"
Value="{Binding Path=ManualSmoothCoeff,Mode=TwoWay}"></fcommon:NumberBox> Value="{Binding Path=ManualSmoothCoeff,Mode=TwoWay}"></toolkit:DoubleUpDown>
</Grid> </Grid>
</Grid> </Grid>
</Border> </Border>
</UserControl> </UserControl>
\ No newline at end of file
VIZ.H2V.Module/VIZ.H2V.Module.csproj
...@@ -115,6 +115,21 @@ ...@@ -115,6 +115,21 @@
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" /> <Reference Include="PresentationFramework" />
<Reference Include="Xceed.Wpf.AvalonDock, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.Toolkit, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Page Include="NDIMainView\View\AlgorithmServiceStatusPanelView.xaml"> <Page Include="NDIMainView\View\AlgorithmServiceStatusPanelView.xaml">
......
VIZ.H2V.Module/packages.config
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Extended.Wpf.Toolkit" version="4.4.0" targetFramework="net48" />
<package id="LiteDB" version="5.0.12" targetFramework="net48" /> <package id="LiteDB" version="5.0.12" targetFramework="net48" />
<package id="log4net" version="2.0.14" targetFramework="net48" /> <package id="log4net" version="2.0.14" targetFramework="net48" />
<package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" targetFramework="net48" /> <package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" targetFramework="net48" />
......
VIZ.H2V.Storage/CSV/Algorithm/AlgorithmStrategy.cs
...@@ -13,11 +13,25 @@ namespace VIZ.H2V.Storage ...@@ -13,11 +13,25 @@ namespace VIZ.H2V.Storage
{ {
/// <summary> /// <summary>
/// 编号 /// 编号
/// <see cref="AlgorithmStrategyType"/>
/// </summary> /// </summary>
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// 是否启用
/// </summary>
public bool IsEnabled { get; set; }
/// <summary>
/// 标记
/// </summary>
public string Tag { get; set; }
/// <summary>
/// 算法类型
/// </summary>
public AlgorithmStrategyType Type { get; set; }
/// <summary>
/// 名称 /// 名称
/// </summary> /// </summary>
public string Name { get; set; } public string Name { get; set; }
...@@ -28,8 +42,12 @@ namespace VIZ.H2V.Storage ...@@ -28,8 +42,12 @@ namespace VIZ.H2V.Storage
public string DisplayName { get; set; } public string DisplayName { get; set; }
/// <summary> /// <summary>
/// 启动路径（绝对路径 or 相对路径） /// 主进程路径
/// </summary> /// </summary>
public string SetupPath { get; set; } /// <remarks>
/// 后缀为 .exe 则直接启动
/// 后缀为 .py 则调用CMD使用 python 命令启动
/// </remarks>
public string MainPath { get; set; }
} }
} }
VIZ.H2V.Storage/CSV/CsvContext.cs
...@@ -52,12 +52,25 @@ namespace VIZ.H2V.Storage ...@@ -52,12 +52,25 @@ namespace VIZ.H2V.Storage
/// 加载算法信息 /// 加载算法信息
/// </summary> /// </summary>
/// <param name="path">文件路径</param> /// <param name="path">文件路径</param>
public void LoadAlgorithmStrategys(string path) /// <param name="isDebug">是否是调试模式</param>
public void LoadAlgorithmStrategys(string path, bool isDebug)
{ {
using (StreamReader sr = new StreamReader(path, Encoding.Default)) using (StreamReader sr = new StreamReader(path, Encoding.Default))
using (CsvReader reader = new CsvReader(sr, CultureInfo.InvariantCulture)) using (CsvReader reader = new CsvReader(sr, CultureInfo.InvariantCulture))
{ {
this.AlgorithmStrategys = reader.GetRecords<AlgorithmStrategy>()?.ToList(); List<AlgorithmStrategy> list = new List<AlgorithmStrategy>();
foreach (AlgorithmStrategy item in reader.GetRecords<AlgorithmStrategy>())
{
if (!item.IsEnabled)
continue;
if (!isDebug && item.Tag == "DEBUG")
continue;
list.Add(item);
}
this.AlgorithmStrategys = list;
} }
} }
......
VIZ.H2V.Storage/LiteDB/NdiView/NdiViewConfig.cs
...@@ -54,6 +54,11 @@ namespace VIZ.H2V.Storage ...@@ -54,6 +54,11 @@ namespace VIZ.H2V.Storage
public bool IsUseClip { get; set; } = true; public bool IsUseClip { get; set; } = true;
/// <summary> /// <summary>
/// 算法类型ID
/// </summary>
public int StrategyID { get; set; }
/// <summary>
/// 算法类型类型 /// 算法类型类型
/// </summary> /// </summary>
public AlgorithmStrategyType StrategyType { get; set; } = AlgorithmStrategyType.Single; public AlgorithmStrategyType StrategyType { get; set; } = AlgorithmStrategyType.Single;
...@@ -62,10 +67,5 @@ namespace VIZ.H2V.Storage ...@@ -62,10 +67,5 @@ namespace VIZ.H2V.Storage
/// 裁切模式 /// 裁切模式
/// </summary> /// </summary>
public AlgorithmStrategyMode StrategyMode { get; set; } = AlgorithmStrategyMode.auto_mode; public AlgorithmStrategyMode StrategyMode { get; set; } = AlgorithmStrategyMode.auto_mode;
/// <summary>
/// 算法进程ID
/// </summary>
public int ProcessID { get; set; }
} }
} }
VIZ.H2V.sln
...@@ -67,6 +67,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.H2V.ClipTestTool", "VIZ ...@@ -67,6 +67,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.H2V.ClipTestTool", "VIZ
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VIZ.Framework.Core.Navigation3D", "..\VIZ.Framework\VIZ.Framework.Core.Navigation3D\VIZ.Framework.Core.Navigation3D.vcxproj", "{D1AA6399-2000-42BA-A577-D50BC5FCA393}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VIZ.Framework.Core.Navigation3D", "..\VIZ.Framework\VIZ.Framework.Core.Navigation3D\VIZ.Framework.Core.Navigation3D.vcxproj", "{D1AA6399-2000-42BA-A577-D50BC5FCA393}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "03-Driver", "03-Driver", "{EA9A2679-B43B-4D2C-A418-6CA223D55104}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
......
VIZ.H2V/App.xaml
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/ScrollView/ScrollView_Default.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.Framework.Common.Resource;component/Style/ScrollView/ScrollView_Default.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.Framework.Common;component/Themes/Generic.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.Framework.Common;component/Themes/Generic.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/MessageBox/MessageBoxEx.xaml"></ResourceDictionary> <ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Style/MessageBox/MessageBoxEx.xaml"></ResourceDictionary>
<ResourceDictionary Source="/VIZ.H2V.Module.Resource;component/Toolkit/NumericUpDown/NumericUpDown.xaml"></ResourceDictionary>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</Application.Resources> </Application.Resources>
......
VIZ.H2V/VIZ.H2V.csproj
...@@ -102,6 +102,21 @@ ...@@ -102,6 +102,21 @@
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" /> <Reference Include="PresentationFramework" />
<Reference Include="Xceed.Wpf.AvalonDock, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.Toolkit, Version=4.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>..\packages\Extended.Wpf.Toolkit.4.4.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ApplicationDefinition Include="App.xaml"> <ApplicationDefinition Include="App.xaml">
......
VIZ.H2V/config/algorithm_strategy.csv
ID,Name,DisplayName,SetupPath ID,IsEnabled,Tag,Type,Name,DisplayName,MainPath,
1,单人机位,单人机位,E:\Projects\VIZ.H2V\VIZ.H2V.UdpTestTool\bin\x64\Debug\VIZ.H2V.UdpTestTool.exe 1,TRUE,,Single,单人机位,单人机位,E:\Projects\VIZ.H2V\VIZ.H2V.UdpTestTool\bin\x64\Debug\VIZ.H2V.UdpTestTool.exe
2,近景机位,近景机位,E:\Projects\VIZ.H2V\VIZ.H2V.UdpTestTool\bin\x64\Debug\VIZ.H2V.UdpTestTool.exe 2,TRUE,,Near,近景机位,近景机位,E:\Projects\VIZ.H2V\VIZ.H2V.UdpTestTool\bin\x64\Debug\VIZ.H2V.UdpTestTool.exe
3,16米机位,16米机位,E:\Projects\VIZ.H2V\VIZ.H2V.UdpTestTool\bin\x64\Debug\VIZ.H2V.UdpTestTool.exe 3,TRUE,,Sixteen,16米机位,16米机位,E:\Projects\VIZ.H2V\VIZ.H2V.UdpTestTool\bin\x64\Debug\VIZ.H2V.UdpTestTool.exe
4,战术机位,战术机位,E:\Projects\VIZ.H2V\VIZ.H2V.UdpTestTool\bin\x64\Debug\VIZ.H2V.UdpTestTool.exe 4,TRUE,,Tactics,战术机位,战术机位,E:\Projects\VIZ.H2V\VIZ.H2V.UdpTestTool\bin\x64\Debug\VIZ.H2V.UdpTestTool.exe
5,索道机位,索道机位,E:\Projects\VIZ.H2V\VIZ.H2V.UdpTestTool\bin\x64\Debug\VIZ.H2V.UdpTestTool.exe 5,TRUE,,Cableway,索道机位,索道机位,E:\Projects\VIZ.H2V\VIZ.H2V.UdpTestTool\bin\x64\Debug\VIZ.H2V.UdpTestTool.exe
6,TRUE,DEBUG,Single,单人机位,单人机位,E:\Projects\VIZ.H2V\VIZ.H2V.UdpTestTool\bin\x64\Debug\VIZ.H2V.UdpTestTool.exe
VIZ.H2V/packages.config
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Extended.Wpf.Toolkit" version="4.4.0" targetFramework="net48" />
<package id="LiteDB" version="5.0.12" targetFramework="net48" /> <package id="LiteDB" version="5.0.12" targetFramework="net48" />
<package id="log4net" version="2.0.14" targetFramework="net48" /> <package id="log4net" version="2.0.14" targetFramework="net48" />
<package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" targetFramework="net48" /> <package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" targetFramework="net48" />
......
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