From 09ac6db6abfc49ffb3f2f7350f4bffa991b256b3 Mon Sep 17 00:00:00 2001
From: "zhengxuan.zhang" <zhengxuan.zhang@hexagon.com>
Date: Sat, 16 May 2026 14:00:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4MainViewModel=20=E9=87=8C?=
 =?UTF-8?q?=E7=9A=84=E5=85=BC=E5=AE=B9=E5=8D=A0=E4=BD=8D=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 XplorePlane/ViewModels/Main/MainViewModel.cs  |  6 +++++
 XplorePlane/Views/Main/MainWindow.xaml        | 17 ++++++--------
 .../Main/NavigationPropertyPanelView.xaml.cs  | 22 ++++++++++++++-----
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/XplorePlane/ViewModels/Main/MainViewModel.cs b/XplorePlane/ViewModels/Main/MainViewModel.cs
index 7ae90db..25d7817 100644
--- a/XplorePlane/ViewModels/Main/MainViewModel.cs
+++ b/XplorePlane/ViewModels/Main/MainViewModel.cs
@@ -173,6 +173,12 @@ namespace XplorePlane.ViewModels
 
         public bool IsUsingLiveDetectorSource => _mainViewportService.CurrentSourceMode == MainViewportSourceMode.LiveDetector;
 
+        // Temporary compatibility properties to avoid startup binding errors before
+        // NavigationPropertyPanelView replaces the inherited DataContext with its own ViewModel.
+        public BitmapSource CameraImageSource => null;
+        public string CameraStatusText => string.Empty;
+        public string CameraPixelCoord => string.Empty;
+
         public string DataRootPath
         {
             get => _dataRootPath;
diff --git a/XplorePlane/Views/Main/MainWindow.xaml b/XplorePlane/Views/Main/MainWindow.xaml
index 6ff2a08..d0ac05b 100644
--- a/XplorePlane/Views/Main/MainWindow.xaml
+++ b/XplorePlane/Views/Main/MainWindow.xaml
@@ -66,7 +66,7 @@
                 <telerik:RadRibbonGroup
                     telerik:ScreenTip.Title="Clipboard"
                     Header="文件"
-                    IsEnabled="{Binding Path=ClipboardGroup.IsEnabled}">
+                    >
                     <telerik:RadRibbonGroup.Variants>
                         <telerik:GroupVariant Priority="0" Variant="Large" />
                     </telerik:RadRibbonGroup.Variants>
@@ -390,7 +390,7 @@
               
                 </telerik:RadRibbonGroup>
 
-                <telerik:RadRibbonGroup Header="高级模块" IsEnabled="{Binding Path=CellsGroup.IsEnabled}">
+                <telerik:RadRibbonGroup Header="高级模块">
                     <telerik:RadRibbonGroup.Variants>
                         <telerik:GroupVariant Priority="0" Variant="Large" />
                     </telerik:RadRibbonGroup.Variants>
@@ -415,24 +415,22 @@
             </telerik:RadRibbonTab>
 
             <telerik:RadRibbonTab Header="3D扫描">
-                <telerik:RadRibbonGroup Header="扫描模式" IsEnabled="{Binding Path=LinksGroup.IsEnabled}">
+                <telerik:RadRibbonGroup Header="扫描模式">
                     <telerik:RadRibbonGroup.Variants>
                         <telerik:GroupVariant Priority="0" Variant="Large" />
                     </telerik:RadRibbonGroup.Variants>
                     <telerik:RadRibbonButton
         telerik:ScreenTip.Description="Create a link in your document for quick access to webpages and files.&#13;&#13;Hyperlinks can also take you to places in your document."
         telerik:ScreenTip.Title="Add a Hyperlink"
-        Command="{Binding Path=ShowHyperlinkDialog.Command}"
         Content="快速扫描"
-        IsEnabled="{Binding Path=ShowHyperlinkDialog.IsEnabled}"
+        IsEnabled="False"
         Size="Large"
         SmallImage="/Assets/Icons/quick-scan.png" />
                     <telerik:RadRibbonButton
         telerik:ScreenTip.Description="Create a link in your document for quick access to webpages and files.&#13;&#13;Hyperlinks can also take you to places in your document."
         telerik:ScreenTip.Title="Add a Hyperlink"
-        Command="{Binding Path=ShowHyperlinkDialog.Command}"
         Content="螺旋扫描"
-        IsEnabled="{Binding Path=ShowHyperlinkDialog.IsEnabled}"
+        IsEnabled="False"
         Size="Large"
         SmallImage="/Assets/Icons/spiral.png" />
                 </telerik:RadRibbonGroup>
@@ -455,11 +453,10 @@
                 <telerik:RadRibbonGroup
        telerik:ScreenTip.Description="Show the Alignment tab of the Format Cells dialog box."
        telerik:ScreenTip.Title="Format Cells: Alignment"
-       DialogLauncherCommand="{Binding Path=ShowFormatCellsDialog.Command}"
        DialogLauncherCommandParameter="Alignment"
-       DialogLauncherVisibility="{Binding Path=ShowFormatCellsDialog.IsEnabled, Converter={StaticResource BoolToVisibilityValueConverter}}"
+       DialogLauncherVisibility="Collapsed"
        Header="硬件"
-       IsEnabled="{Binding Path=AlignmentGroup.IsEnabled}">
+       IsEnabled="True">
                     <telerik:RadRibbonGroup.Variants>
                         <telerik:GroupVariant Priority="0" Variant="Large" />
                     </telerik:RadRibbonGroup.Variants>
diff --git a/XplorePlane/Views/Main/NavigationPropertyPanelView.xaml.cs b/XplorePlane/Views/Main/NavigationPropertyPanelView.xaml.cs
index 39a7b9c..dd3c414 100644
--- a/XplorePlane/Views/Main/NavigationPropertyPanelView.xaml.cs
+++ b/XplorePlane/Views/Main/NavigationPropertyPanelView.xaml.cs
@@ -13,19 +13,31 @@ namespace XplorePlane.Views
         public NavigationPropertyPanelView()
         {
             InitializeComponent();
+            ResolveViewModel();
             Loaded += OnLoaded;
         }
 
         private void OnLoaded(object sender, RoutedEventArgs e)
         {
-            if (DataContext is NavigationPropertyPanelViewModel) return;
+            ResolveViewModel();
+        }
+
+        private void ResolveViewModel()
+        {
+            if (DataContext is NavigationPropertyPanelViewModel viewModel)
+            {
+                _viewModel = viewModel;
+                return;
+            }
 
             var bootstrapper = AppBootstrapper.Instance;
-            if (bootstrapper != null)
+            if (bootstrapper == null)
             {
-                _viewModel = bootstrapper.Container.Resolve<NavigationPropertyPanelViewModel>();
-                DataContext = _viewModel;
+                return;
             }
+
+            _viewModel = bootstrapper.Container.Resolve<NavigationPropertyPanelViewModel>();
+            DataContext = _viewModel;
         }
 
         /// <summary>
@@ -53,4 +65,4 @@ namespace XplorePlane.Views
             }
         }
     }
-}
\ No newline at end of file
+}