From 79c24f2cd5fe604a0192cd64d7931a47e0684d79 Mon Sep 17 00:00:00 2001 From: Evgeny Redikultsev Date: Sat, 6 May 2023 21:10:02 +0500 Subject: [PATCH] Tools for graphs were added --- StructureHelper/StructureHelper.csproj.user | 6 + .../ForcesResultsView.xaml | 1 + StructureHelper/Windows/Graphs/GraphView.xaml | 73 +++++++ .../Windows/Graphs/GraphView.xaml.cs | 31 +++ .../Windows/MainWindow/MainViewModel.cs | 2 +- .../Materials/MaterialDiagramView.xaml | 6 +- .../Calculators/ForcesResultsViewModel.cs | 68 +++++++ .../GeometryCalculatorResultViewModel.cs | 2 +- .../ViewModels/Forces/ActionsViewModel.cs | 15 +- .../ViewModels/Forces/ForceTuplesViewModel.cs | 2 +- .../ViewModels/Graphs/GraphViewModel.cs | 178 ++++++++++++++++++ .../Materials/MaterialDiagramViewModel.cs | 6 +- .../Materials/MaterialsViewModel.cs | 2 +- .../Materials/PartialFactorsViewModel.cs | 2 +- .../Materials/SafetyFactorsViewModel.cs | 2 +- .../NdmCrossSections/AnalysisVewModelLogic.cs | 2 +- .../ViewModels/SelectItemsViewModel.cs | 6 + ...wModelBase.cs => SelectedItemViewModel.cs} | 6 +- .../Models/Parameters/ArrayParameter.cs | 37 ++++ .../Models/Parameters/IArrayParameter.cs | 14 ++ .../{ITextParameter.cs => IValueParameter.cs} | 6 +- .../{TextParameter.cs => ValueParameter.cs} | 6 +- .../Services/ColorServices/ColorProcessor.cs | 18 +- .../Templates/CrossSections/ForceLogic.cs | 6 +- .../Templates/CrossSections/IForceLogic.cs | 2 +- .../CrossSections/RCs/SectionTemplate.cs | 2 +- .../Analyses/ByForces/ForceCalculator.cs | 2 + .../Analyses/Geometry/GeometryResult.cs | 2 +- .../Analyses/Geometry/IGeometryResult.cs | 2 +- .../NdmPrimitives/TextParametersLogic.cs | 82 ++++---- .../ViewModelTests/GraphViewModelTest.cs | 41 ++++ 31 files changed, 553 insertions(+), 77 deletions(-) create mode 100644 StructureHelper/Windows/Graphs/GraphView.xaml create mode 100644 StructureHelper/Windows/Graphs/GraphView.xaml.cs create mode 100644 StructureHelper/Windows/ViewModels/Graphs/GraphViewModel.cs rename StructureHelper/Windows/ViewModels/{CRUDViewModelBase.cs => SelectedItemViewModel.cs} (93%) create mode 100644 StructureHelperCommon/Models/Parameters/ArrayParameter.cs create mode 100644 StructureHelperCommon/Models/Parameters/IArrayParameter.cs rename StructureHelperCommon/Models/Parameters/{ITextParameter.cs => IValueParameter.cs} (74%) rename StructureHelperCommon/Models/Parameters/{TextParameter.cs => ValueParameter.cs} (71%) create mode 100644 StructureHelperTests/ViewModelTests/GraphViewModelTest.cs diff --git a/StructureHelper/StructureHelper.csproj.user b/StructureHelper/StructureHelper.csproj.user index d1809bb..5b22347 100644 --- a/StructureHelper/StructureHelper.csproj.user +++ b/StructureHelper/StructureHelper.csproj.user @@ -18,6 +18,9 @@ Code + + Code + Code @@ -47,6 +50,9 @@ Designer + + Designer + Designer diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsView.xaml b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsView.xaml index 48ab589..ef7698c 100644 --- a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsView.xaml +++ b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsView.xaml @@ -40,6 +40,7 @@