合并 TURBO-615-RecognitionAndPositioning 到 ResolveConflicts，保留双方冲突内容

XplorePlane/Views/Main/MainWindow.xaml

@@ -166,7 +166,7 @@
                             Size="Medium"
                             SmallImage="/Assets/Icons/crosshair.png"
                             Text="辅助线" />
-                         <telerik:RadRibbonToggleButton
+                        <telerik:RadRibbonToggleButton
                             telerik:ScreenTip.Description="显示/隐藏图像比例尺"
                             telerik:ScreenTip.Title="比例尺"
                             IsChecked="{Binding IsScaleBarVisible, Mode=TwoWay}"
@@ -537,9 +537,53 @@
                            Text="坐标标定" />
                     </StackPanel>
                 </telerik:RadRibbonGroup>
+<<<<<<< HEAD
                 
                 
                 
+=======
+                <telerik:RadRibbonGroup
+                telerik:ScreenTip.Description="Show the Alignment tab of the Format Cells dialog box."
+                telerik:ScreenTip.Title="Format Cells: Alignment"
+                DialogLauncherCommand="{Binding Path=ShowFormatCellsDialog.Command}"
+                DialogLauncherCommandParameter="Alignment"
+                DialogLauncherVisibility="{Binding Path=ShowFormatCellsDialog.IsEnabled, Converter={StaticResource BoolToVisibilityValueConverter}}"
+                Header="识别定位"
+                IsEnabled="{Binding Path=AlignmentGroup.IsEnabled}">
+                    <telerik:RadRibbonGroup.Variants>
+                        <telerik:GroupVariant Priority="0" Variant="Large" />
+                    </telerik:RadRibbonGroup.Variants>
+                    <telerik:RadRibbonGroup.Resources>
+                        <spreadsheetControls:RadHorizontalAlignmentToBooleanConverter x:Key="horizontalAlignmentToBooleanConverter" />
+                        <spreadsheetControls:RadVerticalAlignmentToBooleanConverter x:Key="verticalAlignmentToBooleanConverter" />
+                    </telerik:RadRibbonGroup.Resources>
+                    <StackPanel />
+                    <StackPanel>
+                        <telerik:RadRibbonButton
+                         telerik:ScreenTip.Description="框选模板、调参并在当前图像上试跑旋转模板匹配"
+                         telerik:ScreenTip.Title="模板匹配助手"
+                         Command="{Binding OpenTemplateMatchAssistantCommand}"
+                         Size="Medium"
+                         SmallImage="/Assets/Icons/Matching.png"
+                         Text="模板助手" />
+                        <telerik:RadRibbonButton
+                        telerik:ScreenTip.Description="沿搜索线放置卡尺检测边缘点并拟合直线"
+                        telerik:ScreenTip.Title="拟合直线"
+                        Command="{Binding EdgeLineFitCommand}"
+                        Size="Medium"
+                        SmallImage="/Assets/Icons/FittedLine.png"
+                        Text="拟合直线" />
+                        <telerik:RadRibbonButton
+                         telerik:ScreenTip.Description="沿搜索线放置卡尺检测边缘点并拟合圆"
+                         telerik:ScreenTip.Title="拟合圆"
+                         Command="{Binding EdgeCircleFitCommand}"
+                         Size="Medium"
+                         SmallImage="/Assets/Icons/FittedCircle.png"
+                         Text="拟合圆" />
+                    </StackPanel>
+                </telerik:RadRibbonGroup>
+
+>>>>>>> TURBO-615-RecognitionAndPositioning
                 <telerik:RadRibbonGroup Header="多语言">
                     <telerik:RadRibbonGroup.Variants>
                         <telerik:GroupVariant Priority="0" Variant="Large" />