New visual control logic. Updates in saving logic: now base save class get more extended functionality. Main window view model got new save logic too, and users can create a bunch of models and batches by pressing one button.

Pores/Bootstrap.cs

@@ -38,7 +38,7 @@ namespace Pores
                 .AsSelf();
 
             build
-                .RegisterType<PoresToFileSaver>()
+                .RegisterType<ReportGenerator>()
                 .AsSelf();
 
             build

Pores/Controllers/BaseSaveController.cs

@@ -1,8 +0,0 @@
-namespace Pores.Controllers
-{
-    public abstract class BaseSaveController<TData>
-    {
-        public abstract void Save(TData data);
-        public abstract TData Load();
-    }
-}

Pores/Controllers/BaseSaveLoadController.cs

@@ -0,0 +1,8 @@
+namespace Pores.Controllers
+{
+    public abstract class BaseSaveLoadController
+    {
+        public abstract void Save<DataType>(DataType data, string fileName);
+        public abstract DataType Load<DataType>();
+    }
+}

Pores/Controllers/BatchGenerator.cs

@@ -10,10 +10,10 @@ namespace Pores.Controllers
 {
     public class BatchGenerator
     {
-        public PoresToFileSaver BatchSaver { get; set; }
+        public ReportGenerator BatchSaver { get; set; }
         public Material Material { get; set; }
 
-        public BatchGenerator(Material material, PoresToFileSaver batchSaver)
+        public BatchGenerator(Material material, ReportGenerator batchSaver)
         {
             Material = material;
             BatchSaver = batchSaver;
@@ -33,9 +33,9 @@ namespace Pores.Controllers
                 Y = bp.Center.Y + bp.Width / 2,
                 Z = bp.Center.Z
             };
-            BatchSaver.FileName = $"batch_${index.ToString()}_${DateTime.Now.ToString("yyyyMMdd_HHmmss")}.log";
-            BatchSaver.FileName = string.Format("batch_{0}_{1}.log", index.ToString(), DateTime.Now.ToString("yyyyMMdd_HHmmss"));
-            BatchSaver.Save(pores.Where(p => IsPointInsideOfCube(p.Point, p1, p2)));
+            BatchSaver.Save(
+                pores.Where(p => IsPointInsideOfCube(p.Point, p1, p2)), 
+                BatchSaver.FileNamer(string.Format("batch_{0}", index)));
         }
        
         public bool IsPointInsideOfCube(Point3D p, Point3D vertex1, Point3D vertex2)

Pores/Controllers/PoreGenerator.cs

@@ -9,16 +9,15 @@ namespace Pores.Controllers
     {
         public IPoreLocalization PoresLocalization { get; set; }
         public Material CurrentMaterial { get; set; }
-        public IList<Pore> Pores { get; set; }
 
         public PoreGenerator(Material currentMaterial)
         {
             CurrentMaterial = currentMaterial;
         }
 
-        public void Generate(IPoreLocalization localization)
+        public IList<Pore> Generate(IPoreLocalization localization)
         {
-            Pores = localization.GetLocalization();
+            return localization.GetLocalization();
         }
     }
 }

Pores/Controllers/PoresToFileSaver.cs

@@ -1,47 +0,0 @@
-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 = "not_defined")
-        {
-            FileName = fileName;
-        }
-    }
-}

Pores/Controllers/ReportGenerator.cs

@@ -0,0 +1,56 @@
+using Microsoft.Win32;
+using Newtonsoft.Json;
+using Pores.Interfaces;
+using Pores.Models;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Windows;
+
+namespace Pores.Controllers
+{
+    public class ReportGenerator : BaseSaveLoadController
+    {
+        public string FileNamer(string fileName)
+        {
+            return
+                ".\\results\\" 
+                + fileName + "_"
+                + DateTime.Now.ToString("yyyyMMdd_HHmmss") 
+                + ".mdl";
+        }
+
+        public override DataType Load<DataType>()
+        {
+            try
+            {
+                var dialog = new OpenFileDialog();
+                if (dialog.ShowDialog() != true)
+                    return default(DataType);
+                var data = File.ReadAllText(dialog.FileName);
+                var output = JsonConvert.DeserializeObject<DataType>(data);
+                return output;
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+                return default(DataType);
+            }
+        }
+
+        public override void Save<DataType>(DataType data, string fileName)
+        {
+            var output = JsonConvert.SerializeObject(data);
+            try
+            {
+                if (!Directory.Exists(".\\results\\")) Directory.CreateDirectory(".\\results\\");
+                File.WriteAllText(fileName, output);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+            }
+        }
+    }
+}

Pores/Interfaces/IPoreGenerator.cs

@@ -5,7 +5,6 @@ namespace Pores.Interfaces
 {
     public interface IPoreGenerator
     {
-        IList<Pore> Pores { get; set; }
-        void Generate(IPoreLocalization localization);
+        IList<Pore> Generate(IPoreLocalization localization);
     }
 }

Pores/MainWindow.xaml

@@ -6,21 +6,27 @@
         xmlns:localizations="clr-namespace:Pores.Models.Localizations"
         xmlns:local="clr-namespace:Pores"
         mc:Ignorable="d"
-        Title="Pores" Height="450" Width="800">
-    <Grid>
+        Title="Pores" Height="500" Width="1000">
+    <Grid IsEnabled="{Binding EnableControlsFlag}">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="2*"/>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
+            <RowDefinition Height="3*"/>
             <RowDefinition Height="2*"/>
             <RowDefinition Height="1*"/>
-            <RowDefinition Height="1*"/>
         </Grid.RowDefinitions>
-        
 
-        <StackPanel VerticalAlignment="Center" Grid.Column="2">
+        <DockPanel Grid.RowSpan="3" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="DimGray">
+            <StackPanel  HorizontalAlignment="Center" VerticalAlignment="Center">
+                <TextBlock Text="Просмотр модели"/>
+            </StackPanel>
+        </DockPanel>
+            
+
+        <StackPanel VerticalAlignment="Center" Grid.Column="1" Margin="5 0">
             <TextBlock Text="Параметры модели"/>
             <TextBlock Text="Ширина: "/>
             <TextBox Text="{Binding CurrentMaterial.Width}"/>
@@ -33,19 +39,19 @@
         </StackPanel>
 
 
-        <StackPanel VerticalAlignment="Center" Grid.Column="2" Grid.Row="2" Grid.RowSpan="2" Margin="20 0">
+        <StackPanel VerticalAlignment="Center" Grid.Column="1" Grid.Row="2" Grid.RowSpan="2" Margin="5 0">
             <TextBlock Text="Результаты работы"/>
             <TextBlock Text="Количество пор: "/>
-            <TextBox Text="{Binding PoreGeneratorInstance.PoreCoordinates.Count, Mode=OneWay}" IsEnabled="False"/>
+            <TextBox Text="{Binding Pores.Count, Mode=OneWay}" IsEnabled="False"/>
         </StackPanel>
 
-        <StackPanel Grid.Column="2" Grid.Row="1" VerticalAlignment="Center">
+        <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="Параметры модели"/>
                             <TextBlock Text="Сигма: "/>
                             <TextBox Text="{Binding sigma}"/>
                             <TextBlock Text="Мю: "/>
@@ -56,26 +62,44 @@
             </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>
+        <DockPanel Grid.Column="2" Grid.RowSpan="3" Margin="5 0">
 
-        <StackPanel VerticalAlignment="Center" Grid.Column="1">
-            <TextBlock Text="Параметры единичной выборки: "/>
-            <TextBlock Text="Координаты центра (Х): "/>
-            <TextBox Text="{Binding BatchPoint.Center.X}"/>
-            <TextBlock Text="Координаты центра (Y): "/>
-            <TextBox Text="{Binding BatchPoint.Center.Y}"/>
-            <TextBlock Text="Координаты центра (Z): "/>
-            <TextBox Text="{Binding BatchPoint.Center.Z}"/>
-            <TextBlock Text="Ширина: "/>
-            <TextBox Text="{Binding BatchPoint.Width}"/>
-            <TextBlock Text="Глубина:"/>
-            <TextBox Text="{Binding BatchPoint.Depth}"/>
-        </StackPanel>
+            <StackPanel DockPanel.Dock="Bottom" VerticalAlignment="Bottom">
+                <Button Content="Сгенерировать модель" Command="{Binding GeneratePoresCommand}"/>
+                <Button Content="Единичная выборка в файл" Command="{Binding GenAndSaveBatchCommand}"/>
+                <Button Content="Сохранить в файл" Command="{Binding SaveToFileCommand}"/>
+                <Button Command="{Binding GenerateAllCommand}" CommandParameter="{Binding ModelAndBatchNumber}">
+                    <Button.Content>
+                        <TextBlock>
+                            <Run Text="Сгенерировать модели+выборки ["/>
+                            <Run><Binding Path="ModelAndBatchNumber"/></Run>
+                            <Run Text="]"/>
+                        </TextBlock>
+                    </Button.Content>
+                </Button>
+            </StackPanel>            
+            
+            <StackPanel DockPanel.Dock="Top">
+                <TextBlock Text="Настройки экспорта выборок" FontWeight="SemiBold" HorizontalAlignment="Center" Margin="0 5"/>
+                <TextBlock Text="Параметры единичного фрагмента:"/>
+                <TextBlock Text="Координаты центра (Х): "/>
+                <TextBox Text="{Binding BatchPoint.Center.X}"/>
+                <TextBlock Text="Координаты центра (Y): "/>
+                <TextBox Text="{Binding BatchPoint.Center.Y}"/>
+                <TextBlock Text="Координаты центра (Z): "/>
+                <TextBox Text="{Binding BatchPoint.Center.Z}"/>
+                <TextBlock Text="Ширина: "/>
+                <TextBox Text="{Binding BatchPoint.Width}"/>
+                <TextBlock Text="Глубина:"/>
+                <TextBox Text="{Binding BatchPoint.Depth}"/>
+                <TextBlock Text="Количество моделей/моделей и выборок генерируемое за один раз:" TextWrapping="Wrap"/>
+                <TextBox Text="{Binding ModelAndBatchNumber}"/>
+                <CheckBox Margin="0 5" IsChecked="{Binding GenerateBatchForEachModelFlag}">
+                    <TextBlock TextWrapping="Wrap" Text="Генерировать для каждой модели по выборке"/>
+                </CheckBox>
+            </StackPanel>
+
+        </DockPanel>
         
         
         

Pores/MainWindowViewModel.cs

@@ -5,65 +5,107 @@ using Pores.Helpers;
 using System.Windows.Input;
 using System.Collections.Generic;
 using System;
+using System.Threading.Tasks;
+using System.Threading;
+using System.Collections.ObjectModel;
 
 namespace Pores
 {
     public class MainWindowViewModel : PropertyChangedClass
     {
         public Material CurrentMaterial { get; set; }
+        public ObservableCollection<Pore> Pores { get; set; } = new ObservableCollection<Pore>();
         public IEnumerable<IPoreLocalization> Localizations { get; set; }
 
         public IPoreLocalization SelectedLocalization { get; set; }
         public IPoreGenerator PoreGeneratorInstance { get; set; }
         public BatchGenerator BatchGenerator { get; }
 
-        private PoresToFileSaver PoreSaver;
+        private ReportGenerator ReportSaver;
+
+        public bool GenerateBatchForEachModelFlag { get; set; } = true;
+        public bool EnableControlsFlag { get; set; } = true;
 
         public int NumberOfPores { get; set; }
+        public int ModelAndBatchNumber { get; set; } = 1;
+
         public ICommand GeneratePoresCommand { get; set; }
         public ICommand SaveToFileCommand { get; set; }
         public ICommand GenAndSaveBatchCommand { get; set; }
+        public ICommand GenerateAllCommand { get; set; } 
 
         public BatchPoint BatchPoint { get; set; } = new BatchPoint();
 
+        public Thread AllSavingThread { get; set; }
+
         public MainWindowViewModel(
             Material material, 
             IEnumerable<IPoreLocalization> localizations, 
             IPoreGenerator poreGenerator,
-            PoresToFileSaver poreSaver,
+            ReportGenerator reportSaver,
             BatchGenerator batchGenerator)
         {
             CurrentMaterial = material;
             Localizations = localizations;
             PoreGeneratorInstance = poreGenerator;
-            PoreSaver = poreSaver;
+            ReportSaver = reportSaver;
             BatchGenerator = batchGenerator;
-            GeneratePoresCommand = new RelayCommand(StartGeneration, () => SelectedLocalization != null);
-            SaveToFileCommand = new RelayCommand(Save, () => PoreGeneratorInstance?.Pores?.Count > 0);
-            GenAndSaveBatchCommand = new RelayCommand(CreateBatch, () => PoreGeneratorInstance?.Pores?.Count > 0);
-        }
-        
-        public void StartGeneration()
-        {
-            PoreGeneratorInstance.Generate(SelectedLocalization);
+
+            GeneratePoresCommand = new RelayCommand(GeneratePoresToForm, () => SelectedLocalization != 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 (AllSavingThread?.IsAlive != true)
+                        return true;
+                return false;
+            });
         }
 
-        public void Save()
+        public void GeneratePoresToForm() 
+            => Pores = new ObservableCollection<Pore>(PoreGeneratorInstance.Generate(SelectedLocalization));
+
+        public IList<Pore> GeneratePores() 
+            => PoreGeneratorInstance.Generate(SelectedLocalization);
+
+        public void Save() 
+            => Save(Pores);
+
+        public void Save(IList<Pore> pores, int i = 0)
         {
-            PoreSaver.FileName = string.Format(
-                "model_w{0}_d{1}_h{2}_n{3}_{4}.mdl", 
+            var n = string.Format(
+                "model_{0}_w{1}_d{2}_h{3}_n{4}",
+                i,
                 CurrentMaterial.Width, 
                 CurrentMaterial.Depth, 
-                CurrentMaterial.Height, 
-                CurrentMaterial.NumberOfPores,
-                DateTime.Now.ToString("yyyyMMdd_HHmmss"));
+                CurrentMaterial.Height,
+                pores.Count);
 
-            PoreSaver.Save(PoreGeneratorInstance.Pores);
+            ReportSaver.Save(pores, ReportSaver.FileNamer(n));
         }
 
-        public void CreateBatch()
+        public void SaveBatch() 
+            => SaveBatch(Pores);
+
+        public void SaveBatch(IList<Pore> pores, int i = 0) 
+            => BatchGenerator.GenerateBatch(BatchPoint, pores, i);
+
+        public void GenAndSaveAll(int num)
         {
-            BatchGenerator.GenerateBatch(BatchPoint, PoreGeneratorInstance.Pores);
+            AllSavingThread = new Thread(() =>
+            {
+                EnableControlsFlag = false;
+                for (int i = 0; i < num; i++)
+                {
+                    var list = GeneratePores();
+                    Save(list, i);
+                    if (GenerateBatchForEachModelFlag)
+                        SaveBatch(list, i);
+                }
+                EnableControlsFlag = true;
+            });
+            AllSavingThread.Start();
         }
     }
 }

Pores/Pores.csproj

@@ -80,9 +80,9 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Bootstrap.cs" />
-    <Compile Include="Controllers\BaseSaveController.cs" />
+    <Compile Include="Controllers\BaseSaveLoadController.cs" />
     <Compile Include="Controllers\BatchGenerator.cs" />
-    <Compile Include="Controllers\PoresToFileSaver.cs" />
+    <Compile Include="Controllers\ReportGenerator.cs" />
     <Compile Include="Controllers\PoreGenerator.cs" />
     <Compile Include="Helpers\PropertyChanged.cs" />
     <Compile Include="Helpers\RelayCommand.cs" />