diff --git a/StructureHelper/App.xaml.cs b/StructureHelper/App.xaml.cs index 0f7f3b1..f18a2b1 100644 --- a/StructureHelper/App.xaml.cs +++ b/StructureHelper/App.xaml.cs @@ -22,8 +22,8 @@ namespace StructureHelper builder.RegisterType().As().SingleInstance(); builder.RegisterType().AsSelf().SingleInstance(); builder.RegisterType().AsSelf().SingleInstance(); - builder.RegisterType().AsSelf().SingleInstance(); - builder.RegisterType().AsSelf().SingleInstance(); + builder.RegisterType().AsSelf().SingleInstance(); + builder.RegisterType().AsSelf().SingleInstance(); builder.RegisterType().AsSelf(); diff --git a/StructureHelper/Infrastructure/UI/DataContexts/PrimitiveBase.cs b/StructureHelper/Infrastructure/UI/DataContexts/PrimitiveBase.cs index 39f4dbd..c0f3d50 100644 --- a/StructureHelper/Infrastructure/UI/DataContexts/PrimitiveBase.cs +++ b/StructureHelper/Infrastructure/UI/DataContexts/PrimitiveBase.cs @@ -242,7 +242,7 @@ namespace StructureHelper.Infrastructure.UI.DataContexts DeltaY = dy; } - public MainViewModel OwnerVM { get; private set; } + public CrossSectionViewModel OwnerVM { get; private set; } public double DeltaX { get; private set; } public double DeltaY { get; private set; } diff --git a/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml.user b/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml.user index 6310abc..7cc792e 100644 --- a/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2023-02-25T08:37:39.2738786Z;False|2023-02-25T13:37:24.0284261+05:00;True|2023-02-25T13:34:01.6858860+05:00;True|2023-02-25T13:31:18.8295711+05:00;False|2023-02-25T13:25:21.5807199+05:00;False|2023-02-25T13:24:41.7164398+05:00; + True|2024-02-02T07:22:50.1454015Z;True|2023-02-25T13:37:39.2738786+05:00;False|2023-02-25T13:37:24.0284261+05:00;True|2023-02-25T13:34:01.6858860+05:00;True|2023-02-25T13:31:18.8295711+05:00;False|2023-02-25T13:25:21.5807199+05:00;False|2023-02-25T13:24:41.7164398+05:00; \ No newline at end of file diff --git a/StructureHelper/Windows/MainWindow/MainModel.cs b/StructureHelper/Windows/MainWindow/CrossSectionModel.cs similarity index 93% rename from StructureHelper/Windows/MainWindow/MainModel.cs rename to StructureHelper/Windows/MainWindow/CrossSectionModel.cs index baf209c..95488a7 100644 --- a/StructureHelper/Windows/MainWindow/MainModel.cs +++ b/StructureHelper/Windows/MainWindow/CrossSectionModel.cs @@ -24,7 +24,7 @@ using System.Threading; namespace StructureHelper.Windows.MainWindow { - public class MainModel + public class CrossSectionModel { public ICrossSection Section { get; private set; } private IPrimitiveRepository primitiveRepository; @@ -37,7 +37,7 @@ namespace StructureHelper.Windows.MainWindow public ICalculationProperty CalculationProperty { get; private set; } - public MainModel(IPrimitiveRepository primitiveRepository, CalculationService calculationService, UnitSystemService unitSystemService) + public CrossSectionModel(IPrimitiveRepository primitiveRepository, CalculationService calculationService, UnitSystemService unitSystemService) { this.primitiveRepository = primitiveRepository; this.calculationService = calculationService; diff --git a/StructureHelper/Windows/MainWindow/MainViewModel.cs b/StructureHelper/Windows/MainWindow/CrossSectionViewModel.cs similarity index 98% rename from StructureHelper/Windows/MainWindow/MainViewModel.cs rename to StructureHelper/Windows/MainWindow/CrossSectionViewModel.cs index df67429..0d35b42 100644 --- a/StructureHelper/Windows/MainWindow/MainViewModel.cs +++ b/StructureHelper/Windows/MainWindow/CrossSectionViewModel.cs @@ -25,7 +25,7 @@ using System.Windows.Input; namespace StructureHelper.Windows.MainWindow { - public class MainViewModel : ViewModelBase + public class CrossSectionViewModel : ViewModelBase { ICrossSection section; ICrossSectionRepository repository => section.SectionRepository; @@ -44,7 +44,7 @@ namespace StructureHelper.Windows.MainWindow public PrimitiveViewModelLogic PrimitiveLogic => primitiveLogic; public HelpLogic HelpLogic => new HelpLogic(); - private MainModel Model { get; } + private CrossSectionModel Model { get; } private double panelX, panelY, scrollPanelX, scrollPanelY; @@ -220,7 +220,7 @@ namespace StructureHelper.Windows.MainWindow private RelayCommand selectPrimitive; private MaterialsViewModel materialsLogic; - public MainViewModel(MainModel model) + public CrossSectionViewModel(CrossSectionModel model) { visualProperty = new CrossSectionViewVisualProperty(); Model = model; diff --git a/StructureHelper/Windows/MainWindow/MainView.xaml b/StructureHelper/Windows/MainWindow/MainView.xaml index ad467a9..05a8e8e 100644 --- a/StructureHelper/Windows/MainWindow/MainView.xaml +++ b/StructureHelper/Windows/MainWindow/MainView.xaml @@ -54,6 +54,11 @@ + + + + + diff --git a/StructureHelper/Windows/MainWindow/MainView.xaml.cs b/StructureHelper/Windows/MainWindow/MainView.xaml.cs index 5c4d817..462baf1 100644 --- a/StructureHelper/Windows/MainWindow/MainView.xaml.cs +++ b/StructureHelper/Windows/MainWindow/MainView.xaml.cs @@ -8,10 +8,10 @@ namespace StructureHelper.Windows.MainWindow { public partial class MainView : Window { - private MainViewModel viewModel; + private CrossSectionViewModel viewModel; public IPrimitiveRepository PrimitiveRepository { get; } - public MainView(IPrimitiveRepository primitiveRepository, MainViewModel viewModel) + public MainView(IPrimitiveRepository primitiveRepository, CrossSectionViewModel viewModel) { PrimitiveRepository = primitiveRepository; this.viewModel = viewModel; diff --git a/StructureHelper/Windows/Services/CopyByParameterView.xaml b/StructureHelper/Windows/Services/CopyByParameterView.xaml index 8b3b642..95bc9f7 100644 --- a/StructureHelper/Windows/Services/CopyByParameterView.xaml +++ b/StructureHelper/Windows/Services/CopyByParameterView.xaml @@ -6,7 +6,7 @@ xmlns:local="clr-namespace:StructureHelper.Windows.Services" d:DataContext ="{d:DesignInstance local:CopyByParameterViewModel}" mc:Ignorable="d" - Title="Copy To" Height="260" Width="300" ResizeMode="NoResize" WindowStartupLocation="CenterOwner"> + Title="Copy To" Height="300" Width="300" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">