Skip to content

V
VIZ.H2V
Commit bf5f012a by liulongfei
Options

1. 添加足球场边线选择面板 

2. 调整UI样式
3. 添加python kill逻辑
parent 6fb354a7
Showing with 906 additions and 48 deletions
VIZ.H2V.Common/Properties/AssemblyInfo.cs 0 → 100644
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;
// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("VIZ.H2V.Common")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("VIZ.H2V.Common")]
[assembly: AssemblyCopyright("Copyright © 2022")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
//将 ComVisible 设置为 false 将使此程序集中的类型
//对 COM 组件不可见。 如果需要从 COM 访问此程序集中的类型，
//请将此类型的 ComVisible 特性设置为 true。
[assembly: ComVisible(false)]
//若要开始生成可本地化的应用程序，请设置
//.csproj 文件中的 <UICulture>CultureYouAreCodingWith</UICulture>
//例如，如果您在源文件中使用的是美国英语，
//使用的是美国英语，请将 <UICulture> 设置为 en-US。 然后取消
//对以下 NeutralResourceLanguage 特性的注释。 更新
//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
[assembly:ThemeInfo(
ResourceDictionaryLocation.None, //主题特定资源词典所处位置
//(未在页面中找到资源时使用，
//或应用程序资源字典中找到时使用)
ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置
//(未在页面中找到资源时使用，
//、应用程序或任何主题专用资源字典中找到时使用)
)]
// 程序集的版本信息由下列四个值组成:
//
// 主版本
// 次版本
// 生成号
// 修订号
//
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
VIZ.H2V.Common/Properties/Resources.Designer.cs 0 → 100644
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本: 4.0.30319.42000
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace VIZ.H2V.Common.Properties {
/// <summary>
/// 强类型资源类，用于查找本地化字符串等。
/// </summary>
// 此类是由 StronglyTypedResourceBuilder
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// 返回此类使用的缓存 ResourceManager 实例。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if ((resourceMan == null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("VIZ.H2V.Common.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// 重写当前线程的 CurrentUICulture 属性，对
/// 使用此强类型资源类的所有资源查找执行重写。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
}
}
VIZ.H2V.Common/Properties/Resources.resx 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file
VIZ.H2V.Common/Properties/Settings.Designer.cs 0 → 100644
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace VIZ.H2V.Common.Properties
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
{
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default
{
get
{
return defaultInstance;
}
}
}
}
VIZ.H2V.Common/Properties/Settings.settings 0 → 100644
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
</SettingsFile>
\ No newline at end of file
VIZ.H2V.Common/Themes/Generic.xaml 0 → 100644
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:VIZ.H2V.Common">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="VIZ.H2V.Common;component/Widgets/FootballFieldPanel/FootballFieldPanel.xaml"></ResourceDictionary>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
VIZ.H2V.Common/VIZ.H2V.Common.csproj 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{750ECE65-60DD-425A-B1D3-68E5158B6E9B}</ProjectGuid>
<OutputType>library</OutputType>
<RootNamespace>VIZ.H2V.Common</RootNamespace>
<AssemblyName>VIZ.H2V.Common</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<Page Include="Themes\Generic.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Widgets\FootballFieldPanel\FootballFieldPanel.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<Compile Include="Widgets\FootballFieldPanel\FootballFieldPanel.cs" />
<Compile Include="Widgets\FootballFieldPanel\FootballFieldPanelModel.cs" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\VIZ.Framework\VIZ.Framework.Core\VIZ.Framework.Core.csproj">
<Project>{75b39591-4bc3-4b09-bd7d-ec9f67efa96e}</Project>
<Name>VIZ.Framework.Core</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
VIZ.H2V.Common/Widgets/FootballFieldPanel/FootballFieldPanel.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace VIZ.H2V.Common
{
/// <summary>
/// 足球边线面板
/// </summary>
public class FootballFieldPanel : Control
{
static FootballFieldPanel()
{
DefaultStyleKeyProperty.OverrideMetadata(typeof(FootballFieldPanel), new FrameworkPropertyMetadata(typeof(FootballFieldPanel)));
}
#region Orientation -- 布局方式
/// <summary>
/// 布局方式
/// </summary>
public Orientation Orientation
{
get { return (Orientation)GetValue(OrientationProperty); }
set { SetValue(OrientationProperty, value); }
}
/// <summary>
/// Using a DependencyProperty as the backing store for Orientation. This enables animation, styling, binding, etc...
/// </summary>
public static readonly DependencyProperty OrientationProperty =
DependencyProperty.Register("Orientation", typeof(Orientation), typeof(FootballFieldPanel), new PropertyMetadata(Orientation.Horizontal));
#endregion
#region FootballFieldWidth -- 球场宽度
/// <summary>
/// 球场宽度
/// </summary>
public GridLength FootballFieldWidth
{
get { return (GridLength)GetValue(FootballFieldWidthProperty); }
set { SetValue(FootballFieldWidthProperty, value); }
}
/// <summary>
/// Using a DependencyProperty as the backing store for FootballFieldWidth. This enables animation, styling, binding, etc...
/// </summary>
public static readonly DependencyProperty FootballFieldWidthProperty =
DependencyProperty.Register("FootballFieldWidth", typeof(GridLength), typeof(FootballFieldPanel), new PropertyMetadata(new GridLength(200d)));
#endregion
#region FootballFieldHeight -- 球场高度
/// <summary>
/// 球场高度
/// </summary>
public GridLength FootballFieldHeight
{
get { return (GridLength)GetValue(FootballFieldHeightProperty); }
set { SetValue(FootballFieldHeightProperty, value); }
}
/// <summary>
/// Using a DependencyProperty as the backing store for FootballFieldHeight. This enables animation, styling, binding, etc...
/// </summary>
public static readonly DependencyProperty FootballFieldHeightProperty =
DependencyProperty.Register("FootballFieldHeight", typeof(GridLength), typeof(FootballFieldPanel), new PropertyMetadata(new GridLength(120d)));
#endregion
}
}
VIZ.H2V.Common/Widgets/FootballFieldPanel/FootballFieldPanelModel.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
namespace VIZ.H2V.Common
{
/// <summary>
/// 足球场边线面板模型
/// </summary>
public class FootballFieldPanelModel : ModelBase
{
#region IsTopSelected -- 顶部是否选中
private bool isTopSelected;
/// <summary>
/// 顶部是否选中
/// </summary>
public bool IsTopSelected
{
get { return isTopSelected; }
set { isTopSelected = value; this.RaisePropertyChanged(nameof(IsTopSelected)); }
}
#endregion
#region IsBottomSelected -- 底部是否选中
private bool isBottomSelected;
/// <summary>
/// 底部是否选中
/// </summary>
public bool IsBottomSelected
{
get { return isBottomSelected; }
set { isBottomSelected = value; this.RaisePropertyChanged(nameof(IsBottomSelected)); }
}
#endregion
#region IsLeftSelected -- 左侧是否选中
private bool isLeftSelected;
/// <summary>
/// 左侧是否选中
/// </summary>
public bool IsLeftSelected
{
get { return isLeftSelected; }
set { isLeftSelected = value; this.RaisePropertyChanged(nameof(IsLeftSelected)); }
}
#endregion
#region IsRightSelected -- 右侧是否选中
private bool isRightSelected;
/// <summary>
/// 右侧是否选中
/// </summary>
public bool IsRightSelected
{
get { return isRightSelected; }
set { isRightSelected = value; this.RaisePropertyChanged(nameof(IsRightSelected)); }
}
#endregion
}
}
VIZ.H2V.Common/packages.config 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.15" targetFramework="net48" />
</packages>
\ No newline at end of file
VIZ.H2V.Module.Resource/Converter/AlgorithmStrategyType2FootballFieldOrientationConverter.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.Controls;
using System.Windows.Data;
using VIZ.H2V.Storage;
namespace VIZ.H2V.Module.Resource
{
/// <summary>
/// 算法类型 -> 足球场 横向竖向 转化器
/// </summary>
public class AlgorithmStrategyType2FootballFieldOrientationConverter : IValueConverter
{
/// <summary>
/// 不包含时的排列方式
/// </summary>
public Orientation NotContainsOrientation { get; set; } = Orientation.Horizontal;
/// <summary>
/// 包含时的排列方式
/// </summary>
public Orientation ContainsOrientation { get; set; } = Orientation.Vertical;
#region StrategyTypeListString -- 算法列表字符串
private string strategyTypeListString;
/// <summary>
/// 算法列表字符串
/// </summary>
public string StrategyTypeListString
{
get { return strategyTypeListString; }
set
{
strategyTypeListString = value;
string[] items = value.Split(',');
List<AlgorithmStrategyType> list = new List<AlgorithmStrategyType>();
foreach (string item in items)
{
list.Add((AlgorithmStrategyType)Enum.Parse(typeof(AlgorithmStrategyType), item.Trim()));
}
this.strategyTypeList = list;
}
}
/// <summary>
/// 算法列表
/// </summary>
private List<AlgorithmStrategyType> strategyTypeList;
#endregion
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if (!(value is AlgorithmStrategyType))
return this.NotContainsOrientation;
AlgorithmStrategyType type = (AlgorithmStrategyType)value;
return this.strategyTypeList.Contains(type) ? this.ContainsOrientation : this.NotContainsOrientation;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}
VIZ.H2V.Module.Resource/Converter/NDIViewProperty2BoolConverter.cs
......@@ -91,6 +91,8 @@ namespace VIZ.H2V.Module.Resource
get { return strategyModeListString; }
set
{
strategyModeListString = value;
string[] items = value.Split(',');
List<AlgorithmStrategyMode> list = new List<AlgorithmStrategyMode>();
foreach (string item in items)
......
VIZ.H2V.Module.Resource/Style/MessageBox/MessageBoxEx.xaml 0 → 100644
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:common="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common">
<Style x:Key="VMessageBox_Button_Yes" TargetType="Button">
<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter>
<Setter Property="Foreground" Value="White"></Setter>
<Setter Property="FontSize" Value="16"></Setter>
<Setter Property="Width" Value="120"></Setter>
<Setter Property="Height" Value="40"></Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Button">
<Grid x:Name="border" Background="#aa303d54">
<TextBlock Text="确定" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="18" Foreground="White"></TextBlock>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="border" Property="Background" Value="#ff303d54"></Setter>
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value="0.7"></Setter>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="VMessageBox_Button_Cancel" TargetType="Button">
<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter>
<Setter Property="Foreground" Value="White"></Setter>
<Setter Property="FontSize" Value="16"></Setter>
<Setter Property="Width" Value="120"></Setter>
<Setter Property="Height" Value="40"></Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Button">
<Grid x:Name="border" Background="#aa303d54">
<TextBlock Text="取消" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="18" Foreground="White"></TextBlock>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="border" Property="Background" Value="#ff303d54"></Setter>
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value="0.7"></Setter>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style TargetType="common:MessageBoxEx">
<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter>
<Setter Property="Width" Value="400"></Setter>
<Setter Property="Height" Value="300"></Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="common:MessageBoxEx">
<Border Background="#ff252b3d" BorderBrush="#22000000" BorderThickness="1">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="100"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
<RowDefinition Height="80"></RowDefinition>
</Grid.RowDefinitions>
<common:DragWindowBar Grid.RowSpan="3" Background="Transparent"></common:DragWindowBar>
<TextBlock Text="{TemplateBinding Title}" Foreground="White" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Left"
FontWeight="Black" Margin="40,0,40,0"></TextBlock>
<TextBlock Grid.Row="1" Text="{TemplateBinding Message}" Foreground="White" FontSize="24" TextWrapping="Wrap" TextTrimming="CharacterEllipsis"
Margin="40,0,40,0"></TextBlock>
<Rectangle Fill="#ff2b3445" Grid.Row="2"></Rectangle>
<StackPanel Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Right" Orientation="Horizontal">
<Button x:Name="PART_CancelButton" Grid.Row="2" Style="{StaticResource VMessageBox_Button_Cancel}"
Width="120" Height="40" Margin="0,0,40,0" Content="取消" Visibility="Hidden"></Button>
<Button x:Name="PART_YesButton" Grid.Row="2" Style="{StaticResource VMessageBox_Button_Yes}"
Width="120" Height="40" Margin="0,0,40,0" Content="确定"></Button>
</StackPanel>
</Grid>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="Buttons" Value="YES_CANCEL">
<Setter TargetName="PART_CancelButton" Property="Visibility" Value="Visible"></Setter>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
\ No newline at end of file
VIZ.H2V.Module.Resource/Style/RadioButton/RadioButton_FootballSide.xaml 0 → 100644
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style TargetType="RadioButton" x:Key="RadioButton_FootballSide">
<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter>
<Setter Property="Foreground" Value="White"></Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="RadioButton">
<Border x:Name="bd_inner" Background="Transparent">
<Border x:Name="bd" Background="Transparent">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"></ContentPresenter>
</Border>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter TargetName="bd" Property="Background" Value="#66FF0000"></Setter>
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="bd_inner" Property="Background" Value="#88FF0000"></Setter>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value="0.7"></Setter>
</Trigger>
</Style.Triggers>
</Style>
</ResourceDictionary>
\ No newline at end of file
VIZ.H2V.Module.Resource/Style/RadioButton/RadioButton_NdiView.xaml
......@@ -9,7 +9,7 @@
<Setter.Value>
<ControlTemplate TargetType="RadioButton">
<Border x:Name="bd_outer" Background="Transparent">
<Grid x:Name="bd" Background="Transparent" Margin="45,0,0,0">
<Grid x:Name="bd" Background="Transparent" Margin="20,0,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="40"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
......
VIZ.H2V.Module.Resource/Style/RadioButton/RadioButton_Setting.xaml
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style TargetType="RadioButton" x:Key="RadioButton_Setting">
<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter>
<Setter Property="Template">
......
VIZ.H2V.Module.Resource/VIZ.H2V.Module.Resource.csproj
......@@ -86,10 +86,18 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Style\MessageBox\MessageBoxEx.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Style\RadioButton\RadioButton_NdiView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Style\RadioButton\RadioButton_FootballSide.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Style\RadioButton\RadioButton_Setting.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
......@@ -108,6 +116,7 @@
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Converter\AlgorithmStrategyType2FootballFieldOrientationConverter.cs" />
<Compile Include="Converter\NDIViewProperty2VisibilityConverter.cs" />
<Compile Include="Converter\NDIViewProperty2BoolConverter.cs" />
<Compile Include="Converter\NDIViewStatus2BoolConverter.cs" />
......
VIZ.H2V.Module/NDIMainView/View/NDIMainView.xaml
......@@ -28,18 +28,18 @@
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="30"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
<RowDefinition Height="50"></RowDefinition>
<RowDefinition Height="30"></RowDefinition>
</Grid.RowDefinitions>
<!-- 顶部 -->
<TextBox x:Name="tbFocus" Visibility="Collapsed"></TextBox>
<Grid Background="#ff12202d">
<TextBlock Text="AI横转竖智能裁切系统" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
<TextBlock Text="AI横转竖智能裁切系统" FontSize="12" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
<StackPanel Orientation="Horizontal" Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Top">
<Button Command="{Binding Path=SettingCommand}" Style="{StaticResource Button_Setting}"></Button>
<Button Command="{Binding Path=MinCommand}" Style="{StaticResource Button_Min}"></Button>
<Button Command="{Binding Path=CloseCommand}" Style="{StaticResource Button_Close}"></Button>
<Button Command="{Binding Path=SettingCommand}" Style="{StaticResource Button_Setting}" Height="30"></Button>
<Button Command="{Binding Path=MinCommand}" Style="{StaticResource Button_Min}" Height="30"></Button>
<Button Command="{Binding Path=CloseCommand}" Style="{StaticResource Button_Close}" Height="30"></Button>
</StackPanel>
</Grid>
<!-- 主体 -->
......@@ -67,35 +67,35 @@
</Grid.ColumnDefinitions>
<!-- 算法服务监控 -->
<StackPanel Orientation="Horizontal">
<Image Width="25" Height="22" VerticalAlignment="Center"
<Image Width="18" Height="18" VerticalAlignment="Center"
Source="/VIZ.H2V.Module.Resource;component/Icons/status_25x22.png"></Image>
<TextBlock Text="算法服务" VerticalAlignment="Center" Foreground="White" FontSize="16" Margin="10,0,0,0"></TextBlock>
<TextBlock Text="算法服务" VerticalAlignment="Center" Foreground="White" FontSize="12" Margin="10,0,0,0"></TextBlock>
</StackPanel>
<!-- 剪切服务监控 -->
<StackPanel Orientation="Horizontal" Grid.Column="1">
<Image Width="25" Height="22" VerticalAlignment="Center"
<Image Width="18" Height="18" VerticalAlignment="Center"
Source="/VIZ.H2V.Module.Resource;component/Icons/status_25x22.png"></Image>
<TextBlock Text="剪切服务" VerticalAlignment="Center" Foreground="White" FontSize="16" Margin="10,0,0,0"></TextBlock>
<TextBlock Text="剪切服务" VerticalAlignment="Center" Foreground="White" FontSize="12" Margin="10,0,0,0"></TextBlock>
</StackPanel>
<!-- 计算机监控 -->
<StackPanel Orientation="Horizontal" Grid.Column="2">
<!-- CPU -->
<TextBlock Text="CPU:" VerticalAlignment="Center" Foreground="White" FontSize="16" Margin="10,0,0,0"></TextBlock>
<TextBlock Text="{Binding Path=SystemMonitorModel.CpuUsedPercentage,StringFormat=P}" VerticalAlignment="Center" Foreground="White" FontSize="16" Margin="10,0,0,0"
<TextBlock Text="CPU:" VerticalAlignment="Center" Foreground="White" FontSize="12" Margin="10,0,0,0"></TextBlock>
<TextBlock Text="{Binding Path=SystemMonitorModel.CpuUsedPercentage,StringFormat=P}" VerticalAlignment="Center" Foreground="White" FontSize="12" Margin="10,0,0,0"
Width="65" TextAlignment="Right"></TextBlock>
<!-- 内存 -->
<TextBlock Text="内存:" VerticalAlignment="Center" Foreground="White" FontSize="16" Margin="30,0,0,0"></TextBlock>
<TextBlock Text="内存:" VerticalAlignment="Center" Foreground="White" FontSize="12" Margin="30,0,0,0"></TextBlock>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding Path=SystemMonitorModel.MemoryUsed,Converter={StaticResource ByteSizeConverter},StringFormat=0.00}"
VerticalAlignment="Center" Foreground="White" FontSize="16" Margin="10,0,0,0" Width="60" TextAlignment="Right"></TextBlock>
<TextBlock Text="/" VerticalAlignment="Center" Foreground="White" FontSize="16" Margin="5,0,0,0"></TextBlock>
VerticalAlignment="Center" Foreground="White" FontSize="12" Margin="10,0,0,0" Width="60" TextAlignment="Right"></TextBlock>
<TextBlock Text="/" VerticalAlignment="Center" Foreground="White" FontSize="12" Margin="5,0,0,0"></TextBlock>
<TextBlock Text="{Binding Path=SystemMonitorModel.MemoryTotal,Converter={StaticResource ByteSizeConverter},StringFormat=0.00}"
VerticalAlignment="Center" Foreground="White" FontSize="16" Margin="5,0,0,0" TextAlignment="Left"></TextBlock>
<TextBlock Text="GB" VerticalAlignment="Center" Foreground="White" FontSize="16" Margin="5,0,0,0"></TextBlock>
<TextBlock Text="(" VerticalAlignment="Center" Foreground="White" FontSize="16" Margin="5,0,0,0"></TextBlock>
VerticalAlignment="Center" Foreground="White" FontSize="12" Margin="5,0,0,0" TextAlignment="Left"></TextBlock>
<TextBlock Text="GB" VerticalAlignment="Center" Foreground="White" FontSize="12" Margin="5,0,0,0"></TextBlock>
<TextBlock Text="(" VerticalAlignment="Center" Foreground="White" FontSize="12" Margin="5,0,0,0"></TextBlock>
<TextBlock Text="{Binding Path=SystemMonitorModel.MemoryUsedPercentage,StringFormat=P}" VerticalAlignment="Center"
Foreground="White" FontSize="16" Margin="5,0,0,0"></TextBlock>
<TextBlock Text=")" VerticalAlignment="Center" Foreground="White" FontSize="16" Margin="5,0,0,0"></TextBlock>
Foreground="White" FontSize="12" Margin="5,0,0,0"></TextBlock>
<TextBlock Text=")" VerticalAlignment="Center" Foreground="White" FontSize="12" Margin="5,0,0,0"></TextBlock>
</StackPanel>
<ListBox Style="{StaticResource ListBox_None}" VerticalAlignment="Center" Margin="30,0,0,0"
ItemsSource="{Binding Path=SystemMonitorModel.GpuModels}">
......@@ -107,10 +107,10 @@
<ListBox.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<TextBlock Text="GPU" VerticalAlignment="Center" Foreground="White" FontSize="16" Margin="10,0,0,0"></TextBlock>
<TextBlock Text="{Binding Path=Physics}" VerticalAlignment="Center" Foreground="White" FontSize="16"></TextBlock>
<TextBlock Text=":" VerticalAlignment="Center" Foreground="White" FontSize="16" Margin="10,0,0,0"></TextBlock>
<TextBlock Text="{Binding Path=UsedPercentage,StringFormat=P}" VerticalAlignment="Center" Foreground="White" FontSize="16" Margin="10,0,0,0"></TextBlock>
<TextBlock Text="GPU" VerticalAlignment="Center" Foreground="White" FontSize="12" Margin="10,0,0,0"></TextBlock>
<TextBlock Text="{Binding Path=Physics}" VerticalAlignment="Center" Foreground="White" FontSize="12"></TextBlock>
<TextBlock Text=":" VerticalAlignment="Center" Foreground="White" FontSize="12" Margin="10,0,0,0"></TextBlock>
<TextBlock Text="{Binding Path=UsedPercentage,StringFormat=P}" VerticalAlignment="Center" Foreground="White" FontSize="12" Margin="10,0,0,0"></TextBlock>
</StackPanel>
</DataTemplate>
</ListBox.ItemTemplate>
......
VIZ.H2V.Module/NDISettingView/View/NDISettingView.xaml
......@@ -45,9 +45,9 @@
<TextBlock Text="设置" Foreground="White" FontSize="24" Margin="10,0,0,0"></TextBlock>
</StackPanel>
<StackPanel Grid.Row="1" Grid.RowSpan="2">
<RadioButton Content="裁剪策略" Height="50" Foreground="White" FontSize="24" VerticalContentAlignment="Center"
<RadioButton Content="裁剪策略" Height="50" Foreground="White" FontSize="22" VerticalContentAlignment="Center"
x:Name="rbAlgorithm" Style="{StaticResource RadioButton_Setting}" IsChecked="True"></RadioButton>
<RadioButton Content="NDI输入" Height="50" Foreground="White" FontSize="24" VerticalContentAlignment="Center"
<RadioButton Content="NDI输入" Height="50" Foreground="White" FontSize="22" VerticalContentAlignment="Center"
x:Name="rbNDI" Style="{StaticResource RadioButton_Setting}"></RadioButton>
</StackPanel>
......
VIZ.H2V.Module/NDIView/View/NDIView.xaml
......@@ -7,6 +7,7 @@
xmlns:local="clr-namespace:VIZ.H2V.Module"
xmlns:fcore="clr-namespace:VIZ.Framework.Core;assembly=VIZ.Framework.Core"
xmlns:fcommon="clr-namespace:VIZ.Framework.Common;assembly=VIZ.Framework.Common"
xmlns:common="clr-namespace:VIZ.H2V.Common;assembly=VIZ.H2V.Common"
xmlns:domain="clr-namespace:VIZ.H2V.Domain;assembly=VIZ.H2V.Domain"
xmlns:storage="clr-namespace:VIZ.H2V.Storage;assembly=VIZ.H2V.Storage"
xmlns:resource="clr-namespace:VIZ.H2V.Module.Resource;assembly=VIZ.H2V.Module.Resource"
......@@ -24,6 +25,7 @@
<fcore:Bool2BoolConverter x:Key="Bool2BoolConverter"></fcore:Bool2BoolConverter>
<resource:NDIViewStatus2BoolConverter x:Key="NDIViewStatus2IsEnabledConverter" TrueListString="Detect,CropRoi"></resource:NDIViewStatus2BoolConverter>
<resource:NDIViewStatus2BoolConverter x:Key="NDIViewStatus2IsEnabledConverter_SettingButton" TrueListString="Stop,Detect,CropRoi"></resource:NDIViewStatus2BoolConverter>
<!-- 检测按钮 -->
<resource:NDIViewProperty2VisibilityConverter x:Key="NDIViewProperty2VisibilityConverter_DetectButton"
ViewStatusListString="Detect,CropRoi"
StrategyModeListString="auto_mode"
......@@ -34,6 +36,14 @@
StrategyModeListString="auto_mode"
StrategyTypeListString="Single">
</resource:NDIViewProperty2BoolConverter>
<!-- 边线选择面板 -->
<resource:NDIViewProperty2VisibilityConverter x:Key="NDIViewProperty2VisibilityConverter_FootballFieldPanel"
ViewStatusListString="Detect,CropRoi"
StrategyModeListString="auto_mode"
StrategyTypeListString="Near,Sixteen,Tactics">
</resource:NDIViewProperty2VisibilityConverter>
<resource:AlgorithmStrategyType2FootballFieldOrientationConverter x:Key="AlgorithmStrategyType2FootballFieldOrientationConverter"
StrategyTypeListString="Near,Tactics"></resource:AlgorithmStrategyType2FootballFieldOrientationConverter>
</ResourceDictionary>
</UserControl.Resources>
......@@ -50,7 +60,7 @@
<RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="240"></ColumnDefinition>
<ColumnDefinition Width="200"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="40"></ColumnDefinition>
</Grid.ColumnDefinitions>
......@@ -92,7 +102,7 @@
<RowDefinition Height="60"></RowDefinition>
</Grid.RowDefinitions>
<RadioButton Content="{Binding Path=StrategyDisplayName,Mode=OneWay}" Grid.Row="0" FontSize="16" Foreground="White"
Style="{StaticResource RadioButton_NdiView}" IsChecked="{Binding IsAutoModeChecked,Mode=TwoWay}">
Style="{StaticResource RadioButton_NdiView}" IsChecked="{Binding IsAutoModeChecked,Mode=TwoWay}">
</RadioButton>
<RadioButton Content="居中" Grid.Row="1" FontSize="16" Foreground="White"
Style="{StaticResource RadioButton_NdiView}" IsChecked="{Binding IsCenterModeChecked,Mode=TwoWay}">
......@@ -105,25 +115,41 @@
</Grid>
</Grid>
<Button Content="选择目标" Grid.Row="1" VerticalAlignment="Bottom" Style="{StaticResource Button_Setting}"
<!-- 机位对应特殊面板区域 -->
<Grid Grid.Row="1">
<!-- 单人机位 ===== 目标检测按钮 -->
<Button Content="选择目标" Grid.Row="1" VerticalAlignment="Bottom" Style="{StaticResource Button_Setting}"
Height="40" Width="120" HorizontalAlignment="Right" Margin="0,0,10,0"
Command="{Binding Path=DetectCommand}">
<Button.IsEnabled>
<MultiBinding Converter="{StaticResource NDIViewProperty2BoolConverter_DetectButton}">
<Binding Path="ViewStatus"></Binding>
<Binding Path="StrategyMode"></Binding>
<Binding Path="StrategyType"></Binding>
</MultiBinding>
</Button.IsEnabled>
<Button.Visibility>
<MultiBinding Converter="{StaticResource NDIViewProperty2VisibilityConverter_DetectButton}">
<Binding Path="ViewStatus"></Binding>
<Binding Path="StrategyMode"></Binding>
<Binding Path="StrategyType"></Binding>
</MultiBinding>
</Button.Visibility>
</Button>
<Button.IsEnabled>
<MultiBinding Converter="{StaticResource NDIViewProperty2BoolConverter_DetectButton}">
<Binding Path="ViewStatus"></Binding>
<Binding Path="StrategyMode"></Binding>
<Binding Path="StrategyType"></Binding>
</MultiBinding>
</Button.IsEnabled>
<Button.Visibility>
<MultiBinding Converter="{StaticResource NDIViewProperty2VisibilityConverter_DetectButton}">
<Binding Path="ViewStatus"></Binding>
<Binding Path="StrategyMode"></Binding>
<Binding Path="StrategyType"></Binding>
</MultiBinding>
</Button.Visibility>
</Button>
<!-- 近景机位 & 16米机位 & 战术机位 ===== 边线检测选择面板 -->
<common:FootballFieldPanel HorizontalAlignment="Center" VerticalAlignment="Bottom"
FootballFieldWidth="150" FootballFieldHeight="100"
DataContext="{Binding Path=FootballFieldPanelModel}"
Orientation="{Binding ElementName=uc,Path=DataContext.StrategyType,Converter={StaticResource AlgorithmStrategyType2FootballFieldOrientationConverter}}">
<common:FootballFieldPanel.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>
</common:FootballFieldPanel.Visibility>
</common:FootballFieldPanel>
</Grid>
<!-- 视频区域 -->
<Border BorderBrush="Transparent" BorderThickness="0" Grid.Row="1" Grid.Column="1">
<fcommon:VideoControl x:Name="video"></fcommon:VideoControl>
......
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Property.cs
......@@ -10,6 +10,7 @@ using VIZ.Framework.Core;
using VIZ.Framework.Storage;
using VIZ.H2V.Domain;
using VIZ.H2V.Storage;
using VIZ.H2V.Common;
namespace VIZ.H2V.Module
{
......@@ -225,6 +226,20 @@ namespace VIZ.H2V.Module
#endregion
#region FootballFiledPanelModel -- 足球场视图模型
private FootballFieldPanelModel footballFieldPanelModel = new FootballFieldPanelModel();
/// <summary>
/// 足球场视图模型
/// </summary>
public FootballFieldPanelModel FootballFieldPanelModel
{
get { return footballFieldPanelModel; }
set { footballFieldPanelModel = value; this.RaisePropertyChanged(nameof(FootballFieldPanelModel)); }
}
#endregion
// --------------------------------------------------------------------------------------
#region IsUseClip -- 是否使用裁切
......
VIZ.H2V.Module/Setup/Provider/AppSetup_Algorithm.cs
......@@ -6,6 +6,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Management;
using VIZ.Framework.Core;
using VIZ.Framework.Connection;
using VIZ.Framework.Module;
......@@ -37,6 +38,10 @@ namespace VIZ.H2V.Module
/// <returns>是否成功执行</returns>
public override bool Setup(AppSetupContext context)
{
// 结束所有H2V相关算法进程
this.processKill();
// 注册进程检测
ApplicationDomainEx.LoopManager.Register("AppSetup_Algorithm", 1, this.processCheck);
return true;
......@@ -108,5 +113,32 @@ namespace VIZ.H2V.Module
}
}
}
/// <summary>
/// 结束进程
/// </summary>
private void processKill()
{
Process[] processes = Process.GetProcesses();
foreach (Process process in processes)
{
if (!(process.ProcessName.Contains("Python") || process.ProcessName.Contains("VIZ.H2V.UdpTestTool")))
continue;
string commandLine = ProcessHelper.GetCommandLine(process);
if (!commandLine.Contains("--vis_port"))
continue;
try
{
process.Kill();
}
catch (Exception ex)
{
log.Error(ex);
}
}
}
}
}
VIZ.H2V.Module/VIZ.H2V.Module.csproj
......@@ -68,6 +68,7 @@
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Management" />
<Reference Include="System.Runtime" />
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
......@@ -323,6 +324,10 @@
<Project>{06b80c09-343d-4bb2-aeb1-61cfbfbf5cad}</Project>
<Name>VIZ.Framework.Storage</Name>
</ProjectReference>
<ProjectReference Include="..\VIZ.H2V.Common\VIZ.H2V.Common.csproj">
<Project>{750ece65-60dd-425a-b1d3-68e5158b6e9b}</Project>
<Name>VIZ.H2V.Common</Name>
</ProjectReference>
<ProjectReference Include="..\VIZ.H2V.Connection\VIZ.H2V.Connection.csproj">
<Project>{94c95c0f-070f-4827-83fc-8dda63bab177}</Project>
<Name>VIZ.H2V.Connection</Name>
......
VIZ.H2V.Storage/LiteDB/Algorithm/AlgorithmStrategyType.cs
......@@ -21,18 +21,27 @@ namespace VIZ.H2V.Storage
/// <summary>
/// 近景机位
/// </summary>
/// <remarks>
/// 显示边线检测
/// </remarks>
[Description("近景机位")]
Near = 2,
/// <summary>
/// 16米机位
/// </summary>
/// <remarks>
/// 显示边线检测
/// </remarks>
[Description("16米机位")]
Sixteen = 3,
/// <summary>
/// 战术机位
/// </summary>
/// <remarks>
/// 显示边线检测
/// </remarks>
[Description("战术机位")]
Tactics = 4,
......
VIZ.H2V.sln
......@@ -59,6 +59,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.H2V.Module.Resource", "
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.H2V.UdpTestTool", "VIZ.H2V.UdpTestTool\VIZ.H2V.UdpTestTool.csproj", "{8FC38D2A-D2E5-44D0-86E4-7136A6D19F2E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VIZ.H2V.Common", "VIZ.H2V.Common\VIZ.H2V.Common.csproj", "{750ECE65-60DD-425A-B1D3-68E5158B6E9B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -203,6 +205,14 @@ Global
{8FC38D2A-D2E5-44D0-86E4-7136A6D19F2E}.Release|Any CPU.Build.0 = Release|Any CPU
{8FC38D2A-D2E5-44D0-86E4-7136A6D19F2E}.Release|x64.ActiveCfg = Release|Any CPU
{8FC38D2A-D2E5-44D0-86E4-7136A6D19F2E}.Release|x64.Build.0 = Release|Any CPU
{750ECE65-60DD-425A-B1D3-68E5158B6E9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{750ECE65-60DD-425A-B1D3-68E5158B6E9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{750ECE65-60DD-425A-B1D3-68E5158B6E9B}.Debug|x64.ActiveCfg = Debug|Any CPU
{750ECE65-60DD-425A-B1D3-68E5158B6E9B}.Debug|x64.Build.0 = Debug|Any CPU
{750ECE65-60DD-425A-B1D3-68E5158B6E9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{750ECE65-60DD-425A-B1D3-68E5158B6E9B}.Release|Any CPU.Build.0 = Release|Any CPU
{750ECE65-60DD-425A-B1D3-68E5158B6E9B}.Release|x64.ActiveCfg = Release|Any CPU
{750ECE65-60DD-425A-B1D3-68E5158B6E9B}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -225,6 +235,7 @@ Global
{B62C822E-701F-480F-BBB1-0E02217D622C} = {B7F9EDBA-B6D0-4DD9-AC3B-E25D0BF8CAF6}
{39FA96E9-DD2C-429D-AA18-FF22F8B0D8C6} = {81A21A6F-DAD9-45C8-8886-455DC44588B8}
{8FC38D2A-D2E5-44D0-86E4-7136A6D19F2E} = {13A90A3F-66CC-445C-9900-39A23DA82C40}
{750ECE65-60DD-425A-B1D3-68E5158B6E9B} = {CB121805-63D4-4D8E-9F37-2C3CDE7733D1}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {665C67CB-147B-44CB-B16D-EA1246EC8333}
......
VIZ.H2V/App.xaml
......@@ -8,6 +8,7 @@
<ResourceDictionary.MergedDictionaries>
<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.H2V.Module.Resource;component/Style/MessageBox/MessageBoxEx.xaml"></ResourceDictionary>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
......
VIZ.H2V/VIZ.H2V.csproj
......@@ -194,6 +194,10 @@
<Project>{06b80c09-343d-4bb2-aeb1-61cfbfbf5cad}</Project>
<Name>VIZ.Framework.Storage</Name>
</ProjectReference>
<ProjectReference Include="..\VIZ.H2V.Common\VIZ.H2V.Common.csproj">
<Project>{750ece65-60dd-425a-b1d3-68e5158b6e9b}</Project>
<Name>VIZ.H2V.Common</Name>
</ProjectReference>
<ProjectReference Include="..\VIZ.H2V.Connection\VIZ.H2V.Connection.csproj">
<Project>{94c95c0f-070f-4827-83fc-8dda63bab177}</Project>
<Name>VIZ.H2V.Connection</Name>
......
VIZ.H2V/config/config.ini
......@@ -3,7 +3,7 @@
; ============================================================
[Application]
;是否是调试模式
APPLICATION_IS_DEBUG=true
APPLICATION_IS_DEBUG=false
; ============================================================
; === Video ===
; ============================================================
......
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