调整rabbion布局，移动下拉算子列表；将扫描相关移动到Tab页；调整 算子参数控件样式

XplorePlane/Views/ImageProcessing/PipelineEditorView.xaml

@@ -307,7 +307,7 @@
                         FontSize="11"
                         FontWeight="Bold"
                         Foreground="#555"
-                        Text="参数配置" />
+                        Text="属性" />
                     <ItemsControl ItemsSource="{Binding SelectedNode.Parameters}">
                         <ItemsControl.ItemContainerStyle>
                             <Style TargetType="ContentPresenter">
@@ -347,13 +347,23 @@
                                             </Style>
                                         </Grid.Style>
                                         <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="52" />
                                             <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="58" />
                                         </Grid.ColumnDefinitions>
 
-                                        <Slider
+                                        <TextBox
                                             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"
                                             IsSnapToTickEnabled="{Binding IsIntegerSlider}"
                                             LargeChange="{Binding SliderTickFrequency}"
@@ -362,21 +372,6 @@
                                             SmallChange="{Binding SliderTickFrequency}"
                                             TickFrequency="{Binding SliderTickFrequency}"
                                             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>
 
                                     <TextBox

XplorePlane/Views/Main/MainWindow.xaml

@@ -265,6 +265,26 @@
                         Size="Large"
                         SmallImage="/Assets/Icons/dynamic-range.png"
                         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 Header="CNC">
@@ -286,26 +306,7 @@
           Size="Large"
           SmallImage="/Assets/Icons/matrix.png"
           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>
                         <telerik:RadRibbonButton
@@ -382,32 +383,33 @@
                         SmallImage="/Assets/Icons/Pores.png" />
                 </telerik:RadRibbonGroup>
 
+                
+            </telerik:RadRibbonTab>
+
+            <telerik:RadRibbonTab Header="3D扫描">
                 <telerik:RadRibbonGroup Header="扫描模式" IsEnabled="{Binding Path=LinksGroup.IsEnabled}">
                     <telerik:RadRibbonGroup.Variants>
                         <telerik:GroupVariant Priority="0" Variant="Large" />
                     </telerik:RadRibbonGroup.Variants>
                     <telerik:RadRibbonButton
-                        telerik:ScreenTip.Description="Create a link in your document for quick access to webpages and files.&#13;&#13;Hyperlinks can also take you to places in your document."
+        telerik:ScreenTip.Description="Create a link in your document for quick access to webpages and files.&#13;&#13;Hyperlinks can also take you to places in your document."
-                        telerik:ScreenTip.Title="Add a Hyperlink"
+        telerik:ScreenTip.Title="Add a Hyperlink"
-                        Command="{Binding Path=ShowHyperlinkDialog.Command}"
+        Command="{Binding Path=ShowHyperlinkDialog.Command}"
-                        Content="快速扫描"
+        Content="快速扫描"
-                        IsEnabled="{Binding Path=ShowHyperlinkDialog.IsEnabled}"
+        IsEnabled="{Binding Path=ShowHyperlinkDialog.IsEnabled}"
-                        Size="Large"
+        Size="Large"
-                        SmallImage="/Assets/Icons/quick-scan.png" />
+        SmallImage="/Assets/Icons/quick-scan.png" />
                     <telerik:RadRibbonButton
-                        telerik:ScreenTip.Description="Create a link in your document for quick access to webpages and files.&#13;&#13;Hyperlinks can also take you to places in your document."
+        telerik:ScreenTip.Description="Create a link in your document for quick access to webpages and files.&#13;&#13;Hyperlinks can also take you to places in your document."
-                        telerik:ScreenTip.Title="Add a Hyperlink"
+        telerik:ScreenTip.Title="Add a Hyperlink"
-                        Command="{Binding Path=ShowHyperlinkDialog.Command}"
+        Command="{Binding Path=ShowHyperlinkDialog.Command}"
-                        Content="螺旋扫描"
+        Content="螺旋扫描"
-                        IsEnabled="{Binding Path=ShowHyperlinkDialog.IsEnabled}"
+        IsEnabled="{Binding Path=ShowHyperlinkDialog.IsEnabled}"
-                        Size="Large"
+        Size="Large"
-                        SmallImage="/Assets/Icons/spiral.png" />
+        SmallImage="/Assets/Icons/spiral.png" />
                 </telerik:RadRibbonGroup>
             </telerik:RadRibbonTab>
 
-            <telerik:RadRibbonTab Header="操作">
-            </telerik:RadRibbonTab>
-
             <telerik:RadRibbonTab Header="设置">
                 <telerik:RadRibbonGroup Header="全局设置">
                     <telerik:RadRibbonGroup.Variants>