From 34292a5fc310ccc66c583fc9388aebbd0221f9be Mon Sep 17 00:00:00 2001 From: Nikita Romanenko Date: Mon, 17 Dec 2018 23:37:11 +0300 Subject: [PATCH] New project name MODELING_DEF_DES_MI_VI --- MODELING-DEF-DES-MI-VI.sln | 25 +++++++++++++++++++ Pores/App.xaml | 4 +-- Pores/App.xaml.cs | 2 +- Pores/Bootstrap.cs | 10 ++++---- Pores/Controllers/BaseSaveLoadController.cs | 2 +- Pores/Controllers/BatchGenerator.cs | 4 +-- .../ConnectedPoreReportGenerator.cs | 4 +-- Pores/Controllers/PoreGenerator.cs | 8 +++--- Pores/Controllers/ReportGenerator.cs | 6 ++--- Pores/Helpers/PropertyChanged.cs | 2 +- Pores/Helpers/RelayCommand.cs | 2 +- Pores/Interfaces/IPoreGenerator.cs | 4 +-- Pores/Interfaces/IPoreSpread.cs | 4 +-- ...s.csproj => MODELING-DEF-DES-MI-VI.csproj} | 0 Pores/MainWindow.xaml | 4 +-- Pores/MainWindow.xaml.cs | 2 +- Pores/MainWindowViewModel.cs | 10 ++++---- Pores/Models/BatchPoint.cs | 4 +-- Pores/Models/Material.cs | 4 +-- Pores/Models/Point.cs | 4 +-- Pores/Models/Point2D.cs | 4 +-- Pores/Models/Point3D.cs | 4 +-- Pores/Models/Pore.cs | 2 +- Pores/Models/Spreads/BaseSpread.cs | 6 ++--- Pores/Models/Spreads/NormalSpread.cs | 2 +- Pores/Properties/Resources.Designer.cs | 2 +- Pores/Properties/Settings.Designer.cs | 2 +- 27 files changed, 76 insertions(+), 51 deletions(-) create mode 100644 MODELING-DEF-DES-MI-VI.sln rename Pores/{Pores.csproj => MODELING-DEF-DES-MI-VI.csproj} (100%) diff --git a/MODELING-DEF-DES-MI-VI.sln b/MODELING-DEF-DES-MI-VI.sln new file mode 100644 index 0000000..d9edc84 --- /dev/null +++ b/MODELING-DEF-DES-MI-VI.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.136 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MODELING-DEF-DES-MI-VI", "Pores\MODELING-DEF-DES-MI-VI.csproj", "{12EAD304-2155-4F18-8373-3EEA60798B8D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {12EAD304-2155-4F18-8373-3EEA60798B8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {12EAD304-2155-4F18-8373-3EEA60798B8D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {12EAD304-2155-4F18-8373-3EEA60798B8D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {12EAD304-2155-4F18-8373-3EEA60798B8D}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {740ACE1D-F83D-4181-9888-B3EA705A5E70} + EndGlobalSection +EndGlobal diff --git a/Pores/App.xaml b/Pores/App.xaml index 5d7dd87..539c9c3 100644 --- a/Pores/App.xaml +++ b/Pores/App.xaml @@ -1,7 +1,7 @@ - diff --git a/Pores/App.xaml.cs b/Pores/App.xaml.cs index 7968fb7..e825f17 100644 --- a/Pores/App.xaml.cs +++ b/Pores/App.xaml.cs @@ -1,6 +1,6 @@ using System.Windows; -namespace Pores +namespace MODELING_DEF_DES_MI_VI { public partial class App : Application { diff --git a/Pores/Bootstrap.cs b/Pores/Bootstrap.cs index 292f264..7f95684 100644 --- a/Pores/Bootstrap.cs +++ b/Pores/Bootstrap.cs @@ -1,8 +1,8 @@ using Autofac; -using Pores.Controllers; -using Pores.Interfaces; -using Pores.Models; -using Pores.Models.Spreads; +using MODELING_DEF_DES_MI_VI.Controllers; +using MODELING_DEF_DES_MI_VI.Interfaces; +using MODELING_DEF_DES_MI_VI.Models; +using MODELING_DEF_DES_MI_VI.Models.Spreads; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -10,7 +10,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Pores +namespace MODELING_DEF_DES_MI_VI { public class Bootstrap { diff --git a/Pores/Controllers/BaseSaveLoadController.cs b/Pores/Controllers/BaseSaveLoadController.cs index 4bc02c6..98570e7 100644 --- a/Pores/Controllers/BaseSaveLoadController.cs +++ b/Pores/Controllers/BaseSaveLoadController.cs @@ -1,4 +1,4 @@ -namespace Pores.Controllers +namespace MODELING_DEF_DES_MI_VI.Controllers { public abstract class BaseSaveLoadController { diff --git a/Pores/Controllers/BatchGenerator.cs b/Pores/Controllers/BatchGenerator.cs index fa191a1..a4f12c9 100644 --- a/Pores/Controllers/BatchGenerator.cs +++ b/Pores/Controllers/BatchGenerator.cs @@ -1,9 +1,9 @@ -using Pores.Models; +using MODELING_DEF_DES_MI_VI.Models; using System; using System.Collections.Generic; using System.Linq; -namespace Pores.Controllers +namespace MODELING_DEF_DES_MI_VI.Controllers { public class BatchGenerator { diff --git a/Pores/Controllers/ConnectedPoreReportGenerator.cs b/Pores/Controllers/ConnectedPoreReportGenerator.cs index 5d78e50..75005f4 100644 --- a/Pores/Controllers/ConnectedPoreReportGenerator.cs +++ b/Pores/Controllers/ConnectedPoreReportGenerator.cs @@ -1,9 +1,9 @@ -using Pores.Models; +using MODELING_DEF_DES_MI_VI.Models; using System; using System.Collections.Generic; using System.Linq; -namespace Pores.Controllers +namespace MODELING_DEF_DES_MI_VI.Controllers { public class ConnectedPoreReportGenerator { diff --git a/Pores/Controllers/PoreGenerator.cs b/Pores/Controllers/PoreGenerator.cs index 020118a..63da3b6 100644 --- a/Pores/Controllers/PoreGenerator.cs +++ b/Pores/Controllers/PoreGenerator.cs @@ -1,9 +1,9 @@ -using Pores.Helpers; -using Pores.Interfaces; -using Pores.Models; +using MODELING_DEF_DES_MI_VI.Helpers; +using MODELING_DEF_DES_MI_VI.Interfaces; +using MODELING_DEF_DES_MI_VI.Models; using System.Collections.Generic; -namespace Pores.Controllers +namespace MODELING_DEF_DES_MI_VI.Controllers { public class PoreGenerator : PropertyChangedClass, IPoreGenerator { diff --git a/Pores/Controllers/ReportGenerator.cs b/Pores/Controllers/ReportGenerator.cs index d5f2257..58c5e5d 100644 --- a/Pores/Controllers/ReportGenerator.cs +++ b/Pores/Controllers/ReportGenerator.cs @@ -1,14 +1,14 @@ using Microsoft.Win32; using Newtonsoft.Json; -using Pores.Interfaces; -using Pores.Models; +using MODELING_DEF_DES_MI_VI.Interfaces; +using MODELING_DEF_DES_MI_VI.Models; using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Windows; -namespace Pores.Controllers +namespace MODELING_DEF_DES_MI_VI.Controllers { public class ReportGenerator : BaseSaveLoadController { diff --git a/Pores/Helpers/PropertyChanged.cs b/Pores/Helpers/PropertyChanged.cs index 8a5bd37..b2ac711 100644 --- a/Pores/Helpers/PropertyChanged.cs +++ b/Pores/Helpers/PropertyChanged.cs @@ -2,7 +2,7 @@ using System.ComponentModel; using System.Runtime.CompilerServices; -namespace Pores.Helpers +namespace MODELING_DEF_DES_MI_VI.Helpers { [Serializable] public class PropertyChangedClass : INotifyPropertyChanged diff --git a/Pores/Helpers/RelayCommand.cs b/Pores/Helpers/RelayCommand.cs index 6f794f8..c95ece9 100644 --- a/Pores/Helpers/RelayCommand.cs +++ b/Pores/Helpers/RelayCommand.cs @@ -1,7 +1,7 @@ using System; using System.Windows.Input; -namespace Pores.Helpers +namespace MODELING_DEF_DES_MI_VI.Helpers { public class RelayCommand : ICommand { diff --git a/Pores/Interfaces/IPoreGenerator.cs b/Pores/Interfaces/IPoreGenerator.cs index 1e7e3d0..079eeba 100644 --- a/Pores/Interfaces/IPoreGenerator.cs +++ b/Pores/Interfaces/IPoreGenerator.cs @@ -1,7 +1,7 @@ -using Pores.Models; +using MODELING_DEF_DES_MI_VI.Models; using System.Collections.Generic; -namespace Pores.Interfaces +namespace MODELING_DEF_DES_MI_VI.Interfaces { public interface IPoreGenerator { diff --git a/Pores/Interfaces/IPoreSpread.cs b/Pores/Interfaces/IPoreSpread.cs index 839a888..cbb4c03 100644 --- a/Pores/Interfaces/IPoreSpread.cs +++ b/Pores/Interfaces/IPoreSpread.cs @@ -1,7 +1,7 @@ -using Pores.Models; +using MODELING_DEF_DES_MI_VI.Models; using System.Collections.ObjectModel; -namespace Pores.Interfaces +namespace MODELING_DEF_DES_MI_VI.Interfaces { public interface IPoreSpread { diff --git a/Pores/Pores.csproj b/Pores/MODELING-DEF-DES-MI-VI.csproj similarity index 100% rename from Pores/Pores.csproj rename to Pores/MODELING-DEF-DES-MI-VI.csproj diff --git a/Pores/MainWindow.xaml b/Pores/MainWindow.xaml index 395c128..032b8e0 100644 --- a/Pores/MainWindow.xaml +++ b/Pores/MainWindow.xaml @@ -1,9 +1,9 @@ - diff --git a/Pores/MainWindow.xaml.cs b/Pores/MainWindow.xaml.cs index fa6c4fc..8a43af0 100644 --- a/Pores/MainWindow.xaml.cs +++ b/Pores/MainWindow.xaml.cs @@ -2,7 +2,7 @@ using Autofac; using System.Windows; -namespace Pores +namespace MODELING_DEF_DES_MI_VI { public partial class MainWindow : Window { diff --git a/Pores/MainWindowViewModel.cs b/Pores/MainWindowViewModel.cs index 50bdf78..e85da1c 100644 --- a/Pores/MainWindowViewModel.cs +++ b/Pores/MainWindowViewModel.cs @@ -1,7 +1,7 @@ -using Pores.Controllers; -using Pores.Interfaces; -using Pores.Models; -using Pores.Helpers; +using MODELING_DEF_DES_MI_VI.Controllers; +using MODELING_DEF_DES_MI_VI.Interfaces; +using MODELING_DEF_DES_MI_VI.Models; +using MODELING_DEF_DES_MI_VI.Helpers; using System.Windows.Input; using System.Collections.Generic; using System.Threading; @@ -9,7 +9,7 @@ using System.IO; using System.Diagnostics; using System.Collections.ObjectModel; -namespace Pores +namespace MODELING_DEF_DES_MI_VI { public class MainWindowViewModel : PropertyChangedClass { diff --git a/Pores/Models/BatchPoint.cs b/Pores/Models/BatchPoint.cs index e7550ca..ae22978 100644 --- a/Pores/Models/BatchPoint.cs +++ b/Pores/Models/BatchPoint.cs @@ -1,6 +1,6 @@ -using Pores.Helpers; +using MODELING_DEF_DES_MI_VI.Helpers; -namespace Pores.Models +namespace MODELING_DEF_DES_MI_VI.Models { public class BatchPoint : PropertyChangedClass { diff --git a/Pores/Models/Material.cs b/Pores/Models/Material.cs index 6c85bc9..08bc9bf 100644 --- a/Pores/Models/Material.cs +++ b/Pores/Models/Material.cs @@ -1,6 +1,6 @@ -using Pores.Helpers; +using MODELING_DEF_DES_MI_VI.Helpers; -namespace Pores.Models +namespace MODELING_DEF_DES_MI_VI.Models { public class MaterialModel : PropertyChangedClass { diff --git a/Pores/Models/Point.cs b/Pores/Models/Point.cs index 0c330dc..fe194a6 100644 --- a/Pores/Models/Point.cs +++ b/Pores/Models/Point.cs @@ -1,6 +1,6 @@ -using Pores.Helpers; +using MODELING_DEF_DES_MI_VI.Helpers; -namespace Pores.Models +namespace MODELING_DEF_DES_MI_VI.Models { public class Point : PropertyChangedClass { diff --git a/Pores/Models/Point2D.cs b/Pores/Models/Point2D.cs index 2115ea5..369f5a4 100644 --- a/Pores/Models/Point2D.cs +++ b/Pores/Models/Point2D.cs @@ -1,6 +1,6 @@ -using Pores.Helpers; +using MODELING_DEF_DES_MI_VI.Helpers; -namespace Pores.Models +namespace MODELING_DEF_DES_MI_VI.Models { public class Point2D : Point { diff --git a/Pores/Models/Point3D.cs b/Pores/Models/Point3D.cs index 46740b0..6d216e0 100644 --- a/Pores/Models/Point3D.cs +++ b/Pores/Models/Point3D.cs @@ -1,8 +1,8 @@ -using Pores.Helpers; +using MODELING_DEF_DES_MI_VI.Helpers; using System; using System.Collections.Generic; -namespace Pores.Models +namespace MODELING_DEF_DES_MI_VI.Models { [Serializable] public class Point3D : Point2D diff --git a/Pores/Models/Pore.cs b/Pores/Models/Pore.cs index 0a93dfd..80448ac 100644 --- a/Pores/Models/Pore.cs +++ b/Pores/Models/Pore.cs @@ -1,6 +1,6 @@ using System; -namespace Pores.Models +namespace MODELING_DEF_DES_MI_VI.Models { [Serializable] public class Pore diff --git a/Pores/Models/Spreads/BaseSpread.cs b/Pores/Models/Spreads/BaseSpread.cs index 24f17a9..6f9f01b 100644 --- a/Pores/Models/Spreads/BaseSpread.cs +++ b/Pores/Models/Spreads/BaseSpread.cs @@ -1,8 +1,8 @@ using System.Collections.ObjectModel; -using Pores.Helpers; -using Pores.Interfaces; +using MODELING_DEF_DES_MI_VI.Helpers; +using MODELING_DEF_DES_MI_VI.Interfaces; -namespace Pores.Models.Spreads +namespace MODELING_DEF_DES_MI_VI.Models.Spreads { public abstract class BaseSpread : PropertyChangedClass, IPoreSpread { diff --git a/Pores/Models/Spreads/NormalSpread.cs b/Pores/Models/Spreads/NormalSpread.cs index 457931b..295d00d 100644 --- a/Pores/Models/Spreads/NormalSpread.cs +++ b/Pores/Models/Spreads/NormalSpread.cs @@ -1,7 +1,7 @@ using System; using System.Collections.ObjectModel; -namespace Pores.Models.Spreads +namespace MODELING_DEF_DES_MI_VI.Models.Spreads { public class NormalSpread : BaseSpread { diff --git a/Pores/Properties/Resources.Designer.cs b/Pores/Properties/Resources.Designer.cs index cb05baf..97177d7 100644 --- a/Pores/Properties/Resources.Designer.cs +++ b/Pores/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Pores.Properties +namespace MODELING_DEF_DES_MI_VI.Properties { diff --git a/Pores/Properties/Settings.Designer.cs b/Pores/Properties/Settings.Designer.cs index cb6249d..4f97616 100644 --- a/Pores/Properties/Settings.Designer.cs +++ b/Pores/Properties/Settings.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Pores.Properties +namespace MODELING_DEF_DES_MI_VI.Properties {