From 5b14ad6626b5872618414c33ce9ab633f86a8c84 Mon Sep 17 00:00:00 2001 From: Evgeny Redikultsev Date: Sun, 26 Mar 2023 16:07:36 +0500 Subject: [PATCH] Material diagram viewer was added --- .../Libraries/LoaderCalculator.dll | Bin 74752 -> 74752 bytes .../MaterialCatalogModel.cs | 59 --------- .../MaterialCatalogView.xaml | 80 ------------ .../MaterialCatalogView.xaml.cs | 19 --- .../MaterialCatalogViewModel.cs | 116 ------------------ .../ResultViewers/ShowAnchorageResult.cs | 13 -- StructureHelper/StructureHelper.csproj | 1 + StructureHelper/StructureHelper.csproj.user | 6 + .../AddMaterialWindow/AddMaterialView.xaml | 48 -------- .../AddMaterialWindow/AddMaterialView.xaml.cs | 18 --- .../AddMaterialWindow/AddMaterialViewModel.cs | 84 ------------- .../CalculationPropertyView.xaml | 92 -------------- .../CalculationPropertyView.xaml.cs | 61 --------- .../Windows/MainWindow/MainViewModel.cs | 13 -- .../Materials/HeadMaterialsView.xaml | 1 + .../Materials/MaterialDiagramView.xaml | 27 ++++ .../Materials/MaterialDiagramView.xaml.cs | 39 ++++++ .../Materials/HeadMaterialsViewModel.cs | 25 +++- .../Materials/MaterialDiagramViewModel.cs | 70 +++++++++++ .../Models/Materials/ConcreteLibMaterial.cs | 2 +- .../Materials/ReinforcementLibMaterial.cs | 2 +- .../AnchorageCalculatorTest.cs | 1 + .../StructureHelperTests.csproj | 1 + .../CalculationPropertyWindowTest.cs | 37 ------ 24 files changed, 169 insertions(+), 646 deletions(-) delete mode 100644 StructureHelper/MaterialCatalogWindow/MaterialCatalogModel.cs delete mode 100644 StructureHelper/MaterialCatalogWindow/MaterialCatalogView.xaml delete mode 100644 StructureHelper/MaterialCatalogWindow/MaterialCatalogView.xaml.cs delete mode 100644 StructureHelper/MaterialCatalogWindow/MaterialCatalogViewModel.cs delete mode 100644 StructureHelper/Windows/AddMaterialWindow/AddMaterialView.xaml delete mode 100644 StructureHelper/Windows/AddMaterialWindow/AddMaterialView.xaml.cs delete mode 100644 StructureHelper/Windows/AddMaterialWindow/AddMaterialViewModel.cs delete mode 100644 StructureHelper/Windows/CalculationWindows/CalculationPropertyWindow/CalculationPropertyView.xaml delete mode 100644 StructureHelper/Windows/CalculationWindows/CalculationPropertyWindow/CalculationPropertyView.xaml.cs create mode 100644 StructureHelper/Windows/MainWindow/Materials/MaterialDiagramView.xaml create mode 100644 StructureHelper/Windows/MainWindow/Materials/MaterialDiagramView.xaml.cs create mode 100644 StructureHelper/Windows/ViewModels/Materials/MaterialDiagramViewModel.cs delete mode 100644 StructureHelperTests/UnitTests/WindowTests/Calculations/CalculationProperties/CalculationPropertyWindowTest.cs diff --git a/StructureHelper/Libraries/LoaderCalculator.dll b/StructureHelper/Libraries/LoaderCalculator.dll index 45065a68c841305007910ab9bc14093d993826a2..5dff10fd0434a6767c9059aa79f8037c2222d21a 100644 GIT binary patch delta 16530 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 diff --git a/StructureHelper/MaterialCatalogWindow/MaterialCatalogModel.cs b/StructureHelper/MaterialCatalogWindow/MaterialCatalogModel.cs deleted file mode 100644 index efa3910..0000000 --- a/StructureHelper/MaterialCatalogWindow/MaterialCatalogModel.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System.Collections.Generic; -using StructureHelper.Infrastructure; -using StructureHelper.Models.Materials; - -namespace StructureHelper.MaterialCatalogWindow -{ - public class MaterialCatalogModel - { - public NamedList ConcreteDefinitions; - public NamedList RebarDefinitions; - - public List> Materials; - - public MaterialCatalogModel() - { - InitializeMaterialCollections(); - Materials = new List>(); - Materials.Add(ConcreteDefinitions); - Materials.Add(RebarDefinitions); - } - - public void InitializeMaterialCollections() - { - InitializeConcreteDefinitions(); - InitializeRebarDefinitions(); - } - - private void InitializeRebarDefinitions() - { - RebarDefinitions = new NamedList - { - new RebarDefinition("S240", 2, 240, 240, 1.15, 1.15), - new RebarDefinition("S400", 2, 400, 400, 1.15, 1.15), - new RebarDefinition("S500", 2, 500, 500, 1.15, 1.15) - }; - RebarDefinitions.Name = "Арматура"; - } - - private void InitializeConcreteDefinitions() - { - ConcreteDefinitions = new NamedList - { - new ConcreteDefinition("C10", 0, 10, 0, 1.3, 1.5), - new ConcreteDefinition("C15", 0, 15, 0, 1.3, 1.5), - new ConcreteDefinition("C20", 0, 20, 0, 1.3, 1.5), - new ConcreteDefinition("C25", 0, 25, 0, 1.3, 1.5), - new ConcreteDefinition("C30", 0, 30, 0, 1.3, 1.5), - new ConcreteDefinition("C35", 0, 35, 0, 1.3, 1.5), - new ConcreteDefinition("C40", 0, 40, 0, 1.3, 1.5), - new ConcreteDefinition("C45", 0, 45, 0, 1.3, 1.5), - new ConcreteDefinition("C50", 0, 50, 0, 1.3, 1.5), - new ConcreteDefinition("C60", 0, 60, 0, 1.3, 1.5), - new ConcreteDefinition("C70", 0, 70, 0, 1.3, 1.5), - new ConcreteDefinition("C80", 0, 80, 0, 1.3, 1.5) - }; - ConcreteDefinitions.Name = "Бетон"; - } - } -} diff --git a/StructureHelper/MaterialCatalogWindow/MaterialCatalogView.xaml b/StructureHelper/MaterialCatalogWindow/MaterialCatalogView.xaml deleted file mode 100644 index 47ea9c0..0000000 --- a/StructureHelper/MaterialCatalogWindow/MaterialCatalogView.xaml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -