diff --git a/README.md b/README.md index ebecf6c..2cf2181 100644 --- a/README.md +++ b/README.md @@ -53,15 +53,12 @@ XplorePlane/ - - - - ### XplorePlane.ImageProcessing (图像库) + ### TO-DO List - [x] 软件基于 WPF + Prism 基础的框架 diff --git a/XplorePlane/MainWindow.xaml b/XplorePlane/MainWindow.xaml deleted file mode 100644 index 4412790..0000000 --- a/XplorePlane/MainWindow.xaml +++ /dev/null @@ -1,1947 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/XplorePlane/MainWindow.xaml.cs b/XplorePlane/MainWindow.xaml.cs deleted file mode 100644 index bd20614..0000000 --- a/XplorePlane/MainWindow.xaml.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Linq; -using System.Reflection; -using System.Windows; -using Telerik.Windows.Controls; -using Telerik.Windows.Documents.Spreadsheet.FormatProviders; -using Telerik.Windows.Documents.Spreadsheet.FormatProviders.OpenXml.Xlsx; -using Telerik.Windows.Documents.Spreadsheet.FormatProviders.Pdf; -using XplorePlane.ViewModels; - -namespace XplorePlane -{ - /// - /// Interaction logic for MainWindow.xaml - /// - public partial class MainWindow : RadRibbonWindow - { - private readonly MainViewModel viewModel; - - static MainWindow() - { - RadRibbonWindow.IsWindowsThemeEnabled = false; - } - - public MainWindow() - { - InitializeComponent(); - - this.viewModel = new MainViewModel(); - this.DataContext = this.viewModel; - - this.Loaded += this.MainWindow_Loaded; - } - - private void MainWindow_Loaded(object sender, RoutedEventArgs e) - { - this.viewModel.OpenSampleCommand.Execute(null); - } - } -} diff --git a/XplorePlane/ViewModels/MainWindowViewModel.cs b/XplorePlane/ViewModels/MainWindowViewModel.cs deleted file mode 100644 index 2e47d47..0000000 --- a/XplorePlane/ViewModels/MainWindowViewModel.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Prism.Mvvm; - -namespace XplorePlane.ViewModels -{ - public class MainWindowViewModel : BindableBase - { - private string _title = "Prism Application"; - public string Title - { - get { return _title; } - set { SetProperty(ref _title, value); } - } - - public MainWindowViewModel() - { - - } - } -} diff --git a/XplorePlane/Views/DetectorPanelView.xaml b/XplorePlane/Views/DetectorPanelView.xaml new file mode 100644 index 0000000..da83f02 --- /dev/null +++ b/XplorePlane/Views/DetectorPanelView.xaml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + diff --git a/XplorePlane/Views/DetectorPanelView.xaml.cs b/XplorePlane/Views/DetectorPanelView.xaml.cs new file mode 100644 index 0000000..dde272e --- /dev/null +++ b/XplorePlane/Views/DetectorPanelView.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows.Controls; + +namespace XplorePlane.Views +{ + public partial class DetectorPanelView : UserControl + { + public DetectorPanelView() + { + InitializeComponent(); + } + } +} diff --git a/XplorePlane/Views/ImagePanelView.xaml b/XplorePlane/Views/ImagePanelView.xaml new file mode 100644 index 0000000..de730a7 --- /dev/null +++ b/XplorePlane/Views/ImagePanelView.xaml @@ -0,0 +1,21 @@ + + + + + + + + + + + + diff --git a/XplorePlane/Views/ImagePanelView.xaml.cs b/XplorePlane/Views/ImagePanelView.xaml.cs new file mode 100644 index 0000000..3f98c0d --- /dev/null +++ b/XplorePlane/Views/ImagePanelView.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows.Controls; + +namespace XplorePlane.Views +{ + public partial class ImagePanelView : UserControl + { + public ImagePanelView() + { + InitializeComponent(); + } + } +} diff --git a/XplorePlane/Views/MainWindow.xaml b/XplorePlane/Views/MainWindow.xaml index 8b4cc39..25bfd87 100644 --- a/XplorePlane/Views/MainWindow.xaml +++ b/XplorePlane/Views/MainWindow.xaml @@ -7,6 +7,7 @@ xmlns:spreadsheet="clr-namespace:Telerik.Windows.Controls.Spreadsheet;assembly=Telerik.Windows.Controls.Spreadsheet" xmlns:spreadsheetControls="clr-namespace:Telerik.Windows.Controls.Spreadsheet.Controls;assembly=Telerik.Windows.Controls.Spreadsheet" xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation" + xmlns:views="clr-namespace:XplorePlane.Views" x:Name="ParentWindow" Title="XplorePlane" Width="1280" @@ -1711,188 +1712,78 @@ - - + - - - - - - + Margin="0,0,0,24" + HasDocumentHost="True"> - - - - - - + + + + + + + + + + + + + - - - + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + diff --git a/XplorePlane/Views/MotionControlPanelView.xaml.cs b/XplorePlane/Views/MotionControlPanelView.xaml.cs new file mode 100644 index 0000000..da21b7b --- /dev/null +++ b/XplorePlane/Views/MotionControlPanelView.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows.Controls; + +namespace XplorePlane.Views +{ + public partial class MotionControlPanelView : UserControl + { + public MotionControlPanelView() + { + InitializeComponent(); + } + } +} diff --git a/XplorePlane/Views/NavigationPanelView.xaml b/XplorePlane/Views/NavigationPanelView.xaml new file mode 100644 index 0000000..3ac753d --- /dev/null +++ b/XplorePlane/Views/NavigationPanelView.xaml @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/XplorePlane/Views/NavigationPanelView.xaml.cs b/XplorePlane/Views/NavigationPanelView.xaml.cs new file mode 100644 index 0000000..b5d8375 --- /dev/null +++ b/XplorePlane/Views/NavigationPanelView.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows.Controls; + +namespace XplorePlane.Views +{ + public partial class NavigationPanelView : UserControl + { + public NavigationPanelView() + { + InitializeComponent(); + } + } +} diff --git a/XplorePlane/Views/NavigationPropertyPanelView.xaml b/XplorePlane/Views/NavigationPropertyPanelView.xaml new file mode 100644 index 0000000..59798a8 --- /dev/null +++ b/XplorePlane/Views/NavigationPropertyPanelView.xaml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + diff --git a/XplorePlane/Views/NavigationPropertyPanelView.xaml.cs b/XplorePlane/Views/NavigationPropertyPanelView.xaml.cs new file mode 100644 index 0000000..7d1ba6d --- /dev/null +++ b/XplorePlane/Views/NavigationPropertyPanelView.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows.Controls; + +namespace XplorePlane.Views +{ + public partial class NavigationPropertyPanelView : UserControl + { + public NavigationPropertyPanelView() + { + InitializeComponent(); + } + } +} diff --git a/XplorePlane/Views/RaySourcePanelView.xaml b/XplorePlane/Views/RaySourcePanelView.xaml new file mode 100644 index 0000000..c1ef78e --- /dev/null +++ b/XplorePlane/Views/RaySourcePanelView.xaml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + diff --git a/XplorePlane/Views/RaySourcePanelView.xaml.cs b/XplorePlane/Views/RaySourcePanelView.xaml.cs new file mode 100644 index 0000000..fbf628d --- /dev/null +++ b/XplorePlane/Views/RaySourcePanelView.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows.Controls; + +namespace XplorePlane.Views +{ + public partial class RaySourcePanelView : UserControl + { + public RaySourcePanelView() + { + InitializeComponent(); + } + } +} diff --git a/XplorePlane/Views/ViewportPanelView.xaml b/XplorePlane/Views/ViewportPanelView.xaml new file mode 100644 index 0000000..2183470 --- /dev/null +++ b/XplorePlane/Views/ViewportPanelView.xaml @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/XplorePlane/Views/ViewportPanelView.xaml.cs b/XplorePlane/Views/ViewportPanelView.xaml.cs new file mode 100644 index 0000000..9be1f23 --- /dev/null +++ b/XplorePlane/Views/ViewportPanelView.xaml.cs @@ -0,0 +1,12 @@ +using System.Windows.Controls; + +namespace XplorePlane.Views +{ + public partial class ViewportPanelView : UserControl + { + public ViewportPanelView() + { + InitializeComponent(); + } + } +} diff --git a/XplorePlane/XplorePlane.csproj b/XplorePlane/XplorePlane.csproj index 7a18518..8bd03ff 100644 --- a/XplorePlane/XplorePlane.csproj +++ b/XplorePlane/XplorePlane.csproj @@ -7,10 +7,6 @@ XplorePlane - - - - @@ -74,6 +70,9 @@ ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.Input.dll + + ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.Docking.dll + ..\lib\RCWPF\2024.1.408.70.NoXaml\Telerik.Windows.Controls.Navigation.dll diff --git a/XplorePlane/readme.txt b/XplorePlane/readme.txt new file mode 100644 index 0000000..1b06956 --- /dev/null +++ b/XplorePlane/readme.txt @@ -0,0 +1,15 @@ +--------------------------------------------------------------- + __ __ _ _____ _ + \ \ / / | | | __ \| | + \ V / _ __ | | ___ _ __ ___| |__) | | __ _ _ __ ___ + > < | '_ \| |/ _ \| '__/ _ \ ___/| |/ _` | '_ \ / _ \ + / . \| |_) | | (_) | | | __/ | | | (_| | | | | __/ + /_/ \_\ .__/|_|\___/|_| \___|_| |_|\__,_|_| |_|\___| + | | + |_| +--------------------------------------------------------------- + + +2026.3.14 +---------------------- +1、主页面的布局与拆分,Dock 化 √ \ No newline at end of file