update

TeamAAS-VM/ViewModels/Calibration/CalibrationTeachCenterPointViewModel.cs

@@ -314,14 +314,26 @@ namespace TeamAAS_VP.ViewModels.Calibration
                     IsShowTechHome = true;
                 }
 
-                if (SelectCalibration.CameraMount == Enums.CameraMount.MobileDown_XYPlatform || Robot.Brand == Enums.RobotBrand.XYZ_Platform || Robot.Brand == Enums.RobotBrand.XYZU_Platform)
+                if (SelectCalibration.CameraMount == Enums.CameraMount.FixedUp)
                 {
-                    IsShowTechP0ModeSelect = true;
+                    IsShowTechP0ModeSelect = false;
                 }
-                else
+                else if (SelectCalibration.CameraMount == Enums.CameraMount.FixedDown)
                 {
                     IsShowTechP0ModeSelect = false;
                 }
+                else if (SelectCalibration.CameraMount == Enums.CameraMount.MobileJ4)
+                {
+                    IsShowTechP0ModeSelect = true;
+                }
+                else if (SelectCalibration.CameraMount == Enums.CameraMount.MobileJ2)
+                {
+                    IsShowTechP0ModeSelect = true;
+                }
+                else if (SelectCalibration.CameraMount == Enums.CameraMount.MobileDown_XYPlatform)
+                {
+                    IsShowTechP0ModeSelect = true;
+                }
             }
             else
             {

TeamAAS-VM/Views/Calibration/CalibrationTeachCenterPoint.xaml

@@ -78,6 +78,9 @@
                     <RowDefinition Height="auto" />
                     <RowDefinition Height="auto" />
                     <RowDefinition Height="auto" />
+                    <RowDefinition Height="auto" />
+                    <RowDefinition Height="auto" />
+                    <RowDefinition Height="auto" />
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="auto"
@@ -110,14 +113,23 @@
                         <Image Source="pack://application:,,,/TeamAAS-VP;component/Resources/Images/FeederCenterPoint.png" />
                     </Button.ToolTip>
                 </Button>
+                <TextBlock Grid.Row="1"
+                           Grid.ColumnSpan="2">
+                    <TextBlock.Text>
+                        <MultiBinding StringFormat="{}X:{0:F3} Y:{1:F3}}">
+                            <Binding Path="SelectCalibration.CenterPoint.X" />
+                            <Binding Path="SelectCalibration.CenterPoint.Y" />
+                        </MultiBinding>
+                    </TextBlock.Text>
+                </TextBlock>
 
                 <TextBlock Text="{lex:Loc 示教避让点,Converter={StaticResource StringFormatConverter},ConverterParameter='{}{0}: '}"
                            FontWeight="Bold"
-                           Grid.Row="1"
+                           Grid.Row="2"
                            Grid.Column="0"
                            Visibility="{Binding IsShowTechHome,Converter={StaticResource BooleanToVisibilityConverter}}" />
                 <Button Content="{lex:Loc 示教}"
-                        Grid.Row="1"
+                        Grid.Row="2"
                         Grid.Column="1"
                         MinWidth="150"
                         Margin="10,10"
@@ -128,13 +140,23 @@
                         Style="{StaticResource MaterialDesignRaisedButton}"
                         Command="{Binding TechHomeCommand}">
                 </Button>
+                <TextBlock Grid.Row="3"
+                           Grid.ColumnSpan="2"
+                           Visibility="{Binding IsShowTechHome,Converter={StaticResource BooleanToVisibilityConverter}}">
+                    <TextBlock.Text>
+                        <MultiBinding StringFormat="{}X:{0:F3} Y:{1:F3}}">
+                            <Binding Path="SelectCalibration.HomePoint.X" />
+                            <Binding Path="SelectCalibration.HomePoint.Y" />
+                        </MultiBinding>
+                    </TextBlock.Text>
+                </TextBlock>
 
                 <TextBlock Text="{lex:Loc 选择模式,Converter={StaticResource StringFormatConverter},ConverterParameter='{}{0}: '}"
-                           Grid.Row="2"
+                           Grid.Row="4"
                            Grid.Column="0"
                            Visibility="{Binding IsShowTechP0ModeSelect,Converter={StaticResource BooleanToVisibilityConverter}}" />
                 <ComboBox x:Name="myComboBox"
-                          Grid.Row="2"
+                          Grid.Row="4"
                           Grid.Column="1"
                           Margin="5,10"
                           SelectedItem="{Binding SelectCalibration.CalibTechP0Mode}"
@@ -143,7 +165,7 @@
 
                 <TextBlock x:Name="txt1"
                            Text="{lex:Loc 示教P0,Converter={StaticResource StringFormatConverter},ConverterParameter='{}{0}: '}"
-                           Grid.Row="3"
+                           Grid.Row="5"
                            Grid.Column="0"
                            d:Visibility="Visible"
                            VerticalAlignment="Center">
@@ -168,7 +190,7 @@
                     </TextBlock.Style>
                 </TextBlock>
                 <Button Content="{lex:Loc 示教}"
-                        Grid.Row="3"
+                        Grid.Row="5"
                         Grid.Column="1"
                         MinWidth="150"
                         Margin="10,10"
@@ -180,10 +202,10 @@
                         Command="{Binding TechMarkPointCommand}">
                 </Button>
 
-                <TextBlock Grid.Row="5"
+                <TextBlock Grid.Row="6"
                            Grid.Column="0"
                            Text="{lex:Loc 宽,Converter={StaticResource StringFormatConverter},ConverterParameter='{}{0}: '}" />
-                <mah:NumericUpDown Grid.Row="5"
+                <mah:NumericUpDown Grid.Row="6"
                                    Grid.Column="1"
                                    Maximum="600"
                                    Minimum="0"
@@ -196,10 +218,10 @@
                                    Value="{Binding SelectCalibration.Width,Mode=TwoWay}" />
 
                 <TextBlock Text="{lex:Loc 高,Converter={StaticResource StringFormatConverter},ConverterParameter='{}{0}: '}"
-                           Grid.Row="6"
+                           Grid.Row="7"
                            Grid.Column="0" />
 
-                <mah:NumericUpDown Grid.Row="6"
+                <mah:NumericUpDown Grid.Row="7"
                                    Grid.Column="1"
                                    Maximum="600"
                                    Minimum="0"
@@ -210,7 +232,7 @@
                                    materialDesign:HintAssist.Hint="{lex:Loc 图像Y方向}"
                                    materialDesign:HintAssist.HelperText="{lex:Loc 图像Y方向}"
                                    Value="{Binding SelectCalibration.Height,Mode=TwoWay}" />
-                <StackPanel Grid.Row="7"
+                <StackPanel Grid.Row="8"
                             Grid.ColumnSpan="2"
                             Orientation="Horizontal"
                             HorizontalAlignment="Center">

TeamAAS-VM/Views/Calibration/FixedUpCameraFindP0.xaml

@@ -181,13 +181,11 @@
                             Command="{Binding FindP0Command}" />
 
 
-                    <TextBlock 
-                               Grid.Row="6"
+                    <TextBlock Grid.Row="6"
                                Grid.ColumnSpan="2">
                         <TextBlock.Text>
                             <MultiBinding StringFormat="{}P0点 X:{0:F3} Y:{1:F3}}">
-                                <Binding Path="SelectCalibration.MarkPoint.X"
-                                         />
+                                <Binding Path="SelectCalibration.MarkPoint.X" />
                                 <Binding Path="SelectCalibration.MarkPoint.Y" />
                             </MultiBinding>
                         </TextBlock.Text>