diff --git a/XplorePlane/App.xaml.cs b/XplorePlane/App.xaml.cs index eef20cb..2d147a2 100644 --- a/XplorePlane/App.xaml.cs +++ b/XplorePlane/App.xaml.cs @@ -154,7 +154,7 @@ namespace XplorePlane protected override Window CreateShell() { - return Container.Resolve(); + return Container.Resolve(); } protected override void RegisterTypes(IContainerRegistry containerRegistry) @@ -167,6 +167,7 @@ namespace XplorePlane // 注册视图和视图模型 containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterForNavigation(); containerRegistry.Register(); // 注册图像处理服务与视图 diff --git a/XplorePlane/Views/Hardware/DetectorPanelView.xaml b/XplorePlane/Views/Hardware/DetectorPanelView.xaml index da83f02..2392f6f 100644 --- a/XplorePlane/Views/Hardware/DetectorPanelView.xaml +++ b/XplorePlane/Views/Hardware/DetectorPanelView.xaml @@ -4,10 +4,10 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - d:DesignHeight="200" - d:DesignWidth="200" + d:DesignHeight="300" + d:DesignWidth="300" mc:Ignorable="d"> - + @@ -17,7 +17,9 @@ FontWeight="SemiBold" Foreground="#333333" Text="探测器" /> - + + + diff --git a/XplorePlane/Views/Hardware/MotionControlPanelView.xaml b/XplorePlane/Views/Hardware/MotionControlPanelView.xaml index 2fde174..28cb447 100644 --- a/XplorePlane/Views/Hardware/MotionControlPanelView.xaml +++ b/XplorePlane/Views/Hardware/MotionControlPanelView.xaml @@ -4,20 +4,229 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - d:DesignHeight="200" - d:DesignWidth="200" + d:DesignHeight="300" + d:DesignWidth="300" mc:Ignorable="d"> - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/XplorePlane/Views/Hardware/RaySourcePanelView.xaml b/XplorePlane/Views/Hardware/RaySourcePanelView.xaml index 869cd20..b4b49b9 100644 --- a/XplorePlane/Views/Hardware/RaySourcePanelView.xaml +++ b/XplorePlane/Views/Hardware/RaySourcePanelView.xaml @@ -5,22 +5,98 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:rayViews="clr-namespace:XP.Hardware.RaySource.Views;assembly=XP.Hardware.RaySource" - d:DesignHeight="300" - d:DesignWidth="200" + d:DesignHeight="140" + d:DesignWidth="300" mc:Ignorable="d"> - + - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +