视觉动态精度分析仪重构与功能增强

重构视觉动态精度分析仪，采用新数据结构（ObservableCollection<DynamicTestResult>），引入精度分析自动计算与展示。完善单次/连续测试流程，支持PDF/CSV导出，界面与交互体验大幅优化，提升健壮性和可维护性。为后续趋势图等扩展奠定基础。

TeamAAS-VM/ViewModels/Product/PlcPointParamsViewModel.cs

@@ -443,6 +443,11 @@ namespace TeamAAS_VP.ViewModels.Product
         private DelegateCommand _StopGrabbingCommand;
         public DelegateCommand StopGrabbingCommand =>
             _StopGrabbingCommand ?? (_StopGrabbingCommand = new DelegateCommand(ExecuteStopGrabbingCommand, CanExecuteStopGrabbingCommand).ObservesProperty(() => IsGrap).ObservesProperty(() => SelectedCamera));
+
+        private DelegateCommand _DynamicTestAnalyzerCommand;
+        public DelegateCommand DynamicTestAnalyzerCommand =>
+            _DynamicTestAnalyzerCommand ?? (_DynamicTestAnalyzerCommand = new DelegateCommand(ExecuteDynamicTestAnalyzerCommand));
+
         
         #endregion
 
@@ -1503,6 +1508,38 @@ namespace TeamAAS_VP.ViewModels.Product
             }
         }
 
+        /// <summary>
+        /// 动态测试分析仪
+        /// </summary>
+        void ExecuteDynamicTestAnalyzerCommand()
+        {
+            try
+            {
+                IDialogParameters parameters = new DialogParameters();
+                parameters.Add("SelectProduct", SelectProduct);
+                parameters.Add("Robot", Robot);
+                _dialogService.Show("VisionDynamicAccuracyAnalyzer", parameters, rst =>
+                {
+                    //对话框关闭之后的回调函数，可以在这解析结果。
+                    ButtonResult result1 = rst.Result;
+
+                    if (result1 == ButtonResult.OK)
+                    {
+                        //var param = rst.Parameters.GetValue<RobotTool>("Tool");
+                        //var param1 = rst.Parameters.GetValue<Matrix<double>>("RobotCameraRotationMatrix");
+                        //var param2 = rst.Parameters.GetValue<double>("Angle");
+                        _eventAggregator.GetEvent<SnackbarMessageNotification>().Publish(new MessageParameter() { Msg = Lang.完成, Duration = 1 });
+                    }
+
+                });
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogError("执行动态测试分析仪命令时出错", ex);
+                MessageBox.Show(ex.Message);
+            }
+        }
+
         /// <summary>
         /// 停止采集
         /// </summary>

TeamAAS-VM/ViewModels/Product/VisionStaticAccuracyAnalyzerViewModel.cs

@@ -272,7 +272,7 @@ namespace TeamAAS_VP.ViewModels.Product
         /// </summary>
         void ExecuteConfirmCommand()
         {
-
+            _cts?.Cancel();
 
             IDialogParameters parameters = new DialogParameters();
             //parameters.Add("Tool", Tool);
@@ -286,6 +286,7 @@ namespace TeamAAS_VP.ViewModels.Product
         /// </summary>
         void ExecuteCancelCommand()
         {
+            _cts?.Cancel();
             IDialogParameters parameters = new DialogParameters();
             //parameters.Add("Tool", Tool);
             RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel, parameters));
@@ -828,29 +829,29 @@ namespace TeamAAS_VP.ViewModels.Product
                 try
                 {
                     // 1. 采集图像
-                    //bool succed = Camera.SetExposureTime(SelectProcedure.ExposureTime);
-                    //if (!succed)
-                    //{
-                    //    SendTaskMessage(Lang.相机曝光设置失败);
-                    //}
-                    //succed = Camera.SetGain(SelectProcedure.Gain);
-                    //if (!succed)
-                    //{
-                    //    SendTaskMessage(Lang.相机增益设置失败);
-                    //}
-                    //DateTime nowtime = DateTime.Now;
-                    //LogHelper.WriteLogInfo(Lang.开始采集图像);
-                    //var image = Camera.Grab();
-                    //if (image == null)
-                    //{
+                    bool succed = Camera.SetExposureTime(SelectProcedure.ExposureTime);
+                    if (!succed)
+                    {
+                        SendTaskMessage(Lang.相机曝光设置失败);
+                    }
+                    succed = Camera.SetGain(SelectProcedure.Gain);
+                    if (!succed)
+                    {
+                        SendTaskMessage(Lang.相机增益设置失败);
+                    }
+                    DateTime nowtime = DateTime.Now;
+                    LogHelper.WriteLogInfo(Lang.开始采集图像);
+                    var image = Camera.Grab();
+                    if (image == null)
+                    {
 
-                    //    SendTaskMessage(Lang.图像采集失败);
-                    //    outputCollection = null;
-                    //    return (false, result.ToArray());
-                    //}
+                        SendTaskMessage(Lang.图像采集失败);
+                        outputCollection = null;
+                        return (false, result.ToArray());
+                    }
                     //Image = image;
-                    //VisionTool.Inputs["InputImage"].Value = image;
-                    //LogHelper.WriteLogInfo(string.Format(Lang.采集图像完成用时0ms, (DateTime.Now - nowtime).Milliseconds));
+                    VisionTool.Inputs["InputImage"].Value = image;
+                    LogHelper.WriteLogInfo(string.Format(Lang.采集图像完成用时0ms, (DateTime.Now - nowtime).Milliseconds));
 
                     // 2. 为ToolBlock传入其他输入终端
                     //if (InputTerminal != null)
@@ -1110,7 +1111,8 @@ namespace TeamAAS_VP.ViewModels.Product
 
         public void OnDialogClosed()
         {
-
+            //关闭时,停止测试
+            _cts?.Cancel();
         }
 
         public void OnDialogOpened(IDialogParameters parameters)

TeamAAS-VM/Views/Product/PlcPointParams.xaml

@@ -80,6 +80,13 @@
             <TextBlock Text="{lex:Loc 机器人点位,Converter={StaticResource StringFormatConverter},ConverterParameter=' - {0}'}"
                        VerticalAlignment="Center" />
         </StackPanel>
+        <Button Grid.Row="0"
+                Margin="5,3"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Content="动态精度分析"
+                MinWidth="100"
+                Command="{Binding DynamicTestAnalyzerCommand}" />
         <Border BorderThickness="1,1,1,1"
                 VerticalAlignment="Bottom"
                 Height="1">
@@ -100,7 +107,7 @@
                                    OpenMode="Standard"
                                    x:Name="DrawerHost"
                                    IsLeftDrawerOpen="{Binding IsLeftDrawerOpen,Mode=TwoWay}"
-                                   d:IsLeftDrawerOpen="true"
+                                   d:IsLeftDrawerOpen="false"
                                    IsEnabled="{Binding IsAllowEdit}">
             <materialDesign:DrawerHost.LeftDrawerContent>
                 <Grid Width="600">

TeamAAS-VM/Views/Product/VisionDynamicAccuracyAnalyzer.xaml

@@ -19,10 +19,10 @@
              prism:ViewModelLocator.AutoWireViewModel="True"
              mc:Ignorable="d"
              d:DataContext="{d:DesignInstance Type=vm:VisionDynamicAccuracyAnalyzerViewModel}"
-             d:Height="700"
-             d:Width="1100"
-             MinHeight="750"
-             MinWidth="1000"
+             d:Height="1080"
+             d:Width="1920"
+             MinHeight="768"
+             MinWidth="1024"
              d:Background="White"
              HorizontalAlignment="Stretch"
              VerticalAlignment="Stretch"
@@ -104,8 +104,8 @@
 
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="2.5*" />
-            <ColumnDefinition Width="3.5*" />
+            <ColumnDefinition Width="45*" />
+            <ColumnDefinition Width="55*" />
         </Grid.ColumnDefinitions>
 
         <!-- 左侧控制面板 -->
@@ -117,7 +117,9 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*"
+                                   MinHeight="100" />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
@@ -150,7 +152,7 @@
                                            VerticalAlignment="Center" />
                                 <TextBox Grid.Column="1"
                                          Text="{Binding PointA, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                         d:Text="X:0.000 Y:0.000 Z:0.000 RX:0.000 RY:0.000 RZ:0.000"
+                                         d:Text="X:0.000 Y:0.000 Z:0.000 U:0.000 V:0.000 W:0.000"
                                          ToolTip="机器人A点位置坐标"
                                          IsReadOnly="True"
                                          Background="#F8F9FA" />
@@ -177,7 +179,7 @@
                                            VerticalAlignment="Center" />
                                 <TextBox Grid.Column="1"
                                          Text="{Binding PointB, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                         d:Text="X:100.000 Y:50.000 Z:0.000 RX:0.000 RY:0.000 RZ:0.000"
+                                         d:Text="X:100.000 Y:50.000 Z:0.000 U:0.000 V:0.000 W:0.000"
                                          ToolTip="机器人B点拍照位置坐标"
                                          IsReadOnly="True"
                                          Background="#F8F9FA" />
@@ -209,6 +211,11 @@
                                             <TextBlock Text="{Binding Name}" />
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
+                                    <b:Interaction.Triggers>
+                                        <b:EventTrigger EventName="SelectionChanged">
+                                            <b:InvokeCommandAction Command="{Binding ProcedureSelectionChangedCommand}" />
+                                        </b:EventTrigger>
+                                    </b:Interaction.Triggers>
                                 </ComboBox>
                             </Grid>
                         </Grid>
@@ -257,7 +264,7 @@
                             </StackPanel>
                         </Grid>
 
-                        
+
                     </StackPanel>
                 </Border>
 
@@ -348,7 +355,7 @@
                                     <TextBlock Text="当前循环"
                                                Foreground="White"
                                                FontSize="11" />
-                                    <TextBlock Text="{Binding CurrentCycle}"
+                                    <TextBlock Text="{Binding CurrentProgress}"
                                                d:Text="1"
                                                Foreground="White"
                                                FontSize="16"
@@ -425,38 +432,31 @@
                             <DataGrid.Columns>
                                 <DataGridTextColumn Header="序号"
                                                     Binding="{Binding Index}"
-                                                    Width="50" />
+                                                    MinWidth="50" />
                                 <DataGridTextColumn Header="状态"
-                                                    Binding="{Binding Status}"
-                                                    Width="60">
-                                    <DataGridTextColumn.CellStyle>
-                                        <Style TargetType="DataGridCell">
-                                            <Setter Property="Foreground"
-                                                    Value="{Binding StatusColor}" />
-                                        </Style>
-                                    </DataGridTextColumn.CellStyle>
-                                </DataGridTextColumn>
-                                <DataGridTextColumn Header="X坐标"
-                                                    Binding="{Binding X, StringFormat={}{0:F3}}"
-                                                    Width="70" />
-                                <DataGridTextColumn Header="Y坐标"
-                                                    Binding="{Binding Y, StringFormat={}{0:F3}}"
-                                                    Width="70" />
+                                                    Binding="{Binding IsPhotoSuccess}"
+                                                    MinWidth="60" />
+                                <DataGridTextColumn Header="像素X"
+                                                    Binding="{Binding PixelX, StringFormat={}{0:F3}}"
+                                                    MinWidth="70" />
+                                <DataGridTextColumn Header="像素Y"
+                                                    Binding="{Binding PixelY, StringFormat={}{0:F3}}"
+                                                    MinWidth="70" />
                                 <DataGridTextColumn Header="角度"
-                                                    Binding="{Binding Angle, StringFormat={}{0:F2}}"
-                                                    Width="60" />
-                                <DataGridTextColumn Header="偏差X"
-                                                    Binding="{Binding DeviationX, StringFormat={}{0:F3}}"
-                                                    Width="70" />
-                                <DataGridTextColumn Header="偏差Y"
-                                                    Binding="{Binding DeviationY, StringFormat={}{0:F3}}"
-                                                    Width="70" />
+                                                    Binding="{Binding AngleU, StringFormat={}{0:F2}}"
+                                                    MinWidth="60" />
+                                <DataGridTextColumn Header="绝对X"
+                                                    Binding="{Binding TransformX, StringFormat={}{0:F3}}"
+                                                    MinWidth="70" />
+                                <DataGridTextColumn Header="绝对Y"
+                                                    Binding="{Binding TransformY, StringFormat={}{0:F3}}"
+                                                    MinWidth="70" />
                                 <DataGridTextColumn Header="循环时间"
                                                     Binding="{Binding CycleTime, StringFormat={}{0:F2}s}"
-                                                    Width="80" />
+                                                    MinWidth="80" />
                                 <DataGridTextColumn Header="时间戳"
                                                     Binding="{Binding Timestamp}"
-                                                    Width="120" />
+                                                    MinWidth="120" />
                             </DataGrid.Columns>
                         </DataGrid>
                     </Grid>
@@ -507,21 +507,21 @@
                                     <StackPanel Grid.Column="0">
                                         <TextBlock>
                                             <Run Text="X方向精度: " />
-                                            <Run Text="{Binding XPrecision, StringFormat={}{0:F3}mm}"
+                                            <Run Text="{Binding PrecisionResult.XPrecision, StringFormat={}{0:F3}mm}"
                                                  d:Text="0.023mm"
                                                  Foreground="#2C3E50"
                                                  FontWeight="Bold" />
                                         </TextBlock>
                                         <TextBlock>
                                             <Run Text="Y方向精度: " />
-                                            <Run Text="{Binding YPrecision, StringFormat={}{0:F3}mm}"
+                                            <Run Text="{Binding PrecisionResult.YPrecision, StringFormat={}{0:F3}mm}"
                                                  d:Text="0.018mm"
                                                  Foreground="#2C3E50"
                                                  FontWeight="Bold" />
                                         </TextBlock>
                                         <TextBlock>
                                             <Run Text="角度精度: " />
-                                            <Run Text="{Binding AnglePrecision, StringFormat={}{0:F2}°}"
+                                            <Run Text="{Binding PrecisionResult.AnglePrecision, StringFormat={}{0:F2}°}"
                                                  d:Text="0.12°"
                                                  Foreground="#2C3E50"
                                                  FontWeight="Bold" />
@@ -531,14 +531,14 @@
                                     <StackPanel Grid.Column="1">
                                         <TextBlock>
                                             <Run Text="3σ范围: " />
-                                            <Run Text="{Binding ThreeSigmaRange, StringFormat={}±{0:F3}mm}"
+                                            <Run Text="{Binding PrecisionResult.OverallThreeSigmaRange, StringFormat={}±{0:F3}mm}"
                                                  d:Text="±0.065mm"
                                                  Foreground="#2C3E50"
                                                  FontWeight="Bold" />
                                         </TextBlock>
                                         <TextBlock>
                                             <Run Text="CPK: " />
-                                            <Run Text="{Binding ProcessCpk, StringFormat={}{0:F2}}"
+                                            <Run Text="{Binding PrecisionResult.OverallPrecision, StringFormat={}{0:F2}}"
                                                  d:Text="1.85"
                                                  Foreground="#2C3E50"
                                                  FontWeight="Bold" />
@@ -591,7 +591,7 @@
                     </wf:WindowsFormsHost>
 
                     <!-- 图像信息栏 -->
-                    <Border Grid.Row="1"
+                    <!--<Border Grid.Row="1"
                             Background="#34495E"
                             Padding="10">
                         <Grid>
@@ -621,12 +621,12 @@
                                            Width="60" />
                             </StackPanel>
                         </Grid>
-                    </Border>
+                    </Border>-->
                 </Grid>
             </Border>
 
             <!-- 轨迹可视化区域 -->
-            <Border Grid.Row="1"
+            <!--<Border Grid.Row="1"
                     Background="#ECF0F1"
                     Padding="10"
                     BorderBrush="#BDC3C7"
@@ -642,12 +642,16 @@
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
 
-                        <!-- 简化轨迹图 -->
+                        -->
+            <!-- 简化轨迹图 -->
+            <!--
                         <Canvas x:Name="trajectoryCanvas"
                                 Height="100"
                                 Background="White"
                                 Margin="0 5 0 0">
-                            <!-- A点标记 -->
+                            -->
+            <!-- A点标记 -->
+            <!--
                             <Ellipse Canvas.Left="50"
                                      Canvas.Top="50"
                                      Width="12"
@@ -671,7 +675,9 @@
                                        FontWeight="Bold"
                                        Foreground="#2C3E50" />
 
-                            <!-- B点标记 -->
+                            -->
+            <!-- B点标记 -->
+            <!--
                             <Ellipse Canvas.Left="200"
                                      Canvas.Top="50"
                                      Width="12"
@@ -695,7 +701,9 @@
                                        FontWeight="Bold"
                                        Foreground="#2C3E50" />
 
-                            <!-- 移动轨迹线 -->
+                            -->
+            <!-- 移动轨迹线 -->
+            <!--
                             <Line x:Name="trajectoryLine"
                                   X1="56"
                                   Y1="56"
@@ -705,7 +713,9 @@
                                   StrokeThickness="2"
                                   StrokeDashArray="5,3" />
 
-                            <!-- 当前位置标记 -->
+                            -->
+            <!-- 当前位置标记 -->
+            <!--
                             <Ellipse x:Name="currentPositionMarker"
                                      Canvas.Left="125"
                                      Canvas.Top="50"
@@ -727,7 +737,9 @@
                             </Ellipse>
                         </Canvas>
 
-                        <!-- 轨迹控制 -->
+                        -->
+            <!-- 轨迹控制 -->
+            <!--
                         <StackPanel Grid.Column="1"
                                     Orientation="Vertical"
                                     Margin="10 0 0 0">
@@ -744,7 +756,7 @@
                         </StackPanel>
                     </Grid>
                 </StackPanel>
-            </Border>
+            </Border>-->
 
             <!-- 底部按钮 -->
             <StackPanel Grid.Row="2"