Переглянути джерело

拍照点位输入面板重构,优化布局与交互

重构拍照点位输入区域,采用Grid布局和mah:NumericUpDown控件,支持拍照1/2的X、Y、Z坐标精确输入,并将“通过CAD导入点位”按钮整合至同一行。微调锁付点批量设置面板的文本显示,整体提升界面美观性和操作体验。
孝锋 徐 8 місяців тому
батько
коміт
5f13058a7d
1 змінених файлів з 135 додано та 34 видалено
  1. 135 34
      TeamAAS-VM/Views/Product/PlcPointParams.xaml

+ 135 - 34
TeamAAS-VM/Views/Product/PlcPointParams.xaml

@@ -252,7 +252,8 @@
                                     materialDesign:ButtonAssist.CornerRadius="5"
                                     Command="{Binding ImportCadPointCommand}">
                                 <Button.Style>
-                                    <Style TargetType="Button" BasedOn="{StaticResource MaterialDesignRaisedDarkButton}">
+                                    <Style TargetType="Button"
+                                           BasedOn="{StaticResource MaterialDesignRaisedDarkButton}">
                                         <Setter Property="Visibility"
                                                 Value="Collapsed" />
                                         <Style.Triggers>
@@ -270,7 +271,7 @@
                         <Border BorderBrush="LightGray"
                                 BorderThickness="1"
                                 Height="1"
-                                DockPanel.Dock="Bottom" /> 
+                                DockPanel.Dock="Bottom" />
 
                         <DockPanel>
                             <!--不同点位类型的操作面板-->
@@ -400,47 +401,146 @@
                                                   VerticalScrollBarVisibility="Disabled">
                                         <StackPanel Orientation="Vertical">
                                             <TextBlock Text="拍1锁多时,相机拍照位置对应的产品坐标系中位置" />
-                                            <StackPanel Orientation="Horizontal"
-                                                        HorizontalAlignment="Left">
-
-                                                <TextBlock Text="拍照1:"
+                                            <Grid HorizontalAlignment="Left">
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                </Grid.ColumnDefinitions>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition Height="Auto" />
+                                                </Grid.RowDefinitions>
+                                                <!--拍照1-->
+                                                <TextBlock Grid.Row="0"
+                                                           Grid.Column="0"
+                                                           Text="拍照1:"
                                                            VerticalAlignment="Center" />
-                                                
-                                                <TextBlock Margin="5,0,0,0"
+
+                                                <TextBlock Grid.Row="0"
+                                                           Grid.Column="1"
+                                                           Margin="5,0,0,0"
                                                            VerticalAlignment="Center"
                                                            Text="X:" />
-                                                <TextBox MinWidth="60"
-                                                         Text="{Binding SelectProduct.ScrewCameraLocalPos1.X_Position, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-                                                <TextBlock Margin="5,0,0,0"
+                                                <mah:NumericUpDown Grid.Row="0"
+                                                                   Grid.Column="2"
+                                                                   Value="{Binding SelectProduct.ScrewCameraLocalPos1.X_Position, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                                   Minimum="-9999.000"
+                                                                   Maximum="9999.000"
+                                                                   Interval="0.1"
+                                                                   StringFormat="F3"
+                                                                   MinWidth="60"
+                                                                   HorizontalAlignment="Stretch"
+                                                                   VerticalAlignment="Center"
+                                                                   Margin="0"
+                                                                   Padding="2" />
+                                                <TextBlock Grid.Row="0"
+                                                           Grid.Column="3"
+                                                           Margin="5,0,0,0"
                                                            VerticalAlignment="Center"
                                                            Text="Y:" />
-                                                <TextBox MinWidth="60"
-                                                         Text="{Binding SelectProduct.ScrewCameraLocalPos1.Y_Position, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-                                            </StackPanel>
-                                            <StackPanel Orientation="Horizontal"
-                                                        HorizontalAlignment="Left">
-
-                                                <TextBlock Text="拍照2:"
+                                                <mah:NumericUpDown Grid.Row="0"
+                                                                   Grid.Column="4"
+                                                                   Value="{Binding SelectProduct.ScrewCameraLocalPos1.Y_Position, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                                   Minimum="-9999.000"
+                                                                   Maximum="9999.000"
+                                                                   Interval="0.1"
+                                                                   StringFormat="F3"
+                                                                   MinWidth="60"
+                                                                   HorizontalAlignment="Stretch"
+                                                                   VerticalAlignment="Center"
+                                                                   Margin="0"
+                                                                   Padding="2" />
+                                                <TextBlock Grid.Row="0"
+                                                           Grid.Column="5"
+                                                           Margin="5,0,0,0"
+                                                           VerticalAlignment="Center"
+                                                           Text="Z:" />
+                                                <mah:NumericUpDown Grid.Row="0"
+                                                                   Grid.Column="6"
+                                                                   Value="{Binding SelectProduct.ScrewCameraLocalPos1.Z_Position_Start, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                                   Minimum="-9999.000"
+                                                                   Maximum="9999.000"
+                                                                   Interval="0.1"
+                                                                   StringFormat="F3"
+                                                                   MinWidth="60"
+                                                                   HorizontalAlignment="Stretch"
+                                                                   VerticalAlignment="Center"
+                                                                   Margin="0"
+                                                                   Padding="2" />
+                                                <!--拍照2-->
+                                                <TextBlock Grid.Row="1"
+                                                           Grid.Column="0"
+                                                           Text="拍照2:"
                                                            VerticalAlignment="Center" />
 
-                                                <TextBlock Margin="5,0,0,0"
+                                                <TextBlock Grid.Row="1"
+                                                           Grid.Column="1"
+                                                           Margin="5,0,0,0"
                                                            VerticalAlignment="Center"
                                                            Text="X:" />
-                                                <TextBox MinWidth="60"
-                                                         Text="{Binding SelectProduct.ScrewCameraLocalPos2.X_Position, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-                                                <TextBlock Margin="5,0,0,0"
+                                                <mah:NumericUpDown Grid.Row="1"
+                                                                   Grid.Column="2"
+                                                                   Value="{Binding SelectProduct.ScrewCameraLocalPos2.X_Position, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                                   Minimum="-9999.000"
+                                                                   Maximum="9999.000"
+                                                                   Interval="0.1"
+                                                                   StringFormat="F3"
+                                                                   MinWidth="60"
+                                                                   HorizontalAlignment="Stretch"
+                                                                   VerticalAlignment="Center"
+                                                                   Margin="0"
+                                                                   Padding="2" />
+                                                <TextBlock Grid.Row="1"
+                                                           Grid.Column="3"
+                                                           Margin="5,0,0,0"
                                                            VerticalAlignment="Center"
                                                            Text="Y:" />
-                                                <TextBox MinWidth="60"
-                                                         Text="{Binding SelectProduct.ScrewCameraLocalPos2.Y_Position, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-                                            </StackPanel>
-                                            <!--通过CAD导入点位按钮-->
-                                            <Button Content="通过CAD导入点位"
-                                                    Margin="0,5,0,0"
-                                                    MinWidth="100"
-                                                    HorizontalAlignment="Left"
-                                                    materialDesign:ButtonAssist.CornerRadius="5"
-                                                    Command="{Binding ImportCadLockCameraPointCommand}" />
+                                                <mah:NumericUpDown Grid.Row="1"
+                                                                   Grid.Column="4"
+                                                                   Value="{Binding SelectProduct.ScrewCameraLocalPos2.Y_Position, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                                   Minimum="-9999.000"
+                                                                   Maximum="9999.000"
+                                                                   Interval="0.1"
+                                                                   StringFormat="F3"
+                                                                   MinWidth="60"
+                                                                   HorizontalAlignment="Stretch"
+                                                                   VerticalAlignment="Center"
+                                                                   Margin="0"
+                                                                   Padding="2" />
+                                                <TextBlock Grid.Row="1"
+                                                           Grid.Column="5"
+                                                           Margin="5,0,0,0"
+                                                           VerticalAlignment="Center"
+                                                           Text="Z:" />
+                                                <mah:NumericUpDown Grid.Row="1"
+                                                                   Grid.Column="6"
+                                                                   Value="{Binding SelectProduct.ScrewCameraLocalPos2.Z_Position_Start, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                                   Minimum="-9999.000"
+                                                                   Maximum="9999.000"
+                                                                   Interval="0.1"
+                                                                   StringFormat="F3"
+                                                                   MinWidth="60"
+                                                                   HorizontalAlignment="Stretch"
+                                                                   VerticalAlignment="Center"
+                                                                   Margin="0"
+                                                                   Padding="2" />
+                                                <!--通过CAD导入点位按钮-->
+                                                <Button Content="通过CAD导入点位"
+                                                        Grid.Row="0"
+                                                        Grid.Column="7"
+                                                        Grid.RowSpan="2"
+                                                        Margin="10,0"
+                                                        MinWidth="100"
+                                                        HorizontalAlignment="Left"
+                                                        materialDesign:ButtonAssist.CornerRadius="5"
+                                                        Command="{Binding ImportCadLockCameraPointCommand}" />
+                                            </Grid>
                                         </StackPanel>
                                     </ScrollViewer>
                                 </StackPanel>
@@ -466,10 +566,11 @@
                                     <ScrollViewer HorizontalScrollBarVisibility="Auto"
                                                   VerticalScrollBarVisibility="Disabled">
                                         <StackPanel Orientation="Vertical">
-                                            
+
                                             <StackPanel Orientation="Horizontal"
                                                         HorizontalAlignment="Left">
-                                                <TextBlock Text="批量设置所有锁付点的起始Z轴高度:" VerticalAlignment="Center"/>
+                                                <TextBlock Text="批量设置所有锁付点的起始Z轴高度:"
+                                                           VerticalAlignment="Center" />
                                                 <TextBlock Text="起始Z轴高度:"
                                                            Margin="5,0,0,0"
                                                            VerticalAlignment="Center" />