From 1cf54603bc762a85a0c3d402251db83482a244a8 Mon Sep 17 00:00:00 2001
From: Evgeny Redikultsev <effect-project@yandex.ru>
Date: Sun, 30 Oct 2022 22:20:58 +0500
Subject: [PATCH] Head material was added

---
 .../Converters/Common/InvertBoolConverter.cs  | 33 +++++++++++++++
 .../UI/DataContexts/PrimitiveBase.cs          | 37 +++++++++++++++--
 .../UI/DataTemplates/RectangleTemplate.xaml   |  5 ++-
 Infrastructure/UI/Styles.xaml                 |  6 ++-
 Models/Materials/HeadMaterial.cs              | 27 ++++++++++++
 Models/Materials/IHeadMaterial.cs             | 16 ++++++++
 StructureHelper.csproj                        | 11 +++++
 .../ColorPickerWindow/ColorPickerView.xaml    |  6 ++-
 .../ColorPickerWindow/ColorPickerViewModel.cs | 16 ++++----
 Windows/MainWindow/MainModel.cs               |  3 ++
 Windows/MainWindow/MainView.xaml              | 26 +++++++++++-
 Windows/MainWindow/MainViewModel.cs           | 27 +++++++++---
 .../Materials/HeadMaterialsView.xaml          | 41 +++++++++++++++++++
 .../Materials/HeadMaterialsView.xaml.cs       | 40 ++++++++++++++++++
 .../PrimitivePropertiesView.xaml              | 20 +++++++--
 .../PrimitivePropertiesView.xaml.cs           |  5 +++
 .../Materials/HeadMaterialsViewModel.cs       | 36 ++++++++++++++++
 .../PrimitivePropertiesViewModel.cs           | 39 +++++++++++++++---
 18 files changed, 363 insertions(+), 31 deletions(-)
 create mode 100644 Infrastructure/UI/Converters/Common/InvertBoolConverter.cs
 create mode 100644 Models/Materials/HeadMaterial.cs
 create mode 100644 Models/Materials/IHeadMaterial.cs
 create mode 100644 Windows/MainWindow/Materials/HeadMaterialsView.xaml
 create mode 100644 Windows/MainWindow/Materials/HeadMaterialsView.xaml.cs
 create mode 100644 Windows/ViewModels/Materials/HeadMaterialsViewModel.cs

diff --git a/Infrastructure/UI/Converters/Common/InvertBoolConverter.cs b/Infrastructure/UI/Converters/Common/InvertBoolConverter.cs
new file mode 100644
index 0000000..3dc8b18
--- /dev/null
+++ b/Infrastructure/UI/Converters/Common/InvertBoolConverter.cs
@@ -0,0 +1,33 @@
+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.Common
+{
+    [ValueConversion(typeof(bool), typeof(bool))]
+    public class InvertBoolConverter : IValueConverter
+    {
+        public InvertBoolConverter()
+        {
+        }
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value != null && value is bool)
+            {
+                return !((bool)value);
+            }
+
+            return true;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return Convert(value, targetType, parameter, culture);
+        }
+    }
+}
diff --git a/Infrastructure/UI/DataContexts/PrimitiveBase.cs b/Infrastructure/UI/DataContexts/PrimitiveBase.cs
index 6607e9b..03bb9c5 100644
--- a/Infrastructure/UI/DataContexts/PrimitiveBase.cs
+++ b/Infrastructure/UI/DataContexts/PrimitiveBase.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.Windows;
+using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
 using StructureHelper.Infrastructure.Enums;
@@ -25,6 +27,9 @@ namespace StructureHelper.Infrastructure.UI.DataContexts
         private double maxElementSize;
         private bool captured, parameterCaptured, elementLock, paramsPanelVisibilty, popupCanBeClosed = true, borderCaptured;
         private Brush brush;
+        private bool setMaterialColor;
+        private Color color;
+        private IHeadMaterial headMaterial;
         private MaterialDefinitionBase material;
         private double prestrain_kx, prestrain_ky, prestrain_epsz;
         private double opacity = 1, showedOpacity = 0, x, y, xY1, yX1, primitiveWidth, primitiveHeight, showedX, showedY;
@@ -91,6 +96,30 @@ namespace StructureHelper.Infrastructure.UI.DataContexts
                 OnPropertyChanged(value, ref centerY);            
             }
         }
+
+        public IHeadMaterial HeadMaterial
+        {
+            get => headMaterial;
+            set
+            {
+                OnPropertyChanged(value, ref headMaterial);
+            }
+        }
+
+        public bool SetMaterialColor
+        {
+            get => setMaterialColor;
+            set { OnPropertyChanged(value, ref setMaterialColor);}
+        }
+        public Color Color
+        {
+            get => setMaterialColor? headMaterial.Color :color;
+            set
+            {
+                SetMaterialColor = false;
+                OnPropertyChanged(value, ref color);
+            }
+        }
         public int MinElementDivision
         {
             get => minElementDivision;
@@ -119,8 +148,8 @@ namespace StructureHelper.Infrastructure.UI.DataContexts
         }
         public Brush Brush
         {
-            get => brush;
-            set => OnPropertyChanged(value, ref brush);
+            get => new SolidColorBrush(Color);
+            set { }
         }
         public MaterialDefinitionBase Material
         {
@@ -259,8 +288,7 @@ namespace StructureHelper.Infrastructure.UI.DataContexts
             var randomR = new Random(new Random((int)DateTime.Now.Ticks % 1000).Next(50)).Next(0, 255);
             var randomG = new Random(new Random((int)DateTime.Now.Ticks % 200).Next(100, 200)).Next(0, 255);
             var randomB = new Random(new Random((int)DateTime.Now.Ticks % 50).Next(500, 1000)).Next(0, 255);
-            var color = Color.FromRgb((byte)randomR, (byte)randomG, (byte)randomB);
-            Brush = new SolidColorBrush(color);
+            color = Color.FromRgb((byte)randomR, (byte)randomG, (byte)randomB);
             PrimitiveLeftButtonUp = new RelayCommand(o => Captured = false);
             PrimitiveLeftButtonDown = new RelayCommand(o => Captured = true);
             
@@ -273,6 +301,7 @@ namespace StructureHelper.Infrastructure.UI.DataContexts
 
             });
             OwnerVm = ownerVM;
+            SetMaterialColor = true;
         }
 
         protected readonly MainViewModel OwnerVm;
diff --git a/Infrastructure/UI/DataTemplates/RectangleTemplate.xaml b/Infrastructure/UI/DataTemplates/RectangleTemplate.xaml
index ce24c9f..7b4053c 100644
--- a/Infrastructure/UI/DataTemplates/RectangleTemplate.xaml
+++ b/Infrastructure/UI/DataTemplates/RectangleTemplate.xaml
@@ -29,7 +29,7 @@
                     </mouseEventTriggers:DoubleClickEventTrigger>-->
                 </i:Interaction.Triggers>
             </Rectangle>
-            <Rectangle Cursor="SizeNWSE" Fill="{Binding Brush}" VerticalAlignment="Bottom" HorizontalAlignment="Right">
+            <Rectangle Cursor="SizeNWSE" VerticalAlignment="Bottom" HorizontalAlignment="Right">
                 <i:Interaction.Triggers>
                     <i:EventTrigger EventName="PreviewMouseDown">
                         <i:InvokeCommandAction Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Path=DataContext.LeftButtonDown}" CommandParameter="{Binding}"/>
@@ -41,6 +41,9 @@
                         <i:InvokeCommandAction Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Path=DataContext.PreviewMouseMove}" CommandParameter="{Binding}"/>
                     </i:EventTrigger>
                 </i:Interaction.Triggers>
+                <!--<Rectangle.Fill>
+                    <SolidColorBrush Color="{Binding Color}"/>
+                </Rectangle.Fill>-->
             </Rectangle>
         </Grid>
         <userControls:PrimitivePopup IsOpen="{Binding ParamsPanelVisibilty}"/>
diff --git a/Infrastructure/UI/Styles.xaml b/Infrastructure/UI/Styles.xaml
index d282a76..7af6e64 100644
--- a/Infrastructure/UI/Styles.xaml
+++ b/Infrastructure/UI/Styles.xaml
@@ -12,7 +12,11 @@
     <converters:Area x:Key="AreaConverter"/>
 
     <Style TargetType="Shape" x:Key="ShapeStyle">
-        <Setter Property="Fill" Value="{Binding Brush, Mode=TwoWay}"/>
+        <Setter Property="Fill">
+            <Setter.Value>
+                <SolidColorBrush Color="{Binding Color}"/>
+            </Setter.Value>
+        </Setter>
         <Setter Property="Opacity" Value="{Binding Opacity, Mode=TwoWay}"/>
         <!--<Setter Property="ToolTip">
             <Setter.Value>
diff --git a/Models/Materials/HeadMaterial.cs b/Models/Materials/HeadMaterial.cs
new file mode 100644
index 0000000..672d532
--- /dev/null
+++ b/Models/Materials/HeadMaterial.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Media;
+
+namespace StructureHelper.Models.Materials
+{
+    public class HeadMaterial : IHeadMaterial
+    {
+        public string Name { get; set; }
+        public Color Color { get; set; }
+        public MaterialDefinitionBase Material { get; set; }
+
+        public HeadMaterial()
+        {
+            Thread.Sleep(100);
+            var randomR = new Random(new Random((int)DateTime.Now.Ticks % 1000).Next(50)).Next(0, 255);
+            var randomG = new Random(new Random((int)DateTime.Now.Ticks % 200).Next(100, 200)).Next(0, 255);
+            var randomB = new Random(new Random((int)DateTime.Now.Ticks % 50).Next(500, 1000)).Next(0, 255);
+            Color = Color.FromRgb((byte)randomR, (byte)randomG, (byte)randomB);
+        }
+    }
+}
diff --git a/Models/Materials/IHeadMaterial.cs b/Models/Materials/IHeadMaterial.cs
new file mode 100644
index 0000000..0b55d40
--- /dev/null
+++ b/Models/Materials/IHeadMaterial.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+
+namespace StructureHelper.Models.Materials
+{
+    public interface IHeadMaterial
+    {
+        string Name { get; set; }
+        Color Color { get; set; }
+        MaterialDefinitionBase Material { get; set; }
+    }
+}
diff --git a/StructureHelper.csproj b/StructureHelper.csproj
index 5d5fb92..62157ed 100644
--- a/StructureHelper.csproj
+++ b/StructureHelper.csproj
@@ -134,6 +134,7 @@
     <Compile Include="Infrastructure\Enums\PrimitiveType.cs" />
     <Compile Include="Infrastructure\Exceptions\StructureHelperException.cs" />
     <Compile Include="Infrastructure\Strings\ErrorStrings.cs" />
+    <Compile Include="Infrastructure\UI\Converters\Common\InvertBoolConverter.cs" />
     <Compile Include="Infrastructure\UI\Converters\Units\Area.cs" />
     <Compile Include="Infrastructure\UI\Converters\Units\Length.cs" />
     <Compile Include="Infrastructure\UI\Converters\Units\UnitBase.cs" />
@@ -141,6 +142,8 @@
     <Compile Include="Infrastructure\UI\UserControls\PrimitivePopup.xaml.cs">
       <DependentUpon>PrimitivePopup.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Models\Materials\HeadMaterial.cs" />
+    <Compile Include="Models\Materials\IHeadMaterial.cs" />
     <Compile Include="Services\Primitives\PrimitiveRepository.cs" />
     <Compile Include="Services\Primitives\IPrimitiveRepository.cs" />
     <Compile Include="Services\Reports\CalculationReports\IIsoFieldReport.cs" />
@@ -195,11 +198,15 @@
     <Compile Include="Infrastructure\UI\DataTemplates\RectangleTemplate.xaml.cs">
       <DependentUpon>RectangleTemplate.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Windows\MainWindow\Materials\HeadMaterialsView.xaml.cs">
+      <DependentUpon>HeadMaterialsView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Windows\PrimitiveProperiesWindow\PrimitivePropertiesView.xaml.cs">
       <DependentUpon>PrimitivePropertiesView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Windows\ViewModels\Calculations\CalculationProperies\CalculationPropertyViewModel.cs" />
     <Compile Include="Windows\ViewModels\Calculations\CalculationResult\CalculationResultViewModel.cs" />
+    <Compile Include="Windows\ViewModels\Materials\HeadMaterialsViewModel.cs" />
     <Compile Include="Windows\ViewModels\PrimitiveProperties\PrimitivePropertiesViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -259,6 +266,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Windows\MainWindow\Materials\HeadMaterialsView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Windows\PrimitiveProperiesWindow\PrimitivePropertiesView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Windows/ColorPickerWindow/ColorPickerView.xaml b/Windows/ColorPickerWindow/ColorPickerView.xaml
index 30c684d..ca5c5d4 100644
--- a/Windows/ColorPickerWindow/ColorPickerView.xaml
+++ b/Windows/ColorPickerWindow/ColorPickerView.xaml
@@ -26,7 +26,11 @@
         <TextBox Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="10" Text="{Binding Red}"/>
 
         <Border Grid.Column="3" Grid.RowSpan="3" Margin="10" BorderBrush="Black" BorderThickness="1">
-            <Rectangle Fill="{Binding SelectedColor}"/>
+            <Rectangle>
+                <Rectangle.Fill>
+                    <SolidColorBrush Color="{Binding SelectedColor}"/>
+                </Rectangle.Fill>
+            </Rectangle>
         </Border>
 
 
diff --git a/Windows/ColorPickerWindow/ColorPickerViewModel.cs b/Windows/ColorPickerWindow/ColorPickerViewModel.cs
index 0d83a63..b23d410 100644
--- a/Windows/ColorPickerWindow/ColorPickerViewModel.cs
+++ b/Windows/ColorPickerWindow/ColorPickerViewModel.cs
@@ -27,8 +27,8 @@ namespace StructureHelper.Windows.ColorPickerWindow
             set => OnColorItemChanged(value, ref blue);
         }
 
-        private Brush selectedColor;
-        public Brush SelectedColor
+        private Color selectedColor;
+        public Color SelectedColor
         {
             get => selectedColor;
             set => OnPropertyChanged(value, ref selectedColor);
@@ -38,12 +38,12 @@ namespace StructureHelper.Windows.ColorPickerWindow
         {
             if (primitive != null)
             {
-                var solidBrush = (SolidColorBrush)primitive.Brush;
-                Red = solidBrush.Color.R;
-                Green = solidBrush.Color.G;
-                Blue = solidBrush.Color.B;
+                var color = primitive.Color;
+                Red = color.R;
+                Green = color.G;
+                Blue = color.B;
 
-                SetColor = new RelayCommand(o => primitive.Brush = SelectedColor);
+                SetColor = new RelayCommand(o => primitive.Color = SelectedColor);
             }
         }
         private void OnColorItemChanged(int value, ref int colorItem, [CallerMemberName] string propertyName = null)
@@ -58,7 +58,7 @@ namespace StructureHelper.Windows.ColorPickerWindow
         private void UpdateSelectedColor()
         {
             var color = Color.FromRgb((byte)Red, (byte)Green, (byte)Blue);
-            SelectedColor = new SolidColorBrush(color);
+            SelectedColor = color;
             OnPropertyChanged(nameof(SelectedColor));
         }
     }
diff --git a/Windows/MainWindow/MainModel.cs b/Windows/MainWindow/MainModel.cs
index bce403b..6a93263 100644
--- a/Windows/MainWindow/MainModel.cs
+++ b/Windows/MainWindow/MainModel.cs
@@ -3,6 +3,7 @@ using LoaderCalculator.Data.Matrix;
 using LoaderCalculator.Data.Ndms;
 using LoaderCalculator.Data.ResultData;
 using LoaderCalculator.Data.SourceData;
+using StructureHelper.Models.Materials;
 using StructureHelper.Services;
 using StructureHelper.Services.Primitives;
 using StructureHelper.UnitSystem;
@@ -21,6 +22,7 @@ namespace StructureHelper.Windows.MainWindow
     public class MainModel
     {
         private IPrimitiveRepository primitiveRepository;
+        public List<IHeadMaterial> HeadMaterials { get; }
         private CalculationService calculationService;
         private UnitSystemService unitSystemService;
 
@@ -33,6 +35,7 @@ namespace StructureHelper.Windows.MainWindow
             this.unitSystemService = unitSystemService;
 
             CalculationProperty = new CalculationProperty();
+            HeadMaterials = new List<IHeadMaterial>();
         }
         
         public IStrainMatrix Calculate(double mx, double my, double nz)
diff --git a/Windows/MainWindow/MainView.xaml b/Windows/MainWindow/MainView.xaml
index 98d6a8e..a12649b 100644
--- a/Windows/MainWindow/MainView.xaml
+++ b/Windows/MainWindow/MainView.xaml
@@ -47,6 +47,7 @@
                     <Button Content="Edit primitive" Command="{Binding EditPrimitive}"/>
                     <Button Content="Delete primitive" Command="{Binding DeletePrimitive}"/>
                 </MenuItem>
+                <Button Content="Materials" Command="{Binding EditHeadMaterialsCommand}"/>
                 <Button Content="Calculation properties" Command="{Binding Path=EditCalculationPropertyCommand}"/>
             </MenuItem>
             <MenuItem Header="Analisys">
@@ -60,7 +61,24 @@
             </Grid.ColumnDefinitions>
             <StackPanel>
                 <Expander Header="Materials" ExpandDirection="Down" MinWidth="20" >
-
+                    <ListBox ItemsSource="{Binding HeadMaterials}">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="20"/>
+                                        <ColumnDefinition/>
+                                    </Grid.ColumnDefinitions>
+                                    <Rectangle Grid.Column="0" Margin="3">
+                                        <Rectangle.Fill>
+                                            <SolidColorBrush Color="{Binding Color}"/>
+                                        </Rectangle.Fill>
+                                    </Rectangle>
+                                    <TextBlock Grid.Column="1" Text="{Binding Name}"/>
+                                </Grid>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
                 </Expander>
                 <Expander Header="Geometry" ExpandDirection="Down" MinWidth="20" >
                     <ListBox ItemsSource="{Binding Primitives}" SelectedItem="{Binding SelectedPrimitive}">
@@ -71,7 +89,11 @@
                                         <ColumnDefinition Width="20"/>
                                         <ColumnDefinition/>
                                     </Grid.ColumnDefinitions>
-                                    <Rectangle Grid.Column="0" Margin="3" Fill="{Binding Brush}" />
+                                    <Rectangle Grid.Column="0" Margin="3">
+                                        <Rectangle.Fill>
+                                            <SolidColorBrush Color="{Binding Color}"/>
+                                        </Rectangle.Fill>
+                                    </Rectangle>
                                     <TextBlock Grid.Column="1" Text="{Binding Name}"/>
                                 </Grid>
                                 
diff --git a/Windows/MainWindow/MainViewModel.cs b/Windows/MainWindow/MainViewModel.cs
index 13368dc..29c5f08 100644
--- a/Windows/MainWindow/MainViewModel.cs
+++ b/Windows/MainWindow/MainViewModel.cs
@@ -26,6 +26,7 @@ using StructureHelper.Services.Primitives;
 using StructureHelper.Windows.PrimitiveProperiesWindow;
 using StructureHelper.Infrastructure.Exceptions;
 using StructureHelper.Infrastructure.Strings;
+using StructureHelper.Windows.MainWindow.Materials;
 
 namespace StructureHelper.Windows.MainWindow
 {
@@ -86,6 +87,7 @@ namespace StructureHelper.Windows.MainWindow
             get => canvasHeight;
             set => OnPropertyChanged(value, ref canvasHeight);
         }
+        public List<IHeadMaterial> HeadMaterials { get => Model.HeadMaterials; }
 
         public double XX2
         {
@@ -111,6 +113,7 @@ namespace StructureHelper.Windows.MainWindow
         public ICommand Calculate { get; }
         public ICommand DeletePrimitive { get; }
         public ICommand EditCalculationPropertyCommand { get; }
+        public ICommand EditHeadMaterialsCommand { get; }
         public ICommand EditPrimitive { get; }
         public ICommand AddTestCase { get; }
         public ICommand LeftButtonDown { get; }
@@ -178,6 +181,7 @@ namespace StructureHelper.Windows.MainWindow
                     primitive.ParameterCaptured = false;
                 }
             });
+            EditHeadMaterialsCommand = new RelayCommand(o => EditHeadMaterials());
             OpenMaterialCatalog = new RelayCommand(o =>
             {
                 var materialCatalogView = new MaterialCatalogView();
@@ -291,6 +295,12 @@ namespace StructureHelper.Windows.MainWindow
             });
         }
 
+        private void EditHeadMaterials()
+        {
+            var wnd = new HeadMaterialsView(HeadMaterials);
+            wnd.ShowDialog();
+        }
+
         private void DeleteSelectedPrimitive()
         {
             if (! (SelectedPrimitive is null))
@@ -331,13 +341,20 @@ namespace StructureHelper.Windows.MainWindow
             var area1 = Math.PI * 0.012d * 0.012d / 4d;
             var area2 = Math.PI * 0.025d * 0.025d / 4d;
             var gap = 0.05d;
+
             var rectMaterial = new ConcreteDefinition("C40", 0, 40, 0, 1.3, 1.5);
             var pointMaterial = new RebarDefinition("S400", 2, 400, 400, 1.15, 1.15);
-            yield return new Rectangle(width, height, 0, 0, this) { Material = rectMaterial, MaterialName = rectMaterial.MaterialClass };
-            yield return new Point(area1, -width / 2 + gap, -height / 2 + gap, this) { Material = pointMaterial, MaterialName = pointMaterial.MaterialClass };
-            yield return new Point(area1, width / 2 - gap, -height / 2 + gap, this) { Material = pointMaterial, MaterialName = pointMaterial.MaterialClass };
-            yield return new Point(area2, -width / 2 + gap, height / 2 - gap, this) { Material = pointMaterial, MaterialName = pointMaterial.MaterialClass };
-            yield return new Point(area2, width / 2 - gap, height / 2 - gap, this) { Material = pointMaterial, MaterialName = pointMaterial.MaterialClass };
+
+            IHeadMaterial concrete = new HeadMaterial() { Name = "Concrete C40", Material = rectMaterial };
+            HeadMaterials.Add(concrete);
+            IHeadMaterial reinforcement = new HeadMaterial() { Name = "Reinforcement S400", Material = pointMaterial };
+            HeadMaterials.Add(reinforcement);
+
+            yield return new Rectangle(width, height, 0, 0, this) { Material = rectMaterial, MaterialName = rectMaterial.MaterialClass, HeadMaterial = concrete };
+            yield return new Point(area1, -width / 2 + gap, -height / 2 + gap, this) { Material = pointMaterial, MaterialName = pointMaterial.MaterialClass, HeadMaterial = reinforcement };
+            yield return new Point(area1, width / 2 - gap, -height / 2 + gap, this) { Material = pointMaterial, MaterialName = pointMaterial.MaterialClass, HeadMaterial = reinforcement };
+            yield return new Point(area2, -width / 2 + gap, height / 2 - gap, this) { Material = pointMaterial, MaterialName = pointMaterial.MaterialClass, HeadMaterial = reinforcement };
+            yield return new Point(area2, width / 2 - gap, height / 2 - gap, this) { Material = pointMaterial, MaterialName = pointMaterial.MaterialClass, HeadMaterial = reinforcement };
         }
         private void EditCalculationProperty()
         {
diff --git a/Windows/MainWindow/Materials/HeadMaterialsView.xaml b/Windows/MainWindow/Materials/HeadMaterialsView.xaml
new file mode 100644
index 0000000..fc7c833
--- /dev/null
+++ b/Windows/MainWindow/Materials/HeadMaterialsView.xaml
@@ -0,0 +1,41 @@
+<Window x:Class="StructureHelper.Windows.MainWindow.Materials.HeadMaterialsView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        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:vm="clr-namespace:StructureHelper.Windows.ViewModels.Materials"
+        d:DataContext="{d:DesignInstance vm:HeadMaterialsViewModel}"
+        mc:Ignorable="d"
+        Title="Materials" Height="350" Width="400" WindowStartupLocation="CenterScreen">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition Width="120"/>
+        </Grid.ColumnDefinitions>
+        <ListBox ItemsSource="{Binding HeadMaterials}">
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="20"/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Rectangle Grid.Column="0" Margin="3">
+                            <Rectangle.Fill>
+                                <SolidColorBrush Color="{Binding Color}"/>
+                            </Rectangle.Fill>
+                        </Rectangle>
+                        <TextBlock Grid.Column="1" Text="{Binding Name}"/>
+                    </Grid>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+        <StackPanel Grid.Column="1">
+            <Button Content="New Concrete"  Command="{Binding AddHeadMaterial}"/>
+            <Button Content="New Reinforcement"  Command="{Binding AddHeadMaterial}"/>
+            <Button Content="Edit"  Command="{Binding EditHeadMaterial}"/>
+            <Button Content="Edit"  Command="{Binding DeleteHeadMaterial}"/>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/Windows/MainWindow/Materials/HeadMaterialsView.xaml.cs b/Windows/MainWindow/Materials/HeadMaterialsView.xaml.cs
new file mode 100644
index 0000000..c6ba83a
--- /dev/null
+++ b/Windows/MainWindow/Materials/HeadMaterialsView.xaml.cs
@@ -0,0 +1,40 @@
+using StructureHelper.Models.Materials;
+using StructureHelper.Windows.ViewModels.Materials;
+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;
+
+namespace StructureHelper.Windows.MainWindow.Materials
+{
+    /// <summary>
+    /// Логика взаимодействия для HeadMaterials.xaml
+    /// </summary>
+    public partial class HeadMaterialsView : Window
+    {
+        private HeadMaterialsViewModel viewmodel;
+
+        public HeadMaterialsView(IEnumerable<IHeadMaterial> materials)
+        {
+            viewmodel = new HeadMaterialsViewModel(materials);
+            this.DataContext = viewmodel;
+            InitializeComponent();
+        }
+
+        public HeadMaterialsView(HeadMaterialsViewModel vm)
+        {
+            viewmodel = vm;
+            this.DataContext = viewmodel;
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Windows/PrimitiveProperiesWindow/PrimitivePropertiesView.xaml b/Windows/PrimitiveProperiesWindow/PrimitivePropertiesView.xaml
index de7ca81..963b43c 100644
--- a/Windows/PrimitiveProperiesWindow/PrimitivePropertiesView.xaml
+++ b/Windows/PrimitiveProperiesWindow/PrimitivePropertiesView.xaml
@@ -5,13 +5,15 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:StructureHelper.Windows.PrimitiveProperiesWindow"
         xmlns:vm="clr-namespace:StructureHelper.Windows.ViewModels.PrimitiveProperties"
-        xmlns:converters ="clr-namespace:StructureHelper.Infrastructure.UI.Converters.Units"
+        xmlns:convertersCommon ="clr-namespace:StructureHelper.Infrastructure.UI.Converters.Common"
+        xmlns:convertersUnits ="clr-namespace:StructureHelper.Infrastructure.UI.Converters.Units"
         d:DataContext="{d:DesignInstance vm:PrimitivePropertiesViewModel}"
         mc:Ignorable="d"
         Title="PrimitiveProperties" Height="450" Width="300" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
     <Window.Resources>
-        <converters:Length x:Key="LengthConverter"/>
-        <converters:Area x:Key="AreaConverter"/>
+        <convertersCommon:InvertBoolConverter x:Key="InvertBoolConverter"/>
+        <convertersUnits:Length x:Key="LengthConverter"/>
+        <convertersUnits:Area x:Key="AreaConverter"/>
         <DataTemplate x:Key="RectangleProperties">
             <Expander Header="Rectangle" IsExpanded="True">
                 <Grid>
@@ -73,6 +75,7 @@
                         <RowDefinition Height="22"/>
                         <RowDefinition Height="22"/>
                         <RowDefinition Height="22"/>
+                        <RowDefinition Height="22"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="100"/>
@@ -82,6 +85,7 @@
                     <TextBlock Grid.Row="1" Text="Name of material"/>
                     <TextBlock Grid.Row="2" Text="Center X"/>
                     <TextBlock Grid.Row="3" Text="Center Y"/>
+                    <TextBlock Grid.Row="4" Text="Material color"/>
                     <TextBox Grid.Row="0" Grid.Column="1" Margin="1" Text="{Binding Name}"/>
                     <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
                         <ComboBox HorizontalAlignment="Left"/>
@@ -90,6 +94,16 @@
                     </StackPanel>
                     <TextBox Grid.Row="2" Grid.Column="1" Margin="1" Text="{Binding CenterX, Converter={StaticResource LengthConverter}, ValidatesOnDataErrors=True}"/>
                     <TextBox Grid.Row="3" Grid.Column="1" Margin="1" Text="{Binding CenterY, Converter={StaticResource LengthConverter}, ValidatesOnDataErrors=True}"/>
+                    <StackPanel Grid.Row="4" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
+                        <CheckBox IsChecked="{Binding SetMaterialColor}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,20,0"/>
+                        <Rectangle Width="50" Margin="5,0,10,0">
+                            <Rectangle.Fill>
+                                <SolidColorBrush Color="{Binding Color}"/>
+                            </Rectangle.Fill>
+                        </Rectangle>
+                        <Button Width="50" Content="..." Command="{Binding EditColorCommand}"/>
+                        <Button Width="50" Content="..." Click="Button_Click"/>
+                    </StackPanel>
                 </Grid>
             </Expander>
             <!--<Expander Header="Prestrain" IsExpanded="True">
diff --git a/Windows/PrimitiveProperiesWindow/PrimitivePropertiesView.xaml.cs b/Windows/PrimitiveProperiesWindow/PrimitivePropertiesView.xaml.cs
index 2bfd5a2..5c53fc1 100644
--- a/Windows/PrimitiveProperiesWindow/PrimitivePropertiesView.xaml.cs
+++ b/Windows/PrimitiveProperiesWindow/PrimitivePropertiesView.xaml.cs
@@ -60,5 +60,10 @@ namespace StructureHelper.Windows.PrimitiveProperiesWindow
                 StpProperties.Children.Add(contentControl);
             }
         }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            viewModel.EditColor();
+        }
     }
 }
diff --git a/Windows/ViewModels/Materials/HeadMaterialsViewModel.cs b/Windows/ViewModels/Materials/HeadMaterialsViewModel.cs
new file mode 100644
index 0000000..64fa5cb
--- /dev/null
+++ b/Windows/ViewModels/Materials/HeadMaterialsViewModel.cs
@@ -0,0 +1,36 @@
+using StructureHelper.Infrastructure;
+using StructureHelper.Models.Materials;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace StructureHelper.Windows.ViewModels.Materials
+{
+    public class HeadMaterialsViewModel : ViewModelBase
+    {
+        IEnumerable<IHeadMaterial> headMaterials;
+
+        public ICommand AddHeadMaterial;
+        public ICommand CopyHeadMaterial;
+        public ICommand DeleteHeadMaterial;
+        public ICommand EditHeadMaterial;
+
+        public ObservableCollection<IHeadMaterial> HeadMaterials { get; private set; }
+        public IHeadMaterial SelectedMaterial { get; set; }
+
+        public HeadMaterialsViewModel(IEnumerable<IHeadMaterial> materials)
+        {
+            headMaterials = materials;
+            HeadMaterials = new ObservableCollection<IHeadMaterial>();
+            foreach (var material in headMaterials)
+            {
+                HeadMaterials.Add(material);
+            }
+        }
+    }
+}
diff --git a/Windows/ViewModels/PrimitiveProperties/PrimitivePropertiesViewModel.cs b/Windows/ViewModels/PrimitiveProperties/PrimitivePropertiesViewModel.cs
index ab8fb29..7e35059 100644
--- a/Windows/ViewModels/PrimitiveProperties/PrimitivePropertiesViewModel.cs
+++ b/Windows/ViewModels/PrimitiveProperties/PrimitivePropertiesViewModel.cs
@@ -1,5 +1,6 @@
 using StructureHelper.Infrastructure;
 using StructureHelper.Infrastructure.UI.DataContexts;
+using StructureHelper.Windows.ColorPickerWindow;
 using StructureHelperCommon.Models.Shapes;
 using System;
 using System.Collections.Generic;
@@ -7,6 +8,8 @@ using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Input;
+using System.Windows.Media;
 using System.Xml.Linq;
 using Point = StructureHelper.Infrastructure.UI.DataContexts.Point;
 using Rectangle = StructureHelper.Infrastructure.UI.DataContexts.Rectangle;
@@ -17,6 +20,8 @@ namespace StructureHelper.Windows.ViewModels.PrimitiveProperties
     {
         private PrimitiveBase primitive;
 
+        public ICommand EditColorCommand;
+
         public string Name
         {
             get => primitive.Name;
@@ -48,7 +53,6 @@ namespace StructureHelper.Windows.ViewModels.PrimitiveProperties
             }
 
         }
-
         public double CenterY
         {
             get => primitive.CenterY;
@@ -61,11 +65,6 @@ namespace StructureHelper.Windows.ViewModels.PrimitiveProperties
             }
         }
 
-        public double Prestrain_Kx
-        {
-            get => primitive.Pre
-        }
-
         public int MinElementDivision
         {
             get => primitive.MinElementDivision;
@@ -145,6 +144,26 @@ namespace StructureHelper.Windows.ViewModels.PrimitiveProperties
             }
         }
 
+        public Color Color
+        {
+            get => primitive.Color;
+            set
+            {
+                primitive.Color = value;
+                OnPropertyChanged(nameof(Color));
+            }
+        }
+
+        public bool SetMaterialColor
+        {
+            get => primitive.SetMaterialColor;
+            set
+            {
+                primitive.SetMaterialColor = value;
+                OnPropertyChanged(nameof(SetMaterialColor));
+            }
+        }
+
         public string this[string columnName]
         {
             get
@@ -169,6 +188,14 @@ namespace StructureHelper.Windows.ViewModels.PrimitiveProperties
         public PrimitivePropertiesViewModel(PrimitiveBase primitive)
         {
             this.primitive = primitive;
+            EditColorCommand = new RelayCommand(o => EditColor(), o => !SetMaterialColor);
+        }
+
+        public void EditColor()
+        {
+            var wnd = new ColorPickerView(primitive);
+            wnd.ShowDialog();
+            OnPropertyChanged(nameof(Color));
         }
     }
 }