Merge branch 'Develop/XP' into turbo-002-cnc
# Conflicts: # XplorePlane/App.xaml.cs # XplorePlane/Themes/Generic.xaml # XplorePlane/ViewModels/Main/MainViewModel.cs # XplorePlane/Views/Main/MainWindow.xaml # XplorePlane/Views/Main/ViewportPanelView.xaml
This commit is contained in:
zhengxuan.zhang
@@ -166,8 +166,16 @@
|
||||
Size="Medium"
|
||||
SmallImage="/Assets/Icons/crosshair.png"
|
||||
Text="辅助线" />
|
||||
<telerik:RadRibbonToggleButton
|
||||
telerik:ScreenTip.Description="显示/隐藏图像比例尺"
|
||||
telerik:ScreenTip.Title="比例尺"
|
||||
IsChecked="{Binding IsScaleBarVisible, Mode=TwoWay}"
|
||||
Size="Medium"
|
||||
SmallImage="/Assets/Icons/Scale.png"
|
||||
Text="比例尺" />
|
||||
<telerik:RadRibbonButton
|
||||
telerik:ScreenTip.Title="白底检测"
|
||||
Command="{Binding WhiteBackgroundDetectionCommand}"
|
||||
Size="Medium"
|
||||
SmallImage="/Assets/Icons/film-darken.png"
|
||||
Text="白底检测" />
|
||||
@@ -175,11 +183,13 @@
|
||||
<StackPanel>
|
||||
<telerik:RadRibbonButton
|
||||
telerik:ScreenTip.Title="灰度"
|
||||
Command="{Binding GrayscaleCommand}"
|
||||
Size="Medium"
|
||||
SmallImage="/Assets/Icons/film-darken.png"
|
||||
Text="灰度" />
|
||||
<telerik:RadRibbonButton
|
||||
telerik:ScreenTip.Title="黑底检测"
|
||||
Command="{Binding BlackBackgroundDetectionCommand}"
|
||||
Size="Medium"
|
||||
SmallImage="/Assets/Icons/film-darken.png"
|
||||
Text="黑底检测" />
|
||||
@@ -187,11 +197,13 @@
|
||||
<StackPanel>
|
||||
<telerik:RadRibbonButton
|
||||
telerik:ScreenTip.Title="锐化"
|
||||
Command="{Binding SharpenCommand}"
|
||||
Size="Medium"
|
||||
SmallImage="/Assets/Icons/sharpen.png"
|
||||
Text="锐化" />
|
||||
<telerik:RadRibbonButton
|
||||
telerik:ScreenTip.Title="增强"
|
||||
Command="{Binding EnhanceCommand}"
|
||||
Size="Medium"
|
||||
SmallImage="/Assets/Icons/dynamic-range.png"
|
||||
Text="增强" />
|
||||
@@ -229,6 +241,7 @@
|
||||
telerik:ScreenTip.Description="测量两点之间的距离"
|
||||
telerik:ScreenTip.Title="点点距测量"
|
||||
Command="{Binding PointDistanceMeasureCommand}"
|
||||
IsEnabled="{Binding IsMeasurementToolsEnabled}"
|
||||
Size="Medium"
|
||||
SmallImage="/Assets/Icons/ptop.png"
|
||||
Text="点点距测量" />
|
||||
@@ -236,6 +249,7 @@
|
||||
telerik:ScreenTip.Description="测量点到直线的距离"
|
||||
telerik:ScreenTip.Title="点线距测量"
|
||||
Command="{Binding PointLineDistanceMeasureCommand}"
|
||||
IsEnabled="{Binding IsMeasurementToolsEnabled}"
|
||||
Size="Medium"
|
||||
SmallImage="/Assets/Icons/ptol.png"
|
||||
Text="点线距测量" />
|
||||
@@ -247,6 +261,7 @@
|
||||
telerik:ScreenTip.Description="测量两条线之间的角度"
|
||||
telerik:ScreenTip.Title="角度测量"
|
||||
Command="{Binding AngleMeasureCommand}"
|
||||
IsEnabled="{Binding IsMeasurementToolsEnabled}"
|
||||
Size="Medium"
|
||||
SmallImage="/Assets/Icons/angle.png"
|
||||
Text="角度测量" />
|
||||
@@ -254,24 +269,19 @@
|
||||
telerik:ScreenTip.Description="测量通孔填锡率"
|
||||
telerik:ScreenTip.Title="通孔填锡率测量"
|
||||
Command="{Binding ThroughHoleFillRateMeasureCommand}"
|
||||
IsEnabled="{Binding IsMeasurementToolsEnabled}"
|
||||
Size="Medium"
|
||||
SmallImage="/Assets/Icons/cylinder.png"
|
||||
Text="通孔填锡率" />
|
||||
</StackPanel>
|
||||
|
||||
<!-- 第三列: BGA空隙测量 + 气泡测量 -->
|
||||
<!-- 第三列: 气泡测量 -->
|
||||
<StackPanel>
|
||||
<telerik:RadRibbonButton
|
||||
telerik:ScreenTip.Description="BGA焊球空隙率检测"
|
||||
telerik:ScreenTip.Title="BGA空隙测量"
|
||||
Command="{Binding BgaVoidMeasureCommand}"
|
||||
Size="Medium"
|
||||
SmallImage="/Assets/Icons/bga.png"
|
||||
Text="BGA空隙" />
|
||||
<telerik:RadRibbonButton
|
||||
telerik:ScreenTip.Description="手动气泡测量（魔棒+画笔）"
|
||||
telerik:ScreenTip.Title="气泡测量"
|
||||
Command="{Binding BubbleMeasureCommand}"
|
||||
IsEnabled="{Binding IsMeasurementToolsEnabled}"
|
||||
Size="Medium"
|
||||
SmallImage="/Assets/Icons/pores.png"
|
||||
Text="气泡测量" />
|
||||
@@ -369,7 +379,6 @@
|
||||
Command="{Binding InsertInspectionModuleCommand}"
|
||||
SmallImage="/Assets/Icons/Module.png"
|
||||
Text="检测模块" />
|
||||
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<telerik:RadRibbonButton
|
||||
@@ -386,8 +395,6 @@
|
||||
Text="插入等待" />
|
||||
</StackPanel>
|
||||
-->
|
||||
|
||||
|
||||
</telerik:RadRibbonGroup>
|
||||
|
||||
<telerik:RadRibbonGroup Header="高级模块">
|
||||
@@ -442,14 +449,13 @@
|
||||
<telerik:GroupVariant Priority="0" Variant="Large" />
|
||||
</telerik:RadRibbonGroup.Variants>
|
||||
<telerik:RadRibbonButton
|
||||
|
||||
|
||||
Size="Large"
|
||||
SmallImage="/Assets/Icons/setting.png"
|
||||
Command="{Binding OpenSettingsCommand}"
|
||||
Text="全局设置" />
|
||||
|
||||
</telerik:RadRibbonGroup>
|
||||
|
||||
|
||||
<telerik:RadRibbonGroup
|
||||
telerik:ScreenTip.Description="Show the Alignment tab of the Format Cells dialog box."
|
||||
telerik:ScreenTip.Title="Format Cells: Alignment"
|
||||
@@ -465,7 +471,7 @@
|
||||
<spreadsheetControls:RadVerticalAlignmentToBooleanConverter x:Key="verticalAlignmentToBooleanConverter" />
|
||||
</telerik:RadRibbonGroup.Resources>
|
||||
|
||||
<StackPanel/>
|
||||
<StackPanel />
|
||||
|
||||
<StackPanel>
|
||||
<telerik:RadRibbonToggleButton
|
||||
@@ -506,7 +512,46 @@
|
||||
Size="Medium"
|
||||
SmallImage="/Assets/Icons/tools.png"
|
||||
Text="PLC 地址" />
|
||||
<telerik:RadRibbonButton
|
||||
telerik:ScreenTip.Description="打开检测报告配置窗口"
|
||||
telerik:ScreenTip.Title="报告配置"
|
||||
Command="{Binding OpenReportConfigCommand}"
|
||||
Size="Medium"
|
||||
SmallImage="/Assets/Icons/message.png"
|
||||
Text="报告配置" />
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<telerik:RadRibbonButton
|
||||
telerik:ScreenTip.Description="导航相机镜头畸变校正"
|
||||
telerik:ScreenTip.Title="畸变校正"
|
||||
Command="{Binding OpenCameraChessboardCalibrationCommand}"
|
||||
Size="Medium"
|
||||
SmallImage="/Assets/Icons/detector2.png"
|
||||
Text="畸变校正" />
|
||||
<telerik:RadRibbonButton
|
||||
telerik:ScreenTip.Description="平面坐标系标定"
|
||||
telerik:ScreenTip.Title="坐标标定"
|
||||
Command="{Binding OpenCameraCalibrationCommand}"
|
||||
Size="Medium"
|
||||
SmallImage="/Assets/Icons/tools.png"
|
||||
Text="坐标标定" />
|
||||
</StackPanel>
|
||||
</telerik:RadRibbonGroup>
|
||||
|
||||
|
||||
|
||||
<telerik:RadRibbonGroup Header="多语言">
|
||||
<telerik:RadRibbonGroup.Variants>
|
||||
<telerik:GroupVariant Priority="0" Variant="Large" />
|
||||
</telerik:RadRibbonGroup.Variants>
|
||||
<telerik:RadRibbonButton
|
||||
telerik:ScreenTip.Description="切换应用程序显示语言"
|
||||
telerik:ScreenTip.Title="多语言设置"
|
||||
Size="Large"
|
||||
SmallImage="/Assets/Icons/tools.png"
|
||||
Command="{Binding OpenLanguageSwitcherCommand}"
|
||||
Text="语言设置" />
|
||||
|
||||
</telerik:RadRibbonGroup>
|
||||
|
||||
<telerik:RadRibbonGroup Header="日志">
|
||||
@@ -554,8 +599,6 @@
|
||||
Command="{Binding OpenLibraryVersionsCommand}"
|
||||
Text="关于" />
|
||||
</telerik:RadRibbonGroup>
|
||||
|
||||
|
||||
</telerik:RadRibbonTab>
|
||||
</telerik:RadRibbonView>
|
||||
|
||||
@@ -566,7 +609,7 @@
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="{Binding ViewportPanelWidth}" />
|
||||
<ColumnDefinition Width="{Binding ImagePanelWidth}" />
|
||||
<ColumnDefinition Width="350" />
|
||||
<ColumnDefinition Width="370" />
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Border
|
||||
@@ -585,16 +628,16 @@
|
||||
|
||||
<Grid Grid.Column="2">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="350*" />
|
||||
<ColumnDefinition Width="370" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<views1:RaySourceOperateView Grid.Row="0" Grid.ColumnSpan="2" />
|
||||
<mcViews:AxisControlView Grid.Row="1" Grid.ColumnSpan="2" />
|
||||
<views:NavigationPropertyPanelView Grid.Row="2" Grid.ColumnSpan="2" />
|
||||
<views1:RaySourceOperateView Grid.Row="0" Margin="0,0,5,0" />
|
||||
<mcViews:AxisControlView Grid.Row="1" Margin="0,0,5,0" />
|
||||
<views:NavigationPropertyPanelView Grid.Row="2" Margin="0,0,5,0" Grid.RowSpan="2" />
|
||||
</Grid>
|
||||
</Grid>
|
||||
|
||||
@@ -639,7 +682,7 @@
|
||||
FontFamily="Consolas"
|
||||
FontSize="11"
|
||||
Foreground="White"
|
||||
Text="x: 0 y: 0" />
|
||||
Text="{Binding CursorInfoText}" />
|
||||
</Grid>
|
||||
</Border>
|
||||
</Grid>
|
||||
|
||||
Reference in New Issue
Block a user