修改描述

b0dea177 · liulongfei · 49599b20 · b0dea177 · b0dea177 · b0dea177
Commit b0dea177 authored Jan 12, 2023 by liulongfei
8 changed files
--- a/VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmSinglePanelView.xaml
+++ b/VIZ.H2V.Module/NDISettingView/View/Algorithm/AlgorithmSinglePanelView.xaml
@@ -115,30 +115,8 @@
                </ComboBox>
            </Grid>
-            <!-- 场景 -->
-            <Grid Grid.Row="5">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="380"></ColumnDefinition>
-                    <ColumnDefinition Width="*"></ColumnDefinition>
-                </Grid.ColumnDefinitions>
-                <TextBlock Text="边线场景" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="6"></TextBlock>
-                <ComboBox Grid.Column="1" Style="{StaticResource ComboBox_Setting}" Height="40"
-                          ItemsSource="{Binding Path=BorderScences,Mode=OneWay}"
-                          SelectedValue="{Binding Path=SelectedBorderScence,Mode=TwoWay}">
-                    <ComboBox.ItemTemplate>
-                        <DataTemplate>
-                            <Grid Background="Transparent" IsHitTestVisible="False">
-                                <TextBlock Text="{Binding DisplayName}" VerticalAlignment="Center" HorizontalAlignment="Left"
-                                           Grid.Column="3" Foreground="White" FontSize="14"></TextBlock>
-                            </Grid>
-                        </DataTemplate>
-                    </ComboBox.ItemTemplate>
-                </ComboBox>
-            </Grid>
-            <Rectangle VerticalAlignment="Bottom" Height="2" Grid.Row="5" Fill="#ff364051"></Rectangle>
            <!-- 单人机位面积校准 -->
-            <Grid Grid.Row="6">
+            <Grid Grid.Row="5">
                <Grid.ColumnDefinitions>
                    <ColumnDefinition Width="380"></ColumnDefinition>
                    <ColumnDefinition Width="*"></ColumnDefinition>
@@ -152,7 +130,7 @@
            </Grid>
            <!-- 单人机位面积校准置信度 -->
-            <Grid Grid.Row="7">
+            <Grid Grid.Row="6">
                <Grid.ColumnDefinitions>
                    <ColumnDefinition Width="380"></ColumnDefinition>
                    <ColumnDefinition Width="*"></ColumnDefinition>

--- a/VIZ.H2V.Module/NDISettingView/View/AlgorithmSettingPanelView.xaml
+++ b/VIZ.H2V.Module/NDISettingView/View/AlgorithmSettingPanelView.xaml
@@ -49,8 +49,8 @@
                </DataTemplate>
            </ComboBox.ItemTemplate>
        </ComboBox>
-        <!-- 机位策略 -->
+        <!-- 裁切策略 -->
-        <TextBlock Text="机位策略" Foreground="White" FontSize="18" VerticalAlignment="Center" Margin="45,0,40,0" Grid.Row="2"></TextBlock>
+        <TextBlock Text="裁切策略" Foreground="White" FontSize="18" VerticalAlignment="Center" Margin="45,0,40,0" Grid.Row="2"></TextBlock>
        <ComboBox Style="{StaticResource ComboBox_Setting}" Grid.Row="3" Margin="45,0,40,0" Height="40"
                      ItemsSource="{Binding Path=AlgorithmStrategys,Mode=OneWay}"
                      SelectedValue="{Binding Path=SelectedAlgorithmStrategy,Mode=TwoWay}">

--- a/VIZ.H2V.Module/NDISettingView/View/NDISettingPanelView.xaml
+++ b/VIZ.H2V.Module/NDISettingView/View/NDISettingPanelView.xaml
@@ -40,9 +40,9 @@
                <RowDefinition Height="*"></RowDefinition>
            </Grid.RowDefinitions>
            <!-- 输入源 -->
-            <TextBlock Text="输入源" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
+            <TextBlock Text="视频输入" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
            <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right">
-                <TextBlock Text="仅显示本机输入源" Foreground="#aaffffff" VerticalAlignment="Center"></TextBlock>
+                <TextBlock Text="仅显示本机视频输入" Foreground="#aaffffff" VerticalAlignment="Center"></TextBlock>
                <CheckBox Style="{StaticResource CheckBox_Setting}" VerticalAlignment="Center" 
                          HorizontalAlignment="Right" Margin="10,0,0,0"
                          IsChecked="{Binding Path=IsShowLocalStream,Mode=TwoWay}"></CheckBox>
@@ -58,8 +58,8 @@
                    </DataTemplate>
                </ComboBox.ItemTemplate>
            </ComboBox>
-            <!-- 输入源名称 -->
+            <!-- 窗口显示名称 -->
-            <TextBlock Text="输入源名称" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock>
+            <TextBlock Text="窗口显示名称" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock>
            <TextBox Grid.Row="3" Style="{StaticResource TextBox_Setting}" Height="40"
                     Text="{Binding Path=NdiDispalyName,Mode=TwoWay}"></TextBox>
            <!-- 视频延迟 -->
@@ -75,8 +75,8 @@
                    </DataTemplate>
                </ComboBox.ItemTemplate>
            </ComboBox>
-            <!-- 是否向裁切程序发送坐标 -->
+            <!-- 发送裁切信息到裁切引擎 -->
-            <TextBlock Text="是否向裁切程序发送坐标" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="6"></TextBlock>
+            <TextBlock Text="发送裁切信息到裁切引擎" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="6"></TextBlock>
            <CheckBox Grid.Row="6" Style="{StaticResource CheckBox_Setting}" VerticalAlignment="Center" HorizontalAlignment="Right"
                      IsChecked="{Binding Path=IsSendToCrop,Mode=TwoWay}"></CheckBox>
        </Grid>

--- a/VIZ.H2V.Module/NDISettingView/View/NDISettingView.xaml
+++ b/VIZ.H2V.Module/NDISettingView/View/NDISettingView.xaml
@@ -47,7 +47,7 @@
        <StackPanel Grid.Row="1" Grid.RowSpan="2">
            <RadioButton Content="裁剪策略" Height="50" Foreground="White" FontSize="22" VerticalContentAlignment="Center"
                         x:Name="rbAlgorithm" Style="{StaticResource RadioButton_Setting}" IsChecked="True"></RadioButton>
-            <RadioButton Content="输入源" Height="50" Foreground="White" FontSize="22" VerticalContentAlignment="Center"
+            <RadioButton Content="视频输入" Height="50" Foreground="White" FontSize="22" VerticalContentAlignment="Center"
                         x:Name="rbNDI" Style="{StaticResource RadioButton_Setting}"></RadioButton>
        </StackPanel>

--- a/VIZ.H2V.Module/NDISettingView/ViewModel/NDISettingViewModel.cs
+++ b/VIZ.H2V.Module/NDISettingView/ViewModel/NDISettingViewModel.cs
@@ -208,7 +208,7 @@ namespace VIZ.H2V.Module
            if (isNeedRestart)
            {
-                MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "该配置需要重启算法进程（1 min），是否继续保存?", MessageBoxExButtons.YES_CANCEL);
+                MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "该配置需要重启算法进程，是否继续保存?", MessageBoxExButtons.YES_CANCEL);
                if (result == MessageBoxExResult.CANCEL)
                    return;
            }

--- a/VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Command.cs
+++ b/VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Command.cs
@@ -337,7 +337,7 @@ namespace VIZ.H2V.Module
        /// </summary>
        private void Restart()
        {
-            MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "重启算法进程需要大概（1 min），是否继续?", MessageBoxExButtons.YES_CANCEL);
+            MessageBoxExResult result = MessageBoxEx.ShowDialog("提示", "重启算法进程需要大概需要1分钟，是否继续?", MessageBoxExButtons.YES_CANCEL);
            if (result == MessageBoxExResult.CANCEL)
                return;

--- a/VIZ.H2V/Properties/AssemblyInfo.cs
+++ b/VIZ.H2V/Properties/AssemblyInfo.cs
@@ -9,12 +9,12 @@ using VIZ.Framework.Core;
 // 有关程序集的一般信息由以下
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
-[assembly: AssemblyTitle("VIZ.H2V")]
+[assembly: AssemblyTitle("智能裁切")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("VIZ.H2V")]
+[assembly: AssemblyProduct("智能裁切")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
+[assembly: AssemblyCopyright("Copyright ©  2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -53,8 +53,8 @@ using VIZ.Framework.Core;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
 // =====================================================================================================
 // VIZ

--- a/VIZ.H2V/VIZ.H2V.csproj
+++ b/VIZ.H2V/VIZ.H2V.csproj
@@ -7,7 +7,7 @@
    <ProjectGuid>{EB6A7895-C3B7-451E-BB9E-5D6A904D5A8C}</ProjectGuid>
    <OutputType>WinExe</OutputType>
    <RootNamespace>VIZ.H2V</RootNamespace>
-    <AssemblyName>VIZ.H2V</AssemblyName>
+    <AssemblyName>智能裁切</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>