From 0f76f3a60a597cf3236c5165677d6aadee4eb070 Mon Sep 17 00:00:00 2001
From: Nikita Romanenko <itsmylivex@gmail.com>
Date: Thu, 13 Dec 2018 09:46:42 +0300
Subject: [PATCH] A lot of visual improvements and code refactoring.

---
 Pores/Bootstrap.cs                            |  6 +-
 .../ConnectedPoreReportGenerator.cs           |  2 +-
 Pores/Controllers/PoreGenerator.cs            |  6 +-
 Pores/Interfaces/IPoreGenerator.cs            |  2 +-
 .../{IPoreLocalization.cs => IPoreSpread.cs}  |  4 +-
 Pores/MainWindow.xaml                         | 79 +++++++++----------
 Pores/MainWindowViewModel.cs                  | 16 ++--
 .../Models/Localizations/BaseLocalization.cs  | 11 ---
 Pores/Models/Spreads/BaseSpread.cs            | 11 +++
 .../NormalSpread.cs}                          | 10 +--
 Pores/Pores.csproj                            |  6 +-
 11 files changed, 72 insertions(+), 81 deletions(-)
 rename Pores/Interfaces/{IPoreLocalization.cs => IPoreSpread.cs} (53%)
 delete mode 100644 Pores/Models/Localizations/BaseLocalization.cs
 create mode 100644 Pores/Models/Spreads/BaseSpread.cs
 rename Pores/Models/{Localizations/NormalLocalization.cs => Spreads/NormalSpread.cs} (88%)

diff --git a/Pores/Bootstrap.cs b/Pores/Bootstrap.cs
index ecd0940..1b9f811 100644
--- a/Pores/Bootstrap.cs
+++ b/Pores/Bootstrap.cs
@@ -2,7 +2,7 @@
 using Pores.Controllers;
 using Pores.Interfaces;
 using Pores.Models;
-using Pores.Models.Localizations;
+using Pores.Models.Spreads;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -24,8 +24,8 @@ namespace Pores
                 .SingleInstance();
 
             build
-                .Register(c => new ObservableCollection<IPoreLocalization>() { new NormalLocalization(c.Resolve<Material>()) })
-                .As<IEnumerable<IPoreLocalization>>()
+                .Register(c => new ObservableCollection<IPoreSpread>() { new NormalSpread(c.Resolve<Material>()) })
+                .As<IEnumerable<IPoreSpread>>()
                 .SingleInstance();
 
             build
diff --git a/Pores/Controllers/ConnectedPoreReportGenerator.cs b/Pores/Controllers/ConnectedPoreReportGenerator.cs
index 4088138..388a96d 100644
--- a/Pores/Controllers/ConnectedPoreReportGenerator.cs
+++ b/Pores/Controllers/ConnectedPoreReportGenerator.cs
@@ -21,7 +21,7 @@ namespace Pores.Controllers
             IList<Tuple<Pore,Pore>> report = new List<Tuple<Pore, Pore>>();
             foreach(Pore p1 in pores)
                 foreach(Pore p2 in pores)
-                    if (!p1.Equals(p2))
+                    if (!p1.Id.Equals(p2.Id))
                         if (!report.Any(a => a.Item1.Id == p2.Id && a.Item2.Id == p1.Id))
                             if (IsTwoPoresConnecting(p1, p2))
                                 report.Add(Tuple.Create(p1, p2));
diff --git a/Pores/Controllers/PoreGenerator.cs b/Pores/Controllers/PoreGenerator.cs
index 2e2cc46..02eddfd 100644
--- a/Pores/Controllers/PoreGenerator.cs
+++ b/Pores/Controllers/PoreGenerator.cs
@@ -7,7 +7,7 @@ namespace Pores.Controllers
 {
     public class PoreGenerator : PropertyChangedClass, IPoreGenerator
     {
-        public IPoreLocalization PoresLocalization { get; set; }
+        public IPoreSpread PoresLocalization { get; set; }
         public Material CurrentMaterial { get; set; }
 
         public PoreGenerator(Material currentMaterial)
@@ -15,9 +15,9 @@ namespace Pores.Controllers
             CurrentMaterial = currentMaterial;
         }
 
-        public IList<Pore> Generate(IPoreLocalization localization)
+        public IList<Pore> Generate(IPoreSpread localization)
         {
-            return localization.GetLocalization();
+            return localization.GetSpread();
         }
     }
 }
diff --git a/Pores/Interfaces/IPoreGenerator.cs b/Pores/Interfaces/IPoreGenerator.cs
index c3accc7..1e7e3d0 100644
--- a/Pores/Interfaces/IPoreGenerator.cs
+++ b/Pores/Interfaces/IPoreGenerator.cs
@@ -5,6 +5,6 @@ namespace Pores.Interfaces
 {
     public interface IPoreGenerator
     {
-        IList<Pore> Generate(IPoreLocalization localization);
+        IList<Pore> Generate(IPoreSpread localization);
     }
 }
diff --git a/Pores/Interfaces/IPoreLocalization.cs b/Pores/Interfaces/IPoreSpread.cs
similarity index 53%
rename from Pores/Interfaces/IPoreLocalization.cs
rename to Pores/Interfaces/IPoreSpread.cs
index c060349..807748f 100644
--- a/Pores/Interfaces/IPoreLocalization.cs
+++ b/Pores/Interfaces/IPoreSpread.cs
@@ -3,8 +3,8 @@ using System.Collections.ObjectModel;
 
 namespace Pores.Interfaces
 {
-    public interface IPoreLocalization
+    public interface IPoreSpread
     {
-        ObservableCollection<Pore> GetLocalization();
+        ObservableCollection<Pore> GetSpread();
     }
 }
diff --git a/Pores/MainWindow.xaml b/Pores/MainWindow.xaml
index 63a17f5..5dd160e 100644
--- a/Pores/MainWindow.xaml
+++ b/Pores/MainWindow.xaml
@@ -3,8 +3,7 @@
         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:localizations="clr-namespace:Pores.Models.Localizations"
-        xmlns:local="clr-namespace:Pores"
+        xmlns:spreads="clr-namespace:Pores.Models.Spreads"
         mc:Ignorable="d"
         Title="Pores" Height="600" Width="1000">
     <Grid IsEnabled="{Binding EnableControlsFlag}">
@@ -24,46 +23,44 @@
                 <TextBlock Text="Просмотр модели"/>
             </StackPanel>
         </DockPanel>
-            
-
-        <StackPanel VerticalAlignment="Center" Grid.Column="1" Margin="5 0">
-            <TextBlock Text="Параметры модели"/>
-            <TextBlock Text="Ширина: "/>
-            <TextBox Text="{Binding CurrentMaterial.Width}"/>
-            <TextBlock Text="Глубина: "/>
-            <TextBox Text="{Binding CurrentMaterial.Depth}"/>
-            <TextBlock Text="Высота: "/>
-            <TextBox Text="{Binding CurrentMaterial.Height}"/>
-            <TextBlock Text="Разрешение каждого из трех измерений (общее количество точек = n^3): " TextWrapping="Wrap"/>
-            <TextBox Text="{Binding CurrentMaterial.NumberOfPores}"/>
-        </StackPanel>
-
 
-        <StackPanel VerticalAlignment="Center" Grid.Column="1" Grid.Row="2" Grid.RowSpan="2" Margin="5 0">
-            <TextBlock Text="Результаты работы"/>
-            <TextBlock Text="Количество пор: "/>
-            <TextBox Text="{Binding Pores.Count, Mode=OneWay}" IsEnabled="False"/>
-        </StackPanel>
 
-        <StackPanel Grid.Column="1" Grid.Row="1" VerticalAlignment="Center" Margin="5 0">
-            <TextBlock Text="Параметры модели распределения:"/>
-            <ComboBox ItemsSource="{Binding Localizations}" SelectedItem="{Binding SelectedLocalization}" HorizontalAlignment="Left" Width="198"></ComboBox>
-            <ContentControl Content="{Binding SelectedLocalization}">
-                <ContentControl.Resources>
-                    <DataTemplate DataType="{x:Type localizations:NormalLocalization}">
-                        <StackPanel>
-                            <TextBlock Text="Сигма: "/>
-                            <TextBox Text="{Binding sigma}"/>
-                            <TextBlock Text="Мю: "/>
-                            <TextBox Text="{Binding mu}"/>  
-                        </StackPanel>
-                    </DataTemplate>
-                </ContentControl.Resources>
-            </ContentControl>
-        </StackPanel>
+        <DockPanel Grid.Column="1" Grid.RowSpan="3" VerticalAlignment="Stretch" Margin="5 0">
+            <StackPanel DockPanel.Dock="Top" Margin="5 0">
+                <TextBlock Text="Настройки моделирования" HorizontalAlignment="Center" FontWeight="SemiBold" Margin="0 5"/>
+                <TextBlock Text="Параметры модели материала: "/>
+                <TextBlock Text="Ширина: "/>
+                <TextBox Text="{Binding CurrentMaterial.Width}"/>
+                <TextBlock Text="Глубина: "/>
+                <TextBox Text="{Binding CurrentMaterial.Depth}"/>
+                <TextBlock Text="Высота: "/>
+                <TextBox Text="{Binding CurrentMaterial.Height}"/>
+                <TextBlock Text="Разрешение каждого из трех измерений (общее количество точек = n^3): " TextWrapping="Wrap"/>
+                <TextBox Text="{Binding CurrentMaterial.NumberOfPores}"/>
+                <TextBlock Text="Параметры модели распределения:"/>
+                <ComboBox ItemsSource="{Binding Spreads}" SelectedItem="{Binding SelectedSpread}" HorizontalAlignment="Left" Width="198"></ComboBox>
+                <ContentControl Content="{Binding SelectedSpread}">
+                    <ContentControl.Resources>
+                        <DataTemplate DataType="{x:Type spreads:NormalSpread}">
+                            <StackPanel>
+                                <TextBlock Text="Сигма: "/>
+                                <TextBox Text="{Binding sigma}"/>
+                                <TextBlock Text="Мю: "/>
+                                <TextBox Text="{Binding mu}"/>
+                            </StackPanel>
+                        </DataTemplate>
+                    </ContentControl.Resources>
+                </ContentControl>
+            </StackPanel>
+            
+            <StackPanel DockPanel.Dock="Bottom" VerticalAlignment="Bottom" Margin="5 10">
+                <TextBlock Text="Результаты работы"/>
+                <TextBlock Text="Количество пор: "/>
+                <TextBox Text="{Binding Pores.Count, Mode=OneWay}" IsEnabled="False"/>
+            </StackPanel>
+        </DockPanel>
 
         <DockPanel Grid.Column="2" Grid.RowSpan="3" Margin="5 0">
-
             <StackPanel DockPanel.Dock="Bottom" VerticalAlignment="Bottom">
                 <Button Content="Сгенерировать модель" Command="{Binding GeneratePoresCommand}"/>
                 <Button Content="Сохранить выборку из модели в файл" Command="{Binding GenAndSaveBatchCommand}"/>
@@ -78,7 +75,7 @@
                     </Button.Content>
                 </Button>
                 <Button Content="Открыть папку с моделями" Command="{Binding OpenModelDirectoryCommand}"/>
-            </StackPanel>            
+            </StackPanel>
             
             <StackPanel DockPanel.Dock="Top">
                 <TextBlock Text="Настройки выборки и экспорта" FontWeight="SemiBold" HorizontalAlignment="Center" Margin="0 5"/>
@@ -105,10 +102,6 @@
                     <TextBlock TextWrapping="Wrap" Text="Предоставить отчет по количеству пор, соединенных между собой"/>
                 </CheckBox>
             </StackPanel>
-
         </DockPanel>
-        
-        
-        
     </Grid>
 </Window>
diff --git a/Pores/MainWindowViewModel.cs b/Pores/MainWindowViewModel.cs
index 8ca9272..5a3f38e 100644
--- a/Pores/MainWindowViewModel.cs
+++ b/Pores/MainWindowViewModel.cs
@@ -15,9 +15,9 @@ namespace Pores
     {
         public Material CurrentMaterial { get; set; }
         public ObservableCollection<Pore> Pores { get; set; } = new ObservableCollection<Pore>();
-        public IEnumerable<IPoreLocalization> Localizations { get; set; }
+        public IEnumerable<IPoreSpread> Spreads { get; set; }
 
-        public IPoreLocalization SelectedLocalization { get; set; }
+        public IPoreSpread SelectedSpread { get; set; }
         public IPoreGenerator PoreGeneratorInstance { get; set; }
         public BatchGenerator BatchGenerator { get; }
         public ConnectedPoreReportGenerator ConnectedPoreReportGenerator { get; }
@@ -43,25 +43,25 @@ namespace Pores
 
         public MainWindowViewModel(
             Material material, 
-            IEnumerable<IPoreLocalization> localizations, 
+            IEnumerable<IPoreSpread> localizations, 
             IPoreGenerator poreGenerator,
             ReportGenerator reportSaver,
             BatchGenerator batchGenerator,
             ConnectedPoreReportGenerator connectedPoreReportGenerator)
         {
             CurrentMaterial = material;
-            Localizations = localizations;
+            Spreads = localizations;
             PoreGeneratorInstance = poreGenerator;
             ReportSaver = reportSaver;
             BatchGenerator = batchGenerator;
             ConnectedPoreReportGenerator = connectedPoreReportGenerator;
 
-            GeneratePoresCommand = new RelayCommand(GeneratePoresToForm, () => SelectedLocalization != null);
+            GeneratePoresCommand = new RelayCommand(GeneratePoresToForm, () => SelectedSpread != null);
             SaveToFileCommand = new RelayCommand(Save, () => Pores?.Count > 0);
             GenAndSaveBatchCommand = new RelayCommand(SaveBatch, () => Pores?.Count > 0);
             GenerateAllCommand = new RelayCommand(c => GenAndSaveAll((int)c), () =>
             {
-                if (SelectedLocalization != null)
+                if (SelectedSpread != null)
                     if (AllSavingThread?.IsAlive != true)
                         return true;
                 return false;
@@ -73,10 +73,10 @@ namespace Pores
         }
 
         public void GeneratePoresToForm() 
-            => Pores = new ObservableCollection<Pore>(PoreGeneratorInstance.Generate(SelectedLocalization));
+            => Pores = new ObservableCollection<Pore>(PoreGeneratorInstance.Generate(SelectedSpread));
 
         public IList<Pore> GeneratePores() 
-            => PoreGeneratorInstance.Generate(SelectedLocalization);
+            => PoreGeneratorInstance.Generate(SelectedSpread);
 
         public void Save() 
             => Save(Pores);
diff --git a/Pores/Models/Localizations/BaseLocalization.cs b/Pores/Models/Localizations/BaseLocalization.cs
deleted file mode 100644
index 925297a..0000000
--- a/Pores/Models/Localizations/BaseLocalization.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Collections.ObjectModel;
-using Pores.Helpers;
-using Pores.Interfaces;
-
-namespace Pores.Models.Localizations
-{
-    public abstract class BaseLocalization : PropertyChangedClass, IPoreLocalization
-    {
-        public abstract ObservableCollection<Pore> GetLocalization();
-    }
-}
\ No newline at end of file
diff --git a/Pores/Models/Spreads/BaseSpread.cs b/Pores/Models/Spreads/BaseSpread.cs
new file mode 100644
index 0000000..0f9dde8
--- /dev/null
+++ b/Pores/Models/Spreads/BaseSpread.cs
@@ -0,0 +1,11 @@
+using System.Collections.ObjectModel;
+using Pores.Helpers;
+using Pores.Interfaces;
+
+namespace Pores.Models.Spreads
+{
+    public abstract class BaseSpread : PropertyChangedClass, IPoreSpread
+    {
+        public abstract ObservableCollection<Pore> GetSpread();
+    }
+}
\ No newline at end of file
diff --git a/Pores/Models/Localizations/NormalLocalization.cs b/Pores/Models/Spreads/NormalSpread.cs
similarity index 88%
rename from Pores/Models/Localizations/NormalLocalization.cs
rename to Pores/Models/Spreads/NormalSpread.cs
index 14565a9..1dd3312 100644
--- a/Pores/Models/Localizations/NormalLocalization.cs
+++ b/Pores/Models/Spreads/NormalSpread.cs
@@ -1,11 +1,9 @@
 using System;
-using Pores.Interfaces;
 using System.Collections.ObjectModel;
-using System.Collections.Generic;
 
-namespace Pores.Models.Localizations
+namespace Pores.Models.Spreads
 {
-    public class NormalLocalization : BaseLocalization
+    public class NormalSpread : BaseSpread
     {
         public double mu { get; set; }
         public double sigma { get; set; }
@@ -24,7 +22,7 @@ namespace Pores.Models.Localizations
             return GaussFunction(c.Z, sigma, mu);
         }
 
-        public override ObservableCollection<Pore> GetLocalization()
+        public override ObservableCollection<Pore> GetSpread()
         {
             var r = new Random();
             var id = 0;
@@ -58,7 +56,7 @@ namespace Pores.Models.Localizations
             maxR = Math.Round(Math.Pow((3.0 / 4.0) * volume / (3.14 * Math.Pow(m.NumberOfPores, 3)), 1.0 / 3.0), 3);
         }
         
-        public NormalLocalization(Material material)
+        public NormalSpread(Material material)
         {
             Material = material;
             sigma = 4;
diff --git a/Pores/Pores.csproj b/Pores/Pores.csproj
index be50d52..3eeefb5 100644
--- a/Pores/Pores.csproj
+++ b/Pores/Pores.csproj
@@ -88,14 +88,14 @@
     <Compile Include="Helpers\PropertyChanged.cs" />
     <Compile Include="Helpers\RelayCommand.cs" />
     <Compile Include="Interfaces\IPoreGenerator.cs" />
-    <Compile Include="Interfaces\IPoreLocalization.cs" />
+    <Compile Include="Interfaces\IPoreSpread.cs" />
     <Compile Include="MainWindowViewModel.cs" />
     <Compile Include="Models\BatchPoint.cs" />
     <Compile Include="Models\Point.cs" />
     <Compile Include="Models\Point2D.cs" />
     <Compile Include="Models\Point3D.cs" />
-    <Compile Include="Models\Localizations\BaseLocalization.cs" />
-    <Compile Include="Models\Localizations\NormalLocalization.cs" />
+    <Compile Include="Models\Spreads\BaseSpread.cs" />
+    <Compile Include="Models\Spreads\NormalSpread.cs" />
     <Compile Include="Models\Material.cs" />
     <Compile Include="Models\Pore.cs" />
     <Compile Include="MainWindow.xaml.cs">