From b4b1720c7061a0cf98d4cd1a6a201923c250918f Mon Sep 17 00:00:00 2001 From: Evgeny Redikultsev Date: Sat, 25 Nov 2023 20:05:49 +0500 Subject: [PATCH] TripleLinear Material Diagram was added --- .../UI/Resources/Materials.xaml | 8 ++ .../Libraries/LoaderCalculator.dll | Bin 82944 -> 84992 bytes .../Windows/Graphs/MaterialDiagramView.xaml | 1 + .../Graphs/MaterialDiagramViewModel.cs | 91 +++++++++++++++++- .../Materials/HeadMaterialViewModel.cs | 1 + .../Materials/LibMaterialViewModel.cs | 5 + .../Settings/ProgramSetting.cs | 10 ++ .../Models/Materials/ConcreteCurveLogic.cs | 4 + .../Factories/MaterialLogicsFactory.cs | 25 +++++ .../Models/Materials/IMaterialLogic.cs | 3 + .../Libraries/ConcreteMaterialEntity.cs | 1 + .../Libraries/Factories/LibMaterialFactory.cs | 39 +++++++- .../Libraries/FiberMaterialEntity.cs | 2 +- .../Libraries/IFiberMaterialEntity.cs | 2 +- .../Materials/Libraries/ILibMaterialEntity.cs | 4 + .../Libraries/ReinforcementMaterialEntity.cs | 1 + .../Materials/MaterialCommonOptionLogic.cs | 1 + ...ogic.cs => ReinforcementByBuilderLogic.cs} | 17 ++-- StructureHelperCommon/Services/CheckObject.cs | 11 ++- .../Models/Materials/ConcreteLibMaterial.cs | 8 +- .../Logics/ConcreteLibUpdateStrategy.cs | 1 - .../Logics/LibMaterialUpdateStrategy.cs | 1 + .../Materials/ReinforcementLibMaterial.cs | 14 +-- 23 files changed, 225 insertions(+), 25 deletions(-) create mode 100644 StructureHelperCommon/Models/Materials/Factories/MaterialLogicsFactory.cs rename StructureHelperCommon/Models/Materials/{ReinforcementBiLinearLogic.cs => ReinforcementByBuilderLogic.cs} (75%) diff --git a/StructureHelper/Infrastructure/UI/Resources/Materials.xaml b/StructureHelper/Infrastructure/UI/Resources/Materials.xaml index e4de792..5cd1ae1 100644 --- a/StructureHelper/Infrastructure/UI/Resources/Materials.xaml +++ b/StructureHelper/Infrastructure/UI/Resources/Materials.xaml @@ -28,6 +28,14 @@ + + + + + + + + diff --git a/StructureHelper/Libraries/LoaderCalculator.dll b/StructureHelper/Libraries/LoaderCalculator.dll index 9b84c07dedcb0a71dc057508f3455067d3f33d0e..f2db256b381741f2e45667f6f13b7f1511ef5d78 100644 GIT binary patch delta 35570 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 delta 33503 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%0AG8QqG6XN=3 zQpZ@&*uV&va|6aA#%jho#(KsEM!14K6%Hi1h_Rfpnz4?tUg03}X73#@FukPJR8jF#*=XMA(eqy4!+R8}%?5 ze|vKZybcxkdzn+=UHoXW2Y>cMt_<6fT#BbXWKHG`936zzO!jIV}qV4(qDiwvsQD-|0 zRAC_}TMXfYjF~|sw@f9xs{>*4U>e7PD3VnYBUt~RTPc4PUq$Ge>mTYfMp8P4yCh|g$EZ`SlPHHSM6Lb-Dujd%iMSoZMqtX*@*p+;5F7w3A^bkDB%+qPYE4Sz1G z?5fm(^Ym!JE!enEKH&-;{nxpaM4;Z+nZcdWFaoXNoNh|T^CMs@YH&}+e`*%krIJ-3 zm4vFwGpV;>oW9XCHP@t4a!MblQ9hqW-icUvjnMZ6uUOn>H*j)@@sWJ&l$9N~LBvOu4TxOY&m{FS_xH>g0LgR$hZ zjPVAH+!g-=1KfdXpjNe7;i{QRNbovWY2CmnVmIqI?z%C^=pe@m0ojNWa^yIaa}g!v z$!k&0N0iV}((hguAWG;YuSdBvqJ%iZ!|=r3`nLf71CulxHDIxJlNcd^4hi+45nOZ}DFHQAcCGT#oVr zLpGK6hUOtcV21E%P^MwGW8O4unkq5P(SZxY^;FClpw5x;UGx1ziYQNsK3Wt8_IO87w1 zZ-;+~C}FSMf$~R)_~je<8p`_-B^;D*p!^A&*m9+kmQ`cG7hkw0FtpDVjc^2>F z?;xGi}iB3B!~Cy0`V{auZYLPEWBer3ue^5mnS-lD{8;$Ad+k2@0^hy7Rt-pD{`|#_c+WLIF2_0WMqNB*}m}~_R5`w?Q8$Qp&n8BFMn9tZbI7qY% zpVv)B;18oXNvhr6QFud&LPA1XhF_1(!{?Q38dD&imZG%QRw#Okfwh+viXX+I+Dp2K z$S4S(2hJdi@(pnW$?$pZ@OdpZ&FUhKiS8?`_OO~oR(p6&9YH<8OoERH))0J2um@ot zkn>uin~8?jKGIFJu@{ki*`}@C#Bi&z!X7U~c+DzXJog(fG0Dj^#(2P{WW+ZnixgQz zo;CHVSv`}@is-jG)~#{kkMdwblwv%`lUM+IyakcoP=#+I5-SNo@#s1aLY(Ry#o7;x z#o<dcix7vOsA~96nyQfRq-OC4T%ie#u+i=J0wR1~EWv)Hp%ge6C&l-5w*p=#k;lf{cy&b^$}e~`KEq-#3qY#AZ{<{f2hl*uzunj Ju{b;E{{Tlj5_|vv diff --git a/StructureHelper/Windows/Graphs/MaterialDiagramView.xaml b/StructureHelper/Windows/Graphs/MaterialDiagramView.xaml index 30b0748..d75bbfa 100644 --- a/StructureHelper/Windows/Graphs/MaterialDiagramView.xaml +++ b/StructureHelper/Windows/Graphs/MaterialDiagramView.xaml @@ -55,6 +55,7 @@