diff --git a/src/UI/WPF/ViewModels/PathEditingViewModel.cs b/src/UI/WPF/ViewModels/PathEditingViewModel.cs index 0d8436d..b4c293f 100644 --- a/src/UI/WPF/ViewModels/PathEditingViewModel.cs +++ b/src/UI/WPF/ViewModels/PathEditingViewModel.cs @@ -1410,7 +1410,7 @@ namespace NavisworksTransport.UI.WPF.ViewModels public ICommand SelectAssemblyInstallationPointForEditCommand { get; private set; } public ICommand ClearAssemblyReferenceRodCommand { get; private set; } public ICommand CancelRailAssemblyWorkflowCommand { get; private set; } - public ICommand QuickAnalyzeAssemblyEndFaceCommand { get; private set; } + public ICommand AnalyzeAssemblyEndFaceCommand { get; private set; } public ICommand DecreaseSelectedRailNormalOffsetCommand { get; private set; } public ICommand IncreaseSelectedRailNormalOffsetCommand { get; private set; } @@ -1477,7 +1477,7 @@ namespace NavisworksTransport.UI.WPF.ViewModels !_isSelectingAssemblyStartPoint && !_isSelectingAssemblyEndFacePoints && !_isSelectingAssemblyInstallationPoint; - public bool CanQuickAnalyzeAssemblyEndFace => HasAssemblyTerminalObject && + public bool CanAnalyzeAssemblyEndFace => HasAssemblyTerminalObject && _pathPlanningManager != null && !IsSelectingAssemblyStartPoint && !IsSelectingAssemblyEndFacePoints && @@ -1683,7 +1683,7 @@ namespace NavisworksTransport.UI.WPF.ViewModels private void NotifyRailAssemblyCommandStateChanged() { - OnPropertyChanged(nameof(CanQuickAnalyzeAssemblyEndFace)); + OnPropertyChanged(nameof(CanAnalyzeAssemblyEndFace)); OnPropertyChanged(nameof(CanSelectAssemblyStartPointForCreate)); OnPropertyChanged(nameof(CanRepositionRailStartPoint)); OnPropertyChanged(nameof(CanSelectAssemblyInstallationPointForCreate)); @@ -2063,7 +2063,7 @@ namespace NavisworksTransport.UI.WPF.ViewModels SelectAssemblyInstallationPointForEditCommand = new RelayCommand(async () => await ExecuteSelectAssemblyInstallationPointAsync(RailAssemblyWorkflowMode.EditSelectedRail), () => CanSelectAssemblyInstallationPointForEdit); ClearAssemblyReferenceRodCommand = new RelayCommand(() => ExecuteClearAssemblyReferenceRod()); CancelRailAssemblyWorkflowCommand = new RelayCommand(() => ExecuteCancelRailAssemblyWorkflow(), () => CanCancelRailAssemblyWorkflow); - QuickAnalyzeAssemblyEndFaceCommand = new RelayCommand(() => BeginAssemblyEndFaceQuickPick(), () => CanQuickAnalyzeAssemblyEndFace); + AnalyzeAssemblyEndFaceCommand = new RelayCommand(() => BeginAssemblyEndFacePick(), () => CanAnalyzeAssemblyEndFace); DecreaseSelectedRailNormalOffsetCommand = new RelayCommand(() => AdjustSelectedRailNormalOffset(-RailNormalOffsetNudgeStepInMeters)); IncreaseSelectedRailNormalOffsetCommand = new RelayCommand(() => AdjustSelectedRailNormalOffset(RailNormalOffsetNudgeStepInMeters)); ApplyHoistingLayerHeightsCommand = new RelayCommand(async () => await ExecuteApplyHoistingLayerHeightsAsync(), () => CanApplyHoistingLayerHeights); @@ -2404,7 +2404,7 @@ namespace NavisworksTransport.UI.WPF.ViewModels LogManager.Info(logMessage); } - private void BeginAssemblyEndFaceQuickPick() + private void BeginAssemblyEndFacePick() { CleanupAssemblyReferenceSelection(); CleanupAssemblyEndFaceSelection(clearVisuals: false); @@ -2436,15 +2436,15 @@ namespace NavisworksTransport.UI.WPF.ViewModels throw new InvalidOperationException("取面工具激活失败,请重试。"); } - FaceInferToolPlugin.FaceInferred += OnQuickEndFaceInferred; + FaceInferToolPlugin.FaceInferred += OnEndFaceInferred; UpdateMainStatus("请在终点箱体端面上点击一下,系统将自动分析端面中心。"); LogManager.Info("[直线装配] 已进入快速取端面模式"); } - private void OnQuickEndFaceInferred(object sender, FaceInferResult result) + private void OnEndFaceInferred(object sender, FaceInferResult result) { - FaceInferToolPlugin.FaceInferred -= OnQuickEndFaceInferred; + FaceInferToolPlugin.FaceInferred -= OnEndFaceInferred; // 恢复选择工具 try { NavisApplication.MainDocument.Tool.Value = Tool.Select; } catch { } diff --git a/src/UI/WPF/Views/PathEditingView.xaml b/src/UI/WPF/Views/PathEditingView.xaml index 828eba2..4950a9b 100644 --- a/src/UI/WPF/Views/PathEditingView.xaml +++ b/src/UI/WPF/Views/PathEditingView.xaml @@ -535,9 +535,9 @@ NavisworksTransport 路径编辑页签视图 - 采用与动画控制和分层管 Command="{Binding CaptureAssemblyTerminalObjectForCreateCommand}" Style="{StaticResource SecondaryButtonStyle}"/>