调整rabbion布局，移动下拉算子列表；将扫描相关移动到Tab页；调整 算子参数控件样式
This commit is contained in:
zhengxuan.zhang
@@ -307,7 +307,7 @@
|
|||||||
FontSize="11"
|
FontSize="11"
|
||||||
FontWeight="Bold"
|
FontWeight="Bold"
|
||||||
Foreground="#555"
|
Foreground="#555"
|
||||||
Text="参数配置" />
|
Text="属性" />
|
||||||
<ItemsControl ItemsSource="{Binding SelectedNode.Parameters}">
|
<ItemsControl ItemsSource="{Binding SelectedNode.Parameters}">
|
||||||
<ItemsControl.ItemContainerStyle>
|
<ItemsControl.ItemContainerStyle>
|
||||||
<Style TargetType="ContentPresenter">
|
<Style TargetType="ContentPresenter">
|
||||||
@@ -347,13 +347,23 @@
|
|||||||
</Style>
|
</Style>
|
||||||
</Grid.Style>
|
</Grid.Style>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="52" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="58" />
|
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<Slider
|
<TextBox
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="0,0,8,0"
|
Margin="0,0,6,0"
|
||||||
|
Padding="2,2"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
BorderBrush="#CDCBCB"
|
||||||
|
BorderThickness="1"
|
||||||
|
FontFamily="{StaticResource UiFont}"
|
||||||
|
FontSize="11"
|
||||||
|
Text="{Binding SliderValue, Mode=TwoWay, UpdateSourceTrigger=LostFocus}" />
|
||||||
|
|
||||||
|
<Slider
|
||||||
|
Grid.Column="1"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
IsSnapToTickEnabled="{Binding IsIntegerSlider}"
|
IsSnapToTickEnabled="{Binding IsIntegerSlider}"
|
||||||
LargeChange="{Binding SliderTickFrequency}"
|
LargeChange="{Binding SliderTickFrequency}"
|
||||||
@@ -362,21 +372,6 @@
|
|||||||
SmallChange="{Binding SliderTickFrequency}"
|
SmallChange="{Binding SliderTickFrequency}"
|
||||||
TickFrequency="{Binding SliderTickFrequency}"
|
TickFrequency="{Binding SliderTickFrequency}"
|
||||||
Value="{Binding SliderValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
Value="{Binding SliderValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
||||||
|
|
||||||
<Border
|
|
||||||
Grid.Column="1"
|
|
||||||
Padding="2,2"
|
|
||||||
Background="#F8F8F8"
|
|
||||||
BorderBrush="#CDCBCB"
|
|
||||||
BorderThickness="1"
|
|
||||||
CornerRadius="2">
|
|
||||||
<TextBlock
|
|
||||||
HorizontalAlignment="Center"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
FontFamily="{StaticResource UiFont}"
|
|
||||||
FontSize="11"
|
|
||||||
Text="{Binding DisplayValueText}" />
|
|
||||||
</Border>
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<TextBox
|
<TextBox
|
||||||
|
|||||||
@@ -265,6 +265,26 @@
|
|||||||
Size="Large"
|
Size="Large"
|
||||||
SmallImage="/Assets/Icons/dynamic-range.png"
|
SmallImage="/Assets/Icons/dynamic-range.png"
|
||||||
Text="算子工具箱" />
|
Text="算子工具箱" />
|
||||||
|
<StackPanel Width="170">
|
||||||
|
<TextBlock
|
||||||
|
Margin="0,0,0,4"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
Text="内置检测模块" />
|
||||||
|
<telerik:RadRibbonComboBox
|
||||||
|
Width="160"
|
||||||
|
ItemsSource="{Binding BuiltInInspectionModules}"
|
||||||
|
DisplayMemberPath="DisplayName"
|
||||||
|
SelectedItem="{Binding SelectedBuiltInInspectionModule}"
|
||||||
|
IsEditable="False" />
|
||||||
|
<telerik:RadRibbonButton
|
||||||
|
Margin="0,4,0,0"
|
||||||
|
telerik:ScreenTip.Description="从 Tools 目录扫描到的 .xpm 中选择一个配方，并插入到当前 CNC 程序中"
|
||||||
|
telerik:ScreenTip.Title="插入内置检测模块"
|
||||||
|
Command="{Binding InsertBuiltInInspectionModuleCommand}"
|
||||||
|
Size="Medium"
|
||||||
|
SmallImage="/Assets/Icons/Module.png"
|
||||||
|
Text="插入模块" />
|
||||||
|
</StackPanel>
|
||||||
</telerik:RadRibbonGroup>
|
</telerik:RadRibbonGroup>
|
||||||
|
|
||||||
<telerik:RadRibbonGroup Header="CNC">
|
<telerik:RadRibbonGroup Header="CNC">
|
||||||
@@ -286,26 +306,7 @@
|
|||||||
Size="Large"
|
Size="Large"
|
||||||
SmallImage="/Assets/Icons/matrix.png"
|
SmallImage="/Assets/Icons/matrix.png"
|
||||||
Text="矩阵编排" />
|
Text="矩阵编排" />
|
||||||
<StackPanel Width="170">
|
|
||||||
<TextBlock
|
|
||||||
Margin="0,0,0,4"
|
|
||||||
HorizontalAlignment="Center"
|
|
||||||
Text="内置检测模块" />
|
|
||||||
<telerik:RadRibbonComboBox
|
|
||||||
Width="160"
|
|
||||||
ItemsSource="{Binding BuiltInInspectionModules}"
|
|
||||||
DisplayMemberPath="DisplayName"
|
|
||||||
SelectedItem="{Binding SelectedBuiltInInspectionModule}"
|
|
||||||
IsEditable="False" />
|
|
||||||
<telerik:RadRibbonButton
|
|
||||||
Margin="0,4,0,0"
|
|
||||||
telerik:ScreenTip.Description="从 Tools 目录扫描到的 .xpm 中选择一个配方，并插入到当前 CNC 程序中"
|
|
||||||
telerik:ScreenTip.Title="插入内置检测模块"
|
|
||||||
Command="{Binding InsertBuiltInInspectionModuleCommand}"
|
|
||||||
Size="Medium"
|
|
||||||
SmallImage="/Assets/Icons/Module.png"
|
|
||||||
Text="插入模块" />
|
|
||||||
</StackPanel>
|
|
||||||
<!--
|
<!--
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
<telerik:RadRibbonButton
|
<telerik:RadRibbonButton
|
||||||
@@ -382,6 +383,10 @@
|
|||||||
SmallImage="/Assets/Icons/Pores.png" />
|
SmallImage="/Assets/Icons/Pores.png" />
|
||||||
</telerik:RadRibbonGroup>
|
</telerik:RadRibbonGroup>
|
||||||
|
|
||||||
|
|
||||||
|
</telerik:RadRibbonTab>
|
||||||
|
|
||||||
|
<telerik:RadRibbonTab Header="3D扫描">
|
||||||
<telerik:RadRibbonGroup Header="扫描模式" IsEnabled="{Binding Path=LinksGroup.IsEnabled}">
|
<telerik:RadRibbonGroup Header="扫描模式" IsEnabled="{Binding Path=LinksGroup.IsEnabled}">
|
||||||
<telerik:RadRibbonGroup.Variants>
|
<telerik:RadRibbonGroup.Variants>
|
||||||
<telerik:GroupVariant Priority="0" Variant="Large" />
|
<telerik:GroupVariant Priority="0" Variant="Large" />
|
||||||
@@ -405,9 +410,6 @@
|
|||||||
</telerik:RadRibbonGroup>
|
</telerik:RadRibbonGroup>
|
||||||
</telerik:RadRibbonTab>
|
</telerik:RadRibbonTab>
|
||||||
|
|
||||||
<telerik:RadRibbonTab Header="操作">
|
|
||||||
</telerik:RadRibbonTab>
|
|
||||||
|
|
||||||
<telerik:RadRibbonTab Header="设置">
|
<telerik:RadRibbonTab Header="设置">
|
||||||
<telerik:RadRibbonGroup Header="全局设置">
|
<telerik:RadRibbonGroup Header="全局设置">
|
||||||
<telerik:RadRibbonGroup.Variants>
|
<telerik:RadRibbonGroup.Variants>
|
||||||
|
|||||||
Reference in New Issue
Block a user