Ver Fonte

修复错误

徐孝锋 há 8 meses atrás
pai
commit
d9fdbf5c2b

+ 5 - 1
TeamAAS-VM/ViewModels/DebugMod/FocusAnalyzerViewModel.cs

@@ -518,7 +518,11 @@ namespace TeamAAS_VP.ViewModels.DebugMod
             {
                 return;
             }
-            Camera.StopGrabbing();
+            if (Camera.IsGrabbing)
+            {
+                Camera.StopGrabbing();
+            }
+            
             //_analysisTimer.Stop();
             IsAnalyzing = false;
             StatusText = "已停止";

+ 3 - 3
TeamAAS-VM/ViewModels/Product/PlcPointParamsViewModel.cs

@@ -352,9 +352,9 @@ namespace TeamAAS_VP.ViewModels.Product
         public DelegateCommand ApplyLockPointFeederAndScrewProgramCommand =>
             _ApplyLockPointFeederAndScrewProgramCommand ?? (_ApplyLockPointFeederAndScrewProgramCommand = new DelegateCommand(ExecuteApplyLockPointFeederAndScrewProgramCommand));
 
-        private DelegateCommand _AutoCorrectLockPoint;
-        public DelegateCommand AutoCorrectLockPoint =>
-            _AutoCorrectLockPoint ?? (_AutoCorrectLockPoint = new DelegateCommand(ExecuteAutoCorrectLockPoint));
+        private DelegateCommand _AutoCorrectLockPointCommand;
+        public DelegateCommand AutoCorrectLockPointCommand =>
+            _AutoCorrectLockPointCommand ?? (_AutoCorrectLockPointCommand = new DelegateCommand(ExecuteAutoCorrectLockPoint));
 
         #endregion
 

+ 1 - 1
TeamAAS-VM/Views/Product/PlcPointParams.xaml

@@ -550,7 +550,7 @@
                                                         MinWidth="150"
                                                         HorizontalAlignment="Left"
                                                         materialDesign:ButtonAssist.CornerRadius="5"
-                                                        Command="{Binding AutoCorrectLockCameraPointCommand}" />
+                                                        Command="{Binding AutoCorrectLockPointCommand}" />
 
                                             </Grid>
                                         </StackPanel>