From 4a8cf2d42a3076527c57c48b9c2d44ead85df509 Mon Sep 17 00:00:00 2001
From: Evgeny Redikultsev <effect-project@yandex.ru>
Date: Mon, 20 Nov 2023 21:54:19 +0500
Subject: [PATCH] Material diagram window was changed

---
 StructureHelper/App.xaml                      |   1 +
 .../UI/Resources/GraphsTemplates.xaml         |  19 ++++++++
 .../Libraries/LoaderCalculator.dll            | Bin 82944 -> 82944 bytes
 StructureHelper/StructureHelper.csproj        |   1 +
 StructureHelper/StructureHelper.csproj.user   |   7 ++-
 StructureHelper/Windows/Graphs/GraphView.xaml |  46 ++++++++----------
 .../Windows/Graphs/GraphView.xaml.cs          |   1 -
 .../{ViewModels => }/Graphs/GraphViewModel.cs |  13 ++---
 .../Graphs/GraphVisualProps.cs                |  10 ++--
 .../MaterialDiagramView.xaml                  |  13 +++--
 .../MaterialDiagramView.xaml.cs               |   2 +-
 .../MaterialDiagramViewModel.cs               |  26 +++++-----
 .../ForceResultLogic/ShowDiagramLogic.cs      |  13 +----
 .../Models/Materials/ConcreteCurveLogic.cs    |   7 +--
 .../Models/Materials/ConcreteLogicOptions.cs  |   2 +-
 .../Materials}/ConcreteMaterialOptionLogic.cs |   2 +-
 .../Models/Materials/IMaterialLogic.cs        |   2 +-
 .../Models/Materials/IMaterialLogicOptions.cs |   2 +-
 .../Models/Materials/IMaterialOptionLogic.cs  |  12 +++++
 .../Materials/MaterialCommonOptionLogic.cs    |   2 +-
 .../Materials/ReinforcementBiLinearLogic.cs   |  10 +---
 .../Materials/ReinforcementLogicOptions.cs    |   4 +-
 .../Models/Materials/ConcreteLibMaterial.cs   |   1 +
 .../Models/Materials/ILibMaterial.cs          |   1 +
 .../Models/Materials/LibMaterial.cs           |   1 +
 .../Materials/ReinforcementLibMaterial.cs     |   1 +
 .../ViewModelTests/GraphViewModelTest.cs      |   9 +---
 27 files changed, 105 insertions(+), 103 deletions(-)
 create mode 100644 StructureHelper/Infrastructure/UI/Resources/GraphsTemplates.xaml
 rename StructureHelper/Windows/{ViewModels => }/Graphs/GraphViewModel.cs (96%)
 rename StructureHelper/Windows/{ViewModels => }/Graphs/GraphVisualProps.cs (84%)
 rename StructureHelper/Windows/{MainWindow/Materials => Graphs}/MaterialDiagramView.xaml (85%)
 rename StructureHelper/Windows/{MainWindow/Materials => Graphs}/MaterialDiagramView.xaml.cs (95%)
 rename StructureHelper/Windows/{ViewModels/Materials => Graphs}/MaterialDiagramViewModel.cs (90%)
 rename {StructureHelperLogics => StructureHelperCommon}/Models/Materials/ConcreteCurveLogic.cs (83%)
 rename {StructureHelperLogics => StructureHelperCommon}/Models/Materials/ConcreteLogicOptions.cs (93%)
 rename {StructureHelperLogics/Models/Materials/Logics => StructureHelperCommon/Models/Materials}/ConcreteMaterialOptionLogic.cs (97%)
 rename {StructureHelperLogics => StructureHelperCommon}/Models/Materials/IMaterialLogic.cs (88%)
 rename {StructureHelperLogics => StructureHelperCommon}/Models/Materials/IMaterialLogicOptions.cs (92%)
 create mode 100644 StructureHelperCommon/Models/Materials/IMaterialOptionLogic.cs
 rename {StructureHelperLogics => StructureHelperCommon}/Models/Materials/MaterialCommonOptionLogic.cs (97%)
 rename {StructureHelperLogics => StructureHelperCommon}/Models/Materials/ReinforcementBiLinearLogic.cs (83%)
 rename {StructureHelperLogics => StructureHelperCommon}/Models/Materials/ReinforcementLogicOptions.cs (83%)

diff --git a/StructureHelper/App.xaml b/StructureHelper/App.xaml
index e5b28d8..dce5889 100644
--- a/StructureHelper/App.xaml
+++ b/StructureHelper/App.xaml
@@ -17,6 +17,7 @@
                 <ResourceDictionary Source="Infrastructure/UI/Resources/ITemEditPanels.xaml"/>
                 <ResourceDictionary Source="Infrastructure/UI/Resources/ForceTemplates.xaml"/>
                 <ResourceDictionary Source="Infrastructure/UI/Resources/IconDictionary.xaml"/>
+                <ResourceDictionary Source="Infrastructure/UI/Resources/GraphsTemplates.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/StructureHelper/Infrastructure/UI/Resources/GraphsTemplates.xaml b/StructureHelper/Infrastructure/UI/Resources/GraphsTemplates.xaml
new file mode 100644
index 0000000..722d7de
--- /dev/null
+++ b/StructureHelper/Infrastructure/UI/Resources/GraphsTemplates.xaml
@@ -0,0 +1,19 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <DataTemplate x:Key="LineVisualProperties">
+        <GroupBox Header="Line properties">
+            <StackPanel>
+                <TextBlock Text="Line smoothness" Margin="0,5,0,5"/>
+                <StackPanel Orientation="Horizontal">
+                    <Slider x:Name="slider" Width="195" Minimum="0" Maximum="{Binding MaxLineSmoothness}" Value="{Binding LineSmoothness}"/>
+                    <TextBox Width="40" Text="{Binding LineSmoothness,Converter={StaticResource PlainDouble}, ValidatesOnDataErrors=True}"/>
+                </StackPanel>
+                <TextBlock Text="Stroke thickness" Margin="0,5,0,5"/>
+                <StackPanel Orientation="Horizontal">
+                    <Slider x:Name="StrokeSlider" Width="195" Minimum="0" Maximum="{Binding MaxStrokeSize}" Value="{Binding StrokeSize}"/>
+                    <TextBox Width="40" Text="{Binding StrokeSize,Converter={StaticResource PlainDouble}, ValidatesOnDataErrors=True}"/>
+                </StackPanel>
+            </StackPanel>
+        </GroupBox>
+    </DataTemplate>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/StructureHelper/Libraries/LoaderCalculator.dll b/StructureHelper/Libraries/LoaderCalculator.dll
index 2f002eb360ff56b6ccaa50340a29eca1b375bde4..9b84c07dedcb0a71dc057508f3455067d3f33d0e 100644
GIT binary patch
delta 125
zcmZqZU~TANozTH@(csShjXfz591Kvf`A0;`Wr0~tGg-AK-145u@@w*^OYa=E=jbrX
z@U!f*UD7ta$C@!ffT{O_l~(s+-#rG`?%G6h9GU*cnz32|D!R7@Dhg6x_Q>=87L~Qv
PJAVhZZg00?tYilOMA|hI

delta 125
zcmZqZU~TANozTJZ>g1)X8+%eBIE=yIwf*KF5h<4iX0FkX*|1U8wet}7#*FWaZ*0%e
zVU*!#37=r~YI=_~V}QVc&w^<}KmEOS>}4odJh!8J`WtJ;Y6YlhR0UKNq`o%pch2VX
Rb55}LFLvJEZo^o~4gko&IH3Rl

diff --git a/StructureHelper/StructureHelper.csproj b/StructureHelper/StructureHelper.csproj
index 76effdd..67628b4 100644
--- a/StructureHelper/StructureHelper.csproj
+++ b/StructureHelper/StructureHelper.csproj
@@ -82,6 +82,7 @@
     <Folder Include="Infrastructure\UI\DataContexts\Logics\" />
     <Folder Include="Resources\" />
     <Folder Include="Windows\UserControls\MultiplyTuples\" />
+    <Folder Include="Windows\ViewModels\Graphs\" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/StructureHelper/StructureHelper.csproj.user b/StructureHelper/StructureHelper.csproj.user
index 9146fef..6687d82 100644
--- a/StructureHelper/StructureHelper.csproj.user
+++ b/StructureHelper/StructureHelper.csproj.user
@@ -33,7 +33,7 @@
     <Compile Update="Windows\MainWindow\Materials\HeadMaterialView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Windows\MainWindow\Materials\MaterialDiagramView.xaml.cs">
+    <Compile Update="Windows\Graphs\MaterialDiagramView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Update="Windows\PrimitiveTemplates\RCs\Beams\CircleView.xaml.cs">
@@ -47,6 +47,9 @@
     <Page Update="Infrastructure\UI\Resources\ForceTemplates.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="Infrastructure\UI\Resources\GraphsTemplates.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="Infrastructure\UI\Resources\IconDictionary.xaml">
       <SubType>Designer</SubType>
     </Page>
@@ -77,7 +80,7 @@
     <Page Update="Windows\MainWindow\Materials\HeadMaterialView.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Update="Windows\MainWindow\Materials\MaterialDiagramView.xaml">
+    <Page Update="Windows\Graphs\MaterialDiagramView.xaml">
       <SubType>Designer</SubType>
     </Page>
     <Page Update="Windows\PrimitiveTemplates\RCs\Beams\CircleView.xaml">
diff --git a/StructureHelper/Windows/Graphs/GraphView.xaml b/StructureHelper/Windows/Graphs/GraphView.xaml
index ba5c938..e1022c7 100644
--- a/StructureHelper/Windows/Graphs/GraphView.xaml
+++ b/StructureHelper/Windows/Graphs/GraphView.xaml
@@ -3,12 +3,11 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
         xmlns:local="clr-namespace:StructureHelper.Windows.Graphs"
-        xmlns:vm="clr-namespace:StructureHelper.Windows.ViewModels.Graphs"
-        d:DataContext="{d:DesignInstance vm:GraphViewModel}"
+        xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
+        d:DataContext="{d:DesignInstance local:GraphViewModel}"
         mc:Ignorable="d"
-        Title="Graph" Height="450" Width="800" MinHeight="300" MinWidth="400" WindowStartupLocation="CenterScreen">
+        Title="Graph" Height="450" Width="800" MinHeight="400" MinWidth="600" WindowStartupLocation="CenterScreen">
     <DockPanel>
         <!--<ToolBarTray DockPanel.Dock="Top">
             <ToolBar>
@@ -27,8 +26,13 @@
                     <RowDefinition/>
                     <RowDefinition Height="40"/>
                 </Grid.RowDefinitions>
-                <StackPanel>
-                    <GroupBox Header="X-axis values">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="70"/>
+                        <RowDefinition/>
+                        <RowDefinition Height="120"/>
+                    </Grid.RowDefinitions>
+                    <GroupBox Grid.Row="0" Header="X-axis values">
                         <StackPanel>
                             <ComboBox ItemsSource="{Binding XItems.Collection}" SelectedItem="{Binding XItems.SelectedItem}">
                                 <ComboBox.ItemTemplate>
@@ -52,28 +56,18 @@
                         </StackPanel>
 
                     </GroupBox>
-                    <GroupBox Header="Y-axis values">
-                        <StackPanel>
+                    <GroupBox Grid.Row="1" Header="Y-axis values">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition/>
+                                <RowDefinition Height="30"/>
+                            </Grid.RowDefinitions>
                             <ContentControl ContentTemplate="{StaticResource ResourceKey=SelectItems}" Content="{Binding YItems}"/>
-                            <CheckBox Margin="5" Content="Invert Values" IsChecked="{Binding InvertYValues}"/>
-                        </StackPanel>
+                            <CheckBox Grid.Row="1" Margin="5" Content="Invert Values" IsChecked="{Binding InvertYValues}"/>
+                        </Grid>
                     </GroupBox>
-                    <GroupBox Header="Line properties" DataContext="{Binding VisualProps}">
-                        <StackPanel>
-                            <TextBlock Text="Line smoothness" Margin="0,5,0,5"/>
-                            <StackPanel Orientation="Horizontal">
-                                <Slider x:Name="slider" Width="195" Minimum="0" Maximum="{Binding MaxLineSmoothness}" Value="{Binding LineSmoothness}"/>
-                                <TextBox Width="40" Text="{Binding LineSmoothness,Converter={StaticResource PlainDouble}, ValidatesOnDataErrors=True}"/>
-                            </StackPanel>
-                            <TextBlock Text="Stroke thickness" Margin="0,5,0,5"/>
-                            <StackPanel Orientation="Horizontal">
-                                <Slider x:Name="StrokeSlider" Width="195" Minimum="0" Maximum="{Binding MaxStrokeSize}" Value="{Binding StrokeSize}"/>
-                                <TextBox Width="40" Text="{Binding StrokeSize,Converter={StaticResource PlainDouble}, ValidatesOnDataErrors=True}"/>
-                            </StackPanel>
-                        </StackPanel>
-                    </GroupBox>
-
-                </StackPanel>
+                    <ContentControl Grid.Row="2" ContentTemplate="{StaticResource ResourceKey=LineVisualProperties}" Content="{Binding VisualProps}"/>
+                </Grid>
                 <StackPanel Grid.Row="1">
                     <Button Margin="3" Content="Draw Lines" ToolTip="Draw Lines" Command="{Binding RedrawLinesCommand}"/>
                 </StackPanel>
diff --git a/StructureHelper/Windows/Graphs/GraphView.xaml.cs b/StructureHelper/Windows/Graphs/GraphView.xaml.cs
index 92d706c..6f8e294 100644
--- a/StructureHelper/Windows/Graphs/GraphView.xaml.cs
+++ b/StructureHelper/Windows/Graphs/GraphView.xaml.cs
@@ -1,5 +1,4 @@
 using LiveCharts.Wpf;
-using StructureHelper.Windows.ViewModels.Graphs;
 using StructureHelperCommon.Models.Parameters;
 using System;
 using System.Collections.Generic;
diff --git a/StructureHelper/Windows/ViewModels/Graphs/GraphViewModel.cs b/StructureHelper/Windows/Graphs/GraphViewModel.cs
similarity index 96%
rename from StructureHelper/Windows/ViewModels/Graphs/GraphViewModel.cs
rename to StructureHelper/Windows/Graphs/GraphViewModel.cs
index 8a850f8..477ad8f 100644
--- a/StructureHelper/Windows/ViewModels/Graphs/GraphViewModel.cs
+++ b/StructureHelper/Windows/Graphs/GraphViewModel.cs
@@ -1,10 +1,9 @@
 using LiveCharts;
 using LiveCharts.Configurations;
-using LiveCharts.Definitions.Charts;
 using LiveCharts.Wpf;
-using LiveCharts.Wpf.Charts.Base;
 using StructureHelper.Infrastructure;
 using StructureHelper.Services.Exports;
+using StructureHelper.Windows.ViewModels;
 using StructureHelperCommon.Models.Parameters;
 using StructureHelperCommon.Models.Shapes;
 using StructureHelperCommon.Services.ColorServices;
@@ -12,15 +11,13 @@ using StructureHelperLogics.NdmCalculations.Analyses;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.IO;
 using System.Linq;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace StructureHelper.Windows.ViewModels.Graphs
+namespace StructureHelper.Windows.Graphs
 {
     public class GraphViewModel : ViewModelBase
     {
@@ -142,7 +139,7 @@ namespace StructureHelper.Windows.ViewModels.Graphs
             }
             return items;
         }
-        
+
         private void DrawLines()
         {
             if (XItems.SelectedItem is null || YItems.SelectedCount == 0) return;
@@ -180,11 +177,11 @@ namespace StructureHelper.Windows.ViewModels.Graphs
                 var chartValues = new ChartValues<Point2D>();
                 for (int i = 0; i < yValues.Count(); i++)
                 {
-                    
+
                     double diagramValue = yValues[i] * yFactor;
                     var x = xValues[i] * xFactor;
                     var y = yValues[i] * yFactor;
-                    var point = new Point2D() { X = x, Y =  y};
+                    var point = new Point2D() { X = x, Y = y };
                     chartValues.Add(point);
                     labels.Add(x);
                     localLabels.Add(x);
diff --git a/StructureHelper/Windows/ViewModels/Graphs/GraphVisualProps.cs b/StructureHelper/Windows/Graphs/GraphVisualProps.cs
similarity index 84%
rename from StructureHelper/Windows/ViewModels/Graphs/GraphVisualProps.cs
rename to StructureHelper/Windows/Graphs/GraphVisualProps.cs
index f1d1381..2d65096 100644
--- a/StructureHelper/Windows/ViewModels/Graphs/GraphVisualProps.cs
+++ b/StructureHelper/Windows/Graphs/GraphVisualProps.cs
@@ -1,14 +1,10 @@
 using StructureHelper.Infrastructure;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace StructureHelper.Windows.ViewModels.Graphs
+namespace StructureHelper.Windows.Graphs
 {
     public class GraphVisualProps : ViewModelBase
-    {       
+    {
         private double lineSmoothness;
         private double strokeSize;
 
@@ -38,7 +34,7 @@ namespace StructureHelper.Windows.ViewModels.Graphs
             }
         }
 
-        public double MaxLineSmoothness { get;}
+        public double MaxLineSmoothness { get; }
         public double MaxStrokeSize { get; }
 
         public GraphVisualProps()
diff --git a/StructureHelper/Windows/MainWindow/Materials/MaterialDiagramView.xaml b/StructureHelper/Windows/Graphs/MaterialDiagramView.xaml
similarity index 85%
rename from StructureHelper/Windows/MainWindow/Materials/MaterialDiagramView.xaml
rename to StructureHelper/Windows/Graphs/MaterialDiagramView.xaml
index 082d589..30b0748 100644
--- a/StructureHelper/Windows/MainWindow/Materials/MaterialDiagramView.xaml
+++ b/StructureHelper/Windows/Graphs/MaterialDiagramView.xaml
@@ -3,10 +3,9 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:StructureHelper.Windows.MainWindow.Materials"
+        xmlns:local="clr-namespace:StructureHelper.Windows.Graphs"
         xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
-        xmlns:vm="clr-namespace:StructureHelper.Windows.ViewModels.Materials"
-        d:DataContext="{d:DesignInstance vm:MaterialDiagramViewModel}"
+        d:DataContext="{d:DesignInstance local:MaterialDiagramViewModel}"
         mc:Ignorable="d"
         Title="Material Diagram" Height="450" Width="800" WindowStartupLocation="CenterScreen">
     <Grid>
@@ -17,6 +16,7 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition/>
+                <RowDefinition Height="120"/>
                 <RowDefinition Height="30"/>
             </Grid.RowDefinitions>
             <ScrollViewer VerticalScrollBarVisibility="Auto">
@@ -52,9 +52,12 @@
                     </Grid>
                 </StackPanel>
             </ScrollViewer>
-            <Button Grid.Row="1" Margin="3" Content="Draw Lines" ToolTip="Draw lines" Command="{Binding RedrawLinesCommand}"/>
+            <ContentControl Grid.Row="1" ContentTemplate="{StaticResource ResourceKey=LineVisualProperties}" Content="{Binding VisualProps}"/>
+            <StackPanel Grid.Row="2" Orientation="Horizontal">
+                <Button Margin="3" Content="Draw Lines" ToolTip="Draw lines" Command="{Binding RedrawLinesCommand}"/>
+            </StackPanel>
         </Grid>
-        <lvc:CartesianChart Grid.Column="1" Series="{Binding SeriesCollection}" LegendLocation="Bottom" >
+        <lvc:CartesianChart Grid.Column="1" Series="{Binding SeriesCollection}" LegendLocation="Bottom" Zoom="Xy">
             <lvc:CartesianChart.AxisY>
                 <lvc:Axis Title="Stress"></lvc:Axis>
             </lvc:CartesianChart.AxisY>
diff --git a/StructureHelper/Windows/MainWindow/Materials/MaterialDiagramView.xaml.cs b/StructureHelper/Windows/Graphs/MaterialDiagramView.xaml.cs
similarity index 95%
rename from StructureHelper/Windows/MainWindow/Materials/MaterialDiagramView.xaml.cs
rename to StructureHelper/Windows/Graphs/MaterialDiagramView.xaml.cs
index c753ed3..58ae274 100644
--- a/StructureHelper/Windows/MainWindow/Materials/MaterialDiagramView.xaml.cs
+++ b/StructureHelper/Windows/Graphs/MaterialDiagramView.xaml.cs
@@ -14,7 +14,7 @@ using System.Windows.Shapes;
 using LiveCharts;
 using LiveCharts.Wpf;
 using StructureHelper.Models.Materials;
-using StructureHelper.Windows.ViewModels.Materials;
+using StructureHelper.Windows.Graphs;
 using StructureHelperLogics.Models.Materials;
 
 namespace StructureHelper.Windows.MainWindow.Materials
diff --git a/StructureHelper/Windows/ViewModels/Materials/MaterialDiagramViewModel.cs b/StructureHelper/Windows/Graphs/MaterialDiagramViewModel.cs
similarity index 90%
rename from StructureHelper/Windows/ViewModels/Materials/MaterialDiagramViewModel.cs
rename to StructureHelper/Windows/Graphs/MaterialDiagramViewModel.cs
index b00dd75..c2ba808 100644
--- a/StructureHelper/Windows/ViewModels/Materials/MaterialDiagramViewModel.cs
+++ b/StructureHelper/Windows/Graphs/MaterialDiagramViewModel.cs
@@ -3,19 +3,15 @@ using LiveCharts.Wpf;
 using StructureHelper.Infrastructure;
 using StructureHelper.Infrastructure.UI.Converters.Units;
 using StructureHelper.Models.Materials;
-using StructureHelperCommon.Infrastructures.Enums;
+using StructureHelper.Windows.ViewModels;
 using StructureHelperCommon.Infrastructures.Settings;
-using StructureHelperLogics.Models.Materials;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
 
-namespace StructureHelper.Windows.ViewModels.Materials
+namespace StructureHelper.Windows.Graphs
 {
     public class MaterialDiagramViewModel : ViewModelBase
     {
@@ -27,6 +23,7 @@ namespace StructureHelper.Windows.ViewModels.Materials
         bool positiveInTension;
 
         public string MaterialName => material.Name;
+        public GraphVisualProps VisualProps { get; }
         public double MinValue
         {
             get => minValue;
@@ -84,9 +81,9 @@ namespace StructureHelper.Windows.ViewModels.Materials
 
         public MaterialDiagramViewModel(IEnumerable<IHeadMaterial> headMaterials, IHeadMaterial material)
         {
-            MaterialsModel = new SelectItemsViewModel<IHeadMaterial>(headMaterials) { ShowButtons = true};
-            LimitStatesModel = new SelectItemsViewModel<LimitStateEntity>(ProgramSetting.LimitStatesList.LimitStates) { ShowButtons = false};
-            CalcTermsModel = new SelectItemsViewModel<CalcTermEntity>(ProgramSetting.CalcTermList.CalcTerms) { ShowButtons = false};
+            MaterialsModel = new SelectItemsViewModel<IHeadMaterial>(headMaterials) { ShowButtons = true };
+            LimitStatesModel = new SelectItemsViewModel<LimitStateEntity>(ProgramSetting.LimitStatesList.LimitStates) { ShowButtons = false };
+            CalcTermsModel = new SelectItemsViewModel<CalcTermEntity>(ProgramSetting.CalcTermList.CalcTerms) { ShowButtons = false };
             foreach (var item in MaterialsModel.CollectionItems)
             {
                 if (item.Item == material)
@@ -100,6 +97,7 @@ namespace StructureHelper.Windows.ViewModels.Materials
             maxValue = 0.005d;
             stepCount = 50;
             positiveInTension = true;
+            VisualProps = new();
             SetLines();
         }
 
@@ -123,9 +121,13 @@ namespace StructureHelper.Windows.ViewModels.Materials
                     {
                         var loaderMaterial = material.GetLoaderMaterial(limitState.LimitState, calcTerm.CalcTerm);
                         var lineSeries = new LineSeries()
-                        { Title = $"{material.Name} ({calcTerm.ShortName} {limitState.ShortName})",
-                            PointGeometry = null,
+                        {
+                            Title = $"{material.Name} ({calcTerm.ShortName} {limitState.ShortName})",
+                            //Stroke = new SolidColorBrush(material.Color),
                             Fill = Brushes.Transparent,
+                            LineSmoothness = VisualProps.LineSmoothness,
+                            PointGeometry = DefaultGeometries.Circle,
+                            PointGeometrySize = VisualProps.StrokeSize
                         };
                         if (limitStates.Count() == 1 && calcTerms.Count() == 1)
                         {
@@ -139,7 +141,7 @@ namespace StructureHelper.Windows.ViewModels.Materials
                             //var point = new PointF() { X = (float)s, Y = (float)diagramValue };
                             //chartValues.Add(point);
                             chartValues.Add(diagramValue);
-                            labels.Add(Convert.ToString(Math.Round(s , 4)));
+                            labels.Add(Convert.ToString(Math.Round(s, 4)));
                         }
                         lineSeries.Values = chartValues;
                         SeriesCollection.Add(lineSeries);
diff --git a/StructureHelper/Windows/ViewModels/Calculations/Calculators/ForceResultLogic/ShowDiagramLogic.cs b/StructureHelper/Windows/ViewModels/Calculations/Calculators/ForceResultLogic/ShowDiagramLogic.cs
index c3d8bd2..63cd77e 100644
--- a/StructureHelper/Windows/ViewModels/Calculations/Calculators/ForceResultLogic/ShowDiagramLogic.cs
+++ b/StructureHelper/Windows/ViewModels/Calculations/Calculators/ForceResultLogic/ShowDiagramLogic.cs
@@ -1,27 +1,16 @@
-using LoaderCalculator;
-using LoaderCalculator.Data.Materials.MaterialBuilders;
-using LoaderCalculator.Data.Ndms;
-using StructureHelper.Windows.Errors;
-using StructureHelper.Windows.Graphs;
+using StructureHelper.Windows.Graphs;
 using StructureHelper.Windows.ViewModels.Errors;
-using StructureHelper.Windows.ViewModels.Graphs;
 using StructureHelperCommon.Infrastructures.Enums;
-using StructureHelperCommon.Infrastructures.Exceptions;
 using StructureHelperCommon.Infrastructures.Interfaces;
 using StructureHelperCommon.Infrastructures.Settings;
 using StructureHelperCommon.Models.Parameters;
 using StructureHelperCommon.Services.Units;
 using StructureHelperLogics.NdmCalculations.Analyses.ByForces;
-using StructureHelperLogics.NdmCalculations.Cracking;
 using StructureHelperLogics.NdmCalculations.Primitives;
-using StructureHelperLogics.Services.NdmPrimitives;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace StructureHelper.Windows.ViewModels.Calculations.Calculators
 {
diff --git a/StructureHelperLogics/Models/Materials/ConcreteCurveLogic.cs b/StructureHelperCommon/Models/Materials/ConcreteCurveLogic.cs
similarity index 83%
rename from StructureHelperLogics/Models/Materials/ConcreteCurveLogic.cs
rename to StructureHelperCommon/Models/Materials/ConcreteCurveLogic.cs
index db320ab..464663c 100644
--- a/StructureHelperLogics/Models/Materials/ConcreteCurveLogic.cs
+++ b/StructureHelperCommon/Models/Materials/ConcreteCurveLogic.cs
@@ -1,13 +1,8 @@
 using LoaderCalculator.Data.Materials;
 using LoaderCalculator.Data.Materials.MaterialBuilders;
-using StructureHelperCommon.Infrastructures.Enums;
 using StructureHelperCommon.Infrastructures.Exceptions;
-using StructureHelperCommon.Models.Materials.Libraries;
-using System.Windows.Media.Media3D;
-using static System.Windows.Forms.Design.AxImporter;
-using LMBuilders = LoaderCalculator.Data.Materials.MaterialBuilders;
 
-namespace StructureHelperLogics.Models.Materials
+namespace StructureHelperCommon.Models.Materials
 {
     public class ConcreteCurveLogic : IMaterialLogic
     {
diff --git a/StructureHelperLogics/Models/Materials/ConcreteLogicOptions.cs b/StructureHelperCommon/Models/Materials/ConcreteLogicOptions.cs
similarity index 93%
rename from StructureHelperLogics/Models/Materials/ConcreteLogicOptions.cs
rename to StructureHelperCommon/Models/Materials/ConcreteLogicOptions.cs
index 91110c2..cb9af68 100644
--- a/StructureHelperLogics/Models/Materials/ConcreteLogicOptions.cs
+++ b/StructureHelperCommon/Models/Materials/ConcreteLogicOptions.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace StructureHelperLogics.Models.Materials
+namespace StructureHelperCommon.Models.Materials
 {
     public class ConcreteLogicOptions : IMaterialLogicOptions
     {
diff --git a/StructureHelperLogics/Models/Materials/Logics/ConcreteMaterialOptionLogic.cs b/StructureHelperCommon/Models/Materials/ConcreteMaterialOptionLogic.cs
similarity index 97%
rename from StructureHelperLogics/Models/Materials/Logics/ConcreteMaterialOptionLogic.cs
rename to StructureHelperCommon/Models/Materials/ConcreteMaterialOptionLogic.cs
index 172255b..c8e0b67 100644
--- a/StructureHelperLogics/Models/Materials/Logics/ConcreteMaterialOptionLogic.cs
+++ b/StructureHelperCommon/Models/Materials/ConcreteMaterialOptionLogic.cs
@@ -10,7 +10,7 @@ using static System.Windows.Forms.Design.AxImporter;
 using LoaderCalculator.Data.Materials.MaterialBuilders;
 using StructureHelperCommon.Models.Materials.Libraries;
 
-namespace StructureHelperLogics.Models.Materials
+namespace StructureHelperCommon.Models.Materials
 {
     internal class ConcreteMaterialOptionLogic : IMaterialOptionLogic
     {
diff --git a/StructureHelperLogics/Models/Materials/IMaterialLogic.cs b/StructureHelperCommon/Models/Materials/IMaterialLogic.cs
similarity index 88%
rename from StructureHelperLogics/Models/Materials/IMaterialLogic.cs
rename to StructureHelperCommon/Models/Materials/IMaterialLogic.cs
index 7a2e626..d6af9ed 100644
--- a/StructureHelperLogics/Models/Materials/IMaterialLogic.cs
+++ b/StructureHelperCommon/Models/Materials/IMaterialLogic.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace StructureHelperLogics.Models.Materials
+namespace StructureHelperCommon.Models.Materials
 {
     public interface IMaterialLogic
     {
diff --git a/StructureHelperLogics/Models/Materials/IMaterialLogicOptions.cs b/StructureHelperCommon/Models/Materials/IMaterialLogicOptions.cs
similarity index 92%
rename from StructureHelperLogics/Models/Materials/IMaterialLogicOptions.cs
rename to StructureHelperCommon/Models/Materials/IMaterialLogicOptions.cs
index a9be9c6..a979cbf 100644
--- a/StructureHelperLogics/Models/Materials/IMaterialLogicOptions.cs
+++ b/StructureHelperCommon/Models/Materials/IMaterialLogicOptions.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace StructureHelperLogics.Models.Materials
+namespace StructureHelperCommon.Models.Materials
 {
     public interface IMaterialLogicOptions
     {
diff --git a/StructureHelperCommon/Models/Materials/IMaterialOptionLogic.cs b/StructureHelperCommon/Models/Materials/IMaterialOptionLogic.cs
new file mode 100644
index 0000000..68b8790
--- /dev/null
+++ b/StructureHelperCommon/Models/Materials/IMaterialOptionLogic.cs
@@ -0,0 +1,12 @@
+using StructureHelperCommon.Infrastructures.Enums;
+using StructureHelperCommon.Models.Materials.Libraries;
+using LCM = LoaderCalculator.Data.Materials;
+using LCMB = LoaderCalculator.Data.Materials.MaterialBuilders;
+
+namespace StructureHelperCommon.Models.Materials
+{
+    public interface IMaterialOptionLogic
+    {
+        void SetMaterialOptions(LCMB.IMaterialOptions materialOptions);
+    }
+}
\ No newline at end of file
diff --git a/StructureHelperLogics/Models/Materials/MaterialCommonOptionLogic.cs b/StructureHelperCommon/Models/Materials/MaterialCommonOptionLogic.cs
similarity index 97%
rename from StructureHelperLogics/Models/Materials/MaterialCommonOptionLogic.cs
rename to StructureHelperCommon/Models/Materials/MaterialCommonOptionLogic.cs
index 0774ff7..1d141ef 100644
--- a/StructureHelperLogics/Models/Materials/MaterialCommonOptionLogic.cs
+++ b/StructureHelperCommon/Models/Materials/MaterialCommonOptionLogic.cs
@@ -2,7 +2,7 @@
 using StructureHelperCommon.Infrastructures.Exceptions;
 using LCMB = LoaderCalculator.Data.Materials.MaterialBuilders;
 
-namespace StructureHelperLogics.Models.Materials
+namespace StructureHelperCommon.Models.Materials
 {
     public class MaterialCommonOptionLogic : IMaterialOptionLogic
     {
diff --git a/StructureHelperLogics/Models/Materials/ReinforcementBiLinearLogic.cs b/StructureHelperCommon/Models/Materials/ReinforcementBiLinearLogic.cs
similarity index 83%
rename from StructureHelperLogics/Models/Materials/ReinforcementBiLinearLogic.cs
rename to StructureHelperCommon/Models/Materials/ReinforcementBiLinearLogic.cs
index cff02b9..8c607d2 100644
--- a/StructureHelperLogics/Models/Materials/ReinforcementBiLinearLogic.cs
+++ b/StructureHelperCommon/Models/Materials/ReinforcementBiLinearLogic.cs
@@ -1,16 +1,8 @@
 using LoaderCalculator.Data.Materials;
 using LoaderCalculator.Data.Materials.MaterialBuilders;
-using StructureHelperCommon.Infrastructures.Enums;
 using StructureHelperCommon.Infrastructures.Exceptions;
-using StructureHelperLogics.Models.Templates.CrossSections.RCs;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static System.Windows.Forms.Design.AxImporter;
 
-namespace StructureHelperLogics.Models.Materials
+namespace StructureHelperCommon.Models.Materials
 {
     public class ReinforcementBiLinearLogic : IMaterialLogic
     {
diff --git a/StructureHelperLogics/Models/Materials/ReinforcementLogicOptions.cs b/StructureHelperCommon/Models/Materials/ReinforcementLogicOptions.cs
similarity index 83%
rename from StructureHelperLogics/Models/Materials/ReinforcementLogicOptions.cs
rename to StructureHelperCommon/Models/Materials/ReinforcementLogicOptions.cs
index 4b80b56..0bcd539 100644
--- a/StructureHelperLogics/Models/Materials/ReinforcementLogicOptions.cs
+++ b/StructureHelperCommon/Models/Materials/ReinforcementLogicOptions.cs
@@ -6,9 +6,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace StructureHelperLogics.Models.Materials
+namespace StructureHelperCommon.Models.Materials
 {
-    internal class ReinforcementLogicOptions : IMaterialLogicOptions
+    public class ReinforcementLogicOptions : IMaterialLogicOptions
     {
         public List<IMaterialSafetyFactor> SafetyFactors { get; set; }
         public ILibMaterialEntity MaterialEntity { get; set; }
diff --git a/StructureHelperLogics/Models/Materials/ConcreteLibMaterial.cs b/StructureHelperLogics/Models/Materials/ConcreteLibMaterial.cs
index 97f5f05..b4b8923 100644
--- a/StructureHelperLogics/Models/Materials/ConcreteLibMaterial.cs
+++ b/StructureHelperLogics/Models/Materials/ConcreteLibMaterial.cs
@@ -6,6 +6,7 @@ using LMLogic = LoaderCalculator.Data.Materials.MaterialBuilders.MaterialLogics;
 using LM = LoaderCalculator.Data.Materials;
 using LoaderCalculator.Data.Materials;
 using StructureHelperCommon.Infrastructures.Exceptions;
+using StructureHelperCommon.Models.Materials;
 
 namespace StructureHelperLogics.Models.Materials
 {
diff --git a/StructureHelperLogics/Models/Materials/ILibMaterial.cs b/StructureHelperLogics/Models/Materials/ILibMaterial.cs
index 3e6dc40..91ed43b 100644
--- a/StructureHelperLogics/Models/Materials/ILibMaterial.cs
+++ b/StructureHelperLogics/Models/Materials/ILibMaterial.cs
@@ -1,4 +1,5 @@
 using StructureHelperCommon.Infrastructures.Enums;
+using StructureHelperCommon.Models.Materials;
 using StructureHelperCommon.Models.Materials.Libraries;
 using StructureHelperLogics.Models.Materials;
 using System;
diff --git a/StructureHelperLogics/Models/Materials/LibMaterial.cs b/StructureHelperLogics/Models/Materials/LibMaterial.cs
index a2aef5b..656bcd8 100644
--- a/StructureHelperLogics/Models/Materials/LibMaterial.cs
+++ b/StructureHelperLogics/Models/Materials/LibMaterial.cs
@@ -1,6 +1,7 @@
 using LoaderCalculator.Data.Materials;
 using StructureHelperCommon.Infrastructures.Enums;
 using StructureHelperCommon.Infrastructures.Exceptions;
+using StructureHelperCommon.Models.Materials;
 using StructureHelperCommon.Models.Materials.Libraries;
 using System.Collections.Generic;
 using LCM = LoaderCalculator.Data.Materials;
diff --git a/StructureHelperLogics/Models/Materials/ReinforcementLibMaterial.cs b/StructureHelperLogics/Models/Materials/ReinforcementLibMaterial.cs
index d1aceb0..8a2b08c 100644
--- a/StructureHelperLogics/Models/Materials/ReinforcementLibMaterial.cs
+++ b/StructureHelperLogics/Models/Materials/ReinforcementLibMaterial.cs
@@ -9,6 +9,7 @@ using Loadermaterials = LoaderCalculator.Data.Materials;
 using LMBuilders = LoaderCalculator.Data.Materials.MaterialBuilders;
 using LoaderMaterialLogics = LoaderCalculator.Data.Materials.MaterialBuilders.MaterialLogics;
 using LoaderCalculator.Data.Materials;
+using StructureHelperCommon.Models.Materials;
 
 namespace StructureHelperLogics.Models.Materials
 {
diff --git a/StructureHelperTests/ViewModelTests/GraphViewModelTest.cs b/StructureHelperTests/ViewModelTests/GraphViewModelTest.cs
index ac6b3c3..34894a4 100644
--- a/StructureHelperTests/ViewModelTests/GraphViewModelTest.cs
+++ b/StructureHelperTests/ViewModelTests/GraphViewModelTest.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NUnit.Framework;
-using StructureHelper.Windows.ViewModels.Graphs;
+using NUnit.Framework;
+using StructureHelper.Windows.Graphs;
 using StructureHelperCommon.Models.Parameters;
 
 namespace StructureHelperTests.ViewModelTests