From 487cc66c39d161e96341d2e7430d0e66e105a36b Mon Sep 17 00:00:00 2001 From: Evgeny Redikultsev Date: Tue, 20 Dec 2022 21:37:38 +0500 Subject: [PATCH] SectionTemlate was added --- App.xaml | 1 + .../UI/Resources/ItemEditPanels.xaml | 22 ++++ .../UI/Resources/PrimitiveTemplates.xaml | 4 +- StructureHelper.csproj | 12 ++ .../Interfaces/IHasForceCombinations.cs | 14 +++ .../Models/Forces/DesignForceTuple.cs | 8 +- .../Models/Forces/ForceCombinationList.cs | 4 + .../Models/Forces/IDesignForceTuple.cs | 2 +- .../Models/Forces/IForceCombinationList.cs | 1 + .../StructureHelperCommon.csproj | 1 + .../CrossSections/ICalculatorLogic.cs | 14 +++ .../CrossSections/ICrossSectionTemplate.cs | 14 +++ .../Templates/CrossSections/IForceLogic.cs | 14 +++ .../Templates/CrossSections/IMaterialLogic.cs | 14 +++ .../CrossSections/ISectionGeometryLogic.cs | 14 +++ .../RCs/IRectangleBeamTemplate.cs | 0 .../CrossSections/RCs/RCSectionTemplate.cs | 65 ++++++++++ .../RCs/RectangleBeamTemplate.cs | 0 .../Analyses/ByForces/ForceCalculator.cs | 111 +++++++++++++++++- .../Analyses/ByForces/ForcesResult.cs | 12 +- .../Analyses/ByForces/ForcesResults.cs | 20 ++++ .../Analyses/ByForces/IForceCalculator.cs | 16 +++ .../Analyses/ByForces/IForcesResults.cs | 11 ++ .../NdmCalculations/Analyses/INdmResult.cs | 3 +- .../Services/Forces/TupleService.cs | 21 ++++ .../NdmPrimitives/NdmPrimitivesService.cs | 21 +++- .../ForceCalculatorView.xaml | 20 ---- .../ForcesResultsView.xaml | 46 ++++++++ .../ForcesResultsView.xaml.cs | 32 +++++ Windows/Forces/ForceCombinationView.xaml | 19 +-- .../CalculationResultViewModel.cs | 2 +- .../Calculators/ForceCalculatorViewModel.cs | 14 +++ .../Calculators/ForcesResultsViewModel.cs | 74 ++++++++++++ .../Forces/ForceCombinationViewModel.cs | 34 ++++++ .../CalculatorsViewModelLogic.cs | 14 ++- .../ICalculatorsViewModelLogic.cs | 1 - 36 files changed, 631 insertions(+), 44 deletions(-) create mode 100644 Infrastructure/UI/Resources/ItemEditPanels.xaml create mode 100644 StructureHelperCommon/Infrastructures/Interfaces/IHasForceCombinations.cs create mode 100644 StructureHelperLogics/Models/Templates/CrossSections/ICalculatorLogic.cs create mode 100644 StructureHelperLogics/Models/Templates/CrossSections/ICrossSectionTemplate.cs create mode 100644 StructureHelperLogics/Models/Templates/CrossSections/IForceLogic.cs create mode 100644 StructureHelperLogics/Models/Templates/CrossSections/IMaterialLogic.cs create mode 100644 StructureHelperLogics/Models/Templates/CrossSections/ISectionGeometryLogic.cs rename StructureHelperLogics/Models/Templates/{ => CrossSections}/RCs/IRectangleBeamTemplate.cs (100%) create mode 100644 StructureHelperLogics/Models/Templates/CrossSections/RCs/RCSectionTemplate.cs rename StructureHelperLogics/Models/Templates/{ => CrossSections}/RCs/RectangleBeamTemplate.cs (100%) create mode 100644 StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForcesResults.cs create mode 100644 StructureHelperLogics/NdmCalculations/Analyses/ByForces/IForceCalculator.cs create mode 100644 StructureHelperLogics/NdmCalculations/Analyses/ByForces/IForcesResults.cs create mode 100644 StructureHelperLogics/Services/Forces/TupleService.cs create mode 100644 Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsView.xaml create mode 100644 Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsView.xaml.cs create mode 100644 Windows/ViewModels/Calculations/Calculators/ForcesResultsViewModel.cs diff --git a/App.xaml b/App.xaml index 5e15593..c984ac3 100644 --- a/App.xaml +++ b/App.xaml @@ -10,6 +10,7 @@ + diff --git a/Infrastructure/UI/Resources/ItemEditPanels.xaml b/Infrastructure/UI/Resources/ItemEditPanels.xaml new file mode 100644 index 0000000..b5745f6 --- /dev/null +++ b/Infrastructure/UI/Resources/ItemEditPanels.xaml @@ -0,0 +1,22 @@ + + + + + + + + + + + +