From 96b331f14cdad3c3d0508218c34d185d88ca6114 Mon Sep 17 00:00:00 2001
From: Evgeny Redikultsev <effect-project@yandex.ru>
Date: Sun, 27 Nov 2022 17:04:34 +0500
Subject: [PATCH] Force combination was added

---
 .../UI/Converters/CommonOperation.cs          | 55 ++++++++++++++++-
 Infrastructure/UI/Converters/Units/Area.cs    | 33 ++---------
 .../UI/Converters/Units/Curvature.cs          | 17 ++++++
 Infrastructure/UI/Converters/Units/Force.cs   | 35 ++---------
 Infrastructure/UI/Converters/Units/Length.cs  | 59 ++-----------------
 Infrastructure/UI/Converters/Units/Moment.cs  | 17 ++++++
 .../UI/Converters/Units/PlainDouble.cs        | 39 ++++++++++++
 Infrastructure/UI/Converters/Units/Stress.cs  | 35 ++---------
 .../UI/Converters/Units/UnitBase.cs           | 18 ++++--
 .../UI/DataContexts/PointViewPrimitive.cs     |  4 ++
 .../UI/DataContexts/PrimitiveBase.cs          |  5 ++
 .../UI/DataTemplates/EllipseTemplate.xaml     |  8 +--
 .../UI/DataTemplates/RectangleTemplate.xaml   |  8 +--
 Infrastructure/UI/Resources/Converters.xaml   |  3 +
 Infrastructure/UI/Styles.xaml                 |  8 +++
 StructureHelper.csproj                        |  3 +
 .../Infrastructures/Enums/LimitStates.cs      |  4 +-
 .../Infrastructures/Enums/UnitTypes.cs        |  3 +-
 .../Models/Calculators/IHelperCalculator.cs   | 14 +++++
 .../Models/Forces/DesignForceTuple.cs         | 23 ++++++++
 .../Models/Forces/ForceCombinationList.cs     | 27 +++++++++
 .../Models/Forces/ForceTuple.cs               | 18 ++++++
 .../Models/Forces/IDesignForceTuple.cs        | 16 +++++
 .../Models/Forces/IForceCombinationList.cs    | 16 +++++
 .../Models/Forces/IForceTuple.cs              | 19 ++++++
 .../Models/Shapes/ICenterShape.cs             |  2 +-
 .../Models/Shapes/ILineShape.cs               |  4 +-
 .../Models/Shapes/{ICenter.cs => IPoint2D.cs} |  2 +-
 .../Models/Shapes/LineShape.cs                |  8 +--
 .../Models/Shapes/{Center.cs => Point2D.cs}   |  2 +-
 .../Services/Units/UnitsFactory.cs            | 17 ++++++
 .../StructureHelperCommon.csproj              | 12 +++-
 .../CalculationProperty.cs                    |  2 +-
 .../Models/Materials/LibMaterial.cs           |  4 +-
 .../Models/Primitives/IPrimitive.cs           |  2 +-
 .../Models/Primitives/LinePrimitive.cs        |  2 +-
 .../Primitives/LinePrimitive.cs               |  8 +--
 .../IPointTriangulationLogicOptions.cs        |  2 +-
 .../IRectangleTriangulationLogicOptions.cs    |  2 +-
 .../Triangulations/PointTriangulationLogic.cs |  2 +-
 .../PointTriangulationLogicOptions.cs         |  6 +-
 .../RectangleTriangulationLogicOptions.cs     |  6 +-
 .../RCSectionFromNdmPrimitiveTest.cs          | 10 ++--
 .../Ndms/RCSections/RCSectionTest.cs          | 10 ++--
 .../Ndms/SteelSections/ReinforcementTest.cs   |  2 +-
 .../RectangleTriangulationTest.cs             |  2 +-
 .../CalculationPropertyView.xaml              |  4 +-
 .../CalculationPropertyView.xaml.cs           |  6 +-
 .../CalculationResultView.xaml                |  4 +-
 Windows/MainWindow/MainView.xaml              | 13 +++-
 Windows/MainWindow/MainViewModel.cs           | 14 ++++-
 .../PrimitivePropertiesView.xaml              |  6 +-
 52 files changed, 427 insertions(+), 214 deletions(-)
 create mode 100644 Infrastructure/UI/Converters/Units/Curvature.cs
 create mode 100644 Infrastructure/UI/Converters/Units/Moment.cs
 create mode 100644 Infrastructure/UI/Converters/Units/PlainDouble.cs
 create mode 100644 StructureHelperCommon/Models/Calculators/IHelperCalculator.cs
 create mode 100644 StructureHelperCommon/Models/Forces/DesignForceTuple.cs
 create mode 100644 StructureHelperCommon/Models/Forces/ForceCombinationList.cs
 create mode 100644 StructureHelperCommon/Models/Forces/ForceTuple.cs
 create mode 100644 StructureHelperCommon/Models/Forces/IDesignForceTuple.cs
 create mode 100644 StructureHelperCommon/Models/Forces/IForceCombinationList.cs
 create mode 100644 StructureHelperCommon/Models/Forces/IForceTuple.cs
 rename StructureHelperCommon/Models/Shapes/{ICenter.cs => IPoint2D.cs} (95%)
 rename StructureHelperCommon/Models/Shapes/{Center.cs => Point2D.cs} (85%)

diff --git a/Infrastructure/UI/Converters/CommonOperation.cs b/Infrastructure/UI/Converters/CommonOperation.cs
index 4b7582e..332d745 100644
--- a/Infrastructure/UI/Converters/CommonOperation.cs
+++ b/Infrastructure/UI/Converters/CommonOperation.cs
@@ -1,5 +1,9 @@
-using StructureHelperCommon.Infrastructures.Exceptions;
+using Newtonsoft.Json.Linq;
+using StructureHelper.Infrastructure.UI.Converters.Units;
+using StructureHelperCommon.Infrastructures.Enums;
+using StructureHelperCommon.Infrastructures.Exceptions;
 using StructureHelperCommon.Infrastructures.Strings;
+using StructureHelperCommon.Services.Units;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -12,6 +16,8 @@ namespace StructureHelper.Infrastructure.UI.Converters
 {
     internal static class CommonOperation
     {
+        private static IEnumerable<IUnit> units = UnitsFactory.GetUnitCollection();
+
         public static double ConvertToDoubleChangeComma(string s)
         {
             double result;
@@ -26,6 +32,7 @@ namespace StructureHelper.Infrastructure.UI.Converters
 
         public static IStringDoublePair DivideIntoStringDoublePair(string s)
         {
+            s = s.Replace(" ", "");
             string digitPattern = @"\d+(\.?|\,?)\d+";
             string textPattern = @"[0-9]|\.|\,";
             string caracterPattern = "[a-z]+$";
@@ -43,5 +50,51 @@ namespace StructureHelper.Infrastructure.UI.Converters
             }
             throw new StructureHelperException(ErrorStrings.DataIsInCorrect);
         }
+
+        public static IUnit GetUnit(UnitTypes unitType, string unitName)
+        {
+            return units.Where(u => u.UnitType == unitType & u.Name == unitName).Single();
+        }
+
+        public static string Convert(IUnit unit, string unitName, object value)
+        {
+            double val;
+            if (value != null) { val = (double)value; }
+            else { throw new Exception($"{unitName} value is null"); }
+            val *= unit.Multiplyer;
+            string strValue = $"{val} {unit.Name}";
+            return strValue;
+        }
+
+        public static double ConvertBack(UnitTypes unitType, IUnit unit, object value)
+        {
+            double val;
+            double multy;
+            double coefficient = unit.Multiplyer;
+            var strVal = value as string;
+            IStringDoublePair pair = DivideIntoStringDoublePair(strVal);
+            try
+            {
+                multy = GetMultiplyer(unitType, pair.Text);
+            }
+            catch (Exception ex)
+            {
+                multy = coefficient;
+            }
+            val = pair.Digit / multy;
+            return val;
+        }
+
+        private static double GetMultiplyer(UnitTypes unitType, string unitName)
+        {
+            try
+            {
+                return units.Where(u => u.UnitType == unitType & u.Name == unitName).Single().Multiplyer;
+            }
+            catch (Exception ex)
+            {
+                throw new StructureHelperException(ErrorStrings.DataIsInCorrect + ex);
+            }
+        }
     }
 }
diff --git a/Infrastructure/UI/Converters/Units/Area.cs b/Infrastructure/UI/Converters/Units/Area.cs
index f6b6e0e..35b5d02 100644
--- a/Infrastructure/UI/Converters/Units/Area.cs
+++ b/Infrastructure/UI/Converters/Units/Area.cs
@@ -1,4 +1,6 @@
-using System;
+using StructureHelperCommon.Infrastructures.Enums;
+using StructureHelperCommon.Services.Units;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -11,33 +13,8 @@ namespace StructureHelper.Infrastructure.UI.Converters.Units
 {
     internal class Area : UnitBase
     {
+        public override UnitTypes unitType { get => UnitTypes.Area; }
+        public override IUnit currentUnit { get => CommonOperation.GetUnit(unitType, "mm2"); }
         public override string unitName { get => "Area"; }
-
-        public override string MeasureUnit => throw new NotImplementedException();
-
-        public override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            double val;
-            if (value != null) { val = (double)value; }
-            else { throw new Exception($"{unitName} value is null"); }
-            val *= UnitConstatnts.Length * UnitConstatnts.Length;
-            return val;
-        }
-
-        public override object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            double val;
-            try
-            {
-                var strVal = value as string;
-                val = CommonOperation.ConvertToDoubleChangeComma(strVal);
-            }
-            catch
-            {
-                return null;
-            }
-            val /= (UnitConstatnts.Length * UnitConstatnts.Length);
-            return val;
-        }
     }
 }
diff --git a/Infrastructure/UI/Converters/Units/Curvature.cs b/Infrastructure/UI/Converters/Units/Curvature.cs
new file mode 100644
index 0000000..45176dd
--- /dev/null
+++ b/Infrastructure/UI/Converters/Units/Curvature.cs
@@ -0,0 +1,17 @@
+using StructureHelperCommon.Infrastructures.Enums;
+using StructureHelperCommon.Services.Units;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelper.Infrastructure.UI.Converters.Units
+{
+    internal class Curvature : UnitBase
+    {
+        public override UnitTypes unitType { get => UnitTypes.Curvature; }
+        public override IUnit currentUnit { get => CommonOperation.GetUnit(unitType, "1/mm"); }
+        public override string unitName { get => "Curvature"; }
+    }
+}
diff --git a/Infrastructure/UI/Converters/Units/Force.cs b/Infrastructure/UI/Converters/Units/Force.cs
index 2715863..0cd5645 100644
--- a/Infrastructure/UI/Converters/Units/Force.cs
+++ b/Infrastructure/UI/Converters/Units/Force.cs
@@ -1,4 +1,6 @@
-using System;
+using StructureHelperCommon.Infrastructures.Enums;
+using StructureHelperCommon.Services.Units;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -10,35 +12,8 @@ namespace StructureHelper.Infrastructure.UI.Converters.Units
 {
     internal class Force : UnitBase
     {
-        private double coeffficient = UnitConstatnts.Force;
-
+        public override UnitTypes unitType { get => UnitTypes.Force; }
+        public override IUnit currentUnit { get => CommonOperation.GetUnit(unitType, "kN"); }
         public override string unitName { get => "Force"; }
-
-        public override string MeasureUnit => throw new NotImplementedException();
-
-        public override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            double val;
-            if (value != null) { val = (double)value; }
-            else { throw new Exception($"{unitName} value is null"); }
-            val *= coeffficient;
-            return val;
-        }
-
-        public override object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            double val;
-            try
-            {
-                var strVal = value as string;
-                val = CommonOperation.ConvertToDoubleChangeComma(strVal);
-            }
-            catch
-            {
-                return null;
-            }
-            val /= coeffficient;
-            return val;
-        }
     }
 }
diff --git a/Infrastructure/UI/Converters/Units/Length.cs b/Infrastructure/UI/Converters/Units/Length.cs
index 886704f..a9d56bf 100644
--- a/Infrastructure/UI/Converters/Units/Length.cs
+++ b/Infrastructure/UI/Converters/Units/Length.cs
@@ -5,6 +5,7 @@ using StructureHelperCommon.Services.Units;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -14,60 +15,8 @@ namespace StructureHelper.Infrastructure.UI.Converters.Units
 {
     internal class Length : UnitBase
     {
-        private IEnumerable<IUnit> units = UnitsFactory.GetUnitCollection();
-        private UnitTypes type = UnitTypes.Length;
-        private IUnit currentUnit => units.Where(u => u.UnitType == type &  u.Name == "mm").Single();
-        public override string MeasureUnit => currentUnit.Name;
-        private double coeffficient => currentUnit.Multiplyer;
-
-        public override string unitName { get => "Length"; }     
-
-        public override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            double val;
-            if (value != null) { val = (double)value; }
-            else { throw new Exception($"{unitName} value is null"); }
-            val *= coeffficient;
-            string strValue = $"{val} {MeasureUnit}";
-            return strValue;
-        }
-
-        public override object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            double val;
-            try
-            {
-                var strVal = value as string;
-                IStringDoublePair pair = CommonOperation.DivideIntoStringDoublePair(strVal);
-                double multy;
-                try
-                {
-                    multy = coeffficient / GetMultiplyer(units, type, pair.Text);
-                }
-                catch (Exception ex)
-                {
-                    multy = 1d;
-                }
-                val = pair.Digit * multy;
-            }
-            catch
-            {
-                return null;
-            }
-            val /= coeffficient;
-            return val;
-        }
-
-        private double GetMultiplyer(IEnumerable<IUnit> units, UnitTypes unitType, string unitName)
-        {
-            try
-            {
-                return units.Where(u => u.UnitType == unitType & u.Name == unitName).Single().Multiplyer;
-            }
-            catch (Exception ex)
-            {
-                throw new StructureHelperException(ErrorStrings.DataIsInCorrect + ex);
-            }
-        }
+        public override UnitTypes unitType { get => UnitTypes.Length; }
+        public override IUnit currentUnit { get => CommonOperation.GetUnit(unitType, "mm"); }
+        public override string unitName { get => "Length"; }
     }
 }
diff --git a/Infrastructure/UI/Converters/Units/Moment.cs b/Infrastructure/UI/Converters/Units/Moment.cs
new file mode 100644
index 0000000..360d1ba
--- /dev/null
+++ b/Infrastructure/UI/Converters/Units/Moment.cs
@@ -0,0 +1,17 @@
+using StructureHelperCommon.Infrastructures.Enums;
+using StructureHelperCommon.Services.Units;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelper.Infrastructure.UI.Converters.Units
+{
+    internal class Moment : UnitBase
+    {
+        public override UnitTypes unitType { get => UnitTypes.Moment; }
+        public override IUnit currentUnit { get => CommonOperation.GetUnit(unitType, "kNm"); }
+        public override string unitName { get => "Moment"; }
+    }
+}
diff --git a/Infrastructure/UI/Converters/Units/PlainDouble.cs b/Infrastructure/UI/Converters/Units/PlainDouble.cs
new file mode 100644
index 0000000..6ab470e
--- /dev/null
+++ b/Infrastructure/UI/Converters/Units/PlainDouble.cs
@@ -0,0 +1,39 @@
+using StructureHelperCommon.Infrastructures.Exceptions;
+using StructureHelperCommon.Infrastructures.Strings;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace StructureHelper.Infrastructure.UI.Converters.Units
+{
+    internal class PlainDouble : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            try
+            {
+                return (double)value;
+            }
+            catch(Exception)
+            {
+                return new StructureHelperException(ErrorStrings.DataIsInCorrect);
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            try
+            {
+                return CommonOperation.ConvertToDoubleChangeComma((string)value);
+            }
+            catch (Exception)
+            {
+                return new StructureHelperException(ErrorStrings.DataIsInCorrect);
+            }
+        }
+    }
+}
diff --git a/Infrastructure/UI/Converters/Units/Stress.cs b/Infrastructure/UI/Converters/Units/Stress.cs
index e19f9cd..254c936 100644
--- a/Infrastructure/UI/Converters/Units/Stress.cs
+++ b/Infrastructure/UI/Converters/Units/Stress.cs
@@ -1,4 +1,6 @@
-using System;
+using StructureHelperCommon.Infrastructures.Enums;
+using StructureHelperCommon.Services.Units;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -10,35 +12,8 @@ namespace StructureHelper.Infrastructure.UI.Converters.Units
 {
     internal class Stress : UnitBase
     {
-        private double coeffficient = UnitConstatnts.Stress;
-
+        public override UnitTypes unitType { get => UnitTypes.Stress; }
+        public override IUnit currentUnit { get => CommonOperation.GetUnit(unitType, "MPa"); }
         public override string unitName { get => "Stress"; }
-
-        public override string MeasureUnit => throw new NotImplementedException();
-
-        public override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            double val;
-            if (value != null) { val = (double)value; }
-            else { throw new Exception($"{unitName} value is null"); }
-            val *= coeffficient;
-            return val;
-        }
-
-        public override object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            double val;
-            try
-            {
-                var strVal = value as string;
-                val = CommonOperation.ConvertToDoubleChangeComma(strVal);
-            }
-            catch
-            {
-                return null;
-            }
-            val /= coeffficient;
-            return val;
-        }
     }
 }
diff --git a/Infrastructure/UI/Converters/Units/UnitBase.cs b/Infrastructure/UI/Converters/Units/UnitBase.cs
index a234531..f63219d 100644
--- a/Infrastructure/UI/Converters/Units/UnitBase.cs
+++ b/Infrastructure/UI/Converters/Units/UnitBase.cs
@@ -1,4 +1,6 @@
-using System;
+using StructureHelperCommon.Infrastructures.Enums;
+using StructureHelperCommon.Services.Units;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -10,9 +12,17 @@ namespace StructureHelper.Infrastructure.UI.Converters.Units
 {
     internal abstract class UnitBase : IValueConverter
     {
+        public abstract UnitTypes unitType { get; }
+        public abstract IUnit currentUnit { get; }
         public abstract string unitName { get;}
-        public abstract string MeasureUnit { get; }
-        public abstract object Convert(object value, Type targetType, object parameter, CultureInfo culture);
-        public abstract object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture);
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return CommonOperation.Convert(currentUnit, unitName, value);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return CommonOperation.ConvertBack(unitType, currentUnit, value);
+        }
     }
 }
diff --git a/Infrastructure/UI/DataContexts/PointViewPrimitive.cs b/Infrastructure/UI/DataContexts/PointViewPrimitive.cs
index 06f0b2d..5231aec 100644
--- a/Infrastructure/UI/DataContexts/PointViewPrimitive.cs
+++ b/Infrastructure/UI/DataContexts/PointViewPrimitive.cs
@@ -20,6 +20,10 @@ namespace StructureHelper.Infrastructure.UI.DataContexts
                 primitive.Area = value;
                 OnPropertyChanged(nameof(Area));
                 OnPropertyChanged(nameof(Diameter));
+                OnPropertyChanged(nameof(CenterX));
+                OnPropertyChanged(nameof(CenterY));
+                OnPropertyChanged(nameof(PrimitiveLeft));
+                OnPropertyChanged(nameof(PrimitiveTop));
             }
         }
 
diff --git a/Infrastructure/UI/DataContexts/PrimitiveBase.cs b/Infrastructure/UI/DataContexts/PrimitiveBase.cs
index 16419e3..b4cbf2d 100644
--- a/Infrastructure/UI/DataContexts/PrimitiveBase.cs
+++ b/Infrastructure/UI/DataContexts/PrimitiveBase.cs
@@ -243,5 +243,10 @@ namespace StructureHelper.Infrastructure.UI.DataContexts
         {
 
         }
+
+        public void RefreshColor()
+        {
+            OnPropertyChanged(nameof(Color));
+        }
     }
 }
diff --git a/Infrastructure/UI/DataTemplates/EllipseTemplate.xaml b/Infrastructure/UI/DataTemplates/EllipseTemplate.xaml
index 02c7b23..d974201 100644
--- a/Infrastructure/UI/DataTemplates/EllipseTemplate.xaml
+++ b/Infrastructure/UI/DataTemplates/EllipseTemplate.xaml
@@ -24,10 +24,10 @@
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="Auto"/>
                     </Grid.RowDefinitions>
-                    <TextBlock Text="Name: "/>
-                    <TextBlock Grid.Column="1" Text="{Binding Name}"/>
-                    <TextBlock Grid.Row="1" Text="Material Name: "/>
-                    <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding HeadMaterial.Name}"/>
+                    <TextBlock Text="Name: " FontWeight="Bold"/>
+                    <TextBlock Grid.Column="1" Text="{Binding Name}" FontWeight="Bold"/>
+                    <TextBlock Grid.Row="1" Text="Material Name: " FontWeight="Bold"/>
+                    <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding HeadMaterial.Name}" FontWeight="Bold"/>
                     <TextBlock Grid.Row="2" Text="Center X: "/>
                     <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding CenterX, Converter={StaticResource LengthConverter}}"/>
                     <TextBlock Grid.Row="3" Text="Center Y: "/>
diff --git a/Infrastructure/UI/DataTemplates/RectangleTemplate.xaml b/Infrastructure/UI/DataTemplates/RectangleTemplate.xaml
index 9c9445b..dc410d2 100644
--- a/Infrastructure/UI/DataTemplates/RectangleTemplate.xaml
+++ b/Infrastructure/UI/DataTemplates/RectangleTemplate.xaml
@@ -30,10 +30,10 @@
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
-                        <TextBlock Text="Name: "/>
-                        <TextBlock Grid.Column="1" Text="{Binding Name}"/>
-                        <TextBlock Grid.Row="1" Text="Material Name: "/>
-                        <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding HeadMaterial.Name}"/>
+                        <TextBlock Text="Name: " FontWeight="Bold"/>
+                        <TextBlock Grid.Column="1" Text="{Binding Name}" FontWeight="Bold"/>
+                        <TextBlock Grid.Row="1" Text="Material Name: " FontWeight="Bold"/>
+                        <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding HeadMaterial.Name}" FontWeight="Bold"/>
                         <TextBlock Grid.Row="2" Text="Center X: "/>
                         <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding CenterX, Converter={StaticResource LengthConverter}}"/>
                         <TextBlock Grid.Row="3" Text="Center Y: "/>
diff --git a/Infrastructure/UI/Resources/Converters.xaml b/Infrastructure/UI/Resources/Converters.xaml
index fa0fe35..d46f2f9 100644
--- a/Infrastructure/UI/Resources/Converters.xaml
+++ b/Infrastructure/UI/Resources/Converters.xaml
@@ -5,8 +5,11 @@
     xmlns:convertersUnits ="clr-namespace:StructureHelper.Infrastructure.UI.Converters.Units">
 
     <convertersCommon:InvertBoolConverter x:Key="InvertBoolConverter"/>
+    <convertersUnits:PlainDouble x:Key="PlainDouble"/>
     <convertersUnits:Length x:Key="LengthConverter"/>
     <convertersUnits:Area x:Key="AreaConverter"/>
     <convertersUnits:Force x:Key="ForceConverter"/>
+    <convertersUnits:Moment x:Key="MomentConverter"/>
     <convertersUnits:Stress x:Key="StressConverter"/>
+    <convertersUnits:Curvature x:Key="Curvature"/>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Infrastructure/UI/Styles.xaml b/Infrastructure/UI/Styles.xaml
index a163e5a..2a43656 100644
--- a/Infrastructure/UI/Styles.xaml
+++ b/Infrastructure/UI/Styles.xaml
@@ -26,6 +26,14 @@
             </Setter.Value>
         </Setter>
         <Setter Property="Opacity" Value="{Binding Opacity, Mode=TwoWay}"/>
+        <Setter Property="Stroke" Value="Black"/>
+        <Setter Property="StrokeThickness" Value="0.001"/>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="true">
+                <Setter Property="Stroke" Value="Red"/>
+                <Setter Property="StrokeThickness" Value="0.002"/>
+            </Trigger>
+        </Style.Triggers>
     </Style>
 
     <Style x:Key="EllipseStyle" TargetType="Ellipse" BasedOn="{StaticResource ShapeStyle}">
diff --git a/StructureHelper.csproj b/StructureHelper.csproj
index e3600df..ea2414f 100644
--- a/StructureHelper.csproj
+++ b/StructureHelper.csproj
@@ -138,6 +138,9 @@
     <Compile Include="Infrastructure\UI\Converters\IStringDoublePair.cs" />
     <Compile Include="Infrastructure\UI\Converters\StringDoublePair.cs" />
     <Compile Include="Infrastructure\UI\Converters\Units\Area.cs" />
+    <Compile Include="Infrastructure\UI\Converters\Units\Curvature.cs" />
+    <Compile Include="Infrastructure\UI\Converters\Units\Moment.cs" />
+    <Compile Include="Infrastructure\UI\Converters\Units\PlainDouble.cs" />
     <Compile Include="Infrastructure\UI\Converters\Units\Stress.cs" />
     <Compile Include="Infrastructure\UI\Converters\Units\Force.cs" />
     <Compile Include="Infrastructure\UI\Converters\Units\Length.cs" />
diff --git a/StructureHelperCommon/Infrastructures/Enums/LimitStates.cs b/StructureHelperCommon/Infrastructures/Enums/LimitStates.cs
index 8393ba8..0ef8a37 100644
--- a/StructureHelperCommon/Infrastructures/Enums/LimitStates.cs
+++ b/StructureHelperCommon/Infrastructures/Enums/LimitStates.cs
@@ -2,8 +2,8 @@
 {
     public enum LimitStates
     {
-        Collapse = 1,
-        ServiceAbility = 2,
+        ULS = 1,
+        SLS = 2,
         Special = 3,
     }
 }
diff --git a/StructureHelperCommon/Infrastructures/Enums/UnitTypes.cs b/StructureHelperCommon/Infrastructures/Enums/UnitTypes.cs
index 4c05928..21f9421 100644
--- a/StructureHelperCommon/Infrastructures/Enums/UnitTypes.cs
+++ b/StructureHelperCommon/Infrastructures/Enums/UnitTypes.cs
@@ -12,6 +12,7 @@ namespace StructureHelperCommon.Infrastructures.Enums
         Area,
         Stress,
         Force,
-        Moment
+        Moment,
+        Curvature
     }
 }
diff --git a/StructureHelperCommon/Models/Calculators/IHelperCalculator.cs b/StructureHelperCommon/Models/Calculators/IHelperCalculator.cs
new file mode 100644
index 0000000..cddd4d2
--- /dev/null
+++ b/StructureHelperCommon/Models/Calculators/IHelperCalculator.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperCommon.Models.Calculators
+{
+    public interface IHelperCalculator <in TInputData, TCalculationResult>
+        where TInputData : class
+        where TCalculationResult : class
+    {
+    }
+}
diff --git a/StructureHelperCommon/Models/Forces/DesignForceTuple.cs b/StructureHelperCommon/Models/Forces/DesignForceTuple.cs
new file mode 100644
index 0000000..f0d2da3
--- /dev/null
+++ b/StructureHelperCommon/Models/Forces/DesignForceTuple.cs
@@ -0,0 +1,23 @@
+using StructureHelperCommon.Infrastructures.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperCommon.Models.Forces
+{
+    public class DesignForceTuple : IDesignForceTuple
+    {
+        public LimitStates LimitState { get; set; }
+        public CalcTerms CalcTerm { get; set; }
+        public IForceTuple ForceTuple { get; private set; }
+
+        public DesignForceTuple(LimitStates limitState, CalcTerms calcTerm)
+        {
+            LimitState = limitState;
+            CalcTerm = calcTerm;
+            ForceTuple = new ForceTuple();
+        }
+    }
+}
diff --git a/StructureHelperCommon/Models/Forces/ForceCombinationList.cs b/StructureHelperCommon/Models/Forces/ForceCombinationList.cs
new file mode 100644
index 0000000..78f6747
--- /dev/null
+++ b/StructureHelperCommon/Models/Forces/ForceCombinationList.cs
@@ -0,0 +1,27 @@
+using StructureHelperCommon.Infrastructures.Enums;
+using StructureHelperCommon.Models.Shapes;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperCommon.Models.Forces
+{
+    public class ForceCombinationList : IForceCombinationList
+    {
+
+        public string Name { get; set; }
+        public Point2D ForcePoint { get; private set; }
+        public List<IDesignForceTuple> DesignForces { get; private set; }
+
+        public ForceCombinationList()
+        {
+            DesignForces = new List<IDesignForceTuple>();
+            DesignForces.Add(new DesignForceTuple(LimitStates.ULS, CalcTerms.ShortTerm));
+            DesignForces.Add(new DesignForceTuple(LimitStates.ULS, CalcTerms.LongTerm));
+            DesignForces.Add(new DesignForceTuple(LimitStates.SLS, CalcTerms.ShortTerm));
+            DesignForces.Add(new DesignForceTuple(LimitStates.SLS, CalcTerms.LongTerm));
+        }
+    }
+}
diff --git a/StructureHelperCommon/Models/Forces/ForceTuple.cs b/StructureHelperCommon/Models/Forces/ForceTuple.cs
new file mode 100644
index 0000000..8e437d8
--- /dev/null
+++ b/StructureHelperCommon/Models/Forces/ForceTuple.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperCommon.Models.Forces
+{
+    public class ForceTuple : IForceTuple
+    {
+        public double Mx { get; set; }
+        public double My { get; set; }
+        public double Nz { get; set; }
+        public double Qx { get; set; }
+        public double Qy { get; set; }
+        public double Mz { get; set; }
+    }
+}
diff --git a/StructureHelperCommon/Models/Forces/IDesignForceTuple.cs b/StructureHelperCommon/Models/Forces/IDesignForceTuple.cs
new file mode 100644
index 0000000..32af626
--- /dev/null
+++ b/StructureHelperCommon/Models/Forces/IDesignForceTuple.cs
@@ -0,0 +1,16 @@
+using StructureHelperCommon.Infrastructures.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperCommon.Models.Forces
+{
+    public interface IDesignForceTuple
+    {
+        LimitStates LimitState { get; set; }
+        CalcTerms CalcTerm { get; set; }
+        IForceTuple ForceTuple {get;}
+    }
+}
diff --git a/StructureHelperCommon/Models/Forces/IForceCombinationList.cs b/StructureHelperCommon/Models/Forces/IForceCombinationList.cs
new file mode 100644
index 0000000..5cf2dc6
--- /dev/null
+++ b/StructureHelperCommon/Models/Forces/IForceCombinationList.cs
@@ -0,0 +1,16 @@
+using StructureHelperCommon.Models.Shapes;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperCommon.Models.Forces
+{
+    public interface IForceCombinationList
+    {
+        string Name { get; set; }
+        Point2D ForcePoint {get ;}
+        List<IDesignForceTuple> DesignForces { get; }
+    }
+}
diff --git a/StructureHelperCommon/Models/Forces/IForceTuple.cs b/StructureHelperCommon/Models/Forces/IForceTuple.cs
new file mode 100644
index 0000000..db3308f
--- /dev/null
+++ b/StructureHelperCommon/Models/Forces/IForceTuple.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperCommon.Models.Forces
+{
+    public interface IForceTuple
+    {
+        double Mx { get; set; }
+        double My { get; set; }
+        double Nz { get; set; }
+        double Qx { get; set; }
+        double Qy { get; set; }
+        double Mz { get; set; }
+
+    }
+}
diff --git a/StructureHelperCommon/Models/Shapes/ICenterShape.cs b/StructureHelperCommon/Models/Shapes/ICenterShape.cs
index 00f2531..5c8e01c 100644
--- a/StructureHelperCommon/Models/Shapes/ICenterShape.cs
+++ b/StructureHelperCommon/Models/Shapes/ICenterShape.cs
@@ -2,7 +2,7 @@
 {
     public interface ICenterShape
     {
-        ICenter Center {get;}
+        IPoint2D Center {get;}
         IShape Shape { get;}
     }
 }
diff --git a/StructureHelperCommon/Models/Shapes/ILineShape.cs b/StructureHelperCommon/Models/Shapes/ILineShape.cs
index 253472d..ea29670 100644
--- a/StructureHelperCommon/Models/Shapes/ILineShape.cs
+++ b/StructureHelperCommon/Models/Shapes/ILineShape.cs
@@ -8,8 +8,8 @@ namespace StructureHelperCommon.Models.Shapes
 {
     public interface ILineShape : IShape
     {
-        ICenter StartPoint { get; set; }
-        ICenter EndPoint { get; set; }
+        IPoint2D StartPoint { get; set; }
+        IPoint2D EndPoint { get; set; }
         double Thickness { get; set; }
     }
 }
diff --git a/StructureHelperCommon/Models/Shapes/ICenter.cs b/StructureHelperCommon/Models/Shapes/IPoint2D.cs
similarity index 95%
rename from StructureHelperCommon/Models/Shapes/ICenter.cs
rename to StructureHelperCommon/Models/Shapes/IPoint2D.cs
index de2b176..1ff92b1 100644
--- a/StructureHelperCommon/Models/Shapes/ICenter.cs
+++ b/StructureHelperCommon/Models/Shapes/IPoint2D.cs
@@ -4,7 +4,7 @@
     /// Interface for point of center of some shape
     /// Интерфейс для точки центра некоторой формы
     /// </summary>
-    public interface ICenter
+    public interface IPoint2D
     {
         /// <summary>
         /// Coordinate of center of rectangle by local axis X, m
diff --git a/StructureHelperCommon/Models/Shapes/LineShape.cs b/StructureHelperCommon/Models/Shapes/LineShape.cs
index c55c472..a47471d 100644
--- a/StructureHelperCommon/Models/Shapes/LineShape.cs
+++ b/StructureHelperCommon/Models/Shapes/LineShape.cs
@@ -10,16 +10,16 @@ namespace StructureHelperCommon.Models.Shapes
     public class LineShape : ILineShape
     {
         /// <inheritdoc />
-        public ICenter StartPoint { get; set; }
+        public IPoint2D StartPoint { get; set; }
         /// <inheritdoc />
-        public ICenter EndPoint { get; set; }
+        public IPoint2D EndPoint { get; set; }
         /// <inheritdoc />
         public double Thickness { get; set; }
 
         public LineShape()
         {
-            StartPoint = new Center();
-            EndPoint = new Center();
+            StartPoint = new Point2D();
+            EndPoint = new Point2D();
             Thickness = 0;
         }
     }
diff --git a/StructureHelperCommon/Models/Shapes/Center.cs b/StructureHelperCommon/Models/Shapes/Point2D.cs
similarity index 85%
rename from StructureHelperCommon/Models/Shapes/Center.cs
rename to StructureHelperCommon/Models/Shapes/Point2D.cs
index 74630ce..0de37e1 100644
--- a/StructureHelperCommon/Models/Shapes/Center.cs
+++ b/StructureHelperCommon/Models/Shapes/Point2D.cs
@@ -1,7 +1,7 @@
 namespace StructureHelperCommon.Models.Shapes
 {
     /// <inheritdoc />
-    public class Center : ICenter
+    public class Point2D : IPoint2D
     {
         /// <inheritdoc />
         public double X { get; set; }
diff --git a/StructureHelperCommon/Services/Units/UnitsFactory.cs b/StructureHelperCommon/Services/Units/UnitsFactory.cs
index 430a961..8620ad4 100644
--- a/StructureHelperCommon/Services/Units/UnitsFactory.cs
+++ b/StructureHelperCommon/Services/Units/UnitsFactory.cs
@@ -17,10 +17,27 @@ namespace StructureHelperCommon.Services.Units
             units.Add(new Unit() { UnitType = type, Name = "mm", Multiplyer = 1e3d });
             units.Add(new Unit() { UnitType = type, Name = "cm", Multiplyer = 1e2d });
             units.Add(new Unit() { UnitType = type, Name = "km", Multiplyer = 1e-3d });
+            type = UnitTypes.Area;
+            units.Add(new Unit() { UnitType = type, Name = "m2", Multiplyer = 1d });
+            units.Add(new Unit() { UnitType = type, Name = "mm2", Multiplyer = 1e6d });
+            units.Add(new Unit() { UnitType = type, Name = "cm2", Multiplyer = 1e4d });
             type = UnitTypes.Stress;
             units.Add(new Unit() { UnitType = type, Name = "Pa", Multiplyer = 1d });
             units.Add(new Unit() { UnitType = type, Name = "kPa", Multiplyer = 1e-3d });
             units.Add(new Unit() { UnitType = type, Name = "MPa", Multiplyer = 1e-6d });
+            type = UnitTypes.Force;
+            units.Add(new Unit() { UnitType = type, Name = "N", Multiplyer = 1d });
+            units.Add(new Unit() { UnitType = type, Name = "kN", Multiplyer = 1e-3d });
+            units.Add(new Unit() { UnitType = type, Name = "MN", Multiplyer = 1e-6d });
+            type = UnitTypes.Moment;
+            units.Add(new Unit() { UnitType = type, Name = "Nm", Multiplyer = 1d });
+            units.Add(new Unit() { UnitType = type, Name = "kNm", Multiplyer = 1e-3d });
+            units.Add(new Unit() { UnitType = type, Name = "kgfm", Multiplyer = 9.8d });
+            units.Add(new Unit() { UnitType = type, Name = "tfm", Multiplyer = 9.8e-3d });
+            type = UnitTypes.Curvature;
+            units.Add(new Unit() { UnitType = type, Name = "1/m", Multiplyer = 1d });
+            units.Add(new Unit() { UnitType = type, Name = "1/mm", Multiplyer = 1e-3d });
+            units.Add(new Unit() { UnitType = type, Name = "1/cm", Multiplyer = 1e-2d });
             return units;
         }
     }
diff --git a/StructureHelperCommon/StructureHelperCommon.csproj b/StructureHelperCommon/StructureHelperCommon.csproj
index f8ab6cd..47ed896 100644
--- a/StructureHelperCommon/StructureHelperCommon.csproj
+++ b/StructureHelperCommon/StructureHelperCommon.csproj
@@ -55,8 +55,15 @@
     <Compile Include="Infrastructures\Interfaces\ISaveable.cs" />
     <Compile Include="Infrastructures\Strings\ErrorString.cs" />
     <Compile Include="Infrastructures\Enums\MaterialTypes.cs" />
-    <Compile Include="Models\Shapes\Center.cs" />
-    <Compile Include="Models\Shapes\ICenter.cs" />
+    <Compile Include="Models\Calculators\IHelperCalculator.cs" />
+    <Compile Include="Models\Forces\DesignForceTuple.cs" />
+    <Compile Include="Models\Forces\ForceCombinationList.cs" />
+    <Compile Include="Models\Forces\ForceTuple.cs" />
+    <Compile Include="Models\Forces\IDesignForceTuple.cs" />
+    <Compile Include="Models\Forces\IForceCombinationList.cs" />
+    <Compile Include="Models\Forces\IForceTuple.cs" />
+    <Compile Include="Models\Shapes\Point2D.cs" />
+    <Compile Include="Models\Shapes\IPoint2D.cs" />
     <Compile Include="Models\Shapes\ICenterShape.cs" />
     <Compile Include="Models\Shapes\ICircle.cs" />
     <Compile Include="Models\Shapes\ILineShape.cs" />
@@ -73,5 +80,6 @@
     <Compile Include="Services\Units\Unit.cs" />
     <Compile Include="Services\Units\UnitsFactory.cs" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/StructureHelperLogics/Models/Calculations/CalculationProperties/CalculationProperty.cs b/StructureHelperLogics/Models/Calculations/CalculationProperties/CalculationProperty.cs
index 838abcb..dc08f1f 100644
--- a/StructureHelperLogics/Models/Calculations/CalculationProperties/CalculationProperty.cs
+++ b/StructureHelperLogics/Models/Calculations/CalculationProperties/CalculationProperty.cs
@@ -16,7 +16,7 @@ namespace StructureHelperLogics.Models.Calculations.CalculationProperties
             {
                 new ForceCombination()
             };
-            LimitState = LimitStates.Collapse;
+            LimitState = LimitStates.ULS;
             CalcTerm = CalcTerms.ShortTerm;
             IterationProperty = new IterationProperty() { Accuracy = 0.001d, MaxIterationCount = 100};
         }
diff --git a/StructureHelperLogics/Models/Materials/LibMaterial.cs b/StructureHelperLogics/Models/Materials/LibMaterial.cs
index ef719c8..2901036 100644
--- a/StructureHelperLogics/Models/Materials/LibMaterial.cs
+++ b/StructureHelperLogics/Models/Materials/LibMaterial.cs
@@ -68,8 +68,8 @@ namespace StructureHelperLogics.Models.Materials
                 materialOptions.CodesType = LCMB.CodesType.SP63_2018;
             }
             else { throw new StructureHelperException($"{ErrorStrings.ObjectTypeIsUnknown} : {codeType}"); }
-            if (limitState == LimitStates.Collapse) { materialOptions.LimitState = LCMB.LimitStates.Collapse; }
-            else if (limitState == LimitStates.ServiceAbility) { materialOptions.LimitState = LCMB.LimitStates.ServiceAbility; }
+            if (limitState == LimitStates.ULS) { materialOptions.LimitState = LCMB.LimitStates.Collapse; }
+            else if (limitState == LimitStates.SLS) { materialOptions.LimitState = LCMB.LimitStates.ServiceAbility; }
             else if (limitState == LimitStates.Special) { materialOptions.LimitState = LCMB.LimitStates.Special; }
             else { throw new StructureHelperException(ErrorStrings.LimitStatesIsNotValid); }
             if (calcTerm == CalcTerms.ShortTerm) { materialOptions.IsShortTerm = true; }
diff --git a/StructureHelperLogics/Models/Primitives/IPrimitive.cs b/StructureHelperLogics/Models/Primitives/IPrimitive.cs
index f1cfaff..e6c1c01 100644
--- a/StructureHelperLogics/Models/Primitives/IPrimitive.cs
+++ b/StructureHelperLogics/Models/Primitives/IPrimitive.cs
@@ -12,7 +12,7 @@ namespace StructureHelperLogics.Models.Primitives
     public interface IPrimitive : ISaveable, ICloneable
     {
         string Name { get; set; }
-        ICenter Center { get; }
+        IPoint2D Center { get; }
         IShape Shape { get; }
         
         IEnumerable<INdmPrimitive> GetNdmPrimitives();
diff --git a/StructureHelperLogics/Models/Primitives/LinePrimitive.cs b/StructureHelperLogics/Models/Primitives/LinePrimitive.cs
index 956c634..e3e0a4c 100644
--- a/StructureHelperLogics/Models/Primitives/LinePrimitive.cs
+++ b/StructureHelperLogics/Models/Primitives/LinePrimitive.cs
@@ -11,7 +11,7 @@ namespace StructureHelperLogics.Models.Primitives
     {
         public int Id { get; set; }
         public string Name { get; set; }
-        public ICenter Center { get; set; }
+        public IPoint2D Center { get; set; }
         public IShape Shape { get; }   
 
         public LinePrimitive()
diff --git a/StructureHelperLogics/NdmCalculations/Primitives/LinePrimitive.cs b/StructureHelperLogics/NdmCalculations/Primitives/LinePrimitive.cs
index cbf019e..56eab9c 100644
--- a/StructureHelperLogics/NdmCalculations/Primitives/LinePrimitive.cs
+++ b/StructureHelperLogics/NdmCalculations/Primitives/LinePrimitive.cs
@@ -27,15 +27,15 @@ namespace StructureHelperLogics.NdmCalculations.Primitives
         public double PrestrainKy { get; set; }
         public double PrestrainEpsZ { get; set; }
 
-        public ICenter StartPoint { get; set; }
-        public ICenter EndPoint { get; set; }
+        public IPoint2D StartPoint { get; set; }
+        public IPoint2D EndPoint { get; set; }
         public double Thickness { get; set; }
         
 
         public LinePrimitive()
         {
-            StartPoint = new Center();
-            EndPoint = new Center();
+            StartPoint = new Point2D();
+            EndPoint = new Point2D();
 
             Name = "New Line";
             NdmMaxSize = 0.01d;
diff --git a/StructureHelperLogics/NdmCalculations/Triangulations/IPointTriangulationLogicOptions.cs b/StructureHelperLogics/NdmCalculations/Triangulations/IPointTriangulationLogicOptions.cs
index 5f6ec96..9d64cce 100644
--- a/StructureHelperLogics/NdmCalculations/Triangulations/IPointTriangulationLogicOptions.cs
+++ b/StructureHelperLogics/NdmCalculations/Triangulations/IPointTriangulationLogicOptions.cs
@@ -4,7 +4,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
 {
     public interface IPointTriangulationLogicOptions : ITriangulationLogicOptions
     {
-        ICenter Center { get; }
+        IPoint2D Center { get; }
         double Area { get; }
     }
 }
diff --git a/StructureHelperLogics/NdmCalculations/Triangulations/IRectangleTriangulationLogicOptions.cs b/StructureHelperLogics/NdmCalculations/Triangulations/IRectangleTriangulationLogicOptions.cs
index 1c689bc..66851dc 100644
--- a/StructureHelperLogics/NdmCalculations/Triangulations/IRectangleTriangulationLogicOptions.cs
+++ b/StructureHelperLogics/NdmCalculations/Triangulations/IRectangleTriangulationLogicOptions.cs
@@ -11,7 +11,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
         /// <summary>
         /// 
         /// </summary>
-        ICenter Center { get; }
+        IPoint2D Center { get; }
         /// <summary>
         /// 
         /// </summary>
diff --git a/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogic.cs b/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogic.cs
index 20afe30..c682be6 100644
--- a/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogic.cs
+++ b/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogic.cs
@@ -20,7 +20,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
         public IEnumerable<INdm> GetNdmCollection(IMaterial material)
         {
             IPointTriangulationLogicOptions options = Options as IPointTriangulationLogicOptions;
-            ICenter center = options.Center;
+            IPoint2D center = options.Center;
             double area = options.Area;
             List<INdm> ndmCollection = new List<INdm>();
             INdm ndm = new Ndm { CenterX = center.X, CenterY = center.Y, Area = area, Material = material };
diff --git a/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogicOptions.cs b/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogicOptions.cs
index 00251a5..c53e40e 100644
--- a/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogicOptions.cs
+++ b/StructureHelperLogics/NdmCalculations/Triangulations/PointTriangulationLogicOptions.cs
@@ -14,7 +14,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
         /// <summary>
         /// 
         /// </summary>
-        public ICenter Center { get; }
+        public IPoint2D Center { get; }
         /// <inheritdoc />
         public double Area { get; }
         /// <inheritdoc />
@@ -24,7 +24,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
         /// <inheritdoc />
         public double PrestrainEpsZ { get; }
 
-        public PointTriangulationLogicOptions(ICenter center, double area)
+        public PointTriangulationLogicOptions(IPoint2D center, double area)
         {
             Center = center;
             Area = area;
@@ -32,7 +32,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
 
         public PointTriangulationLogicOptions(IPointPrimitive primitive)
         {
-            Center = new Center() { X = primitive.CenterX, Y = primitive.CenterY };
+            Center = new Point2D() { X = primitive.CenterX, Y = primitive.CenterY };
             Area = primitive.Area;
             PrestrainKx = primitive.PrestrainKx;
             PrestrainKy = primitive.PrestrainKy;
diff --git a/StructureHelperLogics/NdmCalculations/Triangulations/RectangleTriangulationLogicOptions.cs b/StructureHelperLogics/NdmCalculations/Triangulations/RectangleTriangulationLogicOptions.cs
index d844b6d..de91233 100644
--- a/StructureHelperLogics/NdmCalculations/Triangulations/RectangleTriangulationLogicOptions.cs
+++ b/StructureHelperLogics/NdmCalculations/Triangulations/RectangleTriangulationLogicOptions.cs
@@ -11,7 +11,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
     public class RectangleTriangulationLogicOptions : IRectangleTriangulationLogicOptions
     {
         /// <inheritdoc />
-        public ICenter Center { get; }
+        public IPoint2D Center { get; }
         /// <inheritdoc />
         public IRectangleShape Rectangle { get; }
         /// <inheritdoc />
@@ -25,7 +25,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
         /// <inheritdoc />
         public double PrestrainEpsZ { get;}
 
-        public RectangleTriangulationLogicOptions(ICenter center, IRectangleShape rectangle, double ndmMaxSize, int ndmMinDivision)
+        public RectangleTriangulationLogicOptions(IPoint2D center, IRectangleShape rectangle, double ndmMaxSize, int ndmMinDivision)
         {
             Center = center;
             Rectangle = rectangle;
@@ -35,7 +35,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
 
         public RectangleTriangulationLogicOptions(IRectanglePrimitive primitive)
         {
-            Center = new Center() { X = primitive.CenterX, Y = primitive.CenterY };
+            Center = new Point2D() { X = primitive.CenterX, Y = primitive.CenterY };
             Rectangle = primitive;
             NdmMaxSize = primitive.NdmMaxSize;
             NdmMinDivision = primitive.NdmMinDivision;
diff --git a/StructureHelperTests/FunctionalTests/Ndms/RCSections/RCSectionFromNdmPrimitiveTest.cs b/StructureHelperTests/FunctionalTests/Ndms/RCSections/RCSectionFromNdmPrimitiveTest.cs
index 3320688..c17c22c 100644
--- a/StructureHelperTests/FunctionalTests/Ndms/RCSections/RCSectionFromNdmPrimitiveTest.cs
+++ b/StructureHelperTests/FunctionalTests/Ndms/RCSections/RCSectionFromNdmPrimitiveTest.cs
@@ -41,19 +41,19 @@ namespace StructureHelperTests.FunctionalTests.Ndms.RCSections
             ITriangulationOptions options = new TriangulationOptions { LimiteState = StructureHelperLogics.Infrastructures.CommonEnums.LimitStates.Collapse, CalcTerm = StructureHelperLogics.Infrastructures.CommonEnums.CalcTerms.ShortTerm };
             var ndmPrimitives = new List<INdmPrimitive>();
             //Добавляем прямоугольник бетонного сечения
-            var concreteRectangle = new dContext.Rectangle(new Center { X = 0, Y = 0 }, new Rectangle { Width = width, Height = height, Angle = 0 });
+            var concreteRectangle = new dContext.Rectangle(new Point2D { X = 0, Y = 0 }, new Rectangle { Width = width, Height = height, Angle = 0 });
             ndmPrimitives.Add(concreteRectangle.GetNdmPrimitive());
             //Добавляем 4 точки для арматуры
             // 0.05 - величина защитного слоя (расстояние от грани прямоугольника до центра арматуры
             //С площадью нижней арматуры
-            var leftBottomReinforcementPoint = new dContext.Point(new Center { X = -width / 2 + 0.05d, Y = -height / 2 + 0.05 }, new Point { Area = bottomArea });
+            var leftBottomReinforcementPoint = new dContext.Point(new Point2D { X = -width / 2 + 0.05d, Y = -height / 2 + 0.05 }, new Point { Area = bottomArea });
             ndmPrimitives.Add(leftBottomReinforcementPoint.GetNdmPrimitive());
-            var rightBottomReinforcementPoint = new Point(new Center { X = width / 2 - 0.05d, Y = -height / 2 + 0.05 }, new Point { Area = bottomArea });
+            var rightBottomReinforcementPoint = new Point(new Point2D { X = width / 2 - 0.05d, Y = -height / 2 + 0.05 }, new Point { Area = bottomArea });
             ndmPrimitives.Add(rightBottomReinforcementPoint.GetNdmPrimitive());
             //С площадью верхней арматуры
-            var leftTopReinforcementPoint = new dContext.Point(new Center { X = -width / 2 + 0.05d, Y = height / 2 - 0.05 }, new Point { Area = topArea });
+            var leftTopReinforcementPoint = new dContext.Point(new Point2D { X = -width / 2 + 0.05d, Y = height / 2 - 0.05 }, new Point { Area = topArea });
             ndmPrimitives.Add(leftTopReinforcementPoint.GetNdmPrimitive());
-            var rightTopReinforcementPoint = new dContext.Point(new Center { X = width / 2 - 0.05d, Y = height / 2 - 0.05 }, new Point { Area = topArea });
+            var rightTopReinforcementPoint = new dContext.Point(new Point2D { X = width / 2 - 0.05d, Y = height / 2 - 0.05 }, new Point { Area = topArea });
             ndmPrimitives.Add(rightTopReinforcementPoint.GetNdmPrimitive());
             //Формируем коллекцию элементарных участков для расчета в библитеке (т.е. выполняем триангуляцию)
             ndmCollection.AddRange(Triangulation.GetNdms(ndmPrimitives, options));
diff --git a/StructureHelperTests/FunctionalTests/Ndms/RCSections/RCSectionTest.cs b/StructureHelperTests/FunctionalTests/Ndms/RCSections/RCSectionTest.cs
index e437871..ce7ee1a 100644
--- a/StructureHelperTests/FunctionalTests/Ndms/RCSections/RCSectionTest.cs
+++ b/StructureHelperTests/FunctionalTests/Ndms/RCSections/RCSectionTest.cs
@@ -61,7 +61,7 @@ namespace StructureHelperTests.FunctionalTests.Ndms.RCSections
         private IEnumerable<INdmPrimitive> GetConcreteNdms(double width, double height)
         {
             double strength = 40e6;
-            ICenter center = new Center { X = 0, Y = 0 };
+            IPoint2D center = new Point2D { X = 0, Y = 0 };
             IRectangleShape rectangle = new RectangleShape { Width = width, Height = height, Angle = 0 };
             IPrimitiveMaterial material = new PrimitiveMaterial { MaterialType = MaterialTypes.Concrete, ClassName = "С40", Strength = strength };
             //ITriangulationOptions options = new TriangulationOptions() { LimiteState = StructureHelperLogics.Infrastructures.CommonEnums.LimitStates.Collapse, CalcTerm = StructureHelperLogics.Infrastructures.CommonEnums.CalcTerms.ShortTerm };
@@ -78,10 +78,10 @@ namespace StructureHelperTests.FunctionalTests.Ndms.RCSections
             IShape bottomReinforcement = new PointShape { Area = bottomArea };
             IPrimitiveMaterial primitiveMaterial = new PrimitiveMaterial { MaterialType = MaterialTypes.Reinforcement, ClassName = "S400", Strength = strength };
             //ITriangulationOptions options = new TriangulationOptions() { LimiteState = StructureHelperLogics.Infrastructures.CommonEnums.LimitStates.Collapse, CalcTerm = StructureHelperLogics.Infrastructures.CommonEnums.CalcTerms.ShortTerm };
-            ICenter centerRT = new Center { X = width / 2 - gap, Y = height / 2 - gap };
-            ICenter centerLT = new Center { X = - (width / 2 - gap), Y = height / 2 - gap };
-            ICenter centerRB = new Center { X = width / 2 - gap, Y = - (height / 2 - gap) };
-            ICenter centerLB = new Center { X = -(width / 2 - gap), Y = - (height / 2 - gap) };
+            IPoint2D centerRT = new Point2D { X = width / 2 - gap, Y = height / 2 - gap };
+            IPoint2D centerLT = new Point2D { X = - (width / 2 - gap), Y = height / 2 - gap };
+            IPoint2D centerRB = new Point2D { X = width / 2 - gap, Y = - (height / 2 - gap) };
+            IPoint2D centerLB = new Point2D { X = -(width / 2 - gap), Y = - (height / 2 - gap) };
             List<INdmPrimitive> primitives = new List<INdmPrimitive>();
             INdmPrimitive primitive;
             //Right top bar
diff --git a/StructureHelperTests/FunctionalTests/Ndms/SteelSections/ReinforcementTest.cs b/StructureHelperTests/FunctionalTests/Ndms/SteelSections/ReinforcementTest.cs
index edcaf53..45f7639 100644
--- a/StructureHelperTests/FunctionalTests/Ndms/SteelSections/ReinforcementTest.cs
+++ b/StructureHelperTests/FunctionalTests/Ndms/SteelSections/ReinforcementTest.cs
@@ -21,7 +21,7 @@ namespace StructureHelperTests.FunctionalTests.Ndms.SteelSections
         public void Run_ShouldPass(double width, double height, double strength, double mx, double my, double nz, double expectedKx, double expectedKy, double expectedEpsilonZ)
         {
             //Arrange
-            ICenter center = new Center { X = 0, Y = 0 };
+            IPoint2D center = new Point2D { X = 0, Y = 0 };
             IRectangleShape rectangle = new RectangleShape { Width = width, Height = height, Angle = 0 };
             IPrimitiveMaterial material = new PrimitiveMaterial { MaterialType = MaterialTypes.Reinforcement, ClassName = "S400", Strength = strength };
             ITriangulationOptions options = new TriangulationOptions { LimiteState = StructureHelperLogics.Infrastructures.CommonEnums.LimitStates.Collapse, CalcTerm = StructureHelperLogics.Infrastructures.CommonEnums.CalcTerms.ShortTerm };
diff --git a/StructureHelperTests/UnitTests/Ndms/Triangulations/RectangleTriangulationTest.cs b/StructureHelperTests/UnitTests/Ndms/Triangulations/RectangleTriangulationTest.cs
index caecc93..8d6cb15 100644
--- a/StructureHelperTests/UnitTests/Ndms/Triangulations/RectangleTriangulationTest.cs
+++ b/StructureHelperTests/UnitTests/Ndms/Triangulations/RectangleTriangulationTest.cs
@@ -21,7 +21,7 @@ namespace StructureHelperTests.UnitTests.Ndms.Triangulations
         {
             //Arrange
             IMaterial material = new Material();
-            ICenter center = new Center { X = centerX, Y = centerY };
+            IPoint2D center = new Point2D { X = centerX, Y = centerY };
             IRectangleShape rectangle = new RectangleShape { Width = width, Height = height, Angle = angle };
             IRectangleTriangulationLogicOptions options = new StructureHelperLogics.NdmCalculations.Triangulations.RectangleTriangulationLogicOptions(center, rectangle, ndmMaxSize, ndmMinDivision);
             IRectangleTriangulationLogic logic = new StructureHelperLogics.NdmCalculations.Triangulations.RectangleTriangulationLogic(options);
diff --git a/Windows/CalculationWindows/CalculationPropertyWindow/CalculationPropertyView.xaml b/Windows/CalculationWindows/CalculationPropertyWindow/CalculationPropertyView.xaml
index 91e7987..cb73f6c 100644
--- a/Windows/CalculationWindows/CalculationPropertyWindow/CalculationPropertyView.xaml
+++ b/Windows/CalculationWindows/CalculationPropertyWindow/CalculationPropertyView.xaml
@@ -39,8 +39,8 @@
                                       SelectedItem="{Binding Path=SelectedCombination}">
                                 <DataGrid.Columns>
                                     <DataGridCheckBoxColumn Header="Active" Binding="{Binding Path=TakeInCalculate}"/>
-                                    <DataGridTextColumn Header="Moment Mx" Width="90" Binding="{Binding Path=ForceMatrix.Mx, Converter={StaticResource ForceConverter}}"/>
-                                    <DataGridTextColumn Header="Moment My" Width="90" Binding="{Binding Path=ForceMatrix.My, Converter={StaticResource ForceConverter}}"/>
+                                    <DataGridTextColumn Header="Moment Mx" Width="90" Binding="{Binding Path=ForceMatrix.Mx, Converter={StaticResource MomentConverter}}"/>
+                                    <DataGridTextColumn Header="Moment My" Width="90" Binding="{Binding Path=ForceMatrix.My, Converter={StaticResource MomentConverter}}"/>
                                     <DataGridTextColumn Header="Force Nz" Width="90" Binding="{Binding Path=ForceMatrix.Nz, Converter={StaticResource ForceConverter}}"/>
                                 </DataGrid.Columns>
                             </DataGrid>
diff --git a/Windows/CalculationWindows/CalculationPropertyWindow/CalculationPropertyView.xaml.cs b/Windows/CalculationWindows/CalculationPropertyWindow/CalculationPropertyView.xaml.cs
index 5c9d06d..d7a7ef0 100644
--- a/Windows/CalculationWindows/CalculationPropertyWindow/CalculationPropertyView.xaml.cs
+++ b/Windows/CalculationWindows/CalculationPropertyWindow/CalculationPropertyView.xaml.cs
@@ -16,7 +16,7 @@ namespace StructureHelper.Windows.CalculationWindows.CalculationPropertyWindow
             InitializeComponent();
             viewModel = calculationProperty;
             this.DataContext = viewModel;
-            if (viewModel.LimitState == LimitStates.Collapse) { LsCollapse.IsChecked = true; }
+            if (viewModel.LimitState == LimitStates.ULS) { LsCollapse.IsChecked = true; }
             else { LsServiceability.IsChecked = true; }
             if (viewModel.CalcTerm == CalcTerms.ShortTerm) { ShortLoads.IsChecked = true; }
             else { LongLoads.IsChecked = true; }
@@ -31,14 +31,14 @@ namespace StructureHelper.Windows.CalculationWindows.CalculationPropertyWindow
         {
             var chBox = sender as RadioButton;
             if (chBox.IsChecked == true & viewModel != null)
-            { viewModel.LimitState = LimitStates.Collapse; }
+            { viewModel.LimitState = LimitStates.ULS; }
         }
 
         private void LsServiceability_Checked(object sender, RoutedEventArgs e)
         {
             var chBox = sender as RadioButton;
             if (chBox.IsChecked == true & viewModel != null)
-            { viewModel.LimitState = LimitStates.ServiceAbility; }
+            { viewModel.LimitState = LimitStates.SLS; }
         }
 
         private void ShortLoads_Checked(object sender, RoutedEventArgs e)
diff --git a/Windows/CalculationWindows/CalculationResultWindow/CalculationResultView.xaml b/Windows/CalculationWindows/CalculationResultWindow/CalculationResultView.xaml
index a40b5b8..add966a 100644
--- a/Windows/CalculationWindows/CalculationResultWindow/CalculationResultView.xaml
+++ b/Windows/CalculationWindows/CalculationResultWindow/CalculationResultView.xaml
@@ -25,8 +25,8 @@
             </DataGrid.RowStyle>
             <DataGrid.Columns>
                 <DataGridCheckBoxColumn Header="Valid" Binding="{Binding Path=IsValid}"/>
-                <DataGridTextColumn Header="Moment Mx" Width="90" Binding="{Binding Path=LoaderResults.ForceStrainPair.ForceMatrix.Mx, Converter={StaticResource ForceConverter}}"/>
-                <DataGridTextColumn Header="Moment My" Width="90" Binding="{Binding Path=LoaderResults.ForceStrainPair.ForceMatrix.My, Converter={StaticResource ForceConverter}}"/>
+                <DataGridTextColumn Header="Moment Mx" Width="90" Binding="{Binding Path=LoaderResults.ForceStrainPair.ForceMatrix.Mx, Converter={StaticResource MomentConverter}}"/>
+                <DataGridTextColumn Header="Moment My" Width="90" Binding="{Binding Path=LoaderResults.ForceStrainPair.ForceMatrix.My, Converter={StaticResource MomentConverter}}"/>
                 <DataGridTextColumn Header="Force Nz" Width="90" Binding="{Binding Path=LoaderResults.ForceStrainPair.ForceMatrix.Nz, Converter={StaticResource ForceConverter}}"/>
                 <DataGridTextColumn Header="Accuracy" Width="90" Binding="{Binding Path=LoaderResults.AccuracyRate}"/>
                 <DataGridTextColumn Header="Max Iteration" Width="90" Binding="{Binding Path=LoaderResults.IterationCounter}"/>
diff --git a/Windows/MainWindow/MainView.xaml b/Windows/MainWindow/MainView.xaml
index 7eaa9ba..6f137a5 100644
--- a/Windows/MainWindow/MainView.xaml
+++ b/Windows/MainWindow/MainView.xaml
@@ -52,7 +52,7 @@
                     <Button Content="Concrete slab" Command="{Binding AddSlabCase}"/>
                 </MenuItem>
             </MenuItem>
-            <MenuItem Header="Analisys">
+            <MenuItem Header="Analysis">
                 <Button Content="Solve problem" Command="{Binding Path=Calculate}"/>
             </MenuItem>
         </Menu>
@@ -206,7 +206,16 @@
         </Grid>
         <StatusBar Grid.Row="2">
             <StatusBarItem>
-                <TextBlock Text="Structure Helper"/>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="Zoom: "/>
+                    <TextBlock Text="{Binding ScaleValue}"/>
+                </StackPanel>
+            </StatusBarItem>
+            <StatusBarItem>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="Number of primitives: "/>
+                    <TextBlock Text="{Binding PrimitivesCount}"/>
+                </StackPanel>
             </StatusBarItem>
         </StatusBar>
     </Grid>
diff --git a/Windows/MainWindow/MainViewModel.cs b/Windows/MainWindow/MainViewModel.cs
index 47bf048..a86d549 100644
--- a/Windows/MainWindow/MainViewModel.cs
+++ b/Windows/MainWindow/MainViewModel.cs
@@ -75,11 +75,12 @@ namespace StructureHelper.Windows.MainWindow
         }
 
         public int PrimitivesCount => Primitives.Count;
+
         private double scaleValue;
 
         public double ScaleValue
         {
-            get => scaleValue;
+            get => Math.Round(scaleValue);
             set
             {
                 OnPropertyChanged(value, ref scaleValue);
@@ -186,7 +187,7 @@ namespace StructureHelper.Windows.MainWindow
             XY1 = CanvasHeight / 2d;
             YX1 = CanvasWidth / 2d;
             YY2 = CanvasHeight;
-            scaleValue = 1000d / scale;
+            scaleValue = 400d / scale;
             axisLineThickness = ConstAxisLineThickness / scaleValue;
             gridLineThickness = ConstGridLineThickness / scaleValue;
             calculationProperty = new CalculationProperty();
@@ -307,6 +308,7 @@ namespace StructureHelper.Windows.MainWindow
                 viewPrimitive.RegisterDeltas(CanvasWidth / 2, CanvasHeight / 2);
                 Primitives.Add(viewPrimitive);
                 PrimitiveRepository.Add(viewPrimitive);
+                OnPropertyChanged(nameof(PrimitivesCount));
             });
 
             DeletePrimitive = new RelayCommand(
@@ -326,6 +328,7 @@ namespace StructureHelper.Windows.MainWindow
                     Primitives.Add(primitive);
                     PrimitiveRepository.Add(primitive);
                 }
+                OnPropertyChanged(nameof(PrimitivesCount));
                 AddCaseLoads(-50e3d, 50e3d, 0d);
             });
 
@@ -336,6 +339,7 @@ namespace StructureHelper.Windows.MainWindow
                     Primitives.Add(primitive);
                     PrimitiveRepository.Add(primitive);
                 }
+                OnPropertyChanged(nameof(PrimitivesCount));
                 AddCaseLoads(50e3d, 50e3d, -100e3d);
             });
 
@@ -346,6 +350,7 @@ namespace StructureHelper.Windows.MainWindow
                     Primitives.Add(primitive);
                     PrimitiveRepository.Add(primitive);
                 }
+                OnPropertyChanged(nameof(PrimitivesCount));
                 AddCaseLoads(-20e3d, 0d, 0d);
             });
 
@@ -391,6 +396,10 @@ namespace StructureHelper.Windows.MainWindow
             wnd.ShowDialog();
             headMaterials = Model.HeadMaterialRepository.HeadMaterials;
             OnPropertyChanged(nameof(headMaterials));
+            foreach (var primitive in Primitives)
+            {
+                primitive.RefreshColor();
+            }
         }
 
         private void DeleteSelectedPrimitive()
@@ -405,6 +414,7 @@ namespace StructureHelper.Windows.MainWindow
                 }
             }
             else { MessageBox.Show("Selection is changed", "Please, select primitive", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); }
+            OnPropertyChanged(nameof(PrimitivesCount));
         }
 
         private void EditSelectedPrimitive()
diff --git a/Windows/PrimitivePropertiesWindow/PrimitivePropertiesView.xaml b/Windows/PrimitivePropertiesWindow/PrimitivePropertiesView.xaml
index dcfe5c2..691ae62 100644
--- a/Windows/PrimitivePropertiesWindow/PrimitivePropertiesView.xaml
+++ b/Windows/PrimitivePropertiesWindow/PrimitivePropertiesView.xaml
@@ -134,9 +134,9 @@
                     <TextBlock Grid.Row="0" Text="k_x"/>
                     <TextBlock Grid.Row="1" Text="k_y"/>
                     <TextBlock Grid.Row="2" Text="epsilon_z"/>
-                    <TextBox Grid.Row="0" Grid.Column="1" Margin="1" Text="{Binding PrestrainKx, ValidatesOnDataErrors=True}"/>
-                    <TextBox Grid.Row="1" Grid.Column="1" Margin="1" Text="{Binding PrestrainKy, ValidatesOnDataErrors=True}"/>
-                    <TextBox Grid.Row="2" Grid.Column="1" Margin="1" Text="{Binding PrestrainEpsZ, ValidatesOnDataErrors=True}"/>
+                    <TextBox Grid.Row="0" Grid.Column="1" Margin="1" Text="{Binding PrestrainKx, Converter={StaticResource Curvature}, ValidatesOnDataErrors=True}"/>
+                    <TextBox Grid.Row="1" Grid.Column="1" Margin="1" Text="{Binding PrestrainKy, Converter={StaticResource Curvature}, ValidatesOnDataErrors=True}"/>
+                    <TextBox Grid.Row="2" Grid.Column="1" Margin="1" Text="{Binding PrestrainEpsZ, Converter={StaticResource PlainDouble}, ValidatesOnDataErrors=True}"/>
                 </Grid>
             </Expander>
         </StackPanel>