From f2f6840ffb83ada626d4d675c2f6b71559fc195a Mon Sep 17 00:00:00 2001
From: Evgeny Redikultsev <effect-project@yandex.ru>
Date: Sat, 16 Mar 2024 21:46:24 +0500
Subject: [PATCH] Value point graph was added

---
 .../Services/ColorServices/ColorOperations.cs |   7 +-
 .../UI/Resources/ItemEditPanels.xaml          |  11 +-
 .../Libraries/LoaderCalculator.dll            | Bin 86016 -> 86016 bytes
 .../PublishProfiles/FolderProfile.pubxml.user |   2 +-
 .../Services/ResultViewers/IResultFunc.cs     |   1 +
 .../Services/ResultViewers/ResultFunc.cs      |   1 +
 .../ResultViewers/ResultFuncFactory.cs        |  19 ++--
 .../ForceResultLogic/DiagramFactory.cs        |  60 +++++++++++
 .../ForceResultLogic/ShowDiagramLogic.cs      |  41 ++-----
 .../ForceResultLogic/ShowProgressLogic.cs     |   4 +-
 .../ShowValuePointDiagramLogic.cs             | 101 +++++++++++++++++-
 .../ForcesResultsViewModel.cs                 |  29 +++--
 .../Windows/Forces/PrimitiveValuePoints.cs    |   5 +-
 .../Windows/Forces/ValueDelegatesLogic.cs     |   3 +-
 .../Forces/ValuePointsInterpolateView.xaml.cs |  17 +--
 .../Forces/ValuePointsInterpolateViewModel.cs |   1 +
 .../Exceptions/StructureHelperException.cs    |   4 +
 .../Models/Parameters/ArrayParameter.cs       |  57 ++++++++++
 .../Analyses/ByForces/ForceCalculator.cs      |   2 +-
 .../CrackWidthLogicInputDataFactory.cs        |   2 +-
 .../Cracking/TensileAreaLogicSP63.cs          |   2 +-
 .../Primitives/CirclePrimitive.cs             |  39 ++++++-
 .../Primitives/INamedAreaPoint.cs             |  11 ++
 .../Primitives/INdmPrimitive.cs               |   2 +-
 .../Primitives/NamedAreaPoint.cs              |  17 +++
 .../Primitives/PointPrimitive.cs              |  10 +-
 .../Primitives/RebarPrimitive.cs              |  10 +-
 .../Primitives/RectanglePrimitive.cs          |  32 ++++--
 28 files changed, 383 insertions(+), 107 deletions(-)
 create mode 100644 StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/DiagramFactory.cs
 create mode 100644 StructureHelperLogics/NdmCalculations/Primitives/INamedAreaPoint.cs
 create mode 100644 StructureHelperLogics/NdmCalculations/Primitives/NamedAreaPoint.cs

diff --git a/FieldVisualizer/Services/ColorServices/ColorOperations.cs b/FieldVisualizer/Services/ColorServices/ColorOperations.cs
index 9b3148d..d436432 100644
--- a/FieldVisualizer/Services/ColorServices/ColorOperations.cs
+++ b/FieldVisualizer/Services/ColorServices/ColorOperations.cs
@@ -85,11 +85,16 @@ namespace FieldVisualizer.Services.ColorServices
                 return map.Colors[^1];
             }
             double colorPerc = 1d / (map.Colors.Count - 1d); // % of each block of color. the last is the "100% Color"
-            double blockOfColor = valPerc / colorPerc;// the integer part repersents how many block to skip
+            double blockOfColor = valPerc / colorPerc;// the integer part represents how many block to skip
             int blockIdx = (int)Math.Truncate(blockOfColor);// Idx of
             double valPercResidual = valPerc - (blockIdx * colorPerc);//remove the part represented of block 
             double percOfColor = valPercResidual / colorPerc;// % of color of this block that will be filled
 
+            //in some cases due to accuracy of double type percent of color may be less than zero
+            if (percOfColor <= 0d)
+            {
+                return map.Colors[blockIdx];
+            }
             Color c = GetColorByColorMap(map, blockIdx, percOfColor);
             return c;
         }
diff --git a/StructureHelper/Infrastructure/UI/Resources/ItemEditPanels.xaml b/StructureHelper/Infrastructure/UI/Resources/ItemEditPanels.xaml
index 7c7acb2..502aeed 100644
--- a/StructureHelper/Infrastructure/UI/Resources/ItemEditPanels.xaml
+++ b/StructureHelper/Infrastructure/UI/Resources/ItemEditPanels.xaml
@@ -23,7 +23,8 @@
             </StackPanel>
             <ListBox Grid.Column="2" ItemsSource="{Binding TargetItems}"
                      SelectedItem="{Binding SelectedTargetItem}"
-                     ItemTemplate="{Binding ItemDataDemplate}">
+                     ItemTemplate="{Binding ItemDataDemplate}"
+                     >
                 <!--<InputBindingCollection>
                     <MouseBinding Gesture="LeftDoubleClick" Command="{Binding RemoveSelected}"/>
                 </InputBindingCollection>-->
@@ -41,8 +42,9 @@
                 <Button Content="Unselect All" Command="{Binding UnSelectAllCommand}"/>
                 <Button Content="Invert Selection" Command="{Binding InvertSelectionCommand}"/>
             </StackPanel>
-            <ListBox Grid.Row="1" ItemsSource="{Binding CollectionItems}" SelectedItem="SelectedItem">
-                <ListBox.ItemTemplate>
+            <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Visible">
+                <ListBox ItemsSource="{Binding CollectionItems}" SelectedItem="SelectedItem">
+                    <ListBox.ItemTemplate>
                         <DataTemplate>
                             <Grid>
                                 <Grid.ColumnDefinitions>
@@ -54,7 +56,8 @@
                             </Grid>
                         </DataTemplate>
                     </ListBox.ItemTemplate>
-            </ListBox>
+                </ListBox>
+            </ScrollViewer>
         </Grid>
     </DataTemplate>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/StructureHelper/Libraries/LoaderCalculator.dll b/StructureHelper/Libraries/LoaderCalculator.dll
index cdc1bd5ecae456967ae8d73def90b97860779a03..d31e226236a3209d011d20cd6764ff1ddb6852f7 100644
GIT binary patch
delta 13397
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

delta 13396
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
Zf58izpV||hzHGhLB4c~IZg?vAe*jHCN?rf}

diff --git a/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml.user b/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml.user
index 3948670..7b83bfc 100644
--- a/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/StructureHelper/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <History>True|2024-03-10T14:11:27.6834663Z;True|2024-02-02T12:22:50.1454015+05:00;True|2023-02-25T13:37:39.2738786+05:00;False|2023-02-25T13:37:24.0284261+05:00;True|2023-02-25T13:34:01.6858860+05:00;True|2023-02-25T13:31:18.8295711+05:00;False|2023-02-25T13:25:21.5807199+05:00;False|2023-02-25T13:24:41.7164398+05:00;</History>
+    <History>True|2024-03-11T15:33:14.1457807Z;True|2024-03-10T19:11:27.6834663+05:00;True|2024-02-02T12:22:50.1454015+05:00;True|2023-02-25T13:37:39.2738786+05:00;False|2023-02-25T13:37:24.0284261+05:00;True|2023-02-25T13:34:01.6858860+05:00;True|2023-02-25T13:31:18.8295711+05:00;False|2023-02-25T13:25:21.5807199+05:00;False|2023-02-25T13:24:41.7164398+05:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/StructureHelper/Services/ResultViewers/IResultFunc.cs b/StructureHelper/Services/ResultViewers/IResultFunc.cs
index 21110f5..f90acc1 100644
--- a/StructureHelper/Services/ResultViewers/IResultFunc.cs
+++ b/StructureHelper/Services/ResultViewers/IResultFunc.cs
@@ -12,6 +12,7 @@ namespace StructureHelper.Services.ResultViewers
     {
         string Name { get; }
         Func<IStrainMatrix, INdm, double> ResultFunction { get; }
+        string UnitName { get; set; }
         double UnitFactor { get; }
     }
 }
diff --git a/StructureHelper/Services/ResultViewers/ResultFunc.cs b/StructureHelper/Services/ResultViewers/ResultFunc.cs
index d0b624c..129e705 100644
--- a/StructureHelper/Services/ResultViewers/ResultFunc.cs
+++ b/StructureHelper/Services/ResultViewers/ResultFunc.cs
@@ -12,6 +12,7 @@ namespace StructureHelper.Services.ResultViewers
     {
         public string Name { get; set; }
         public Func<IStrainMatrix, INdm, double> ResultFunction { get; set; }
+        public string UnitName { get; set; }
         public double UnitFactor { get; set; }
 
         public ResultFunc()
diff --git a/StructureHelper/Services/ResultViewers/ResultFuncFactory.cs b/StructureHelper/Services/ResultViewers/ResultFuncFactory.cs
index d4dc1ac..3064412 100644
--- a/StructureHelper/Services/ResultViewers/ResultFuncFactory.cs
+++ b/StructureHelper/Services/ResultViewers/ResultFuncFactory.cs
@@ -1,6 +1,8 @@
 using LoaderCalculator.Logics;
 using StructureHelper.Infrastructure.UI.Converters.Units;
+using StructureHelperCommon.Infrastructures.Enums;
 using StructureHelperCommon.Infrastructures.Exceptions;
+using StructureHelperCommon.Services.Units;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -18,6 +20,11 @@ namespace StructureHelper.Services.ResultViewers
     }
     public static class ResultFuncFactory
     {
+        static IUnit unitForce = CommonOperation.GetUnit(UnitTypes.Force);
+        static IUnit unitStress = CommonOperation.GetUnit(UnitTypes.Stress);
+        static IUnit unitMoment = CommonOperation.GetUnit(UnitTypes.Moment);
+        static IUnit unitCurvature = CommonOperation.GetUnit(UnitTypes.Curvature);
+
         static readonly IStressLogic stressLogic = new StressLogic();
         public static List<IResultFunc> GetResultFuncs(FuncsTypes funcsType = FuncsTypes.Full)
         {
@@ -50,7 +57,7 @@ namespace StructureHelper.Services.ResultViewers
         {
             List<IResultFunc> resultFuncs = new List<IResultFunc>();
             resultFuncs.Add(new ResultFunc() { Name = "Total Strain", ResultFunction = stressLogic.GetTotalStrain });
-            resultFuncs.Add(new ResultFunc() { Name = "Total Strain with prestrain", ResultFunction = stressLogic.GetTotalStrainWithPresrain });
+            resultFuncs.Add(new ResultFunc() { Name = "Total Strain with prestrain", ResultFunction = stressLogic.GetTotalStrainWithPrestrain });
             resultFuncs.Add(new ResultFunc() { Name = "Elastic Strain", ResultFunction = stressLogic.GetElasticStrain });
             resultFuncs.Add(new ResultFunc() { Name = "Plastic Strain", ResultFunction = stressLogic.GetPlasticStrain });
             return resultFuncs;
@@ -58,17 +65,17 @@ namespace StructureHelper.Services.ResultViewers
         private static List<IResultFunc> GetStressResultFuncs()
         {
             List<IResultFunc> resultFuncs = new List<IResultFunc>();
-            resultFuncs.Add(new ResultFunc() { Name = "Stress", ResultFunction = stressLogic.GetStress, UnitFactor = UnitConstants.Stress });
-            resultFuncs.Add(new ResultFunc() { Name = "Secant modulus", ResultFunction = stressLogic.GetSecantModulus, UnitFactor = UnitConstants.Stress });
+            resultFuncs.Add(new ResultFunc() { Name = "Stress", ResultFunction = stressLogic.GetStress, UnitFactor = unitStress.Multiplyer, UnitName = unitStress.Name });
+            resultFuncs.Add(new ResultFunc() { Name = "Secant modulus", ResultFunction = stressLogic.GetSecantModulus, UnitFactor = unitStress.Multiplyer, UnitName = unitStress.Name });
             resultFuncs.Add(new ResultFunc() { Name = "Modulus degradation", ResultFunction = stressLogic.GetModulusDegradation });
             return resultFuncs;
         }
         private static List<IResultFunc> GetForcesResultFuncs()
         {
             List<IResultFunc> resultFuncs = new List<IResultFunc>();
-            resultFuncs.Add(new ResultFunc() { Name = "Force", ResultFunction = stressLogic.GetForce, UnitFactor = UnitConstants.Force });
-            resultFuncs.Add(new ResultFunc() { Name = "Moment X", ResultFunction = stressLogic.GetMomentX, UnitFactor = UnitConstants.Force });
-            resultFuncs.Add(new ResultFunc() { Name = "Moment Y", ResultFunction = stressLogic.GetMomentY, UnitFactor = UnitConstants.Force });
+            resultFuncs.Add(new ResultFunc() { Name = "Force", ResultFunction = stressLogic.GetForce, UnitFactor = unitForce.Multiplyer, UnitName = unitForce.Name });
+            resultFuncs.Add(new ResultFunc() { Name = "Moment X", ResultFunction = stressLogic.GetMomentX, UnitFactor = unitMoment.Multiplyer, UnitName = unitMoment.Name });
+            resultFuncs.Add(new ResultFunc() { Name = "Moment Y", ResultFunction = stressLogic.GetMomentY, UnitFactor = unitMoment.Multiplyer, UnitName = unitMoment.Name });
             return resultFuncs;
         }
     }
diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/DiagramFactory.cs b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/DiagramFactory.cs
new file mode 100644
index 0000000..d934745
--- /dev/null
+++ b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/DiagramFactory.cs
@@ -0,0 +1,60 @@
+using StructureHelperCommon.Infrastructures.Enums;
+using StructureHelperCommon.Models.Parameters;
+using StructureHelperCommon.Services.Units;
+using StructureHelperLogics.NdmCalculations.Analyses.ByForces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews
+{
+    public class DiagramFactory
+    {
+        private ArrayParameter<double> arrayParameter;
+        public List<IForcesTupleResult> TupleList { get; set; }
+
+        public Action<int> SetProgress { get; set; }
+
+        public ArrayParameter<double> GetCommonArray()
+        {
+            var labels = LabelsFactory.GetCommonLabels();
+            arrayParameter = new ArrayParameter<double>(TupleList.Count(), labels);
+            Calculate();
+            return arrayParameter;
+        }
+
+        private void Calculate()
+        {
+            var data = arrayParameter.Data;
+            for (int i = 0; i < TupleList.Count(); i++)
+            {
+                var valueList = ProcessResult(i);
+                for (int j = 0; j < valueList.Count; j++)
+                {
+                    data[i, j] = valueList[j];
+                }
+                SetProgress?.Invoke(i);
+            }
+        }
+
+
+        private List<double> ProcessResult(int i)
+        {
+            var unitForce = CommonOperation.GetUnit(UnitTypes.Force);
+            var unitMoment = CommonOperation.GetUnit(UnitTypes.Moment);
+            var unitCurvature = CommonOperation.GetUnit(UnitTypes.Curvature);
+
+            return new List<double>
+                {
+                    TupleList[i].DesignForceTuple.ForceTuple.Mx * unitMoment.Multiplyer,
+                    TupleList[i].DesignForceTuple.ForceTuple.My * unitMoment.Multiplyer,
+                    TupleList[i].DesignForceTuple.ForceTuple.Nz * unitForce.Multiplyer,
+                    TupleList[i].LoaderResults.ForceStrainPair.StrainMatrix.Kx * unitCurvature.Multiplyer,
+                    TupleList[i].LoaderResults.ForceStrainPair.StrainMatrix.Ky * unitCurvature.Multiplyer,
+                    TupleList[i].LoaderResults.ForceStrainPair.StrainMatrix.EpsZ
+                };
+        }
+    }
+}
diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowDiagramLogic.cs b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowDiagramLogic.cs
index 8e42820..60f4b9b 100644
--- a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowDiagramLogic.cs
+++ b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowDiagramLogic.cs
@@ -58,9 +58,12 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu
         {
             validTupleList = tupleList.Where(x => x.IsValid == true).ToList();
 
-            var labels = LabelsFactory.GetCommonLabels();
-            arrayParameter = new ArrayParameter<double>(validTupleList.Count(), labels);
-            Calculate();
+            var factory = new DiagramFactory()
+            {
+                TupleList = validTupleList,
+                SetProgress = SetProgress,
+            };
+            arrayParameter = factory.GetCommonArray();
         }
 
         public ShowDiagramLogic(IEnumerable<IForcesTupleResult> tupleList, IEnumerable<INdmPrimitive> ndmPrimitives)
@@ -69,37 +72,5 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu
             this.ndmPrimitives = ndmPrimitives;
             validTupleList = tupleList.Where(x => x.IsValid == true).ToList();
         }
-
-        private void Calculate()
-        {
-            var data = arrayParameter.Data;
-            for (int i = 0; i < validTupleList.Count(); i++)
-            {
-                var valueList = ProcessResult(i);
-                for (int j = 0; j < valueList.Count; j++)
-                {
-                    data[i, j] = valueList[j];
-                }
-                SetProgress?.Invoke(i);
-            }
-        }
-
-
-        private List<double> ProcessResult(int i)
-        {
-            var unitForce = CommonOperation.GetUnit(UnitTypes.Force);
-            var unitMoment = CommonOperation.GetUnit(UnitTypes.Moment);
-            var unitCurvature = CommonOperation.GetUnit(UnitTypes.Curvature);
-            
-            return new List<double>
-                {
-                    validTupleList[i].DesignForceTuple.ForceTuple.Mx * unitMoment.Multiplyer,
-                    validTupleList[i].DesignForceTuple.ForceTuple.My * unitMoment.Multiplyer,
-                    validTupleList[i].DesignForceTuple.ForceTuple.Nz * unitForce.Multiplyer,
-                    validTupleList[i].LoaderResults.ForceStrainPair.StrainMatrix.Kx * unitCurvature.Multiplyer,
-                    validTupleList[i].LoaderResults.ForceStrainPair.StrainMatrix.Ky * unitCurvature.Multiplyer,
-                    validTupleList[i].LoaderResults.ForceStrainPair.StrainMatrix.EpsZ
-                };
-        }
     }
 }
diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowProgressLogic.cs b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowProgressLogic.cs
index ecf5414..b749272 100644
--- a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowProgressLogic.cs
+++ b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowProgressLogic.cs
@@ -1,4 +1,5 @@
 using StructureHelper.Windows.CalculationWindows.ProgressViews;
+using StructureHelperCommon.Infrastructures.Exceptions;
 using StructureHelperCommon.Infrastructures.Interfaces;
 using StructureHelperCommon.Models.Calculators;
 using StructureHelperCommon.Models.Forces;
@@ -82,8 +83,7 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu
             }
             catch (Exception ex)
             {
-
-                throw;
+                throw new StructureHelperException(ex);
             }
         }
     }
diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowValuePointDiagramLogic.cs b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowValuePointDiagramLogic.cs
index f527fcc..2ec5fff 100644
--- a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowValuePointDiagramLogic.cs
+++ b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForceResultLogic/ShowValuePointDiagramLogic.cs
@@ -1,11 +1,14 @@
-using StructureHelper.Infrastructure.UI.DataContexts;
+using LoaderCalculator.Data.Ndms;
+using StructureHelper.Infrastructure.UI.DataContexts;
 using StructureHelper.Services.ResultViewers;
 using StructureHelper.Windows.Forces;
 using StructureHelper.Windows.Graphs;
 using StructureHelper.Windows.ViewModels.Errors;
+using StructureHelperCommon.Infrastructures.Enums;
 using StructureHelperCommon.Infrastructures.Exceptions;
 using StructureHelperCommon.Infrastructures.Interfaces;
 using StructureHelperCommon.Models;
+using StructureHelperCommon.Models.Forces;
 using StructureHelperCommon.Models.Parameters;
 using StructureHelperCommon.Models.Shapes;
 using StructureHelperLogics.NdmCalculations.Analyses.ByForces;
@@ -25,7 +28,7 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews
         private IEnumerable<IForcesTupleResult> tupleList;
         private IEnumerable<INdmPrimitive> ndmPrimitives;
         private List<IForcesTupleResult> validTupleList;
-        private List<(PrimitiveBase PrimitiveBase, List<NamedValue<IPoint2D>>)> valuePoints;
+        private List<(PrimitiveBase PrimitiveBase, List<INamedAreaPoint> namedPoints)> valuePoints;
         private List<IResultFunc> resultFuncList;
 
         public ForceCalculator Calculator { get; set; }
@@ -42,8 +45,19 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews
             this.tupleList = tupleList;
             this.ndmPrimitives = ndmPrimitives;
             validTupleList = this.tupleList.Where(x => x.IsValid == true).ToList();
-            valuePoints = new List<(PrimitiveBase PrimitiveBase, List<NamedValue<IPoint2D>>)>();
-            foreach (var item in PrimitiveLogic.Collection.CollectionItems) 
+            valuePoints = new List<(PrimitiveBase PrimitiveBase, List<INamedAreaPoint>)>();
+        }
+
+        public void SetParameters()
+        {
+            var factory = new DiagramFactory()
+            {
+                TupleList = validTupleList,
+                SetProgress = SetProgress,
+            };
+            arrayParameter = factory.GetCommonArray();
+
+            foreach (var item in PrimitiveLogic.Collection.CollectionItems)
             {
                 var pointsCount = item.Item.ValuePoints.SelectedCount;
                 if (pointsCount > 0)
@@ -53,7 +67,79 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews
                     valuePoints.Add((primitive, points));
                 }
             }
+
+            var selectedDelegates = ValueDelegatesLogic.ResultFuncs.SelectedItems;
+            if (selectedDelegates.Count() == 0) { return; }
+            var labels = GetLabels(valuePoints, selectedDelegates);
+            var pointCount = valuePoints.Sum(x => x.namedPoints.Count());
+            List<double> values = new();
+            var tuplesList = tupleList
+                .Where(x => x.IsValid == true)
+                .ToList();
+            var newArray = new ArrayParameter<double>(tuplesList.Count(), labels);
+            for (int i = 0; i < tuplesList.Count(); i++)
+            {
+                var strainMatrix = tuplesList[i].LoaderResults.ForceStrainPair.StrainMatrix;
+                values.Clear();
+                foreach (var valuePoint in valuePoints)
+                {
+                    foreach (var point in valuePoint.namedPoints)
+                    {
+                        var limitState = tuplesList[i].DesignForceTuple.LimitState;
+                        var calcTerm = tuplesList[i].DesignForceTuple.CalcTerm;
+                        var ndm = GetNdm(valuePoint, point, limitState, calcTerm);
+
+                        foreach (var valDelegate in selectedDelegates)
+                        {
+
+                            double val = valDelegate.ResultFunction.Invoke(strainMatrix, ndm) * valDelegate.UnitFactor;
+                            values.Add(val);
+                        }
+                    }
+                }
+                newArray.AddRow(i, values);
+            }
+            arrayParameter.AddArray(newArray);
         }
+
+        private List<string> GetLabels(List<(PrimitiveBase PrimitiveBase, List<INamedAreaPoint> namedPoints)> valuePoints, IEnumerable<IResultFunc> selectedDelegates)
+        {
+            List<string> strings = new();
+            foreach (var valuePoint in valuePoints)
+            {
+                foreach (var item in valuePoint.namedPoints)
+                {
+                    foreach (var deleg in selectedDelegates)
+                    {
+                        string s = valuePoint.PrimitiveBase.Name;
+                        s += "_" + item.Name;
+                        s += "_" + deleg.Name + ", " + deleg.UnitName;
+                        strings.Add(s);
+                    }
+                }
+            }
+            return strings;
+        }
+
+        private static RebarNdm GetNdm((PrimitiveBase PrimitiveBase, List<INamedAreaPoint> namedPoints) valuePoint, INamedAreaPoint point, LimitStates limitState, CalcTerms calcTerm)
+        {
+            var ndmPrimitive = valuePoint.PrimitiveBase.GetNdmPrimitive();
+            var material = ndmPrimitive.HeadMaterial.GetLoaderMaterial(limitState, calcTerm);
+            var userPrestrain = ndmPrimitive.UsersPrestrain;
+            var autoPrestrain = ndmPrimitive.AutoPrestrain;
+            var ndm = new RebarNdm()
+            {
+                Area = point.Area,
+                CenterX = point.Point.X,
+                CenterY = point.Point.Y,
+                Material = material,
+            };
+            ndm.Prestrain = (userPrestrain.Mx + autoPrestrain.Mx) * point.Point.Y
+                + (userPrestrain.My + autoPrestrain.My) * point.Point.X
+                + userPrestrain.Nz + autoPrestrain.Nz;
+            return ndm;
+        }
+
         public void ShowWindow()
         {
             SafetyProcessor.RunSafeProcess(() =>
@@ -89,7 +175,14 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews
 
         private void Show()
         {
+            validTupleList = tupleList.Where(x => x.IsValid == true).ToList();
 
+            var factory = new DiagramFactory()
+            {
+                TupleList = validTupleList,
+                SetProgress = SetProgress,
+            };
+            arrayParameter = factory.GetCommonArray();
         }
 
         private List<string> GetColumnNames()
diff --git a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsViewModel.cs b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsViewModel.cs
index cac1378..7caa0b4 100644
--- a/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsViewModel.cs
+++ b/StructureHelper/Windows/CalculationWindows/CalculatorsViews/ForceCalculatorViews/ForcesResultsViewModel.cs
@@ -152,12 +152,12 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu
         {
             get => showGraphsCommand ??= new RelayCommand(o =>
             {
-                InterpolateTuplesViewModel interploateTuplesViewModel;
+                InterpolateTuplesViewModel interpolateTuplesViewModel;
                 InterpolateTuplesView wndTuples;
-                ShowInterpolationWindow(out interploateTuplesViewModel, out wndTuples);
+                ShowInterpolationWindow(out interpolateTuplesViewModel, out wndTuples);
                 if (wndTuples.DialogResult != true) return;
 
-                var interpolationLogic = new InterpolationProgressLogic(forceCalculator, interploateTuplesViewModel.ForceInterpolationViewModel.Result);
+                var interpolationLogic = new InterpolationProgressLogic(forceCalculator, interpolateTuplesViewModel.ForceInterpolationViewModel.Result);
                 showProgressLogic = new(interpolationLogic)
                 {
                     WindowTitle = "Interpolate forces"
@@ -298,18 +298,27 @@ namespace StructureHelper.Windows.CalculationWindows.CalculatorsViews.ForceCalcu
             wnd.ShowDialog();
             if (wnd.DialogResult != true) { return; }
             var interpolationLogic = new InterpolationProgressLogic(forceCalculator, viewModel.ForceInterpolationViewModel.Result);
-            ShowValuePointDiagramLogic pointGraphLogic = new(ForcesResults.ForcesResultList, ndmPrimitives)
-            {
-                Calculator = interpolationLogic.InterpolateCalculator,
-                PrimitiveLogic = viewModel.PrimitiveLogic,
-                ValueDelegatesLogic = viewModel.ValueDelegatesLogic
-            };
             progressLogic = interpolationLogic;
             showProgressLogic = new(interpolationLogic)
             {
-                ShowResult = pointGraphLogic.ShowWindow
+                WindowTitle = "Interpolate forces",
             };
             showProgressLogic.Show();
+            var result = interpolationLogic.InterpolateCalculator.Result;
+            if (result.IsValid == false) { return; }
+            if (result is IForcesResults)
+            {
+                var tupleResult = result as IForcesResults;
+                var pointGraphLogic = new ShowValuePointDiagramLogic(tupleResult.ForcesResultList, ndmPrimitives)
+                {
+                    Calculator = interpolationLogic.InterpolateCalculator,
+                    PrimitiveLogic = viewModel.PrimitiveLogic,
+                    ValueDelegatesLogic = viewModel.ValueDelegatesLogic
+                };
+                pointGraphLogic.SetParameters();
+                pointGraphLogic.ShowWindow();
+            }
+
         }
 
         private void ShowInterpolationWindow(out InterpolateTuplesViewModel interploateTuplesViewModel, out InterpolateTuplesView wndTuples)
diff --git a/StructureHelper/Windows/Forces/PrimitiveValuePoints.cs b/StructureHelper/Windows/Forces/PrimitiveValuePoints.cs
index 4d56791..9b74b00 100644
--- a/StructureHelper/Windows/Forces/PrimitiveValuePoints.cs
+++ b/StructureHelper/Windows/Forces/PrimitiveValuePoints.cs
@@ -2,6 +2,7 @@
 using StructureHelper.Windows.ViewModels;
 using StructureHelperCommon.Models.Parameters;
 using StructureHelperCommon.Models.Shapes;
+using StructureHelperLogics.NdmCalculations.Primitives;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,13 +14,13 @@ namespace StructureHelper.Windows.Forces
     public class PrimitiveValuePoints
     {
         public PrimitiveBase PrimitiveBase {get;set;}
-        public SelectItemsVM<NamedValue<IPoint2D>> ValuePoints { get; set; }
+        public SelectItemsVM<INamedAreaPoint> ValuePoints { get; set; }
 
         public PrimitiveValuePoints(PrimitiveBase primitiveBase)
         {
             var ndmPrimitive = primitiveBase.GetNdmPrimitive();
             var pointCollection = ndmPrimitive.GetValuePoints();
-            ValuePoints = new SelectItemsVM<NamedValue<IPoint2D>>(pointCollection)
+            ValuePoints = new SelectItemsVM<INamedAreaPoint>(pointCollection)
             {
                 ShowButtons = false
             };
diff --git a/StructureHelper/Windows/Forces/ValueDelegatesLogic.cs b/StructureHelper/Windows/Forces/ValueDelegatesLogic.cs
index ed5f5a1..0307821 100644
--- a/StructureHelper/Windows/Forces/ValueDelegatesLogic.cs
+++ b/StructureHelper/Windows/Forces/ValueDelegatesLogic.cs
@@ -16,8 +16,7 @@ namespace StructureHelper.Windows.Forces
         public ValueDelegatesLogic()
         {
             resultFuncs = new List<IResultFunc>();
-            resultFuncs.AddRange(ResultFuncFactory.GetResultFuncs(FuncsTypes.Strain));
-            resultFuncs.AddRange(ResultFuncFactory.GetResultFuncs(FuncsTypes.Stress));
+            resultFuncs.AddRange(ResultFuncFactory.GetResultFuncs(FuncsTypes.Full));
             ResultFuncs = new SelectItemsVM<IResultFunc>(resultFuncs)
             {
                 ShowButtons = true
diff --git a/StructureHelper/Windows/Forces/ValuePointsInterpolateView.xaml.cs b/StructureHelper/Windows/Forces/ValuePointsInterpolateView.xaml.cs
index 0ee9ac7..15e783e 100644
--- a/StructureHelper/Windows/Forces/ValuePointsInterpolateView.xaml.cs
+++ b/StructureHelper/Windows/Forces/ValuePointsInterpolateView.xaml.cs
@@ -1,16 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
+using System.Windows;
 
 namespace StructureHelper.Windows.Forces
 {
@@ -22,10 +10,11 @@ namespace StructureHelper.Windows.Forces
         private ValuePointsInterpolateViewModel viewModel;
         public ValuePointsInterpolateView(ValuePointsInterpolateViewModel viewModel)
         {
-            InitializeComponent();
             this.viewModel = viewModel;
             this.viewModel.ParentWindow = this;
             this.DataContext = this.viewModel;
+            InitializeComponent();
+            InterpolationControl.Properties = viewModel.ForceInterpolationViewModel;
         }
     }
 }
diff --git a/StructureHelper/Windows/Forces/ValuePointsInterpolateViewModel.cs b/StructureHelper/Windows/Forces/ValuePointsInterpolateViewModel.cs
index 29155fe..c5039d2 100644
--- a/StructureHelper/Windows/Forces/ValuePointsInterpolateViewModel.cs
+++ b/StructureHelper/Windows/Forces/ValuePointsInterpolateViewModel.cs
@@ -1,4 +1,5 @@
 using StructureHelper.Windows.ViewModels;
+using StructureHelper.Windows.ViewModels.Materials;
 using StructureHelperCommon.Models.Forces;
 using System;
 using System.Collections.Generic;
diff --git a/StructureHelperCommon/Infrastructures/Exceptions/StructureHelperException.cs b/StructureHelperCommon/Infrastructures/Exceptions/StructureHelperException.cs
index ab76f9d..0bf94cf 100644
--- a/StructureHelperCommon/Infrastructures/Exceptions/StructureHelperException.cs
+++ b/StructureHelperCommon/Infrastructures/Exceptions/StructureHelperException.cs
@@ -7,5 +7,9 @@ namespace StructureHelperCommon.Infrastructures.Exceptions
         public StructureHelperException(string errorString) : base(errorString)
         {
         }
+        public StructureHelperException(Exception ex) : this(ex.Message)
+        {
+            
+        }
     }
 }
diff --git a/StructureHelperCommon/Models/Parameters/ArrayParameter.cs b/StructureHelperCommon/Models/Parameters/ArrayParameter.cs
index 0b3df4f..59e2b05 100644
--- a/StructureHelperCommon/Models/Parameters/ArrayParameter.cs
+++ b/StructureHelperCommon/Models/Parameters/ArrayParameter.cs
@@ -43,5 +43,62 @@ namespace StructureHelperCommon.Models.Parameters
 			}
         }
         public ArrayParameter(int rowCount, List<string> columnLabels) : this(rowCount, columnLabels.Count, columnLabels) { }
+		public void AddArray(IArrayParameter<T> array)
+		{
+			var rowCount = array.Data.GetLength(0);
+            int existingRowCount = this.Data.GetLength(0);
+            if (rowCount != existingRowCount)
+			{
+				throw new StructureHelperException(ErrorStrings.DataIsInCorrect + $": number of rows in new array {rowCount} is not equal existing row count {existingRowCount}");
+			}
+			var existingColumnCount = this.Data.GetLength(1);
+			var newColumnCount = array.Data.GetLength(1);
+			var totalCount = existingColumnCount + newColumnCount;
+			var newData = new T[rowCount, totalCount];
+			var lackColumns = existingColumnCount - ColumnLabels.Count;
+			if (lackColumns > 0)
+			{
+				for (int i = 0; i < lackColumns; i++)
+				{
+					ColumnLabels.Add(string.Empty);
+				}
+			}
+			ColumnLabels.AddRange(array.ColumnLabels);
+			for (int i = 0; i < rowCount; i++)
+			{
+				for (int j = 0; j < existingColumnCount; j++)
+				{
+					newData[i, j] = Data[i, j];
+				}
+                for (int j = 0; j < newColumnCount; j++)
+                {
+                    newData[i, existingColumnCount + j] = array.Data[i,j];
+                }
+            }
+			Data = newData;
+		}
+
+		public void AddRow(int rowNumber, IEnumerable<T> values)
+        {
+            CheckParams(rowNumber, values);
+			var valueList = values.ToList();
+			for (int i = 0; i < values.Count(); i++)
+			{
+				Data[rowNumber, i] = valueList[i];
+			}
+        }
+
+        private void CheckParams(int rowNumber, IEnumerable<T> values)
+        {
+            int rowCount = Data.GetLength(0) - 1;
+            if (rowNumber > rowCount)
+            {
+                throw new StructureHelperException(ErrorStrings.DataIsInCorrect + $": number of rows {rowNumber} is greater than length of array {rowCount}");
+            }
+            if (values.Count() != Data.GetLength(1))
+            {
+                throw new StructureHelperException(ErrorStrings.DataIsInCorrect + $": number of colums in values {values.Count()} is not equal existing column count {Data.GetLength(1)}");
+            }
+        }
     }
 }
diff --git a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculator.cs b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculator.cs
index 55d40ac..087863b 100644
--- a/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculator.cs
+++ b/StructureHelperLogics/NdmCalculations/Analyses/ByForces/ForceCalculator.cs
@@ -109,7 +109,7 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
                 forcelogic = new ForceTupleMoveToPointDecorator(forcelogic) { Point2D = point2D};
             }
             var newTuple = forcelogic.GetValue();
-            TraceLogger?.AddMessage($"Input force combination");
+            TraceLogger?.AddMessage("Input force combination");
             TraceLogger?.AddEntry(new TraceTablesFactory().GetByForceTuple(newTuple));
             if (CompressedMember.Buckling == true)
             {
diff --git a/StructureHelperLogics/NdmCalculations/Cracking/Factories/CrackWidthLogicInputDataFactory.cs b/StructureHelperLogics/NdmCalculations/Cracking/Factories/CrackWidthLogicInputDataFactory.cs
index a3d8b7a..7fb69ea 100644
--- a/StructureHelperLogics/NdmCalculations/Cracking/Factories/CrackWidthLogicInputDataFactory.cs
+++ b/StructureHelperLogics/NdmCalculations/Cracking/Factories/CrackWidthLogicInputDataFactory.cs
@@ -46,7 +46,7 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
             var concreteNdm = ndms[0];
             var rebarNdm = ndms[1];
             data.ConcreteStrain = concreteNdm.Prestrain;// stressLogic.GetTotalStrain(strainMatrix, concreteNdm) - stressLogic.GetTotalStrainWithPresrain(strainMatrix, concreteNdm);
-            data.RebarStrain = stressLogic.GetTotalStrainWithPresrain(strainMatrix, rebarNdm);
+            data.RebarStrain = stressLogic.GetTotalStrainWithPrestrain(strainMatrix, rebarNdm);
             data.Length = inputData.Length;
         }
     }
diff --git a/StructureHelperLogics/NdmCalculations/Cracking/TensileAreaLogicSP63.cs b/StructureHelperLogics/NdmCalculations/Cracking/TensileAreaLogicSP63.cs
index 845aa73..3c7324c 100644
--- a/StructureHelperLogics/NdmCalculations/Cracking/TensileAreaLogicSP63.cs
+++ b/StructureHelperLogics/NdmCalculations/Cracking/TensileAreaLogicSP63.cs
@@ -32,7 +32,7 @@ namespace StructureHelperLogics.NdmCalculations.Cracking
             var concreteArea = concreteCollection
                 .Sum(x => x.Area * x.StressScale);
             var concreteTensileArea = concreteCollection
-                .Where(x => stressLogic.GetTotalStrainWithPresrain(StrainMatrix, x) > 0d)
+                .Where(x => stressLogic.GetTotalStrainWithPrestrain(StrainMatrix, x) > 0d)
                 .Sum(x => x.Area * x.StressScale);
             
             concreteTensileArea = Math.Max(concreteTensileArea, rebarArea * minRebarFactor);
diff --git a/StructureHelperLogics/NdmCalculations/Primitives/CirclePrimitive.cs b/StructureHelperLogics/NdmCalculations/Primitives/CirclePrimitive.cs
index a7794e7..2275ee7 100644
--- a/StructureHelperLogics/NdmCalculations/Primitives/CirclePrimitive.cs
+++ b/StructureHelperLogics/NdmCalculations/Primitives/CirclePrimitive.cs
@@ -74,14 +74,43 @@ namespace StructureHelperLogics.NdmCalculations.Primitives
             return true;
         }
 
-        List<NamedValue<IPoint2D>> INdmPrimitive.GetValuePoints()
+        List<INamedAreaPoint> INdmPrimitive.GetValuePoints()
         {
-            var points = new List<NamedValue<IPoint2D>>();
-            NamedValue<IPoint2D> newPoint;
-            newPoint = new NamedValue<IPoint2D>()
+            var points = new List<INamedAreaPoint>();
+            INamedAreaPoint newPoint;
+            newPoint = new NamedAreaPoint
             {
                 Name = "Center",
-                Value = Center.Clone() as Point2D
+                Point = Center.Clone() as Point2D,
+                Area = 0d
+            };
+            points.Add(newPoint);
+            newPoint = new NamedAreaPoint
+            {
+                Name = "Left",
+                Point = new Point2D() { X = Center.X - Diameter / 2d, Y = Center.Y},
+                Area = 0d
+            };
+            points.Add(newPoint);
+            newPoint = new NamedAreaPoint
+            {
+                Name = "Top",
+                Point = new Point2D() { X = Center.X, Y = Center.Y + Diameter / 2d },
+                Area = 0d
+            };
+            points.Add(newPoint);
+            newPoint = new NamedAreaPoint
+            {
+                Name = "Right",
+                Point = new Point2D() { X = Center.X + Diameter / 2d, Y = Center.Y },
+                Area = 0d
+            };
+            points.Add(newPoint);
+            newPoint = new NamedAreaPoint
+            {
+                Name = "Bottom",
+                Point = new Point2D() { X = Center.X, Y = Center.Y - Diameter / 2d },
+                Area = 0d
             };
             points.Add(newPoint);
             return points;
diff --git a/StructureHelperLogics/NdmCalculations/Primitives/INamedAreaPoint.cs b/StructureHelperLogics/NdmCalculations/Primitives/INamedAreaPoint.cs
new file mode 100644
index 0000000..c6bc330
--- /dev/null
+++ b/StructureHelperLogics/NdmCalculations/Primitives/INamedAreaPoint.cs
@@ -0,0 +1,11 @@
+using StructureHelperCommon.Models.Shapes;
+
+namespace StructureHelperLogics.NdmCalculations.Primitives
+{
+    public interface INamedAreaPoint
+    {
+        double Area { get; set; }
+        string Name { get; set; }
+        Point2D Point { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/StructureHelperLogics/NdmCalculations/Primitives/INdmPrimitive.cs b/StructureHelperLogics/NdmCalculations/Primitives/INdmPrimitive.cs
index 28d5b1e..ad6de4f 100644
--- a/StructureHelperLogics/NdmCalculations/Primitives/INdmPrimitive.cs
+++ b/StructureHelperLogics/NdmCalculations/Primitives/INdmPrimitive.cs
@@ -29,6 +29,6 @@ namespace StructureHelperLogics.NdmCalculations.Primitives
         IVisualProperty VisualProperty {get; }
 
         IEnumerable<INdm> GetNdms(ITriangulationOptions triangulationOptions);
-        List<NamedValue<IPoint2D>> GetValuePoints();
+        List<INamedAreaPoint> GetValuePoints();
     }
 }
diff --git a/StructureHelperLogics/NdmCalculations/Primitives/NamedAreaPoint.cs b/StructureHelperLogics/NdmCalculations/Primitives/NamedAreaPoint.cs
new file mode 100644
index 0000000..1f4b2f5
--- /dev/null
+++ b/StructureHelperLogics/NdmCalculations/Primitives/NamedAreaPoint.cs
@@ -0,0 +1,17 @@
+using StructureHelperCommon.Models.Shapes;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperLogics.NdmCalculations.Primitives
+{
+    public class NamedAreaPoint : INamedAreaPoint
+    {
+        public string Name { get; set; }
+        public Point2D Point { get; set; }
+        public double Area { get; set; }
+    }
+}
diff --git a/StructureHelperLogics/NdmCalculations/Primitives/PointPrimitive.cs b/StructureHelperLogics/NdmCalculations/Primitives/PointPrimitive.cs
index 270d202..5540e02 100644
--- a/StructureHelperLogics/NdmCalculations/Primitives/PointPrimitive.cs
+++ b/StructureHelperLogics/NdmCalculations/Primitives/PointPrimitive.cs
@@ -56,14 +56,14 @@ namespace StructureHelperLogics.Models.Primitives
             return logic.GetNdmCollection();
         }
 
-        public List<NamedValue<IPoint2D>> GetValuePoints()
+        public List<INamedAreaPoint> GetValuePoints()
         {
-            var points = new List<NamedValue<IPoint2D>>();
-            NamedValue<IPoint2D> newPoint;
-            newPoint = new NamedValue<IPoint2D>()
+            var points = new List<INamedAreaPoint>();
+            var newPoint = new NamedAreaPoint()
             {
                 Name = "Center",
-                Value = Center.Clone() as Point2D
+                Point = Center.Clone() as Point2D,
+                Area = Area
             };
             points.Add(newPoint);
             return points;
diff --git a/StructureHelperLogics/NdmCalculations/Primitives/RebarPrimitive.cs b/StructureHelperLogics/NdmCalculations/Primitives/RebarPrimitive.cs
index b3bfff9..7a0690f 100644
--- a/StructureHelperLogics/NdmCalculations/Primitives/RebarPrimitive.cs
+++ b/StructureHelperLogics/NdmCalculations/Primitives/RebarPrimitive.cs
@@ -77,14 +77,14 @@ namespace StructureHelperLogics.NdmCalculations.Primitives
             return logic.GetNdmCollection();
         }
 
-        public List<NamedValue<IPoint2D>> GetValuePoints()
+        public List<INamedAreaPoint> GetValuePoints()
         {
-            var points = new List<NamedValue<IPoint2D>>();
-            NamedValue<IPoint2D> newPoint;
-            newPoint = new NamedValue<IPoint2D>()
+            var points = new List<INamedAreaPoint>();
+            var newPoint = new NamedAreaPoint
             {
                 Name = "Center",
-                Value = Center.Clone() as Point2D
+                Point = Center.Clone() as Point2D,
+                Area = Area
             };
             points.Add(newPoint);
             return points;
diff --git a/StructureHelperLogics/NdmCalculations/Primitives/RectanglePrimitive.cs b/StructureHelperLogics/NdmCalculations/Primitives/RectanglePrimitive.cs
index ca0f1dd..6007b60 100644
--- a/StructureHelperLogics/NdmCalculations/Primitives/RectanglePrimitive.cs
+++ b/StructureHelperLogics/NdmCalculations/Primitives/RectanglePrimitive.cs
@@ -82,20 +82,38 @@ namespace StructureHelperLogics.NdmCalculations.Primitives
             return true;
         }
 
-        public List<NamedValue<IPoint2D>> GetValuePoints()
+        public List<INamedAreaPoint> GetValuePoints()
         {
-            var points = new List<NamedValue<IPoint2D>>();
-            NamedValue<IPoint2D> newPoint;
-            newPoint = new NamedValue<IPoint2D>()
+            var points = new List<INamedAreaPoint>();
+            INamedAreaPoint newPoint;
+            newPoint = new NamedAreaPoint()
             {
                 Name = "Center",
-                Value = Center.Clone() as Point2D
+                Point = Center.Clone() as Point2D
             };
             points.Add(newPoint);
-            newPoint = new NamedValue<IPoint2D>()
+            newPoint = new NamedAreaPoint()
             {
                 Name = "LeftTop",
-                Value = new Point2D() { X = Center.X - Width / 2d, Y = Center.Y + Height / 2d}
+                Point = new Point2D() { X = Center.X - Width / 2d, Y = Center.Y + Height / 2d}
+            };
+            points.Add(newPoint);
+            newPoint = new NamedAreaPoint()
+            {
+                Name = "RightTop",
+                Point = new Point2D() { X = Center.X + Width / 2d, Y = Center.Y + Height / 2d }
+            };
+            points.Add(newPoint);
+            newPoint = new NamedAreaPoint()
+            {
+                Name = "LeftBottom",
+                Point = new Point2D() { X = Center.X - Width / 2d, Y = Center.Y - Height / 2d }
+            };
+            points.Add(newPoint);
+            newPoint = new NamedAreaPoint()
+            {
+                Name = "RightBottom",
+                Point = new Point2D() { X = Center.X + Width / 2d, Y = Center.Y - Height / 2d }
             };
             points.Add(newPoint);
             return points;