From b83bc18121bd383ee7689ec1ce1899b7e625395b Mon Sep 17 00:00:00 2001
From: defend <itsmylivex@gmail.com>
Date: Sun, 9 Dec 2018 19:51:09 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81,=20=D0=B7=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=BC=D0=B0=D1=8E=D1=89=D0=B8=D0=B9=D1=81=D1=8F=20=D1=81?=
 =?UTF-8?q?=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5=D0=BC=20=D0=B2=D1=8B?=
 =?UTF-8?q?=D0=B1=D0=BE=D1=80=D0=BE=D0=BA,=20=D0=B0=20=D1=82=D0=B0=D0=BA?=
 =?UTF-8?q?=D0=B6=D0=B5=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9=D1=81=D1=8F?=
 =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=BE=D0=BA=20?=
 =?UTF-8?q?=D0=B2=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9?=
 =?UTF-8?q?=20=D1=84=D0=B0=D0=B9=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Pores/Controllers/BaseSaveController.cs       |  5 +-
 Pores/Controllers/BatchGenerator.cs           | 41 ++++++++++++++++
 Pores/Controllers/PoresToFileController.cs    | 27 -----------
 Pores/Controllers/PoresToFileSaver.cs         | 47 +++++++++++++++++++
 Pores/MainWindow.xaml                         | 32 ++++++++++---
 Pores/MainWindowViewModel.cs                  | 22 ++++++---
 .../Localizations/NormalLocalization.cs       |  4 +-
 Pores/Models/Material.cs                      |  2 +-
 Pores/Models/Point.cs                         |  9 ++++
 Pores/Models/Point2D.cs                       |  7 +++
 Pores/Models/{Coordinate.cs => Point3D.cs}    |  4 +-
 Pores/Models/Pore.cs                          |  2 +-
 Pores/Pores.csproj                            |  7 ++-
 13 files changed, 158 insertions(+), 51 deletions(-)
 create mode 100644 Pores/Controllers/BatchGenerator.cs
 delete mode 100644 Pores/Controllers/PoresToFileController.cs
 create mode 100644 Pores/Controllers/PoresToFileSaver.cs
 create mode 100644 Pores/Models/Point.cs
 create mode 100644 Pores/Models/Point2D.cs
 rename Pores/Models/{Coordinate.cs => Point3D.cs} (71%)

diff --git a/Pores/Controllers/BaseSaveController.cs b/Pores/Controllers/BaseSaveController.cs
index 9bfe999..45b89a1 100644
--- a/Pores/Controllers/BaseSaveController.cs
+++ b/Pores/Controllers/BaseSaveController.cs
@@ -2,8 +2,7 @@
 {
     public abstract class BaseSaveController<TData>
     {
-        public virtual TData Data { get; set; } = default(TData);
-        public abstract void Save();
-        public abstract void Load();
+        public abstract void Save(TData data);
+        public abstract TData Load();
     }
 }
diff --git a/Pores/Controllers/BatchGenerator.cs b/Pores/Controllers/BatchGenerator.cs
new file mode 100644
index 0000000..a2a3512
--- /dev/null
+++ b/Pores/Controllers/BatchGenerator.cs
@@ -0,0 +1,41 @@
+using Pores.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace Pores.Controllers
+{
+    public class BatchGenerator
+    {
+        public PoresToFileSaver batchSaver = new PoresToFileSaver("batch.log");
+
+        public Material Material { get; }
+        public IList<Pore> Pores { get; }
+
+        public BatchGenerator(Material material, IList<Pore> pores)
+        {
+            Material = material;
+            Pores = pores;
+        }
+
+        public void GenerateBatch(Point3D center, double width, double depth)
+        {
+            var p1 = new Point3D() { X = center.X - width / 2, Y = center.Y - width / 2, Z = Math.Abs(center.Z - depth) };
+            var p2 = new Point3D() { X = center.X + width / 2, Y = center.Y + width / 2, Z = center.Z };
+            batchSaver.FileName = "batch_" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".log";
+            batchSaver.Save(Pores.Where(p => IsPointInsideOfCube(p.Point, p1, p2)));
+        }
+       
+        public bool IsPointInsideOfCube(Point3D p, Point3D vertex1, Point3D vertex2)
+        {
+            if (vertex1.X <= p.X && p.X <= vertex2.X)
+                if (vertex1.Y <= p.Y && p.Y <= vertex2.Y)
+                    if (vertex1.Z <= p.Z && p.Z <= vertex2.Z)
+                        return true;
+            return false;
+        }
+    }
+}
diff --git a/Pores/Controllers/PoresToFileController.cs b/Pores/Controllers/PoresToFileController.cs
deleted file mode 100644
index d5229be..0000000
--- a/Pores/Controllers/PoresToFileController.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Newtonsoft.Json;
-using Pores.Models;
-using System.Collections.Generic;
-using System.IO;
-
-namespace Pores.Controllers
-{
-    public class PoresToFileController : BaseSaveController<IList<Pore>>
-    {
-        public string FileName { get; }
-
-        public override void Load()
-        {
-        }
-
-        public override void Save()
-        {
-            var output = JsonConvert.SerializeObject(Data);
-            File.WriteAllText(FileName, output);
-        }
-
-        public PoresToFileController(string fileName)
-        {
-            FileName = fileName;
-        }
-    }
-}
diff --git a/Pores/Controllers/PoresToFileSaver.cs b/Pores/Controllers/PoresToFileSaver.cs
new file mode 100644
index 0000000..b963458
--- /dev/null
+++ b/Pores/Controllers/PoresToFileSaver.cs
@@ -0,0 +1,47 @@
+using Newtonsoft.Json;
+using Pores.Models;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Windows;
+
+namespace Pores.Controllers
+{
+    public class PoresToFileSaver : BaseSaveController<IEnumerable<Pore>>
+    {
+        public string FileName { get; set;  }
+
+        public override IEnumerable<Pore> Load()
+        {
+            try
+            {
+                var data = File.ReadAllText(FileName);
+                var output = JsonConvert.DeserializeObject<IList<Pore>>(data);
+                return output;
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+                return null;
+            }
+        }
+
+        public override void Save(IEnumerable<Pore> data)
+        {
+            var output = JsonConvert.SerializeObject(data);
+            try
+            {
+                File.WriteAllText(FileName, output);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+            }
+        }
+
+        public PoresToFileSaver(string fileName)
+        {
+            FileName = fileName;
+        }
+    }
+}
diff --git a/Pores/MainWindow.xaml b/Pores/MainWindow.xaml
index 238b716..6c10687 100644
--- a/Pores/MainWindow.xaml
+++ b/Pores/MainWindow.xaml
@@ -9,14 +9,14 @@
         Title="Pores" Height="450" Width="800">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2*"/>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
+            <RowDefinition Height="2*"/>
             <RowDefinition Height="1*"/>
             <RowDefinition Height="1*"/>
-            <RowDefinition Height="60"/>
         </Grid.RowDefinitions>
         
 
@@ -33,14 +33,14 @@
         </StackPanel>
 
 
-        <StackPanel VerticalAlignment="Center" Grid.Column="2" Grid.Row="2" Margin="20 0">
+        <StackPanel VerticalAlignment="Center" Grid.Column="2" Grid.Row="2" Grid.RowSpan="2" Margin="20 0">
             <TextBlock Text="Результаты работы"/>
             <TextBlock Text="Количество пор: "/>
             <TextBox Text="{Binding GenController.PoreCoordinates.Count, Mode=OneWay}" IsEnabled="False"/>
         </StackPanel>
 
         <StackPanel Grid.Column="2" Grid.Row="1" VerticalAlignment="Center">
-            <ComboBox ItemsSource="{Binding Localizations}" SelectedItem="{Binding SelectedLocalization}"></ComboBox>
+            <ComboBox ItemsSource="{Binding Localizations}" SelectedItem="{Binding SelectedLocalization}" HorizontalAlignment="Left" Width="198"></ComboBox>
             <ContentControl Content="{Binding SelectedLocalization}">
                 <ContentControl.Resources>
                     <DataTemplate DataType="{x:Type localizations:NormalLocalization}">
@@ -56,8 +56,28 @@
             </ContentControl>
         </StackPanel>
 
+        <StackPanel Grid.Column="1" Grid.Row="2" VerticalAlignment="Bottom">
+            <Button Content="Сгенерировать поры" Command="{Binding GeneratePoresCommand}" Grid.Row="2"/>
+            <Button Content="Выборка в файл" Command="{Binding GenAndSaveBatchCommand}" 
+                    Grid.Row="2" Grid.Column="1"/>
+            <Button Content="Сохранить в файл" Command="{Binding SaveToFileCommand}" Grid.Row="2" Grid.Column="1"/>
+        </StackPanel>
+
+        <StackPanel VerticalAlignment="Center" Grid.Column="1">
+            <TextBlock Text="Параметры единичной выборки: "/>
+            <TextBlock Text="Координаты центра (Х): "/>
+            <TextBox Text="{Binding BatchCenter.X}"/>
+            <TextBlock Text="Координаты центра (Y): "/>
+            <TextBox Text="{Binding BatchCenter.Y}"/>
+            <TextBlock Text="Координаты центра (Z): "/>
+            <TextBox Text="{Binding BatchCenter.Z}"/>
+            <TextBlock Text="Ширина: "/>
+            <TextBox Text="{Binding BatchWidth}"/>
+            <TextBlock Text="Глубина:"/>
+            <TextBox Text="{Binding BatchDepth}"/>
+        </StackPanel>
+
+
 
-        <Button Content="Сгенерировать поры" Command="{Binding GeneratePoresCommand}" Grid.Row="2"/>
-        <Button Content="Сохранить в файл" Command="{Binding SaveToFileCommand}" Grid.Row="2" Grid.Column="1"/>
     </Grid>
 </Window>
diff --git a/Pores/MainWindowViewModel.cs b/Pores/MainWindowViewModel.cs
index 5d638d2..a051107 100644
--- a/Pores/MainWindowViewModel.cs
+++ b/Pores/MainWindowViewModel.cs
@@ -5,7 +5,6 @@ using Pores.Models.Localizations;
 using Pores.Helpers;
 using System.Windows.Input;
 using System.Collections.ObjectModel;
-using System.Collections.Generic;
 
 namespace Pores
 {
@@ -15,11 +14,16 @@ namespace Pores
         public IPoreLocalization SelectedLocalization { get; set; }
         public ModelGenerationController GenController { get; set; }
         public ObservableCollection<IPoreLocalization> Localizations { get; set; }
-        public PoresToFileController saveController = new PoresToFileController("output.log");
-        public ICommand SaveToFileCommand { get; set; }
+        public PoresToFileSaver saveController = new PoresToFileSaver("output.log");
 
         public int NumberOfPores { get; set; }
-        public ICommand GeneratePoresCommand { get; set; } 
+        public ICommand GeneratePoresCommand { get; set; }
+        public ICommand SaveToFileCommand { get; set; }
+        public ICommand GenAndSaveBatchCommand { get; set; }
+
+        public double BatchWidth { get; set; }
+        public double BatchDepth { get; set; }
+        public Point3D BatchCenter { get; set; } = new Point3D();
 
         public MainWindowViewModel()
         {
@@ -29,6 +33,7 @@ namespace Pores
             };
             GeneratePoresCommand = new RelayCommand(StartGeneration, () => SelectedLocalization != null);
             SaveToFileCommand = new RelayCommand(Save, () => GenController?.PoreCoordinates?.Count > 0);
+            GenAndSaveBatchCommand = new RelayCommand(CreateBatch, () => GenController?.PoreCoordinates?.Count > 0);
         }
         
         public void StartGeneration()
@@ -39,8 +44,13 @@ namespace Pores
 
         public void Save()
         {
-            saveController.Data = GenController.PoreCoordinates;
-            saveController.Save();
+            saveController.Save(GenController.PoreCoordinates);
+        }
+
+        public void CreateBatch()
+        {
+            var batchGenerator = new BatchGenerator(Material, GenController.PoreCoordinates);
+            batchGenerator.GenerateBatch(BatchCenter, BatchWidth, BatchDepth);
         }
     }
 }
diff --git a/Pores/Models/Localizations/NormalLocalization.cs b/Pores/Models/Localizations/NormalLocalization.cs
index dc07058..1e82d19 100644
--- a/Pores/Models/Localizations/NormalLocalization.cs
+++ b/Pores/Models/Localizations/NormalLocalization.cs
@@ -19,7 +19,7 @@ namespace Pores.Models.Localizations
             return part1 * part2;
         }
 
-        public double GaussFunctionByHeight (Coordinate c)
+        public double GaussFunctionByHeight (Point3D c)
         {
             return GaussFunction(c.Z, sigma, mu);
         }
@@ -33,7 +33,7 @@ namespace Pores.Models.Localizations
                 for (int j = 0; j <= Material.NumberOfPores; j++)
                     for (int k = 0; k <= Material.NumberOfPores; k++)
                     {
-                        var c = new Coordinate()
+                        var c = new Point3D()
                         {
                             X = (double) i / Material.NumberOfPores * Material.Width,
                             Y = (double) j / Material.NumberOfPores * Material.Depth,
diff --git a/Pores/Models/Material.cs b/Pores/Models/Material.cs
index d08325a..82f15f4 100644
--- a/Pores/Models/Material.cs
+++ b/Pores/Models/Material.cs
@@ -4,7 +4,7 @@ namespace Pores.Models
 {
     public class Material : PropertyChangedClass
     {
-        public Coordinate GetCoordinate { get; set; }
+        public Point3D GetCoordinate { get; set; }
         public double Height { get; set; }
         public double Width { get; set; }
         public double Depth { get; set; }
diff --git a/Pores/Models/Point.cs b/Pores/Models/Point.cs
new file mode 100644
index 0000000..809572c
--- /dev/null
+++ b/Pores/Models/Point.cs
@@ -0,0 +1,9 @@
+using Pores.Helpers;
+
+namespace Pores.Models
+{
+    public class Point : PropertyChangedClass
+    {
+        public double X { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Pores/Models/Point2D.cs b/Pores/Models/Point2D.cs
new file mode 100644
index 0000000..161ac46
--- /dev/null
+++ b/Pores/Models/Point2D.cs
@@ -0,0 +1,7 @@
+namespace Pores.Models
+{
+    public class Point2D : Point
+    {
+        public double Y { get; set; }
+    }
+}
diff --git a/Pores/Models/Coordinate.cs b/Pores/Models/Point3D.cs
similarity index 71%
rename from Pores/Models/Coordinate.cs
rename to Pores/Models/Point3D.cs
index 1c509aa..557b6ed 100644
--- a/Pores/Models/Coordinate.cs
+++ b/Pores/Models/Point3D.cs
@@ -4,10 +4,8 @@ using System.Collections.Generic;
 namespace Pores.Models
 {
     [Serializable]
-    public class Coordinate
+    public class Point3D : Point2D
     {
-        public double X { get; set; }
-        public double Y { get; set; }
         public double Z { get; set; }
 
         public List<double> ToList()
diff --git a/Pores/Models/Pore.cs b/Pores/Models/Pore.cs
index d44ec13..c5a8450 100644
--- a/Pores/Models/Pore.cs
+++ b/Pores/Models/Pore.cs
@@ -5,7 +5,7 @@ namespace Pores.Models
     [Serializable]
     public class Pore
     {
-        public Coordinate Point { get; set; }
+        public Point3D Point { get; set; }
         public double Radius { get; set; }
     }
 }
diff --git a/Pores/Pores.csproj b/Pores/Pores.csproj
index 1d1efe8..05334af 100644
--- a/Pores/Pores.csproj
+++ b/Pores/Pores.csproj
@@ -77,13 +77,16 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Controllers\BaseSaveController.cs" />
-    <Compile Include="Controllers\PoresToFileController.cs" />
+    <Compile Include="Controllers\BatchGenerator.cs" />
+    <Compile Include="Controllers\PoresToFileSaver.cs" />
     <Compile Include="Controllers\ModelGenerationController.cs" />
     <Compile Include="Helpers\PropertyChanged.cs" />
     <Compile Include="Helpers\RelayCommand.cs" />
     <Compile Include="Interfaces\IPoresLocalization.cs" />
     <Compile Include="MainWindowViewModel.cs" />
-    <Compile Include="Models\Coordinate.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\Material.cs" />