From 8fecfb931fb4ba9b0827543f18b85476395a87e2 Mon Sep 17 00:00:00 2001
From: Evgeny Redikultsev <effect-project@yandex.ru>
Date: Fri, 24 Feb 2023 22:17:55 +0500
Subject: [PATCH] Circle Primitive Added

---
 .../Infrastructure/Enums/PrimitiveType.cs     |   3 +-
 .../UI/DataContexts/CircleViewPrimitive.cs    |  56 +++++++++++++++
 .../UI/DataContexts/PrimitiveOperations.cs    |  17 +++--
 .../UI/DataTemplates/EllipseTemplate.xaml     |   3 +-
 .../UI/DataTemplates/RectangleTemplate.xaml   |   1 -
 .../Libraries/LoaderCalculator.dll            | Bin 72704 -> 72704 bytes
 .../Windows/MainWindow/MainView.xaml          |  45 +++++++++---
 .../Windows/MainWindow/MainView.xaml.cs       |  13 +++-
 .../Windows/MainWindow/MainViewModel.cs       |  18 ++++-
 .../PrimitivePropertiesView.xaml              |  15 ++++
 .../PrimitivePropertiesView.xaml.cs           |   2 +
 .../CrossSectionViewVisualProperty.cs         |   4 +-
 .../PrimitiveViewModelLogic.cs                |  11 ++-
 .../RCs/RectangleBeamViewModel.cs             |   2 +-
 .../Infrastructures/Strings/ErrorString.cs    |   2 +-
 .../Shapes/{ICircle.cs => ICircleShape.cs}    |   2 +-
 .../Services/ShapeServices/ShapeService.cs    |   5 ++
 .../CrossSections/RCs/CircleGeometryLogic.cs  |  61 ++++++++++++++++
 .../CrossSections/RCs/ICircleBeamTemplate.cs  |  20 ++++++
 .../CrossSections/RCs/RectGeometryLogic.cs    |   2 +-
 .../Primitives/CirclePrimitive.cs             |  66 ++++++++++++++++++
 .../Primitives/ICirclePrimitive.cs            |  13 ++++
 .../Primitives/INdmPrimitive.cs               |   2 +-
 .../Primitives/RectanglePrimitive.cs          |   8 +--
 .../CircleTriangulationLogic.cs               |  47 +++++++++++++
 .../CircleTriangulationLogicOptions.cs        |  38 ++++++++++
 .../ICircleTriangulationLogicOptions.cs       |  18 +++++
 .../IRectangleTriangulationLogicOptions.cs    |  14 +---
 .../IShapeTriangulationLogicOptions.cs        |  25 +++++++
 .../ITriangulationLogicOptions.cs             |   8 +--
 .../Triangulations/PointTriangulationLogic.cs |   2 +-
 .../PointTriangulationLogicOptions.cs         |  18 ++---
 .../RectangleTriangulationLogic.cs            |  27 ++++---
 .../RectangleTriangulationLogicOptions.cs     |  17 ++---
 .../Triangulations/TriangulationService.cs    |  28 ++++++++
 .../NdmPrimitives/NdmPrimitivesService.cs     |   2 -
 .../Ndms/SteelSections/ReinforcementTest.cs   |  43 ++++++++++--
 37 files changed, 571 insertions(+), 87 deletions(-)
 create mode 100644 StructureHelper/Infrastructure/UI/DataContexts/CircleViewPrimitive.cs
 rename StructureHelperCommon/Models/Shapes/{ICircle.cs => ICircleShape.cs} (70%)
 create mode 100644 StructureHelperLogics/Models/Templates/CrossSections/RCs/CircleGeometryLogic.cs
 create mode 100644 StructureHelperLogics/Models/Templates/CrossSections/RCs/ICircleBeamTemplate.cs
 create mode 100644 StructureHelperLogics/NdmCalculations/Primitives/CirclePrimitive.cs
 create mode 100644 StructureHelperLogics/NdmCalculations/Primitives/ICirclePrimitive.cs
 create mode 100644 StructureHelperLogics/NdmCalculations/Triangulations/CircleTriangulationLogic.cs
 create mode 100644 StructureHelperLogics/NdmCalculations/Triangulations/CircleTriangulationLogicOptions.cs
 create mode 100644 StructureHelperLogics/NdmCalculations/Triangulations/ICircleTriangulationLogicOptions.cs
 create mode 100644 StructureHelperLogics/NdmCalculations/Triangulations/IShapeTriangulationLogicOptions.cs
 create mode 100644 StructureHelperLogics/NdmCalculations/Triangulations/TriangulationService.cs

diff --git a/StructureHelper/Infrastructure/Enums/PrimitiveType.cs b/StructureHelper/Infrastructure/Enums/PrimitiveType.cs
index 7cf1ab0..596226c 100644
--- a/StructureHelper/Infrastructure/Enums/PrimitiveType.cs
+++ b/StructureHelper/Infrastructure/Enums/PrimitiveType.cs
@@ -3,6 +3,7 @@
     public enum PrimitiveType
     {
         Point,
-        Rectangle
+        Rectangle,
+        Circle
     }
 }
\ No newline at end of file
diff --git a/StructureHelper/Infrastructure/UI/DataContexts/CircleViewPrimitive.cs b/StructureHelper/Infrastructure/UI/DataContexts/CircleViewPrimitive.cs
new file mode 100644
index 0000000..f94a001
--- /dev/null
+++ b/StructureHelper/Infrastructure/UI/DataContexts/CircleViewPrimitive.cs
@@ -0,0 +1,56 @@
+using StructureHelper.Infrastructure.UI.Converters.Units;
+using StructureHelperCommon.Infrastructures.Exceptions;
+using StructureHelperCommon.Infrastructures.Strings;
+using StructureHelperLogics.NdmCalculations.Primitives;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelper.Infrastructure.UI.DataContexts
+{
+    public class CircleViewPrimitive : PrimitiveBase, IHasDivision, IHasCenter
+    {
+        ICirclePrimitive primitive;
+        public double Diameter
+        { get
+            {
+                return primitive.Diameter;
+            }
+        set
+            {
+                primitive.Diameter = value;
+                RefreshPlacement();
+            }
+        }
+        public int NdmMinDivision { get; set; }
+        public double NdmMaxSize { get; set; }
+
+        public double PrimitiveLeft => DeltaX - Diameter / 2d;
+        public double PrimitiveTop => DeltaY - Diameter / 2d;
+
+        public CircleViewPrimitive(INdmPrimitive primitive) : base(primitive)
+        {
+            if (primitive is not ICirclePrimitive)
+            {
+                throw new StructureHelperException(ErrorStrings.DataIsInCorrect + $"\nExpected: {nameof(ICirclePrimitive)}, But was: {nameof(primitive)}");
+            }
+            this.primitive = primitive as ICirclePrimitive;
+        }
+
+        public override INdmPrimitive GetNdmPrimitive()
+        {
+            return primitive;
+        }
+
+        private void RefreshPlacement()
+        {
+            OnPropertyChanged(nameof(Diameter));
+            OnPropertyChanged(nameof(CenterX));
+            OnPropertyChanged(nameof(CenterY));
+            OnPropertyChanged(nameof(PrimitiveLeft));
+            OnPropertyChanged(nameof(PrimitiveTop));
+        }
+    }
+}
diff --git a/StructureHelper/Infrastructure/UI/DataContexts/PrimitiveOperations.cs b/StructureHelper/Infrastructure/UI/DataContexts/PrimitiveOperations.cs
index 7e3c315..719c60c 100644
--- a/StructureHelper/Infrastructure/UI/DataContexts/PrimitiveOperations.cs
+++ b/StructureHelper/Infrastructure/UI/DataContexts/PrimitiveOperations.cs
@@ -19,16 +19,21 @@ namespace StructureHelper.Infrastructure.UI.DataContexts
             ObservableCollection<PrimitiveBase> viewItems = new ObservableCollection<PrimitiveBase>();
             foreach (var item in primitives)
             {
-                if (item is IPointPrimitive)
-                {
-                    var point = item as IPointPrimitive;
-                    viewItems.Add(new PointViewPrimitive(point));
-                }
-                else if (item is IRectanglePrimitive)
+                if (item is IRectanglePrimitive)
                 {
                     var rect = item as IRectanglePrimitive;
                     viewItems.Add(new RectangleViewPrimitive(rect));
                 }
+                else if (item is ICirclePrimitive)
+                {
+                    var circle = item as ICirclePrimitive;
+                    viewItems.Add(new CircleViewPrimitive(circle));
+                }
+                else if (item is IPointPrimitive)
+                {
+                    var point = item as IPointPrimitive;
+                    viewItems.Add(new PointViewPrimitive(point));
+                }
                 else throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknown);
             }
             return viewItems;
diff --git a/StructureHelper/Infrastructure/UI/DataTemplates/EllipseTemplate.xaml b/StructureHelper/Infrastructure/UI/DataTemplates/EllipseTemplate.xaml
index d974201..ce12680 100644
--- a/StructureHelper/Infrastructure/UI/DataTemplates/EllipseTemplate.xaml
+++ b/StructureHelper/Infrastructure/UI/DataTemplates/EllipseTemplate.xaml
@@ -10,7 +10,7 @@
              xmlns:userControls="clr-namespace:StructureHelper.Infrastructure.UI.UserControls"
              mc:Ignorable="d">
     <StackPanel>
-        <Ellipse Style="{StaticResource EllipseStyle}" d:DataContext="{d:DesignInstance dataContexts:PointViewPrimitive}">
+        <Ellipse Style="{StaticResource EllipseStyle}" d:DataContext="{d:DesignInstance dataContexts:PointViewPrimitive}" Tag ="{Binding}">
             <Ellipse.ToolTip>
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -43,6 +43,5 @@
                 </TransformGroup>
             </Ellipse.RenderTransform>
         </Ellipse>
-        <userControls:PrimitivePopup Type="Rectangle" IsOpen="{Binding ParamsPanelVisibilty}" d:DataContext="{d:DesignInstance dataContexts:PrimitiveBase}"/>
     </StackPanel>
 </UserControl>
diff --git a/StructureHelper/Infrastructure/UI/DataTemplates/RectangleTemplate.xaml b/StructureHelper/Infrastructure/UI/DataTemplates/RectangleTemplate.xaml
index dc410d2..89eb81a 100644
--- a/StructureHelper/Infrastructure/UI/DataTemplates/RectangleTemplate.xaml
+++ b/StructureHelper/Infrastructure/UI/DataTemplates/RectangleTemplate.xaml
@@ -52,6 +52,5 @@
                 </Rectangle.RenderTransform>
             </Rectangle>
         </Grid>
-        <userControls:PrimitivePopup IsOpen="{Binding ParamsPanelVisibilty}"/>
     </StackPanel>
 </UserControl>
diff --git a/StructureHelper/Libraries/LoaderCalculator.dll b/StructureHelper/Libraries/LoaderCalculator.dll
index fc4e08067578ab5c8f212779e1d03bab298d5f48..16ad4e55167c49e6f5ac3a52e96f0b3373374d68 100644
GIT binary patch
delta 17521
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

delta 17395
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
CmPfw;

diff --git a/StructureHelper/Windows/MainWindow/MainView.xaml b/StructureHelper/Windows/MainWindow/MainView.xaml
index 53028ca..0234fdb 100644
--- a/StructureHelper/Windows/MainWindow/MainView.xaml
+++ b/StructureHelper/Windows/MainWindow/MainView.xaml
@@ -18,6 +18,9 @@
         <DataTemplate DataType="{x:Type dataContexts:RectangleViewPrimitive}">
             <dataTemplates:RectangleTemplate/>
         </DataTemplate>
+        <DataTemplate DataType="{x:Type dataContexts:CircleViewPrimitive}">
+            <dataTemplates:EllipseTemplate/>
+        </DataTemplate>
         <DataTemplate DataType="{x:Type dataContexts:PointViewPrimitive}">
             <dataTemplates:EllipseTemplate/>
         </DataTemplate>
@@ -97,23 +100,24 @@
                         <ListBox ItemsSource="{Binding HeadMaterials}"  ItemTemplate="{StaticResource ColoredItemTemplate}">
                         </ListBox>
                     </Expander>
-                    <Expander Header="Geometry" MinWidth="20" DataContext="{Binding PrimitiveLogic}">
+                    <Expander Header="Geometry" MinWidth="20">
                         <Expander.ContextMenu>
                             <ContextMenu>
                                 <MenuItem Header="Add">
-                                    <Button Content="Add Rectangle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Rectangle}"/>
-                                    <Button Content="Add Point" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Point}"/>
+                                    <Button Content="Add Rectangle" Command="{Binding PrimitiveLogic.Add}" CommandParameter="{x:Static enums:PrimitiveType.Rectangle}"/>
+                                    <Button Content="Add Circle" Command="{Binding PrimitiveLogic.Add}" CommandParameter="{x:Static enums:PrimitiveType.Circle}"/>
+                                    <Button Content="Add Point" Command="{Binding PrimitiveLogic.Add}" CommandParameter="{x:Static enums:PrimitiveType.Point}"/>
                                 </MenuItem>
                             </ContextMenu>
                         </Expander.ContextMenu>
                         <ListBox ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" ItemTemplate="{StaticResource ColoredItemTemplate}">
                             <ListBox.ContextMenu>
                                 <ContextMenu>
-                                    <Button Content="Edit" Command="{Binding Edit}"/>
-                                    <Button Content="Copy" Command="{Binding Copy}"/>
-                                    <Button Content="Delete" Command="{Binding Delete}"/>
-                                    <Button Content="To Foreground" Command="{Binding SetToFront}"/>
-                                    <Button Content="To Background" Command="{Binding SetToBack}"/>
+                                    <Button Content="Edit" Command="{Binding PrimitiveLogic.Edit}"/>
+                                    <Button Content="Copy" Command="{Binding PrimitiveLogic.Copy}"/>
+                                    <Button Content="Delete" Command="{Binding PrimitiveLogic.Delete}"/>
+                                    <Button Content="To Foreground" Command="{Binding PrimitiveLogic.SetToFront}"/>
+                                    <Button Content="To Background" Command="{Binding PrimitiveLogic.SetToBack}"/>
                                 </ContextMenu>
                             </ListBox.ContextMenu>
                         </ListBox>
@@ -152,6 +156,15 @@
                 </i:Interaction.Triggers>
                 <ScrollViewer VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible">
                     <Canvas Name="WorkPlane" ClipToBounds="True" Width="{Binding CanvasWidth}" Height="{Binding CanvasHeight}">
+                        <Canvas.ContextMenu>
+                            <ContextMenu>
+                                <MenuItem Header="Add">
+                                    <Button Content="Add Rectangle" Command="{Binding PrimitiveLogic.Add}" CommandParameter="{x:Static enums:PrimitiveType.Rectangle}"/>
+                                    <Button Content="Add Circle" Command="{Binding PrimitiveLogic.Add}" CommandParameter="{x:Static enums:PrimitiveType.Circle}"/>
+                                    <Button Content="Add Point" Command="{Binding PrimitiveLogic.Add}" CommandParameter="{x:Static enums:PrimitiveType.Point}"/>
+                                </MenuItem>
+                            </ContextMenu>
+                        </Canvas.ContextMenu>
                         <i:Interaction.Behaviors>
                             <infrastructure:MouseBehaviour MouseX="{Binding PanelX, Mode=OneWayToSource}" MouseY="{Binding PanelY, Mode=OneWayToSource}"/>
                         </i:Interaction.Behaviors>
@@ -182,9 +195,9 @@
                         <Line X1="{Binding YX1}" X2="{Binding YX1}" Y1="0" Y2="{Binding YY2}" Stroke="ForestGreen" StrokeThickness="{Binding AxisLineThickness}"/>
                         <ItemsControl ItemsSource="{Binding PrimitiveLogic.Items}" d:DataContext="{d:DesignInstance vm:MainViewModel}">
                             <ItemsControl.ItemsPanel>
-                                <ItemsPanelTemplate>
-                                    <Canvas/>
-                                </ItemsPanelTemplate>
+                                    <ItemsPanelTemplate>
+                                        <Canvas/>
+                                    </ItemsPanelTemplate>
                             </ItemsControl.ItemsPanel>
                             <ItemsControl.ItemContainerStyle>
                                 <Style TargetType="ContentPresenter">
@@ -192,8 +205,18 @@
                                     <Setter Property="Canvas.Left" Value="{Binding PrimitiveLeft}"/>
                                     <Setter Property="Canvas.Top" Value="{Binding PrimitiveTop}"/>
                                     <Setter Property="Visibility" Value="{Binding IsVisible, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                                    <EventSetter Event="MouseDown" Handler="ContentPresenter_MouseLeftButtonDown"/>
                                 </Style>
                             </ItemsControl.ItemContainerStyle>
+                            <ItemsControl.ContextMenu>
+                                <ContextMenu>
+                                    <Button Content="Edit primitive" Command="{Binding PrimitiveLogic.Edit}"/>
+                                    <Button Content="Copy" Command="{Binding PrimitiveLogic.Copy}"/>
+                                    <Button Content="Delete" Command="{Binding PrimitiveLogic.Delete}"/>
+                                    <Button Content="To Foreground" Command="{Binding PrimitiveLogic.SetToFront}"/>
+                                    <Button Content="To Background" Command="{Binding PrimitiveLogic.SetToBack}"/>
+                                </ContextMenu>
+                            </ItemsControl.ContextMenu>
                         </ItemsControl>
                     </Canvas>
                 </ScrollViewer>
diff --git a/StructureHelper/Windows/MainWindow/MainView.xaml.cs b/StructureHelper/Windows/MainWindow/MainView.xaml.cs
index 54fb619..5c4d817 100644
--- a/StructureHelper/Windows/MainWindow/MainView.xaml.cs
+++ b/StructureHelper/Windows/MainWindow/MainView.xaml.cs
@@ -1,4 +1,6 @@
 using System.Windows;
+using System.Windows.Controls;
+using StructureHelper.Infrastructure.UI.DataContexts;
 using StructureHelper.Services;
 using StructureHelper.Services.Primitives;
 
@@ -6,13 +8,22 @@ namespace StructureHelper.Windows.MainWindow
 {
     public partial class MainView : Window
     {
+        private MainViewModel viewModel;
         public IPrimitiveRepository PrimitiveRepository { get; }
 
         public MainView(IPrimitiveRepository primitiveRepository, MainViewModel viewModel)
         {
             PrimitiveRepository = primitiveRepository;
-            DataContext = viewModel;
+            this.viewModel = viewModel;
+            DataContext = this.viewModel;
             InitializeComponent();
         }
+
+        private void ContentPresenter_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            var contentPresenter = sender as ContentPresenter;
+            var item = contentPresenter?.Content as PrimitiveBase;
+            viewModel.PrimitiveLogic.SelectedItem = item;
+        }
     }
 }
diff --git a/StructureHelper/Windows/MainWindow/MainViewModel.cs b/StructureHelper/Windows/MainWindow/MainViewModel.cs
index e7df72c..c11bf65 100644
--- a/StructureHelper/Windows/MainWindow/MainViewModel.cs
+++ b/StructureHelper/Windows/MainWindow/MainViewModel.cs
@@ -191,10 +191,26 @@ namespace StructureHelper.Windows.MainWindow
             }
         }
 
+        public RelayCommand SelectPrimitiveCommand
+        {
+            get
+            {
+                return selectPrimitive ??
+                    (selectPrimitive = new RelayCommand(obj=>
+                    {
+                        if (obj is PrimitiveBase)
+                        {
+                            SelectedPrimitive = obj as PrimitiveBase;
+                        }
+                    }));
+            }
+        }
+
         private double delta = 0.0005;
         private ActionsViewModel combinationsLogic;
         private IPrimitiveViewModelLogic primitiveLogic;
         private RelayCommand showVisualProperty;
+        private RelayCommand selectPrimitive;
 
         public MainViewModel(MainModel model)
         {
@@ -208,7 +224,7 @@ namespace StructureHelper.Windows.MainWindow
             XY1 = CanvasHeight / 2d;
             YX1 = CanvasWidth / 2d;
             YY2 = CanvasHeight;
-            scaleValue = 400d;
+            scaleValue = 300d;
 
             LeftButtonUp = new RelayCommand(o =>
             {
diff --git a/StructureHelper/Windows/PrimitivePropertiesWindow/PrimitivePropertiesView.xaml b/StructureHelper/Windows/PrimitivePropertiesWindow/PrimitivePropertiesView.xaml
index 173a83f..34eb61f 100644
--- a/StructureHelper/Windows/PrimitivePropertiesWindow/PrimitivePropertiesView.xaml
+++ b/StructureHelper/Windows/PrimitivePropertiesWindow/PrimitivePropertiesView.xaml
@@ -28,6 +28,21 @@
                 </Grid>
             </Expander>
         </DataTemplate>
+        <DataTemplate x:Key="CircleProperties">
+            <Expander Header="Circle" IsExpanded="True">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="22"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Row="0" Text="Diameter"/>
+                    <TextBox Grid.Row="0" Grid.Column="1" Margin="1" Text="{Binding Diameter, Converter={StaticResource LengthConverter}, ValidatesOnExceptions=True}"/>
+                </Grid>
+            </Expander>
+        </DataTemplate>
         <DataTemplate x:Key="PointProperties">
             <Expander Header="Point" IsExpanded="True">
                 <Grid>
diff --git a/StructureHelper/Windows/PrimitivePropertiesWindow/PrimitivePropertiesView.xaml.cs b/StructureHelper/Windows/PrimitivePropertiesWindow/PrimitivePropertiesView.xaml.cs
index cff5505..f28700a 100644
--- a/StructureHelper/Windows/PrimitivePropertiesWindow/PrimitivePropertiesView.xaml.cs
+++ b/StructureHelper/Windows/PrimitivePropertiesWindow/PrimitivePropertiesView.xaml.cs
@@ -36,6 +36,7 @@ namespace StructureHelper.Windows.PrimitiveProperiesWindow
             this.DataContext = viewModel;
             InitializeComponent();
             if (primitive is RectangleViewPrimitive) { AddPrimitiveProperties(PrimitiveType.Rectangle); }
+            else if (primitive is CircleViewPrimitive) { AddPrimitiveProperties(PrimitiveType.Circle); }
             else if (primitive is PointViewPrimitive) { AddPrimitiveProperties(PrimitiveType.Point); }
             else { throw new Exception("Type of object is unknown"); }   
         }
@@ -44,6 +45,7 @@ namespace StructureHelper.Windows.PrimitiveProperiesWindow
             List<string> names = new List<string>();
             if (primitive is IHasDivision) { names.Add("TriangulationProperties");}
             if (primitive is RectangleViewPrimitive) { names.Add("RectangleProperties"); }
+            else if (primitive is CircleViewPrimitive) { names.Add("CircleProperties"); }
             else if (primitive is PointViewPrimitive) { names.Add("PointProperties"); }
             foreach (var name in names)
             {
diff --git a/StructureHelper/Windows/ViewModels/NdmCrossSections/CrossSectionViewVisualProperty.cs b/StructureHelper/Windows/ViewModels/NdmCrossSections/CrossSectionViewVisualProperty.cs
index c9e5e4c..e41f9a4 100644
--- a/StructureHelper/Windows/ViewModels/NdmCrossSections/CrossSectionViewVisualProperty.cs
+++ b/StructureHelper/Windows/ViewModels/NdmCrossSections/CrossSectionViewVisualProperty.cs
@@ -19,8 +19,8 @@ namespace StructureHelper.Windows.ViewModels.NdmCrossSections
             AxisLineThickness = 2d;
             GridLineThickness = 0.25d;
             GridSize = 0.05d;
-            WorkPlainWidth = 2d;
-            WorkPlainHeight = 1.6d;
+            WorkPlainWidth = 2.4d;
+            WorkPlainHeight = 2.0d;
         }
     }
 }
diff --git a/StructureHelper/Windows/ViewModels/NdmCrossSections/PrimitiveViewModelLogic.cs b/StructureHelper/Windows/ViewModels/NdmCrossSections/PrimitiveViewModelLogic.cs
index e8df0e8..c674ee4 100644
--- a/StructureHelper/Windows/ViewModels/NdmCrossSections/PrimitiveViewModelLogic.cs
+++ b/StructureHelper/Windows/ViewModels/NdmCrossSections/PrimitiveViewModelLogic.cs
@@ -78,7 +78,15 @@ namespace StructureHelper.Windows.ViewModels.NdmCrossSections
                 ndmPrimitive = primitive;
                 viewPrimitive = new PointViewPrimitive(primitive);
             }
-
+            else if (primitiveType == PrimitiveType.Circle)
+            {
+                var primitive = new CirclePrimitive
+                {
+                    Diameter = 0.5d
+                };
+                ndmPrimitive = primitive;
+                viewPrimitive = new CircleViewPrimitive(primitive);
+            }
             else { throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknown + nameof(primitiveType)); }
             viewPrimitive.RegisterDeltas(CanvasWidth / 2, CanvasHeight / 2);
             repository.Primitives.Add(ndmPrimitive);
@@ -159,6 +167,7 @@ namespace StructureHelper.Windows.ViewModels.NdmCrossSections
             repository.Primitives.Add(newPrimitive);
             PrimitiveBase primitiveBase;
             if (newPrimitive is IRectanglePrimitive) { primitiveBase = new RectangleViewPrimitive(newPrimitive as IRectanglePrimitive); }
+            else if (newPrimitive is ICirclePrimitive) { primitiveBase = new CircleViewPrimitive(newPrimitive as ICirclePrimitive); }
             else if (newPrimitive is IPointPrimitive) { primitiveBase = new PointViewPrimitive(newPrimitive as IPointPrimitive); }
             else throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknown);
             primitiveBase.RegisterDeltas(CanvasWidth / 2, CanvasHeight / 2);
diff --git a/StructureHelper/Windows/ViewModels/PrimitiveTemplates/RCs/RectangleBeamViewModel.cs b/StructureHelper/Windows/ViewModels/PrimitiveTemplates/RCs/RectangleBeamViewModel.cs
index 099e09d..2157442 100644
--- a/StructureHelper/Windows/ViewModels/PrimitiveTemplates/RCs/RectangleBeamViewModel.cs
+++ b/StructureHelper/Windows/ViewModels/PrimitiveTemplates/RCs/RectangleBeamViewModel.cs
@@ -17,7 +17,7 @@ namespace StructureHelper.Windows.ViewModels.PrimitiveTemplates.RCs
     {
 		public IRectangleBeamTemplate Model;
 
-		private RectangleShape rectangle => (Model.Shape as RectangleShape);
+		private RectangleShape rectangle => Model.Shape as RectangleShape;
 
 		public Window ParentWindow { get; set; }
 
diff --git a/StructureHelperCommon/Infrastructures/Strings/ErrorString.cs b/StructureHelperCommon/Infrastructures/Strings/ErrorString.cs
index 1939600..7ccbc75 100644
--- a/StructureHelperCommon/Infrastructures/Strings/ErrorString.cs
+++ b/StructureHelperCommon/Infrastructures/Strings/ErrorString.cs
@@ -9,7 +9,7 @@
         public static string ShapeIsNotCorrect => "#0004: Shape is not valid";
         public static string LimitStatesIsNotValid => "#0005: Type of limite state is not valid";
         public static string LoadTermIsNotValid => "#0006: Load term is not valid";
-        public static string IncorrectValue => "#0007: value is not valid";
+        public static string IncorrectValue => "#0007: Value is not valid";
         public static string FileCantBeDeleted => "#0008: File can't be deleted";
         public static string FileCantBeSaved => "#0009: File can't be saved";
         public static string VisualPropertyIsNotRight => "#0010: VisualPropertyIsNotRight";
diff --git a/StructureHelperCommon/Models/Shapes/ICircle.cs b/StructureHelperCommon/Models/Shapes/ICircleShape.cs
similarity index 70%
rename from StructureHelperCommon/Models/Shapes/ICircle.cs
rename to StructureHelperCommon/Models/Shapes/ICircleShape.cs
index 93b181f..068031e 100644
--- a/StructureHelperCommon/Models/Shapes/ICircle.cs
+++ b/StructureHelperCommon/Models/Shapes/ICircleShape.cs
@@ -1,6 +1,6 @@
 namespace StructureHelperCommon.Models.Shapes
 {
-    public interface ICircle : IShape
+    public interface ICircleShape : IShape
     {
         double Diameter { get; set; }
     }
diff --git a/StructureHelperCommon/Services/ShapeServices/ShapeService.cs b/StructureHelperCommon/Services/ShapeServices/ShapeService.cs
index e198a12..ba5d8dc 100644
--- a/StructureHelperCommon/Services/ShapeServices/ShapeService.cs
+++ b/StructureHelperCommon/Services/ShapeServices/ShapeService.cs
@@ -18,5 +18,10 @@ namespace StructureHelperCommon.Services.ShapeServices
             target.Height = source.Height;
             target.Angle = source.Angle;
         }
+
+        public static void CopyCircleProperties(ICircleShape source, ICircleShape target)
+        {
+            target.Diameter = source.Diameter;
+        }
     }
 }
diff --git a/StructureHelperLogics/Models/Templates/CrossSections/RCs/CircleGeometryLogic.cs b/StructureHelperLogics/Models/Templates/CrossSections/RCs/CircleGeometryLogic.cs
new file mode 100644
index 0000000..6cdfb08
--- /dev/null
+++ b/StructureHelperLogics/Models/Templates/CrossSections/RCs/CircleGeometryLogic.cs
@@ -0,0 +1,61 @@
+using StructureHelper.Models.Materials;
+using StructureHelperLogics.Models.Primitives;
+using StructureHelperLogics.NdmCalculations.Primitives;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media.Media3D;
+
+namespace StructureHelperLogics.Models.Templates.CrossSections.RCs
+{
+    public class CircleGeometryLogic : IRCGeometryLogic
+    {
+        ICircleBeamTemplate template;
+        
+        
+        public IEnumerable<IHeadMaterial> HeadMaterials { get; set; }
+
+        public CircleGeometryLogic(ICircleBeamTemplate template)
+        {
+            this.template = template;
+        }
+
+        public IEnumerable<INdmPrimitive> GetNdmPrimitives()
+        {
+            List<INdmPrimitive> primitives = new List<INdmPrimitive>();
+            primitives.AddRange(GetConcretePrimitives());
+            primitives.AddRange(GetReinfrocementPrimitives());
+            return primitives;
+        }
+
+        private IEnumerable<INdmPrimitive> GetConcretePrimitives()
+        {
+            var diameter = template.SectionDiameter;
+            var concreteMaterial = HeadMaterials.ToList()[0];
+            var primitives = new List<INdmPrimitive>();
+            var rectangle = new CirclePrimitive() { Diameter = diameter, Name = "Concrete block", HeadMaterial = concreteMaterial };
+            primitives.Add(rectangle);
+            return primitives;
+        }
+
+        private IEnumerable<INdmPrimitive> GetReinfrocementPrimitives()
+        {
+            var reinforcementMaterial = HeadMaterials.ToList()[1];
+            var radius = template.SectionDiameter / 2 - template.CoverGap;
+            var dAngle = 2d * Math.PI / template.BarQuantity;
+            var barArea = Math.PI* template.BarDiameter* template.BarDiameter / 4d;
+            var primitives = new List<INdmPrimitive>();
+            for (int i = 0; i < template.BarQuantity; i++)
+            {
+                var angle = i * dAngle;
+                var x = radius * Math.Sin(angle);
+                var y = radius * Math.Cos(angle);
+                var point = new PointPrimitive() { CenterX = x, CenterY = y, Area = barArea, Name = "Left bottom point", HeadMaterial = reinforcementMaterial };
+                primitives.Add(point);
+            }
+            return primitives;
+        }
+    }
+}
diff --git a/StructureHelperLogics/Models/Templates/CrossSections/RCs/ICircleBeamTemplate.cs b/StructureHelperLogics/Models/Templates/CrossSections/RCs/ICircleBeamTemplate.cs
new file mode 100644
index 0000000..179407e
--- /dev/null
+++ b/StructureHelperLogics/Models/Templates/CrossSections/RCs/ICircleBeamTemplate.cs
@@ -0,0 +1,20 @@
+using StructureHelperCommon.Models.Shapes;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperLogics.Models.Templates.CrossSections.RCs
+{
+    public interface ICircleBeamTemplate
+    {
+        ICircleShape Circle { get; }
+        double CoverGap { get; set; }
+        double SectionDiameter { get; set; }
+        int BarQuantity { get; set; }
+        double BarDiameter { get; set; }
+
+
+    }
+}
diff --git a/StructureHelperLogics/Models/Templates/CrossSections/RCs/RectGeometryLogic.cs b/StructureHelperLogics/Models/Templates/CrossSections/RCs/RectGeometryLogic.cs
index 2910820..cc14ce3 100644
--- a/StructureHelperLogics/Models/Templates/CrossSections/RCs/RectGeometryLogic.cs
+++ b/StructureHelperLogics/Models/Templates/CrossSections/RCs/RectGeometryLogic.cs
@@ -46,7 +46,7 @@ namespace StructureHelperLogics.Models.Templates.CrossSections.RCs
 
         private IEnumerable<INdmPrimitive> GetConcretePrimitives()
         {
-            List<INdmPrimitive> primitives = new List<INdmPrimitive>();
+            var primitives = new List<INdmPrimitive>();
             var rectangle = new RectanglePrimitive(concrete) { Width = width, Height = height, Name = "Concrete block" };
             primitives.Add(rectangle);
             return primitives;
diff --git a/StructureHelperLogics/NdmCalculations/Primitives/CirclePrimitive.cs b/StructureHelperLogics/NdmCalculations/Primitives/CirclePrimitive.cs
new file mode 100644
index 0000000..588c69f
--- /dev/null
+++ b/StructureHelperLogics/NdmCalculations/Primitives/CirclePrimitive.cs
@@ -0,0 +1,66 @@
+using LoaderCalculator.Data.Materials;
+using LoaderCalculator.Data.Ndms;
+using StructureHelper.Models.Materials;
+using StructureHelperCommon.Models.Forces;
+using StructureHelperCommon.Services.ShapeServices;
+using StructureHelperLogics.NdmCalculations.Triangulations;
+using StructureHelperLogics.Services.NdmPrimitives;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperLogics.NdmCalculations.Primitives
+{
+    public class CirclePrimitive : ICirclePrimitive
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+        public double CenterX { get; set; }
+        public double CenterY { get; set; }
+        public IHeadMaterial? HeadMaterial { get; set; }
+
+        public IStrainTuple UsersPrestrain { get; }
+
+        public IStrainTuple AutoPrestrain { get; }
+
+        public IVisualProperty VisualProperty { get; }
+
+        public double Diameter { get; set; }
+        public double NdmMaxSize { get; set; }
+        public int NdmMinDivision { get; set; }
+
+        public CirclePrimitive()
+        {
+            Name = "New Circle";
+            NdmMaxSize = 0.01d;
+            NdmMinDivision = 10;
+            VisualProperty = new VisualProperty { Opacity = 0.8d };
+            UsersPrestrain = new StrainTuple();
+            AutoPrestrain = new StrainTuple();
+        }
+
+        public object Clone()
+        {
+            var primitive = new CirclePrimitive();
+            NdmPrimitivesService.CopyDivisionProperties(this, primitive);
+            ShapeService.CopyCircleProperties(this, primitive);
+            return primitive;
+        }
+
+        public IEnumerable<INdm> GetNdms(IMaterial material)
+        {
+            var ndms = new List<INdm>();
+            var options = new CircleTriangulationLogicOptions(this);
+            var logic = new CircleTriangulationLogic(options);
+            ndms.AddRange(logic.GetNdmCollection(material));
+            return ndms;
+        }
+
+        public void Save()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/StructureHelperLogics/NdmCalculations/Primitives/ICirclePrimitive.cs b/StructureHelperLogics/NdmCalculations/Primitives/ICirclePrimitive.cs
new file mode 100644
index 0000000..74f9438
--- /dev/null
+++ b/StructureHelperLogics/NdmCalculations/Primitives/ICirclePrimitive.cs
@@ -0,0 +1,13 @@
+using StructureHelperCommon.Models.Shapes;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperLogics.NdmCalculations.Primitives
+{
+    public interface ICirclePrimitive : IHasDivisionSize, ICircleShape
+    {
+    }
+}
diff --git a/StructureHelperLogics/NdmCalculations/Primitives/INdmPrimitive.cs b/StructureHelperLogics/NdmCalculations/Primitives/INdmPrimitive.cs
index b5584c9..4eb6cd1 100644
--- a/StructureHelperLogics/NdmCalculations/Primitives/INdmPrimitive.cs
+++ b/StructureHelperLogics/NdmCalculations/Primitives/INdmPrimitive.cs
@@ -16,7 +16,7 @@ namespace StructureHelperLogics.NdmCalculations.Primitives
         string Name { get; set; }
         double CenterX { get; set; }
         double CenterY { get; set; }
-        IHeadMaterial HeadMaterial { get; set; }
+        IHeadMaterial? HeadMaterial { get; set; }
         IStrainTuple UsersPrestrain { get; }
         IStrainTuple AutoPrestrain { get; }
         //double PrestrainKx { get; set; }
diff --git a/StructureHelperLogics/NdmCalculations/Primitives/RectanglePrimitive.cs b/StructureHelperLogics/NdmCalculations/Primitives/RectanglePrimitive.cs
index a7d4cca..836468d 100644
--- a/StructureHelperLogics/NdmCalculations/Primitives/RectanglePrimitive.cs
+++ b/StructureHelperLogics/NdmCalculations/Primitives/RectanglePrimitive.cs
@@ -22,7 +22,7 @@ namespace StructureHelperLogics.NdmCalculations.Primitives
         public string Name { get; set; }
         public double CenterX { get; set; }
         public double CenterY { get; set; }
-        public IHeadMaterial HeadMaterial { get; set; }
+        public IHeadMaterial? HeadMaterial { get; set; }
         public IStrainTuple UsersPrestrain { get; private set; }
         public IStrainTuple AutoPrestrain { get; private set; }
         public double NdmMaxSize { get; set; }
@@ -47,7 +47,7 @@ namespace StructureHelperLogics.NdmCalculations.Primitives
 
         public object Clone()
         {
-            RectanglePrimitive primitive = new RectanglePrimitive();
+            var primitive = new RectanglePrimitive();
             NdmPrimitivesService.CopyDivisionProperties(this, primitive);
             ShapeService.CopyRectangleProperties(this, primitive);
             return primitive;
@@ -55,9 +55,9 @@ namespace StructureHelperLogics.NdmCalculations.Primitives
 
         public IEnumerable<INdm> GetNdms(IMaterial material)
         {
-            List<INdm> ndms = new List<INdm>();
+            var ndms = new List<INdm>();
             var options = new RectangleTriangulationLogicOptions(this);
-            ITriangulationLogic logic = new RectangleTriangulationLogic(options);
+            var logic = new RectangleTriangulationLogic(options);
             ndms.AddRange(logic.GetNdmCollection(material));
             return ndms;
         }
diff --git a/StructureHelperLogics/NdmCalculations/Triangulations/CircleTriangulationLogic.cs b/StructureHelperLogics/NdmCalculations/Triangulations/CircleTriangulationLogic.cs
new file mode 100644
index 0000000..344f3f4
--- /dev/null
+++ b/StructureHelperLogics/NdmCalculations/Triangulations/CircleTriangulationLogic.cs
@@ -0,0 +1,47 @@
+using LoaderCalculator.Data.Materials;
+using LoaderCalculator.Data.Ndms;
+using StructureHelperCommon.Infrastructures.Exceptions;
+using StructureHelperCommon.Infrastructures.Strings;
+using StructureHelperLogics.NdmCalculations.Primitives;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperLogics.NdmCalculations.Triangulations
+{
+    internal class CircleTriangulationLogic : ITriangulationLogic
+    {
+        CircleTriangulationLogicOptions options;
+        public ITriangulationLogicOptions Options { get; private set; }
+        public CircleTriangulationLogic(ITriangulationLogicOptions options)
+        {
+            ValidateOptions(options);
+            this.options = options as CircleTriangulationLogicOptions;
+            Options = options;
+        }
+
+        public IEnumerable<INdm> GetNdmCollection(IMaterial material)
+        {
+
+            double diameter = options.Circle.Diameter;
+            double ndmMaxSize = options.NdmMaxSize;
+            int ndmMinDivision = options.NdmMinDivision;
+            var logicOptions = new LoaderCalculator.Triangulations.CircleTriangulationLogicOptions(diameter, ndmMaxSize, ndmMinDivision);
+            var logic = LoaderCalculator.Triangulations.Triangulation.GetLogicInstance(logicOptions);
+            var ndmCollection = logic.GetNdmCollection(new LoaderCalculator.Data.Planes.CirclePlane { Material = material });
+            TriangulationService.CommonTransform(ndmCollection, options);
+            TriangulationService.SetPrestrain(ndmCollection, options.Prestrain);
+            return ndmCollection;
+        }
+
+        public void ValidateOptions(ITriangulationLogicOptions options)
+        {
+            if (options is not ICircleTriangulationLogicOptions )
+            {
+                throw new StructureHelperException(ErrorStrings.DataIsInCorrect + $"\n Expected: {nameof(ICircleTriangulationLogicOptions)}, But was: {nameof(options)}");
+            }
+        }
+    }
+}
diff --git a/StructureHelperLogics/NdmCalculations/Triangulations/CircleTriangulationLogicOptions.cs b/StructureHelperLogics/NdmCalculations/Triangulations/CircleTriangulationLogicOptions.cs
new file mode 100644
index 0000000..7b7fea2
--- /dev/null
+++ b/StructureHelperLogics/NdmCalculations/Triangulations/CircleTriangulationLogicOptions.cs
@@ -0,0 +1,38 @@
+using StructureHelperCommon.Models.Forces;
+using StructureHelperCommon.Models.Shapes;
+using StructureHelperLogics.NdmCalculations.Primitives;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperLogics.NdmCalculations.Triangulations
+{
+    public class CircleTriangulationLogicOptions : ICircleTriangulationLogicOptions
+    {
+        public ICircleShape Circle { get; }
+
+        public IPoint2D Center { get; }
+
+        public double NdmMaxSize { get; }
+
+        public int NdmMinDivision { get; }
+
+        public IStrainTuple Prestrain { get; set; }
+
+        public CircleTriangulationLogicOptions(ICirclePrimitive primitive)
+        {
+            Center = new Point2D() { X = primitive.CenterX, Y = primitive.CenterY };
+            Circle = primitive;
+            NdmMaxSize = primitive.NdmMaxSize;
+            NdmMinDivision = primitive.NdmMinDivision;
+            Prestrain = new StrainTuple
+            {
+                Kx = primitive.UsersPrestrain.Kx + primitive.AutoPrestrain.Kx,
+                Ky = primitive.UsersPrestrain.Ky + primitive.AutoPrestrain.Ky,
+                EpsZ = primitive.UsersPrestrain.EpsZ + primitive.AutoPrestrain.EpsZ
+            };
+        }
+    }
+}
diff --git a/StructureHelperLogics/NdmCalculations/Triangulations/ICircleTriangulationLogicOptions.cs b/StructureHelperLogics/NdmCalculations/Triangulations/ICircleTriangulationLogicOptions.cs
new file mode 100644
index 0000000..414792d
--- /dev/null
+++ b/StructureHelperLogics/NdmCalculations/Triangulations/ICircleTriangulationLogicOptions.cs
@@ -0,0 +1,18 @@
+using StructureHelperCommon.Models.Shapes;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperLogics.NdmCalculations.Triangulations
+{
+    internal interface ICircleTriangulationLogicOptions : IShapeTriangulationLogicOptions
+    {
+        /// <summary>
+        /// Shape
+        /// </summary>
+        ICircleShape Circle { get; }
+
+    }
+}
diff --git a/StructureHelperLogics/NdmCalculations/Triangulations/IRectangleTriangulationLogicOptions.cs b/StructureHelperLogics/NdmCalculations/Triangulations/IRectangleTriangulationLogicOptions.cs
index 66851dc..5f62a22 100644
--- a/StructureHelperLogics/NdmCalculations/Triangulations/IRectangleTriangulationLogicOptions.cs
+++ b/StructureHelperLogics/NdmCalculations/Triangulations/IRectangleTriangulationLogicOptions.cs
@@ -6,23 +6,11 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
     /// Parameter of triangulation of rectangle part of section
     /// Параметры триангуляции прямоугольного участка сечения
     /// </summary>
-    public interface IRectangleTriangulationLogicOptions : ITriangulationLogicOptions
+    public interface IRectangleTriangulationLogicOptions : IShapeTriangulationLogicOptions
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        IPoint2D Center { get; }
         /// <summary>
         /// 
         /// </summary>
         IRectangleShape Rectangle { get; }
-        /// <summary>
-        /// Maximum size (width or height) of ndm part after triangulation
-        /// </summary>
-        double NdmMaxSize { get; }
-        /// <summary>
-        /// Minimum quantity of division of side of rectangle after triangulation
-        /// </summary>
-        int NdmMinDivision { get; }
     }
 }
diff --git a/StructureHelperLogics/NdmCalculations/Triangulations/IShapeTriangulationLogicOptions.cs b/StructureHelperLogics/NdmCalculations/Triangulations/IShapeTriangulationLogicOptions.cs
new file mode 100644
index 0000000..e1340a3
--- /dev/null
+++ b/StructureHelperLogics/NdmCalculations/Triangulations/IShapeTriangulationLogicOptions.cs
@@ -0,0 +1,25 @@
+using StructureHelperCommon.Models.Shapes;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperLogics.NdmCalculations.Triangulations
+{
+    public interface IShapeTriangulationLogicOptions : ITriangulationLogicOptions
+    {
+        /// <summary>
+        /// Center of shape
+        /// </summary>
+        IPoint2D Center { get; }
+        /// <summary>
+        /// Maximum size (width or height) of ndm part after triangulation
+        /// </summary>
+        double NdmMaxSize { get; }
+        /// <summary>
+        /// Minimum quantity of division of side of rectangle after triangulation
+        /// </summary>
+        int NdmMinDivision { get; }
+    }
+}
diff --git a/StructureHelperLogics/NdmCalculations/Triangulations/ITriangulationLogicOptions.cs b/StructureHelperLogics/NdmCalculations/Triangulations/ITriangulationLogicOptions.cs
index 513a185..ed4cc19 100644
--- a/StructureHelperLogics/NdmCalculations/Triangulations/ITriangulationLogicOptions.cs
+++ b/StructureHelperLogics/NdmCalculations/Triangulations/ITriangulationLogicOptions.cs
@@ -1,9 +1,9 @@
-namespace StructureHelperLogics.NdmCalculations.Triangulations
+using StructureHelperCommon.Models.Forces;
+
+namespace StructureHelperLogics.NdmCalculations.Triangulations
 {
     public interface ITriangulationLogicOptions
     {
-        double PrestrainKx { get;}
-        double PrestrainKy { get;}
-        double PrestrainEpsZ { get;}
+        IStrainTuple Prestrain { get; set; }
     }
 }
diff --git a/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogic.cs b/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogic.cs
index c682be6..964343d 100644
--- a/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogic.cs
+++ b/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogic.cs
@@ -25,7 +25,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
             List<INdm> ndmCollection = new List<INdm>();
             INdm ndm = new Ndm { CenterX = center.X, CenterY = center.Y, Area = area, Material = material };
             ndmCollection.Add(ndm);
-            NdmTransform.SetPrestrain(ndmCollection, new StrainMatrix() { Kx = Options.PrestrainKx, Ky = Options.PrestrainKy, EpsZ = Options.PrestrainEpsZ });
+            NdmTransform.SetPrestrain(ndmCollection, new StrainMatrix() { Kx = options.Prestrain.Kx, Ky = options.Prestrain.Ky, EpsZ = options.Prestrain.EpsZ });
             return ndmCollection;
         }
 
diff --git a/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogicOptions.cs b/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogicOptions.cs
index 1abae2e..49913e9 100644
--- a/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogicOptions.cs
+++ b/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogicOptions.cs
@@ -1,5 +1,6 @@
 using StructureHelperCommon.Infrastructures.Exceptions;
 using StructureHelperCommon.Infrastructures.Strings;
+using StructureHelperCommon.Models.Forces;
 using StructureHelperCommon.Models.Shapes;
 using StructureHelperLogics.Models.Primitives;
 using StructureHelperLogics.NdmCalculations.Primitives;
@@ -17,26 +18,27 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
         public IPoint2D Center { get; }
         /// <inheritdoc />
         public double Area { get; }
+        public IStrainTuple Prestrain { get; set; }
+
         /// <inheritdoc />
-        public double PrestrainKx { get; }
-        /// <inheritdoc />
-        public double PrestrainKy { get; }
-        /// <inheritdoc />
-        public double PrestrainEpsZ { get; }
 
         public PointTriangulationLogicOptions(IPoint2D center, double area)
         {
             Center = center;
             Area = area;
+            Prestrain = new StrainTuple();
         }
 
         public PointTriangulationLogicOptions(IPointPrimitive primitive)
         {
             Center = new Point2D() { X = primitive.CenterX, Y = primitive.CenterY };
             Area = primitive.Area;
-            PrestrainKx = primitive.UsersPrestrain.Kx + primitive.AutoPrestrain.Kx;
-            PrestrainKy = primitive.UsersPrestrain.Ky + primitive.AutoPrestrain.Ky;
-            PrestrainEpsZ = primitive.UsersPrestrain.EpsZ + primitive.AutoPrestrain.EpsZ;
+            Prestrain = new StrainTuple
+            {
+                Kx = primitive.UsersPrestrain.Kx + primitive.AutoPrestrain.Kx,
+                Ky = primitive.UsersPrestrain.Ky + primitive.AutoPrestrain.Ky,
+                EpsZ = primitive.UsersPrestrain.EpsZ + primitive.AutoPrestrain.EpsZ
+            };
         }
     }
 }
diff --git a/StructureHelperLogics/NdmCalculations/Triangulations/RectangleTriangulationLogic.cs b/StructureHelperLogics/NdmCalculations/Triangulations/RectangleTriangulationLogic.cs
index a11e435..bf6c69f 100644
--- a/StructureHelperLogics/NdmCalculations/Triangulations/RectangleTriangulationLogic.cs
+++ b/StructureHelperLogics/NdmCalculations/Triangulations/RectangleTriangulationLogic.cs
@@ -4,39 +4,44 @@ using System;
 using System.Collections.Generic;
 using LoaderCalculator.Data.Ndms.Transformations;
 using LoaderCalculator.Data.Matrix;
+using StructureHelperCommon.Infrastructures.Exceptions;
+using StructureHelperCommon.Infrastructures.Strings;
 
 namespace StructureHelperLogics.NdmCalculations.Triangulations
 {
     public class RectangleTriangulationLogic : IRectangleTriangulationLogic
     {
+        IRectangleTriangulationLogicOptions options;
         public ITriangulationLogicOptions Options { get; }
 
         public IEnumerable<INdm> GetNdmCollection(IMaterial material)
         {
-            IRectangleTriangulationLogicOptions rectangleOptions = Options as IRectangleTriangulationLogicOptions;
-            double width = rectangleOptions.Rectangle.Width;
-            double height = rectangleOptions.Rectangle.Height;
-            double ndmMaxSize = rectangleOptions.NdmMaxSize;
-            int ndmMinDivision = rectangleOptions.NdmMinDivision;
+            double width = options.Rectangle.Width;
+            double height = options.Rectangle.Height;
+            double ndmMaxSize = options.NdmMaxSize;
+            int ndmMinDivision = options.NdmMinDivision;
             LoaderCalculator.Triangulations.RectangleTriangulationLogicOptions logicOptions = new LoaderCalculator.Triangulations.RectangleTriangulationLogicOptions(width, height, ndmMaxSize, ndmMinDivision);
             var logic = LoaderCalculator.Triangulations.Triangulation.GetLogicInstance(logicOptions);
             var ndmCollection = logic.GetNdmCollection(new LoaderCalculator.Data.Planes.RectangularPlane { Material = material });
-            double dX = rectangleOptions.Center.X;
-            double dY = rectangleOptions.Center.Y;
-            NdmTransform.Move(ndmCollection, dX, dY);
-            double angle = rectangleOptions.Rectangle.Angle;
+            TriangulationService.CommonTransform(ndmCollection, options);
+            double angle = options.Rectangle.Angle;
             NdmTransform.Rotate(ndmCollection, angle);
-            NdmTransform.SetPrestrain(ndmCollection, new StrainMatrix() { Kx = Options.PrestrainKx, Ky = Options.PrestrainKy, EpsZ = Options.PrestrainEpsZ });
+            TriangulationService.SetPrestrain(ndmCollection, options.Prestrain);
             return ndmCollection;
         }
 
         public void ValidateOptions(ITriangulationLogicOptions options)
         {
-            throw new NotImplementedException();
+            if (options is not IRectangleTriangulationLogicOptions)
+            {
+                throw new StructureHelperException(ErrorStrings.DataIsInCorrect + $"\n Expected: {nameof(IRectangleTriangulationLogicOptions)}, But was: {nameof(options)}");
+            }
         }
 
         public RectangleTriangulationLogic(ITriangulationLogicOptions options)
         {
+            ValidateOptions(options);
+            this.options = options as IRectangleTriangulationLogicOptions;
             Options = options;
         }
     }
diff --git a/StructureHelperLogics/NdmCalculations/Triangulations/RectangleTriangulationLogicOptions.cs b/StructureHelperLogics/NdmCalculations/Triangulations/RectangleTriangulationLogicOptions.cs
index b7bf8a3..20bb04e 100644
--- a/StructureHelperLogics/NdmCalculations/Triangulations/RectangleTriangulationLogicOptions.cs
+++ b/StructureHelperLogics/NdmCalculations/Triangulations/RectangleTriangulationLogicOptions.cs
@@ -1,6 +1,7 @@
 using System;
 using StructureHelperCommon.Infrastructures.Exceptions;
 using StructureHelperCommon.Infrastructures.Strings;
+using StructureHelperCommon.Models.Forces;
 using StructureHelperCommon.Models.Shapes;
 using StructureHelperLogics.Models.Primitives;
 using StructureHelperLogics.NdmCalculations.Primitives;
@@ -19,11 +20,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
         /// <inheritdoc />
         public int NdmMinDivision { get; }
         /// <inheritdoc />
-        public double PrestrainKx { get;}
-        /// <inheritdoc />
-        public double PrestrainKy { get; }
-        /// <inheritdoc />
-        public double PrestrainEpsZ { get;}
+        public IStrainTuple Prestrain { get; set; }
 
         public RectangleTriangulationLogicOptions(IPoint2D center, IRectangleShape rectangle, double ndmMaxSize, int ndmMinDivision)
         {
@@ -31,6 +28,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
             Rectangle = rectangle;
             NdmMaxSize = ndmMaxSize;
             NdmMinDivision = ndmMinDivision;
+            Prestrain = new StrainTuple();
         }
 
         public RectangleTriangulationLogicOptions(IRectanglePrimitive primitive)
@@ -39,9 +37,12 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
             Rectangle = primitive;
             NdmMaxSize = primitive.NdmMaxSize;
             NdmMinDivision = primitive.NdmMinDivision;
-            PrestrainKx = primitive.UsersPrestrain.Kx + primitive.AutoPrestrain.Kx;
-            PrestrainKy = primitive.UsersPrestrain.Ky + primitive.AutoPrestrain.Ky;
-            PrestrainEpsZ = primitive.UsersPrestrain.EpsZ + primitive.AutoPrestrain.EpsZ;
+            Prestrain = new StrainTuple
+            {
+                Kx = primitive.UsersPrestrain.Kx + primitive.AutoPrestrain.Kx,
+                Ky = primitive.UsersPrestrain.Ky + primitive.AutoPrestrain.Ky,
+                EpsZ = primitive.UsersPrestrain.EpsZ + primitive.AutoPrestrain.EpsZ
+            };
         }
     }
 }
diff --git a/StructureHelperLogics/NdmCalculations/Triangulations/TriangulationService.cs b/StructureHelperLogics/NdmCalculations/Triangulations/TriangulationService.cs
new file mode 100644
index 0000000..d92481d
--- /dev/null
+++ b/StructureHelperLogics/NdmCalculations/Triangulations/TriangulationService.cs
@@ -0,0 +1,28 @@
+using LoaderCalculator.Data.Matrix;
+using LoaderCalculator.Data.Ndms;
+using LoaderCalculator.Data.Ndms.Transformations;
+using StructureHelperCommon.Models.Forces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static System.Windows.Forms.Design.AxImporter;
+
+namespace StructureHelperLogics.NdmCalculations.Triangulations
+{
+    internal static class TriangulationService
+    {
+        public static void SetPrestrain(IEnumerable<INdm> ndmCollection, IStrainTuple strainTuple)
+        {
+            NdmTransform.SetPrestrain(ndmCollection, new StrainMatrix() { Kx = strainTuple.Kx, Ky = strainTuple.Kx, EpsZ = strainTuple.Kx });
+        }
+
+        public static void CommonTransform(IEnumerable<INdm> ndmCollection, IShapeTriangulationLogicOptions options)
+        {
+            double dX = options.Center.X;
+            double dY = options.Center.Y;
+            NdmTransform.Move(ndmCollection, dX, dY);
+        }
+    }
+}
diff --git a/StructureHelperLogics/Services/NdmPrimitives/NdmPrimitivesService.cs b/StructureHelperLogics/Services/NdmPrimitives/NdmPrimitivesService.cs
index de61870..af71ab8 100644
--- a/StructureHelperLogics/Services/NdmPrimitives/NdmPrimitivesService.cs
+++ b/StructureHelperLogics/Services/NdmPrimitives/NdmPrimitivesService.cs
@@ -46,11 +46,9 @@ namespace StructureHelperLogics.Services.NdmPrimitives
         {
             //Настройки триангуляции
             ITriangulationOptions options = new TriangulationOptions { LimiteState = limitState, CalcTerm = calcTerm };
-
             //Формируем коллекцию элементарных участков для расчета в библитеке (т.е. выполняем триангуляцию)
             List<INdm> ndmCollection = new List<INdm>();
             ndmCollection.AddRange(Triangulation.GetNdms(primitives, options));
-
             return ndmCollection;
         }
     }
diff --git a/StructureHelperTests/FunctionalTests/Ndms/SteelSections/ReinforcementTest.cs b/StructureHelperTests/FunctionalTests/Ndms/SteelSections/ReinforcementTest.cs
index e8207fb..c815271 100644
--- a/StructureHelperTests/FunctionalTests/Ndms/SteelSections/ReinforcementTest.cs
+++ b/StructureHelperTests/FunctionalTests/Ndms/SteelSections/ReinforcementTest.cs
@@ -21,14 +21,47 @@ namespace StructureHelperTests.FunctionalTests.Ndms.SteelSections
         [TestCase(0.3, 0.6, 4e8, 0, 0, -1800000, 0d, 0d, -5e-5d)]
         [TestCase(0.3, 0.6, 4e8, 7000000, 0, 0, 0.0065882684745345067d, 0d, 0d)]
         //[TestCase(0.3, 0.6, 6e8, 10000000, 0, 0, 0.010485801788961743d, 0d, -0.00011114996218404612d)]
-        public void Run_ShouldPass(double width, double height, double strength, double mx, double my, double nz, double expectedKx, double expectedKy, double expectedEpsilonZ)
+        public void Run_ShouldPass_Rectangle(double width, double height, double strength, double mx, double my, double nz, double expectedKx, double expectedKy, double expectedEpsilonZ)
         {
             //Arrange
             var headMaterial = HeadMaterialFactory.GetHeadMaterial(HeadmaterialType.Reinforecement400, CodeTypes.EuroCode_2_1990);
-            ITriangulationOptions options = new TriangulationOptions { LimiteState = LimitStates.ULS, CalcTerm = CalcTerms.ShortTerm };
-            INdmPrimitive primitive = new RectanglePrimitive { CenterX = 0, CenterY = 0, Width = width, Height = height, HeadMaterial = headMaterial, NdmMaxSize = 1, NdmMinDivision = 100 };
-            List<INdmPrimitive> primitives = new List<INdmPrimitive>();
-            primitives.Add(primitive);
+            var options = new TriangulationOptions { LimiteState = LimitStates.ULS, CalcTerm = CalcTerms.ShortTerm };
+            var primitive = new RectanglePrimitive { CenterX = 0, CenterY = 0, Width = width, Height = height, HeadMaterial = headMaterial, NdmMaxSize = 1, NdmMinDivision = 100 };
+            var primitives = new List<INdmPrimitive>() { primitive};
+            var ndmCollection = Triangulation.GetNdms(primitives, options);
+            var loaderData = new LoaderOptions
+            {
+                Preconditions = new Preconditions
+                {
+                    ConditionRate = 0.01,
+                    MaxIterationCount = 100,
+                    StartForceMatrix = new ForceMatrix { Mx = mx, My = my, Nz = nz }
+                },
+                NdmCollection = ndmCollection
+            };
+            var calculator = new Calculator();
+            //Act
+            calculator.Run(loaderData, new CancellationToken());
+            var results = calculator.Result;
+            //Assert
+            Assert.NotNull(results);
+            var strainMatrix = results.StrainMatrix;
+            Assert.NotNull(strainMatrix);
+            Assert.AreEqual(expectedKx, strainMatrix.Kx, ExpectedProcessor.GetAccuracyForExpectedValue(expectedKx));
+            Assert.AreEqual(expectedKy, strainMatrix.Ky, ExpectedProcessor.GetAccuracyForExpectedValue(expectedKy));
+            Assert.AreEqual(expectedEpsilonZ, strainMatrix.EpsZ, ExpectedProcessor.GetAccuracyForExpectedValue(expectedEpsilonZ));
+        }
+
+        [TestCase(0.3, 4e8, 0, 0, 706850.84713269188d, 0d, 0d, 5e-5d)]
+        [TestCase(0.3, 4e8, 0, 0, -706850.84713269188d, 0d, 0d, -5e-5d)]
+        [TestCase(0.3, 4e8, 700000, 0, 0, 0.0076471604851248189d, 0d, 0d)]
+        public void Run_ShouldPass_Circle(double diameter, double strength, double mx, double my, double nz, double expectedKx, double expectedKy, double expectedEpsilonZ)
+        {
+            //Arrange
+            var headMaterial = HeadMaterialFactory.GetHeadMaterial(HeadmaterialType.Reinforecement400, CodeTypes.EuroCode_2_1990);
+            var options = new TriangulationOptions { LimiteState = LimitStates.ULS, CalcTerm = CalcTerms.ShortTerm };
+            var primitive = new CirclePrimitive { CenterX = 0, CenterY = 0, Diameter = diameter, HeadMaterial = headMaterial, NdmMaxSize = 1, NdmMinDivision = 100 };
+            var primitives = new List<INdmPrimitive>() { primitive };
             var ndmCollection = Triangulation.GetNdms(primitives, options);
             var loaderData = new LoaderOptions
             {