Commit ef7debf5 by liulongfei

样式调整

parent 0856c806
<UserControl x:Class="VIZ.H2V.Module.AlgorithmServiceStatusPanelView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:local="clr-namespace:VIZ.H2V.Module"
d:DataContext="{d:DesignInstance Type=local:AlgorithmServiceStatusPanelViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<behaviors:Interaction.Triggers>
<behaviors:EventTrigger EventName="Loaded">
<behaviors:InvokeCommandAction Command="{Binding LoadedCommand}" />
</behaviors:EventTrigger>
</behaviors:Interaction.Triggers>
<Grid>
</Grid>
</UserControl>
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;
using VIZ.Framework.Core;
namespace VIZ.H2V.Module
{
/// <summary>
/// AlgorithmServiceStatusPanelView.xaml 的交互逻辑
/// </summary>
public partial class AlgorithmServiceStatusPanelView : UserControl
{
public AlgorithmServiceStatusPanelView()
{
InitializeComponent();
WPFHelper.BindingViewModel(this, new AlgorithmServiceStatusPanelViewModel());
}
}
}
<UserControl x:Class="VIZ.H2V.Module.ClipServiceStatusPanelView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors"
xmlns:local="clr-namespace:VIZ.H2V.Module"
d:DataContext="{d:DesignInstance Type=local:ClipServiceStatusPanelViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<behaviors:Interaction.Triggers>
<behaviors:EventTrigger EventName="Loaded">
<behaviors:InvokeCommandAction Command="{Binding LoadedCommand}" />
</behaviors:EventTrigger>
</behaviors:Interaction.Triggers>
<Grid>
</Grid>
</UserControl>
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;
using VIZ.Framework.Core;
namespace VIZ.H2V.Module
{
/// <summary>
/// ClipServiceStatusPanelView.xaml 的交互逻辑
/// </summary>
public partial class ClipServiceStatusPanelView : UserControl
{
public ClipServiceStatusPanelView()
{
InitializeComponent();
WPFHelper.BindingViewModel(this, new ClipServiceStatusPanelViewModel());
}
}
}
......@@ -67,12 +67,18 @@
</Grid.ColumnDefinitions>
<!-- 算法服务监控 -->
<StackPanel Orientation="Horizontal" Background="Transparent">
<!--<StackPanel.ToolTip>
<local:AlgorithmServiceStatusPanelView></local:AlgorithmServiceStatusPanelView>
</StackPanel.ToolTip>-->
<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="12" Margin="10,0,0,0"></TextBlock>
</StackPanel>
<!-- 剪切服务监控 -->
<StackPanel Orientation="Horizontal" Grid.Column="1" Background="Transparent">
<!--<StackPanel.ToolTip>
<local:ClipServiceStatusPanelView></local:ClipServiceStatusPanelView>
</StackPanel.ToolTip>-->
<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="12" Margin="10,0,0,0"></TextBlock>
......
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
namespace VIZ.H2V.Module
{
/// <summary>
/// 算法服务状态视图模型
/// </summary>
public class AlgorithmServiceStatusPanelViewModel : ViewModelBase
{
/// <summary>
/// 算法服务状态视图模型
/// </summary>
public AlgorithmServiceStatusPanelViewModel()
{
this.LoadedCommand = new VCommand(this.Loaded);
}
#region LoadedCommand -- 加载命令
/// <summary>
/// 加载命令
/// </summary>
public VCommand LoadedCommand { get; set; }
/// <summary>
/// 加载
/// </summary>
private void Loaded()
{
}
#endregion
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VIZ.Framework.Core;
namespace VIZ.H2V.Module
{
/// <summary>
/// 裁切服务状态面板视图模型
/// </summary>
public class ClipServiceStatusPanelViewModel : ViewModelBase
{
/// <summary>
/// 裁切服务状态面板视图模型
/// </summary>
public ClipServiceStatusPanelViewModel()
{
this.LoadedCommand = new VCommand(this.Loaded);
}
#region LoadedCommand -- 加载命令
/// <summary>
/// 加载命令
/// </summary>
public VCommand LoadedCommand { get; set; }
/// <summary>
/// 加载
/// </summary>
private void Loaded()
{
}
#endregion
}
}
......@@ -90,8 +90,8 @@
<ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="非常平滑,移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center"></TextBlock>
<TextBlock Text="一般平滑,移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center"></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 VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.001" Foreground="White" FontSize="16" Grid.Row="1"></TextBlock>
<Slider Grid.Column="1" VerticalAlignment="Center" Margin="10,0,10,0" Style="{StaticResource Slider_Setting}" Grid.Row="1"
Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001"
......@@ -112,7 +112,7 @@
<ColumnDefinition Width="40"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="维持上一帧位置(帧)" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<fcommon:NumberBox Grid.Column="1" MinValue="0" MaxValue="100" Interval="1" Height="40"
<fcommon:NumberBox Grid.Column="1" MinValue="0" MaxValue="1000000" Interval="1" Height="40"
Value="{Binding Path=KeepPrevFrame,Mode=TwoWay}"></fcommon:NumberBox>
<TextBlock Text="内" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2"
HorizontalAlignment="Right"></TextBlock>
......@@ -156,7 +156,7 @@
<ColumnDefinition Width="380"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="场景" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="6"></TextBlock>
<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}">
......
......@@ -90,8 +90,8 @@
<ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="非常平滑,移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center"></TextBlock>
<TextBlock Text="一般平滑,移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center"></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 VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.001" Foreground="White" FontSize="16" Grid.Row="1"></TextBlock>
<Slider Grid.Column="1" VerticalAlignment="Center" Margin="10,0,10,0" Style="{StaticResource Slider_Setting}" Grid.Row="1"
Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001"
......@@ -112,7 +112,7 @@
<ColumnDefinition Width="40"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="维持上一帧位置(帧)" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<fcommon:NumberBox Grid.Column="1" MinValue="0" MaxValue="100" Interval="1" Height="40"
<fcommon:NumberBox Grid.Column="1" MinValue="0" MaxValue="1000000" Interval="1" Height="40"
Value="{Binding Path=KeepPrevFrame,Mode=TwoWay}"></fcommon:NumberBox>
<TextBlock Text="内" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2"
Margin="10,0,0,0"></TextBlock>
......@@ -156,7 +156,7 @@
<ColumnDefinition Width="380"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="场景" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="6"></TextBlock>
<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}">
......
......@@ -51,8 +51,8 @@
<ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="非常平滑,移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center"></TextBlock>
<TextBlock Text="一般平滑,移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center"></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 VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.001" Foreground="White" FontSize="16" Grid.Row="1"></TextBlock>
<Slider Grid.Column="1" VerticalAlignment="Center" Margin="10,0,10,0" Style="{StaticResource Slider_Setting}" Grid.Row="1"
Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001"
......@@ -73,7 +73,7 @@
<ColumnDefinition Width="40"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="维持上一帧位置(帧)" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<fcommon:NumberBox Grid.Column="1" MinValue="0" MaxValue="100" Interval="1" Height="40"
<fcommon:NumberBox Grid.Column="1" MinValue="0" MaxValue="1000000" Interval="1" Height="40"
Value="{Binding Path=KeepPrevFrame,Mode=TwoWay}"></fcommon:NumberBox>
<TextBlock Text="内" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2"
Margin="10,0,0,0"></TextBlock>
......@@ -117,7 +117,7 @@
<ColumnDefinition Width="380"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="场景" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="6"></TextBlock>
<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}">
......
......@@ -90,8 +90,8 @@
<ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="非常平滑,移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center"></TextBlock>
<TextBlock Text="一般平滑,移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center"></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 VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.001" Foreground="White" FontSize="16" Grid.Row="1"></TextBlock>
<Slider Grid.Column="1" VerticalAlignment="Center" Margin="10,0,10,0" Style="{StaticResource Slider_Setting}" Grid.Row="1"
Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001"
......@@ -112,7 +112,7 @@
<ColumnDefinition Width="40"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="维持上一帧位置(帧)" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<fcommon:NumberBox Grid.Column="1" MinValue="0" MaxValue="100" Interval="1" Height="40"
<fcommon:NumberBox Grid.Column="1" MinValue="0" MaxValue="1000000" Interval="1" Height="40"
Value="{Binding Path=KeepPrevFrame,Mode=TwoWay}"></fcommon:NumberBox>
<TextBlock Text="内" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2"
HorizontalAlignment="Right"></TextBlock>
......@@ -156,7 +156,7 @@
<ColumnDefinition Width="380"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="场景" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="6"></TextBlock>
<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}">
......
......@@ -90,8 +90,8 @@
<ColumnDefinition Width="80"></ColumnDefinition>
<ColumnDefinition Width="80"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="非常平滑,移动速度慢" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" VerticalAlignment="Center"></TextBlock>
<TextBlock Text="一般平滑,移动速度快" Foreground="#aaffffff" FontSize="14" Grid.ColumnSpan="2" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center"></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 VerticalAlignment="Center" HorizontalAlignment="Center" Text="0.001" Foreground="White" FontSize="16" Grid.Row="1"></TextBlock>
<Slider Grid.Column="1" VerticalAlignment="Center" Margin="10,0,10,0" Style="{StaticResource Slider_Setting}" Grid.Row="1"
Minimum="0.001" Maximum="0.05" IsSnapToTickEnabled="True" TickFrequency="0.001"
......@@ -112,7 +112,7 @@
<ColumnDefinition Width="40"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="维持上一帧位置(帧)" Foreground="White" FontSize="18" VerticalAlignment="Center"></TextBlock>
<fcommon:NumberBox Grid.Column="1" MinValue="0" MaxValue="100" Interval="1" Height="40"
<fcommon:NumberBox Grid.Column="1" MinValue="0" MaxValue="1000000" Interval="1" Height="40"
Value="{Binding Path=KeepPrevFrame,Mode=TwoWay}"></fcommon:NumberBox>
<TextBlock Text="内" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Column="2"
HorizontalAlignment="Right"></TextBlock>
......@@ -156,7 +156,7 @@
<ColumnDefinition Width="380"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="场景" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="6"></TextBlock>
<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}">
......
......@@ -93,6 +93,14 @@
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<Page Include="NDIMainView\View\AlgorithmServiceStatusPanelView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="NDIMainView\View\ClipServiceStatusPanelView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
......@@ -171,6 +179,14 @@
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="NDIMainView\ViewModel\AlgorithmServiceStatusPanelViewModel.cs" />
<Compile Include="NDIMainView\ViewModel\ClipServiceStatusPanelViewModel.cs" />
<Compile Include="NDIMainView\View\AlgorithmServiceStatusPanelView.xaml.cs">
<DependentUpon>AlgorithmServiceStatusPanelView.xaml</DependentUpon>
</Compile>
<Compile Include="NDIMainView\View\ClipServiceStatusPanelView.xaml.cs">
<DependentUpon>ClipServiceStatusPanelView.xaml</DependentUpon>
</Compile>
<Compile Include="NDIMainView\Controller\Hotkey\HotkeyController.cs" />
<Compile Include="NDIMainView\Controller\Hotkey\IHotkeySupport.cs" />
<Compile Include="NDIMainView\Service\INDIMainViewService.cs" />
......
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