diff --git a/XplorePlane/App.xaml.cs b/XplorePlane/App.xaml.cs index 14f3155..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) diff --git a/XplorePlane/Views/Main/MainWindowB.xaml b/XplorePlane/Views/Main/MainWindowB.xaml index 994936b..51b7e00 100644 --- a/XplorePlane/Views/Main/MainWindowB.xaml +++ b/XplorePlane/Views/Main/MainWindowB.xaml @@ -1738,7 +1738,6 @@ - @@ -1752,16 +1751,8 @@ - - - - - - + @@ -1776,7 +1767,7 @@ - + + @@ -1878,6 +1873,23 @@ Foreground="#D4A017" Text="✥" /> + + + + public partial class MainWindowB : RadRibbonWindow { + private static readonly Brush ActiveBg = new SolidColorBrush(Color.FromRgb(0xF0, 0xA0, 0x30)); + public MainWindowB(MainViewModel viewModel) { InitializeComponent(); @@ -19,24 +21,33 @@ namespace XplorePlane.Views private void OnMotionTabClick(object sender, RoutedEventArgs e) { - MotionPanel.Visibility = Visibility.Visible; - DetectorPanel.Visibility = Visibility.Collapsed; - - BtnMotion.IsChecked = true; - BtnMotion.Background = new SolidColorBrush(Color.FromRgb(0xF0, 0xA0, 0x30)); - BtnDetector.IsChecked = false; - BtnDetector.Background = Brushes.Transparent; + ShowPanel(motion: true); } private void OnDetectorTabClick(object sender, RoutedEventArgs e) { - MotionPanel.Visibility = Visibility.Collapsed; - DetectorPanel.Visibility = Visibility.Visible; + ShowPanel(detector: true); + } - BtnDetector.IsChecked = true; - BtnDetector.Background = new SolidColorBrush(Color.FromRgb(0xF0, 0xA0, 0x30)); - BtnMotion.IsChecked = false; - BtnMotion.Background = Brushes.Transparent; + private void OnImageTabClick(object sender, RoutedEventArgs e) + { + ShowPanel(image: true); + } + + private void ShowPanel(bool motion = false, bool detector = false, bool image = false) + { + MotionPanel.Visibility = motion ? Visibility.Visible : Visibility.Collapsed; + DetectorPanel.Visibility = detector ? Visibility.Visible : Visibility.Collapsed; + ImagePanel.Visibility = image ? Visibility.Visible : Visibility.Collapsed; + + BtnMotion.IsChecked = motion; + BtnMotion.Background = motion ? ActiveBg : Brushes.Transparent; + + BtnDetector.IsChecked = detector; + BtnDetector.Background = detector ? ActiveBg : Brushes.Transparent; + + BtnImage.IsChecked = image; + BtnImage.Background = image ? ActiveBg : Brushes.Transparent; } } } diff --git a/XplorePlane/readme.txt b/XplorePlane/readme.txt index d594a0f..29e94d4 100644 --- a/XplorePlane/readme.txt +++ b/XplorePlane/readme.txt @@ -16,8 +16,19 @@ 2、硬件层射线源的集成 √ 3、图像层集成,包括复刻一个示例界面,优化界面布局及算子中文 √ 4、浮动图像处理工具箱调研 √ -5、修复图像工具箱拖拽事件,流水线列表没有生成对应的控件 +5、修复图像工具箱拖拽事件,流水线列表没有生成对应的控件 √ + +2026.3.16 +---------------------- +1、优化图像处理窗体的页面布局,简洁清晰 √ +2、新增打开图像工具箱(修复DataContext问题) √ +3、对主界面B方案进行优化 + + + +TO-DO +---------------------- 5、各窗体间数据流的传递,全局数据结构的设计 \ No newline at end of file