From 0a6c1d69626e7a9af49c76a73ef5ff8051ebf419 Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期三, 15 五月 2024 14:34:47 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/Yw/Hydro.V1.1
---
Hydraulic/Hydro.Inp2.2/.vs/Hydro.Inp2.2.csproj.dtbcache.json | 2
Hydraulic/Hydro.Core/.vs/Hydro.Core.csproj.dtbcache.json | 2
Hydraulic/Hydro.HydraulicOptimizer/.vs/Hydro.HydraulicOptimizer.csproj.dtbcache.json | 2
Hydraulic/Hydro.MapView/Model/PumpViewModel.cs | 18 +-
Hydraulic/Hydro.MapView/Model/NozzleViewModel.cs | 2
Hydraulic/Hydro.MapView/Template/Template.cs | 32 ++--
Hydraulic/Hydro.ConfigModel/.vs/Hydro.ConfigModel.csproj.dtbcache.json | 2
Hydraulic/Hydro.MapView/Model/ValveViewModel.cs | 18 +-
Hydraulic/Hydro.MapView/Model/ReservoirViewModel.cs | 8
Hydraulic/Hydro.MapView/Common/MapDimensions.cs | 16 +-
Hydraulic/Hydro.MapView/Model/TankViewModel.cs | 24 +-
Hydraulic/Hydro.MapView/Model/PipeViewModel.cs | 8
Hydraulic/Hydro.MapView/Model/ValveNodeViewModel.cs | 18 +-
Hydraulic/Hydro.Core/Base/NodeCalcModel.cs | 18 +-
Hydraulic/Hydro.MapUI/.vs/Hydro.MapUI.csproj.dtbcache.json | 2
Hydraulic/Hydro.MapView/Model/RepeaterViewModel.cs | 28 ++--
Hydraulic/Hydro.MapView/Base/LinkViewModel.cs | 42 +++---
Hydraulic/Hydro.Core/Base/LinkCalcModel.cs | 26 +-
Hydraulic/Hydro.MapView/Base/AreaViewModel.cs | 26 +-
Hydraulic/Hydro.MapView/Base/NodeViewModel.cs | 46 +++---
Hydraulic/Hydro.MapView/.vs/Hydro.MapView.csproj.dtbcache.json | 2
Hydraulic/Hydro.MapView/Base/IBaseViewModel.cs | 24 +-
Hydraulic/Hydro.Revit2022/.vs/Hydro.Revit2022.csproj.dtbcache.json | 2
Hydraulic/Hydro.HydraulicModel/.vs/Hydro.HydraulicModel.csproj.dtbcache.json | 2
Hydraulic/Hydro.CodeProvider/.vs/Hydro.CodeProvider.csproj.dtbcache.json | 2
Hydraulic/Hydro.CommonBase/.vs/Hydro.CommonBase.csproj.dtbcache.json | 2
Hydraulic/Hydro.MapUI/Hydro.MapUI.csproj | 37 +++++
27 files changed, 223 insertions(+), 188 deletions(-)
diff --git a/Hydraulic/Hydro.CodeProvider/.vs/Hydro.CodeProvider.csproj.dtbcache.json b/Hydraulic/Hydro.CodeProvider/.vs/Hydro.CodeProvider.csproj.dtbcache.json
index 1ab561d..624007f 100644
--- a/Hydraulic/Hydro.CodeProvider/.vs/Hydro.CodeProvider.csproj.dtbcache.json
+++ b/Hydraulic/Hydro.CodeProvider/.vs/Hydro.CodeProvider.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydraulic\\Hydro.CodeProvider","ProjectFileName":"Hydro.CodeProvider.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Class1.cs"},{"SourceFile":"DemoCodeClass.cs"},{"SourceFile":"Eval.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydraulic\\Hydro.CommonBase\\bin\\Hydro.CommonBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\Debug\\Hydro.CodeProvider.dll","OutputItemRelativePath":"Hydro.CodeProvider.dll"},{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\Debug\\Hydro.CodeProvider.pdb","OutputItemRelativePath":"Hydro.CodeProvider.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\WorkDatas\\Hydro.V1.1\\Hydraulic\\Hydro.CodeProvider","ProjectFileName":"Hydro.CodeProvider.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Class1.cs"},{"SourceFile":"DemoCodeClass.cs"},{"SourceFile":"Eval.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.CommonBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.CodeProvider.dll","OutputItemRelativePath":"Hydro.CodeProvider.dll"},{"OutputItemFullPath":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.CodeProvider.pdb","OutputItemRelativePath":"Hydro.CodeProvider.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/Hydraulic/Hydro.CommonBase/.vs/Hydro.CommonBase.csproj.dtbcache.json b/Hydraulic/Hydro.CommonBase/.vs/Hydro.CommonBase.csproj.dtbcache.json
index b548b14..ab48f96 100644
--- a/Hydraulic/Hydro.CommonBase/.vs/Hydro.CommonBase.csproj.dtbcache.json
+++ b/Hydraulic/Hydro.CommonBase/.vs/Hydro.CommonBase.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydraulic\\Hydro.CommonBase","ProjectFileName":"Hydro.CommonBase.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"ChromosomeBase.cs"},{"SourceFile":"component\\Combine.cs"},{"SourceFile":"component\\DeepCopy.cs"},{"SourceFile":"component\\dict.cs"},{"SourceFile":"component\\json.cs"},{"SourceFile":"control\\messageCtrl.cs"},{"SourceFile":"ex\\JObjectExtensions.cs"},{"SourceFile":"Helper\\Base64Helper.cs"},{"SourceFile":"Helper\\CalcExt.cs"},{"SourceFile":"Helper\\CurveFitHelper.cs"},{"SourceFile":"Helper\\ExcelHelper.cs"},{"SourceFile":"Helper\\JsonHelper.cs"},{"SourceFile":"Helper\\MathSolver.cs"},{"SourceFile":"Helper\\MessageCompressHelper.cs"},{"SourceFile":"Helper\\ParamBuffers.cs"},{"SourceFile":"Helper\\DbHelper.cs"},{"SourceFile":"Helper\\GlobalConfig.cs"},{"SourceFile":"Helper\\GlobalProgress.cs"},{"SourceFile":"Helper\\Log.cs"},{"SourceFile":"Helper\\PartsHelper.cs"},{"SourceFile":"Helper\\QuickListTreat.cs"},{"SourceFile":"Helper\\Solution.cs"},{"SourceFile":"Helper\\SolutionSelector.cs"},{"SourceFile":"Helper\\ToDictionaryExtentions.cs"},{"SourceFile":"Helper\\Type.cs"},{"SourceFile":"IChromosome.cs"},{"SourceFile":"IFitnessFunction.cs"},{"SourceFile":"ParamModel.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\Dapper.2.1.28\\lib\\net461\\Dapper.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\ExcelDataReader.DataSet.3.6.0\\lib\\net35\\ExcelDataReader.DataSet.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\ExcelDataReader.3.6.0\\lib\\net45\\ExcelDataReader.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\SharpZipLib.1.0.0\\lib\\net45\\ICSharpCode.SharpZipLib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\MathNet.Numerics.4.1.0\\lib\\net40\\MathNet.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\MessagePack.Annotations.2.0.323\\lib\\netstandard2.0\\MessagePack.Annotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\MessagePack.1.9.11\\lib\\net47\\MessagePack.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\Microsoft.Bcl.AsyncInterfaces.7.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\Microsoft.NET.StringTools.17.6.3\\lib\\net472\\Microsoft.NET.StringTools.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\NPOI.2.4.1\\lib\\net45\\NPOI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\NPOI.2.4.1\\lib\\net45\\NPOI.OOXML.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\NPOI.2.4.1\\lib\\net45\\NPOI.OpenXml4Net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\NPOI.2.4.1\\lib\\net45\\NPOI.OpenXmlFormats.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\System.Collections.Immutable.6.0.0\\lib\\net461\\System.Collections.Immutable.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.ComponentModel.Composition.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\\lib\\net46\\System.Data.SQLite.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\System.Data.SQLite.EF6.1.0.118.0\\lib\\net46\\System.Data.SQLite.EF6.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\System.Data.SQLite.Linq.1.0.118.0\\lib\\net46\\System.Data.SQLite.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.IO.Compression.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\System.Memory.4.5.5\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\System.Runtime.CompilerServices.Unsafe.6.0.0\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydraulic\\Hydro.CommonBase\\bin\\Hydro.CommonBase.dll","OutputItemRelativePath":"Hydro.CommonBase.dll"},{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydraulic\\Hydro.CommonBase\\bin\\Hydro.CommonBase.pdb","OutputItemRelativePath":"Hydro.CommonBase.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\WorkDatas\\Hydro.V1.1\\Hydraulic\\Hydro.CommonBase","ProjectFileName":"Hydro.CommonBase.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"ChromosomeBase.cs"},{"SourceFile":"component\\Combine.cs"},{"SourceFile":"component\\DeepCopy.cs"},{"SourceFile":"component\\dict.cs"},{"SourceFile":"component\\json.cs"},{"SourceFile":"control\\messageCtrl.cs"},{"SourceFile":"ex\\JObjectExtensions.cs"},{"SourceFile":"Helper\\Base64Helper.cs"},{"SourceFile":"Helper\\CalcExt.cs"},{"SourceFile":"Helper\\CurveFitHelper.cs"},{"SourceFile":"Helper\\ExcelHelper.cs"},{"SourceFile":"Helper\\JsonHelper.cs"},{"SourceFile":"Helper\\MathSolver.cs"},{"SourceFile":"Helper\\MessageCompressHelper.cs"},{"SourceFile":"Helper\\ParamBuffers.cs"},{"SourceFile":"Helper\\DbHelper.cs"},{"SourceFile":"Helper\\GlobalConfig.cs"},{"SourceFile":"Helper\\GlobalProgress.cs"},{"SourceFile":"Helper\\Log.cs"},{"SourceFile":"Helper\\PartsHelper.cs"},{"SourceFile":"Helper\\QuickListTreat.cs"},{"SourceFile":"Helper\\Solution.cs"},{"SourceFile":"Helper\\SolutionSelector.cs"},{"SourceFile":"Helper\\ToDictionaryExtentions.cs"},{"SourceFile":"Helper\\Type.cs"},{"SourceFile":"IChromosome.cs"},{"SourceFile":"IFitnessFunction.cs"},{"SourceFile":"ParamModel.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\Dapper.2.1.28\\lib\\net461\\Dapper.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\ExcelDataReader.DataSet.3.6.0\\lib\\net35\\ExcelDataReader.DataSet.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\ExcelDataReader.3.6.0\\lib\\net45\\ExcelDataReader.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\SharpZipLib.1.0.0\\lib\\net45\\ICSharpCode.SharpZipLib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\MathNet.Numerics.4.1.0\\lib\\net40\\MathNet.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\MessagePack.Annotations.2.0.323\\lib\\netstandard2.0\\MessagePack.Annotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\MessagePack.1.9.11\\lib\\net47\\MessagePack.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\Microsoft.Bcl.AsyncInterfaces.7.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\Microsoft.NET.StringTools.17.6.3\\lib\\net472\\Microsoft.NET.StringTools.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\NPOI.2.4.1\\lib\\net45\\NPOI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\NPOI.2.4.1\\lib\\net45\\NPOI.OOXML.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\NPOI.2.4.1\\lib\\net45\\NPOI.OpenXml4Net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\NPOI.2.4.1\\lib\\net45\\NPOI.OpenXmlFormats.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\System.Collections.Immutable.6.0.0\\lib\\net461\\System.Collections.Immutable.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.ComponentModel.Composition.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\\lib\\net46\\System.Data.SQLite.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\System.Data.SQLite.EF6.1.0.118.0\\lib\\net46\\System.Data.SQLite.EF6.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\System.Data.SQLite.Linq.1.0.118.0\\lib\\net46\\System.Data.SQLite.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.IO.Compression.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\System.Memory.4.5.5\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\System.Runtime.CompilerServices.Unsafe.6.0.0\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.CommonBase.dll","OutputItemRelativePath":"Hydro.CommonBase.dll"},{"OutputItemFullPath":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.CommonBase.pdb","OutputItemRelativePath":"Hydro.CommonBase.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/Hydraulic/Hydro.ConfigModel/.vs/Hydro.ConfigModel.csproj.dtbcache.json b/Hydraulic/Hydro.ConfigModel/.vs/Hydro.ConfigModel.csproj.dtbcache.json
index b9008d3..036b0bd 100644
--- a/Hydraulic/Hydro.ConfigModel/.vs/Hydro.ConfigModel.csproj.dtbcache.json
+++ b/Hydraulic/Hydro.ConfigModel/.vs/Hydro.ConfigModel.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydraulic\\Hydro.ConfigModel","ProjectFileName":"Hydro.ConfigModel.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"GlobalModel.cs"},{"SourceFile":"HostExt.cs"},{"SourceFile":"LogicPoint.cs"},{"SourceFile":"MetroColorStyle.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"SQLiteHelper.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\Dapper.2.1.28\\lib\\net461\\Dapper.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\EntityFramework.6.4.4\\lib\\net45\\EntityFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\EntityFramework.6.4.4\\lib\\net45\\EntityFramework.SqlServer.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydraulic\\Hydro.CommonBase\\bin\\Hydro.CommonBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.HydraulicModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\\lib\\net46\\System.Data.SQLite.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\System.Data.SQLite.EF6.1.0.118.0\\lib\\net46\\System.Data.SQLite.EF6.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\System.Data.SQLite.Linq.1.0.118.0\\lib\\net46\\System.Data.SQLite.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.ConfigModel.dll","OutputItemRelativePath":"Hydro.ConfigModel.dll"},{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.ConfigModel.pdb","OutputItemRelativePath":"Hydro.ConfigModel.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\WorkDatas\\Hydro.V1.1\\Hydraulic\\Hydro.ConfigModel","ProjectFileName":"Hydro.ConfigModel.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"GlobalModel.cs"},{"SourceFile":"HostExt.cs"},{"SourceFile":"LogicPoint.cs"},{"SourceFile":"MetroColorStyle.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"SQLiteHelper.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\Dapper.2.1.28\\lib\\net461\\Dapper.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\EntityFramework.6.4.4\\lib\\net45\\EntityFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\EntityFramework.6.4.4\\lib\\net45\\EntityFramework.SqlServer.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.CommonBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.HydraulicModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\\lib\\net46\\System.Data.SQLite.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\System.Data.SQLite.EF6.1.0.118.0\\lib\\net46\\System.Data.SQLite.EF6.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\System.Data.SQLite.Linq.1.0.118.0\\lib\\net46\\System.Data.SQLite.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.ConfigModel.dll","OutputItemRelativePath":"Hydro.ConfigModel.dll"},{"OutputItemFullPath":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.ConfigModel.pdb","OutputItemRelativePath":"Hydro.ConfigModel.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/Hydraulic/Hydro.Core/.vs/Hydro.Core.csproj.dtbcache.json b/Hydraulic/Hydro.Core/.vs/Hydro.Core.csproj.dtbcache.json
index 0442b58..b7cb1e1 100644
--- a/Hydraulic/Hydro.Core/.vs/Hydro.Core.csproj.dtbcache.json
+++ b/Hydraulic/Hydro.Core/.vs/Hydro.Core.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydraulic\\Hydro.Core","ProjectFileName":"Hydro.Core.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Base\\BaseModel.cs"},{"SourceFile":"Base\\LinkCalcModel.cs"},{"SourceFile":"Base\\NodeCalcModel.cs"},{"SourceFile":"Common\\CheckModel.cs"},{"SourceFile":"Common\\Coor.cs"},{"SourceFile":"Common\\FlowCurve.cs"},{"SourceFile":"Common\\Parts.cs"},{"SourceFile":"Common\\TimePoint.cs"},{"SourceFile":"Enum\\EpanetEnum.cs"},{"SourceFile":"Enum\\ObjectEnum.cs"},{"SourceFile":"Link\\PipeModel.cs"},{"SourceFile":"Link\\PumpModel.cs"},{"SourceFile":"Link\\ValveModel.cs"},{"SourceFile":"Node\\JunctionModel.cs"},{"SourceFile":"Node\\MeterModel.cs"},{"SourceFile":"Node\\NozzleModel.cs"},{"SourceFile":"Node\\ReservoisModel.cs"},{"SourceFile":"Node\\TankModel.cs"},{"SourceFile":"Geometry_2d\\Line2d.cs"},{"SourceFile":"Geometry_2d\\Point2d.cs"},{"SourceFile":"Geometry_2d\\Vector2d.cs"},{"SourceFile":"Geometry_3d\\Line.cs"},{"SourceFile":"Geometry_2d\\Line2d_Func.cs"},{"SourceFile":"Geometry_3d\\Point_Func.cs"},{"SourceFile":"Geometry_2d\\Boundary2d.cs"},{"SourceFile":"Geometry_3d\\Point.cs"},{"SourceFile":"Geometry_3d\\Polygon.cs"},{"SourceFile":"Geometry_3d\\Vector.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.Core.dll","OutputItemRelativePath":"Hydro.Core.dll"},{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.Core.pdb","OutputItemRelativePath":"Hydro.Core.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\WorkDatas\\Hydro.V1.1\\Hydraulic\\Hydro.Core","ProjectFileName":"Hydro.Core.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Base\\BaseModel.cs"},{"SourceFile":"Base\\LinkCalcModel.cs"},{"SourceFile":"Base\\NodeCalcModel.cs"},{"SourceFile":"Common\\CheckModel.cs"},{"SourceFile":"Common\\Coor.cs"},{"SourceFile":"Common\\FlowCurve.cs"},{"SourceFile":"Common\\Parts.cs"},{"SourceFile":"Common\\TimePoint.cs"},{"SourceFile":"Enum\\EpanetEnum.cs"},{"SourceFile":"Enum\\ObjectEnum.cs"},{"SourceFile":"Link\\PipeModel.cs"},{"SourceFile":"Link\\PumpModel.cs"},{"SourceFile":"Link\\ValveModel.cs"},{"SourceFile":"Node\\JunctionModel.cs"},{"SourceFile":"Node\\MeterModel.cs"},{"SourceFile":"Node\\NozzleModel.cs"},{"SourceFile":"Node\\ReservoisModel.cs"},{"SourceFile":"Node\\TankModel.cs"},{"SourceFile":"Geometry_2d\\Line2d.cs"},{"SourceFile":"Geometry_2d\\Point2d.cs"},{"SourceFile":"Geometry_2d\\Vector2d.cs"},{"SourceFile":"Geometry_3d\\Line.cs"},{"SourceFile":"Geometry_2d\\Line2d_Func.cs"},{"SourceFile":"Geometry_3d\\Point_Func.cs"},{"SourceFile":"Geometry_2d\\Boundary2d.cs"},{"SourceFile":"Geometry_3d\\Point.cs"},{"SourceFile":"Geometry_3d\\Polygon.cs"},{"SourceFile":"Geometry_3d\\Vector.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.Core.dll","OutputItemRelativePath":"Hydro.Core.dll"},{"OutputItemFullPath":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.Core.pdb","OutputItemRelativePath":"Hydro.Core.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/Hydraulic/Hydro.Core/Base/LinkCalcModel.cs b/Hydraulic/Hydro.Core/Base/LinkCalcModel.cs
index 8d345ba..8182420 100644
--- a/Hydraulic/Hydro.Core/Base/LinkCalcModel.cs
+++ b/Hydraulic/Hydro.Core/Base/LinkCalcModel.cs
@@ -152,43 +152,43 @@
}
//瀹為檯闇�姘撮噺
- [Category("3銆佽绠楃粨鏋�")]
- [DisplayName("1)娴侀噺")]
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("1)娴侀噺(m鲁/h)")]
[Browsable(true)]
public float EN_FLOW { get; set; } = float.NaN;
//瀹為檯闇�姘撮噺
- [Category("3銆佽绠楃粨鏋�")]
- [DisplayName("2)娴侀��")]
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("2)娴侀��(m/s)")]
[Browsable(true)]
public float EN_VELOCITY { get; set; } = float.NaN;
//瀹為檯闇�姘撮噺
- [Category("3銆佽绠楃粨鏋�")]
- [DisplayName("3)姘村ご鎹熷け")]
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("3)姘村ご鎹熷け(m)")]
[Browsable(true)]
public float EN_HEADLOSS { get; set; } = float.NaN;
- [Category("3銆佽绠楃粨鏋�")]
- [DisplayName("4)娌跨▼姘存崯")]
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("4)娌跨▼姘存崯(m)")]
[Browsable(true)]
public float EN_HEADLOSS_LINE { get; set; } = float.NaN;
- [Category("3銆佽绠楃粨鏋�")]
- [DisplayName("5)灞�閮ㄦ按鎹�")]
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("5)灞�閮ㄦ按鎹�(m)")]
[Browsable(true)]
public float EN_HEADLOSS_MINOR { get; set; } = float.NaN;
//瀹為檯闇�姘撮噺
- [Category("3銆佽绠楃粨鏋�")]
+ [Category("璁＄畻缁撴灉")]
[DisplayName("5)褰撳墠鐘舵��")]
[Browsable(false)]
public float EN_STATUS { get; set; } = float.NaN;
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("閫変腑")]
[DisplayName("閫変腑")]
[Browsable(false)]
public bool Selected { get; set; }
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("榧犳爣鎮簬涓婃柟")]
[DisplayName("榧犳爣鎮簬涓婃柟")]
[Browsable(false)]
diff --git a/Hydraulic/Hydro.Core/Base/NodeCalcModel.cs b/Hydraulic/Hydro.Core/Base/NodeCalcModel.cs
index 152baff..408da96 100644
--- a/Hydraulic/Hydro.Core/Base/NodeCalcModel.cs
+++ b/Hydraulic/Hydro.Core/Base/NodeCalcModel.cs
@@ -49,34 +49,34 @@
public List<LinkCalcModel> Links=new List<LinkCalcModel>();
//瀹為檯闇�姘撮噺
- [Category("3銆佽绠楃粨鏋�")]
- [DisplayName("1)瀹為檯闇�姘撮噺")]
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("1)瀹為檯闇�姘撮噺(m)")]
[Browsable(true)]
public float EN_DEMAND { get; set; } = float.NaN;
//瀹為檯闇�姘撮噺
- [Category("3銆佽绠楃粨鏋�")]
- [DisplayName("2)缁濆姘村帇")]
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("2)缁濆姘村帇(m)")]
[Browsable(true)]
public float EN_HEAD { get; set; } = float.NaN;
//瀹為檯闇�姘撮噺
- [Category("3銆佽绠楃粨鏋�")]
- [DisplayName("3)鑷敱姘村帇")]
+ [Category("璁＄畻缁撴灉")]
+ [DisplayName("3)鑷敱姘村帇(m)")]
[Browsable(true)]
public float EN_PRESSURE { get; set; } = float.NaN;
//瀹為檯闇�姘撮噺
- [Category("3銆佽绠楃粨鏋�")]
+ [Category("璁＄畻缁撴灉")]
[DisplayName("4)姘撮緞")]
[Browsable(false)]
public float EN_QUALITY { get; set; } = float.NaN;
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("閫変腑")]
[DisplayName("閫変腑")]
[Browsable(false)]
public bool Selected { get; set; }
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("榧犳爣鎮簬涓婃柟")]
[DisplayName("榧犳爣鎮簬涓婃柟")]
[Browsable(false)]
diff --git a/Hydraulic/Hydro.HydraulicModel/.vs/Hydro.HydraulicModel.csproj.dtbcache.json b/Hydraulic/Hydro.HydraulicModel/.vs/Hydro.HydraulicModel.csproj.dtbcache.json
index 122d134..3f9943d 100644
--- a/Hydraulic/Hydro.HydraulicModel/.vs/Hydro.HydraulicModel.csproj.dtbcache.json
+++ b/Hydraulic/Hydro.HydraulicModel/.vs/Hydro.HydraulicModel.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydraulic\\Hydro.HydraulicModel","ProjectFileName":"Hydro.HydraulicModel.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"EPAmodel.cs"},{"SourceFile":"EpanetBase2.2.cs"},{"SourceFile":"HydraulicCore.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\x64\\Debug\\Hydro.HydraulicCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.HydraulicModel.dll","OutputItemRelativePath":"Hydro.HydraulicModel.dll"},{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.HydraulicModel.pdb","OutputItemRelativePath":"Hydro.HydraulicModel.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\WorkDatas\\Hydro.V1.1\\Hydraulic\\Hydro.HydraulicModel","ProjectFileName":"Hydro.HydraulicModel.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"EPAmodel.cs"},{"SourceFile":"EpanetBase2.2.cs"},{"SourceFile":"HydraulicCore.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\x64\\Debug\\Hydro.HydraulicCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.HydraulicModel.dll","OutputItemRelativePath":"Hydro.HydraulicModel.dll"},{"OutputItemFullPath":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.HydraulicModel.pdb","OutputItemRelativePath":"Hydro.HydraulicModel.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/Hydraulic/Hydro.HydraulicOptimizer/.vs/Hydro.HydraulicOptimizer.csproj.dtbcache.json b/Hydraulic/Hydro.HydraulicOptimizer/.vs/Hydro.HydraulicOptimizer.csproj.dtbcache.json
index 10910e5..a468f6b 100644
--- a/Hydraulic/Hydro.HydraulicOptimizer/.vs/Hydro.HydraulicOptimizer.csproj.dtbcache.json
+++ b/Hydraulic/Hydro.HydraulicOptimizer/.vs/Hydro.HydraulicOptimizer.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydraulic\\Hydro.HydraulicOptimizer","ProjectFileName":"Hydro.HydraulicOptimizer.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"WDNModelOptimizer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\Dapper.2.1.28\\lib\\net461\\Dapper.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\Debug\\Hydro.CodeProvider.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydraulic\\Hydro.CommonBase\\bin\\Hydro.CommonBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.ConfigModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Lib\\Hydro.HydraulicHelper.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.HydraulicModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\bin\\debug\\Hydro.HydraulicOptimizer.dll","OutputItemRelativePath":"Hydro.HydraulicOptimizer.dll"},{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\bin\\debug\\Hydro.HydraulicOptimizer.pdb","OutputItemRelativePath":"Hydro.HydraulicOptimizer.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\WorkDatas\\Hydro.V1.1\\Hydraulic\\Hydro.HydraulicOptimizer","ProjectFileName":"Hydro.HydraulicOptimizer.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"WDNModelOptimizer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\Dapper.2.1.28\\lib\\net461\\Dapper.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.CodeProvider.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.CommonBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.ConfigModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\Lib\\Hydro.HydraulicHelper.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.HydraulicModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.HydraulicOptimizer.dll","OutputItemRelativePath":"Hydro.HydraulicOptimizer.dll"},{"OutputItemFullPath":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.HydraulicOptimizer.pdb","OutputItemRelativePath":"Hydro.HydraulicOptimizer.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/Hydraulic/Hydro.Inp2.2/.vs/Hydro.Inp2.2.csproj.dtbcache.json b/Hydraulic/Hydro.Inp2.2/.vs/Hydro.Inp2.2.csproj.dtbcache.json
index 5db9623..2af869b 100644
--- a/Hydraulic/Hydro.Inp2.2/.vs/Hydro.Inp2.2.csproj.dtbcache.json
+++ b/Hydraulic/Hydro.Inp2.2/.vs/Hydro.Inp2.2.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydraulic\\Hydro.Inp2.2","ProjectFileName":"Hydro.Inp2.2.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"NetRelationExtentions.cs"},{"SourceFile":"NetWork.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.HydraulicModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.Inp.dll","OutputItemRelativePath":"Hydro.Inp.dll"},{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.Inp.pdb","OutputItemRelativePath":"Hydro.Inp.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\WorkDatas\\Hydro.V1.1\\Hydraulic\\Hydro.Inp2.2","ProjectFileName":"Hydro.Inp2.2.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"NetRelationExtentions.cs"},{"SourceFile":"NetWork.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.HydraulicModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.Inp.dll","OutputItemRelativePath":"Hydro.Inp.dll"},{"OutputItemFullPath":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.Inp.pdb","OutputItemRelativePath":"Hydro.Inp.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/Hydraulic/Hydro.MapUI/.vs/Hydro.MapUI.csproj.dtbcache.json b/Hydraulic/Hydro.MapUI/.vs/Hydro.MapUI.csproj.dtbcache.json
index 0ba5e53..d3ff907 100644
--- a/Hydraulic/Hydro.MapUI/.vs/Hydro.MapUI.csproj.dtbcache.json
+++ b/Hydraulic/Hydro.MapUI/.vs/Hydro.MapUI.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydraulic\\Hydro.MapUI","ProjectFileName":"Hydro.MapUI.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"ChartPump.cs"},{"SourceFile":"ChartPump.Designer.cs"},{"SourceFile":"WindowsForm\\ColorPicker.cs"},{"SourceFile":"WindowsForm\\ColorPicker.designer.cs"},{"SourceFile":"WindowsForm\\FormFilter.cs"},{"SourceFile":"WindowsForm\\FormFilter.designer.cs"},{"SourceFile":"WindowsForm\\Form_Color.cs"},{"SourceFile":"WindowsForm\\Form_Color.designer.cs"},{"SourceFile":"WindowsForm\\InputBox.cs"},{"SourceFile":"WindowsForm\\InputBox.designer.cs"},{"SourceFile":"WindowsForm\\Progress.cs"},{"SourceFile":"WindowsForm\\Progress.designer.cs"},{"SourceFile":"Map\\MapViewer.Model.cs"},{"SourceFile":"Map\\MapContainer.cs"},{"SourceFile":"Map\\MapContainer.Designer.cs"},{"SourceFile":"Map\\MapViewer.cs"},{"SourceFile":"Map\\MapViewer.Designer.cs"},{"SourceFile":"WindowsForm\\Form_EditFloors.cs"},{"SourceFile":"WindowsForm\\Form_EditFloors.designer.cs"},{"SourceFile":"WindowsForm\\Form_importObjs.cs"},{"SourceFile":"WindowsForm\\Form_importObjs.Designer.cs"},{"SourceFile":"GlobalObject.cs"},{"SourceFile":"WindowsForm\\Form_Magnifier.cs"},{"SourceFile":"WindowsForm\\Form_Magnifier.Designer.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"WindowsForm\\propertyform.cs"},{"SourceFile":"WindowsForm\\propertyform.designer.cs"},{"SourceFile":"WindowsForm\\妯℃澘绠＄悊.cs"},{"SourceFile":"WindowsForm\\妯℃澘绠＄悊.Designer.cs"},{"SourceFile":"PropertyFrom.cs"},{"SourceFile":"PropertyFrom.Designer.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\Dapper.2.1.28\\lib\\net461\\Dapper.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files\\DevExpress 22.2\\Components\\Bin\\Framework\\DevExpress.Charts.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files\\DevExpress 22.2\\Components\\Bin\\Framework\\DevExpress.Data.Desktop.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files\\DevExpress 22.2\\Components\\Bin\\Framework\\DevExpress.Data.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files\\DevExpress 22.2\\Components\\Bin\\Framework\\DevExpress.Diagram.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files\\DevExpress 22.2\\Components\\Bin\\Framework\\DevExpress.Drawing.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files\\DevExpress 22.2\\Components\\Bin\\Framework\\DevExpress.Pdf.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files\\DevExpress 22.2\\Components\\Bin\\Framework\\DevExpress.Printing.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files\\DevExpress 22.2\\Components\\Bin\\Framework\\DevExpress.Utils.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files\\DevExpress 22.2\\Components\\Bin\\Framework\\DevExpress.Utils.v22.2.UI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files\\DevExpress 22.2\\Components\\Bin\\Framework\\DevExpress.XtraBars.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files\\DevExpress 22.2\\Components\\Bin\\Framework\\DevExpress.XtraCharts.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files\\DevExpress 22.2\\Components\\Bin\\Framework\\DevExpress.XtraCharts.v22.2.UI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files\\DevExpress 22.2\\Components\\Bin\\Framework\\DevExpress.XtraCharts.v22.2.Wizard.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files\\DevExpress 22.2\\Components\\Bin\\Framework\\DevExpress.XtraDiagram.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files\\DevExpress 22.2\\Components\\Bin\\Framework\\DevExpress.XtraEditors.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files\\DevExpress 22.2\\Components\\Bin\\Framework\\DevExpress.XtraLayout.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files\\DevExpress 22.2\\Components\\Bin\\Framework\\DevExpress.XtraPrinting.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\Program Files\\DevExpress 22.2\\Components\\Bin\\Framework\\DevExpress.XtraVerticalGrid.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydraulic\\Hydro.CommonBase\\bin\\Hydro.CommonBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.Inp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.MapView.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\MathNet.Numerics.4.1.0\\lib\\net40\\MathNet.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\\lib\\net46\\System.Data.SQLite.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\System.Data.SQLite.EF6.1.0.118.0\\lib\\net46\\System.Data.SQLite.EF6.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\System.Data.SQLite.Linq.1.0.118.0\\lib\\net46\\System.Data.SQLite.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\bin\\debug\\Hydro.MapUI.dll","OutputItemRelativePath":"Hydro.MapUI.dll"},{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\bin\\debug\\Hydro.MapUI.pdb","OutputItemRelativePath":"Hydro.MapUI.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\WorkDatas\\Hydro.V1.1\\Hydraulic\\Hydro.MapUI","ProjectFileName":"Hydro.MapUI.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"ChartPump.cs"},{"SourceFile":"ChartPump.Designer.cs"},{"SourceFile":"Map\\DMap.cs"},{"SourceFile":"Map\\DMap.designer.cs"},{"SourceFile":"Map\\DMap.Model.cs"},{"SourceFile":"Map\\GraphHelper.cs"},{"SourceFile":"Map\\MapViewer.Draw.cs"},{"SourceFile":"WindowsForm\\ColorPicker.cs"},{"SourceFile":"WindowsForm\\ColorPicker.designer.cs"},{"SourceFile":"WindowsForm\\FormFilter.cs"},{"SourceFile":"WindowsForm\\FormFilter.designer.cs"},{"SourceFile":"WindowsForm\\Form_Color.cs"},{"SourceFile":"WindowsForm\\Form_Color.designer.cs"},{"SourceFile":"WindowsForm\\InputBox.cs"},{"SourceFile":"WindowsForm\\InputBox.designer.cs"},{"SourceFile":"WindowsForm\\Progress.cs"},{"SourceFile":"WindowsForm\\Progress.designer.cs"},{"SourceFile":"Map\\MapViewer.Model.cs"},{"SourceFile":"Map\\MapViewer.cs"},{"SourceFile":"Map\\MapViewer.Designer.cs"},{"SourceFile":"WindowsForm\\Form_EditFloors.cs"},{"SourceFile":"WindowsForm\\Form_EditFloors.designer.cs"},{"SourceFile":"WindowsForm\\Form_importObjs.cs"},{"SourceFile":"WindowsForm\\Form_importObjs.Designer.cs"},{"SourceFile":"GlobalObject.cs"},{"SourceFile":"WindowsForm\\Form_Magnifier.cs"},{"SourceFile":"WindowsForm\\Form_Magnifier.Designer.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"WindowsForm\\propertyform.cs"},{"SourceFile":"WindowsForm\\propertyform.designer.cs"},{"SourceFile":"WindowsForm\\妯℃澘绠＄悊.cs"},{"SourceFile":"WindowsForm\\妯℃澘绠＄悊.Designer.cs"},{"SourceFile":"PropertyFrom.cs"},{"SourceFile":"PropertyFrom.Designer.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\Dapper.2.1.28\\lib\\net461\\Dapper.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.CommonBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.Inp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.MapView.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\MathNet.Numerics.4.1.0\\lib\\net40\\MathNet.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\\lib\\net46\\System.Data.SQLite.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\System.Data.SQLite.EF6.1.0.118.0\\lib\\net46\\System.Data.SQLite.EF6.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\System.Data.SQLite.Linq.1.0.118.0\\lib\\net46\\System.Data.SQLite.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkDatas\\bin\\debug\\Hydro.MapUI.dll","OutputItemRelativePath":"Hydro.MapUI.dll"},{"OutputItemFullPath":"D:\\WorkDatas\\bin\\debug\\Hydro.MapUI.pdb","OutputItemRelativePath":"Hydro.MapUI.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/Hydraulic/Hydro.MapUI/Hydro.MapUI.csproj b/Hydraulic/Hydro.MapUI/Hydro.MapUI.csproj
index 4f86043..221636b 100644
--- a/Hydraulic/Hydro.MapUI/Hydro.MapUI.csproj
+++ b/Hydraulic/Hydro.MapUI/Hydro.MapUI.csproj
@@ -160,7 +160,6 @@
<EmbeddedResource Include="Map\DMap.resx">
<DependentUpon>DMap.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="PropertyFrom.resx">
<DependentUpon>PropertyFrom.cs</DependentUpon>
</EmbeddedResource>
@@ -242,6 +241,42 @@
<Reference Include="Dapper, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dapper.2.1.28\lib\net461\Dapper.dll</HintPath>
</Reference>
+ <Reference Include="DevExpress.Data.Desktop.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Debug\DevExpress.Data.Desktop.v22.2.dll</HintPath>
+ </Reference>
+ <Reference Include="DevExpress.Data.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Debug\DevExpress.Data.v22.2.dll</HintPath>
+ </Reference>
+ <Reference Include="DevExpress.Drawing.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Debug\DevExpress.Drawing.v22.2.dll</HintPath>
+ </Reference>
+ <Reference Include="DevExpress.Printing.v22.2.Core, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Debug\DevExpress.Printing.v22.2.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="DevExpress.Utils.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Debug\DevExpress.Utils.v22.2.dll</HintPath>
+ </Reference>
+ <Reference Include="DevExpress.XtraEditors.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Debug\DevExpress.XtraEditors.v22.2.dll</HintPath>
+ </Reference>
+ <Reference Include="DevExpress.XtraGrid.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Debug\DevExpress.XtraGrid.v22.2.dll</HintPath>
+ </Reference>
+ <Reference Include="DevExpress.XtraPrinting.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Debug\DevExpress.XtraPrinting.v22.2.dll</HintPath>
+ </Reference>
+ <Reference Include="DevExpress.XtraVerticalGrid.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Debug\DevExpress.XtraVerticalGrid.v22.2.dll</HintPath>
+ </Reference>
<Reference Include="MathNet.Numerics, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\MathNet.Numerics.4.1.0\lib\net40\MathNet.Numerics.dll</HintPath>
</Reference>
diff --git a/Hydraulic/Hydro.MapView/.vs/Hydro.MapView.csproj.dtbcache.json b/Hydraulic/Hydro.MapView/.vs/Hydro.MapView.csproj.dtbcache.json
index 196ce25..4f807a7 100644
--- a/Hydraulic/Hydro.MapView/.vs/Hydro.MapView.csproj.dtbcache.json
+++ b/Hydraulic/Hydro.MapView/.vs/Hydro.MapView.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydraulic\\Hydro.MapView","ProjectFileName":"Hydro.MapView.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Base\\AreaViewModel.cs"},{"SourceFile":"Base\\IBaseViewModel.cs"},{"SourceFile":"Base\\LinkViewModel.cs"},{"SourceFile":"Base\\NodeViewModel.cs"},{"SourceFile":"calc.cs"},{"SourceFile":"Common\\Copy.cs"},{"SourceFile":"Common\\Dataset.cs"},{"SourceFile":"Common\\Default.cs"},{"SourceFile":"Common\\Global.cs"},{"SourceFile":"Common\\MapObjectExtensions.cs"},{"SourceFile":"Common\\MapOption.cs"},{"SourceFile":"Common\\MapDimensions.cs"},{"SourceFile":"Common\\ShouldSerializeContractResolver.cs"},{"SourceFile":"Common\\TempForEnum.cs"},{"SourceFile":"Enum\\MapViewEnum.cs"},{"SourceFile":"MapViewNetWork.cs"},{"SourceFile":"MapViewNetWork2Inp.cs"},{"SourceFile":"Model\\AreaViewModel.cs"},{"SourceFile":"Model\\Factory.cs"},{"SourceFile":"Model\\FactoryList.cs"},{"SourceFile":"Model\\JunctionViewModel.cs"},{"SourceFile":"Model\\MeterViewModel.cs"},{"SourceFile":"Model\\NozzleViewModel.cs"},{"SourceFile":"Model\\PipeViewModel.cs"},{"SourceFile":"Model\\PointF3D.cs"},{"SourceFile":"Model\\PumpNodeViewModel.cs"},{"SourceFile":"Model\\PumpViewModel.cs"},{"SourceFile":"Model\\RepeaterViewModel.cs"},{"SourceFile":"Model\\ReservoirViewModel.cs"},{"SourceFile":"Model\\TankViewModel.cs"},{"SourceFile":"Model\\ValveNodeViewModel.cs"},{"SourceFile":"Model\\ValveViewModel.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Template\\Floor.cs"},{"SourceFile":"Template\\Template.cs"},{"SourceFile":"Template\\TemplateList.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\Debug\\Hydro.CodeProvider.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydraulic\\Hydro.CommonBase\\bin\\Hydro.CommonBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.ConfigModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.HydraulicModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\bin\\debug\\Hydro.HydraulicOptimizer.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.Inp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\MathNet.Numerics.4.1.0\\lib\\net40\\MathNet.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.MapView.dll","OutputItemRelativePath":"Hydro.MapView.dll"},{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.MapView.pdb","OutputItemRelativePath":"Hydro.MapView.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\WorkDatas\\Hydro.V1.1\\Hydraulic\\Hydro.MapView","ProjectFileName":"Hydro.MapView.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Base\\AreaViewModel.cs"},{"SourceFile":"Base\\IBaseViewModel.cs"},{"SourceFile":"Base\\LinkViewModel.cs"},{"SourceFile":"Base\\NodeViewModel.cs"},{"SourceFile":"calc.cs"},{"SourceFile":"Common\\Copy.cs"},{"SourceFile":"Common\\Dataset.cs"},{"SourceFile":"Common\\Default.cs"},{"SourceFile":"Common\\Global.cs"},{"SourceFile":"Common\\MapObjectExtensions.cs"},{"SourceFile":"Common\\MapOption.cs"},{"SourceFile":"Common\\MapDimensions.cs"},{"SourceFile":"Common\\ShouldSerializeContractResolver.cs"},{"SourceFile":"Common\\TempForEnum.cs"},{"SourceFile":"Enum\\MapViewEnum.cs"},{"SourceFile":"MapViewNetWork.cs"},{"SourceFile":"MapViewNetWork2Inp.cs"},{"SourceFile":"Model\\AreaViewModel.cs"},{"SourceFile":"Model\\Factory.cs"},{"SourceFile":"Model\\FactoryList.cs"},{"SourceFile":"Model\\JunctionViewModel.cs"},{"SourceFile":"Model\\MeterViewModel.cs"},{"SourceFile":"Model\\NozzleViewModel.cs"},{"SourceFile":"Model\\PipeViewModel.cs"},{"SourceFile":"Model\\PointF3D.cs"},{"SourceFile":"Model\\PumpNodeViewModel.cs"},{"SourceFile":"Model\\PumpViewModel.cs"},{"SourceFile":"Model\\RepeaterViewModel.cs"},{"SourceFile":"Model\\ReservoirViewModel.cs"},{"SourceFile":"Model\\TankViewModel.cs"},{"SourceFile":"Model\\ValveNodeViewModel.cs"},{"SourceFile":"Model\\ValveViewModel.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Template\\Floor.cs"},{"SourceFile":"Template\\Template.cs"},{"SourceFile":"Template\\TemplateList.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.CodeProvider.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.CommonBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.ConfigModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.HydraulicModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.HydraulicOptimizer.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.Inp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\MathNet.Numerics.4.1.0\\lib\\net40\\MathNet.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.MapView.dll","OutputItemRelativePath":"Hydro.MapView.dll"},{"OutputItemFullPath":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.MapView.pdb","OutputItemRelativePath":"Hydro.MapView.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/Hydraulic/Hydro.MapView/Base/AreaViewModel.cs b/Hydraulic/Hydro.MapView/Base/AreaViewModel.cs
index 723fea0..e0e49a0 100644
--- a/Hydraulic/Hydro.MapView/Base/AreaViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Base/AreaViewModel.cs
@@ -17,22 +17,22 @@
{
public List<PointF> Points { get; set; }
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("瀵硅薄鐨処D鍞竴鏍囪瘑")]
- [DisplayName(" 缂栧彿 ")]
+ [DisplayName("缂栧彿")]
public string ID { get; set; }
public string Name { get; set; }
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("閫変腑")]
[DisplayName("閫変腑")]
[Browsable(false)]
public bool Selected { get; set; }
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("榧犳爣鎮簬涓婃柟")]
[DisplayName("榧犳爣鎮簬涓婃柟")]
[Browsable(false)]
@@ -40,7 +40,7 @@
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("閫変腑")]
[DisplayName("浣嶇疆淇℃伅")]
[Browsable(false)]
@@ -53,7 +53,7 @@
[JsonIgnore]
public String regionName { get; set; } = null;
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("X鍧愭爣")]
[DisplayName("X鍧愭爣")]
[Browsable(true)]
@@ -68,7 +68,7 @@
Position = new PointF(value, Position.Y);
}
}
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("Y鍧愭爣")]
[DisplayName("Y鍧愭爣")]
[Browsable(true)]
@@ -84,38 +84,38 @@
}
}
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("鏍囬珮")]
[DisplayName("鏍囬珮")]
[Browsable(true)]
public float Elev { get; set; }
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("瀵硅薄鐨勭瓑绾�")]
[DisplayName("绾у埆")]
public int Level { get; set; } = 0;
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("瀵硅薄鐨勭瓑绾�")]
[DisplayName("鏄惁鏄剧ず")]
public bool Visible { get; set; } = true;
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("绫诲瀷")]
[DisplayName("绫诲瀷")]
public MapObjectType Type { get { return this.GetTypeString(); } }
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("ID绫诲瀷")]
[DisplayName("ID绫诲瀷")]
[Browsable(false)]
public string IDType => Type.ToString() + "\t" + ID;
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("鏍囩")]
[DisplayName("鏍囩")]
[Editor(typeof(MyEditor), typeof(UITypeEditor))]
diff --git a/Hydraulic/Hydro.MapView/Base/IBaseViewModel.cs b/Hydraulic/Hydro.MapView/Base/IBaseViewModel.cs
index ecdf2ac..70b9cd1 100644
--- a/Hydraulic/Hydro.MapView/Base/IBaseViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Base/IBaseViewModel.cs
@@ -14,13 +14,13 @@
{
public interface IBaseViewModel
{
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("瀵硅薄鐨処D鍞竴鏍囪瘑")]
- [DisplayName(" 缂栧彿 ")]
+ [DisplayName("缂栧彿")]
string ID { get; set; }
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("閫変腑")]
[DisplayName("閫変腑")]
[Browsable(false)]
@@ -29,7 +29,7 @@
bool Hovered { get; set; }
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("閫変腑")]
[DisplayName("浣嶇疆淇℃伅")]
[Browsable(false)]
@@ -39,7 +39,7 @@
[JsonIgnore]
String regionName { get; set; }//= null;
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("X鍧愭爣")]
[DisplayName("X鍧愭爣")]
[Browsable(true)]
@@ -54,7 +54,7 @@
// Position = new PointF(value, Position.Y);
// }
//}
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("Y鍧愭爣")]
[DisplayName("Y鍧愭爣")]
[Browsable(true)]
@@ -70,19 +70,19 @@
// }
//}
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("鏍囬珮")]
[DisplayName("鏍囬珮")]
[Browsable(true)]
float Elev { get; set; }
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("瀵硅薄鐨勭瓑绾�")]
[DisplayName("绾у埆")]
//[Editor(typeof(MyPropertyEditor), typeof(UITypeEditor))]
int Level { get; set; } //= 0;
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("瀵硅薄鐨勭瓑绾�")]
[DisplayName("鏄惁鏄剧ず")]
bool Visible { get; set; } //= true;
@@ -92,13 +92,13 @@
//[DisplayName("鏍囩")]
//public string Tags { get; set; } = null;
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("绫诲瀷")]
[DisplayName("绫诲瀷")]
MapObjectType Type { get; }// { get { return this.GetTypeString(); } }
//[Browsable(false)]
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("ID绫诲瀷")]
[DisplayName("ID绫诲瀷")]
[Browsable(false)]
@@ -117,7 +117,7 @@
[Serializable]
public class TagList:List<string>
{
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Browsable(false)]
public override string ToString()
{
diff --git a/Hydraulic/Hydro.MapView/Base/LinkViewModel.cs b/Hydraulic/Hydro.MapView/Base/LinkViewModel.cs
index 0e9f8bd..8f90e54 100644
--- a/Hydraulic/Hydro.MapView/Base/LinkViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Base/LinkViewModel.cs
@@ -41,18 +41,18 @@
#region 灞炴��
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("ID缂栧彿")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("缂栧彿")]
[Browsable(true)]
public new string ID { get { return base.ID; } set { base.ID = value; } }
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("Name鍚嶇О")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("鍚嶇О")]
[Browsable(true)]
public new string Name { get { return base.Name; } set { base.Name = value; } }
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("鑺傜偣1")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("璧峰鑺傜偣")]
[Browsable(true)]
public string Node1
{
@@ -68,8 +68,8 @@
}
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("鑺傜偣2")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("缁堟鑺傜偣")]
[Browsable(true)]
public string Node2
{
@@ -126,8 +126,8 @@
}
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("鏍囬珮")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("鏍囬珮(m)")]
[Browsable(true)]
public float Elev
{
@@ -142,8 +142,8 @@
}
}
- [Category("2銆佽绠楀弬鏁�")]
- [DisplayName("1)鍒濆鐘舵��")]
+ [Category("璁＄畻鍙傛暟")]
+ [DisplayName("鍒濆鐘舵��")]
[Browsable(true)]
public StatusType Status
{
@@ -165,8 +165,8 @@
// return "";
//}
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("鍙ｅ緞")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("鍙ｅ緞(mm)")]
[Browsable(true)]
public new float Diameter { get { return base.Diameter; } set { base.Diameter = value; } }
@@ -182,7 +182,7 @@
[JsonIgnore]
public String regionName { get; set; } = null;
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("X鍧愭爣")]
[DisplayName("X鍧愭爣")]
[Browsable(true)]
@@ -197,7 +197,7 @@
//Position = new PointF(value, Position.Y);
}
}
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("Y鍧愭爣")]
[DisplayName("Y鍧愭爣")]
[Browsable(true)]
@@ -214,18 +214,18 @@
}
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("瀵硅薄鐨勭瓑绾�")]
[DisplayName("绾у埆")]
public int Level { get; set; } = 0;
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("瀵硅薄鐨勭瓑绾�")]
[DisplayName("鏄惁鏄剧ず")]
public bool Visible { get; set; } = true;
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("鏍囩")]
[DisplayName("鏍囩")]
[Editor(typeof(MyEditor), typeof(UITypeEditor))]
@@ -234,13 +234,13 @@
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("绫诲瀷")]
[DisplayName("绫诲瀷")]
public MapObjectType Type { get { return this.GetTypeString(); } }
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("ID绫诲瀷")]
[DisplayName("ID绫诲瀷")]
[Browsable(false)]
diff --git a/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs b/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs
index 6532a30..fe7a0c5 100644
--- a/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs
@@ -35,13 +35,13 @@
#region 灞炴��
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("ID缂栧彿")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("缂栧彿")]
[Browsable(true)]
public new string ID { get { return base.ID; } set { base.ID = value; } }
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("Name鍚嶇О")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("鍚嶇О")]
[Browsable(true)]
public new string Name { get { return base.Name; } set { base.Name = value; } }
@@ -60,7 +60,7 @@
}
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("X鍧愭爣")]
[DisplayName("X鍧愭爣")]
[Browsable(true)]
@@ -75,7 +75,7 @@
base.X = value;
}
}
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("Y鍧愭爣")]
[DisplayName("Y鍧愭爣")]
[Browsable(true)]
@@ -91,33 +91,33 @@
}
}
- [Category("1銆佸熀鏈俊鎭�")]
- [Description("鏍囬珮")]
- [DisplayName("鏍囬珮")]
+ [Category("鍩烘湰淇℃伅")]
+ [Description("鏍囬珮(m)")]
+ [DisplayName("鏍囬珮(m)")]
[Browsable(true)]
public new float Elev { get { return base.Elev; } set { base.Elev = value; } }
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("绫诲瀷")]
[DisplayName("绫诲瀷")]
public MapObjectType Type { get { return this.GetTypeString(); } }
- [Category("2銆佽绠楀弬鏁�")]
- [Description("鏈�澶у彛寰�")]
- [DisplayName("鏈�澶у彛寰�")]
+ [Category("璁＄畻鍙傛暟")]
+ [Description("鏈�澶у彛寰�(mm)")]
+ [DisplayName("鏈�澶у彛寰�(mm)")]
[Browsable(false)]
public virtual float MaxDiameter { get; set; } = 0;
- [Category("2銆佽绠楀弬鏁�")]
- [Description("闇�姘撮噺")]
- [DisplayName("闇�姘撮噺")]
+ [Category("璁＄畻鍙傛暟")]
+ [Description("闇�姘撮噺(m)")]
+ [DisplayName("闇�姘撮噺(m)")]
[Browsable(true)]
public virtual float Demand { get; set; }
/// <summary>
/// 妯″紡鐨勭紪鍙�
/// </summary>
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[Description("鐢ㄦ按閲忔ā寮忕殑缂栧彿")]
[DisplayName("妯″紡缂栧彿")]
[Browsable(true)]
@@ -125,7 +125,7 @@
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[DisplayName("閾捐〃娓呭崟")]
[Browsable(true)]
[JsonIgnore]
@@ -161,7 +161,7 @@
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("閫変腑")]
[DisplayName("浣嶇疆淇℃伅")]
[Browsable(false)]
@@ -174,7 +174,7 @@
set { if (value != null) X = value.X; Y = value.Y; }
}
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("鏍囩")]
[DisplayName("鏍囩")]
[Editor(typeof(MyEditor), typeof(UITypeEditor))]
@@ -188,13 +188,13 @@
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("瀵硅薄鐨勭瓑绾�")]
[DisplayName("绾у埆")]
public int Level { get; set; } = 0;
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("瀵硅薄鐨勭瓑绾�")]
[DisplayName("鏄惁鏄剧ず")]
public bool Visible { get; set; } = true;
@@ -203,7 +203,7 @@
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("ID绫诲瀷")]
[DisplayName("ID绫诲瀷")]
[Browsable(false)]
diff --git a/Hydraulic/Hydro.MapView/Common/MapDimensions.cs b/Hydraulic/Hydro.MapView/Common/MapDimensions.cs
index 2646d14..ae984bc 100644
--- a/Hydraulic/Hydro.MapView/Common/MapDimensions.cs
+++ b/Hydraulic/Hydro.MapView/Common/MapDimensions.cs
@@ -13,24 +13,24 @@
{
- [Category("4銆佽瑙�")]
+ [Category("瑙嗚")]
[DisplayName("涓績")]
[Browsable(true)]
public PointF Center { get; set; }
- [Category("4銆佽瑙�")]
+ [Category("瑙嗚")]
[DisplayName("缂╂斁")]
[Browsable(true)]
public float zoom { get; set; } = 0.1f;
- [Category("4銆佽瑙�")]
+ [Category("瑙嗚")]
[DisplayName("鏃嬭浆瑙掑害")]
[Browsable(true)]
public double rotation { get; set; } = 0;
private double _rotationF;
- [Category("4銆佽瑙�")]
+ [Category("瑙嗚")]
[DisplayName("淇瑙掑害")]
[Browsable(true)]
public double rotationF
@@ -47,17 +47,17 @@
}
}
- [Category("4銆佽瑙�")]
+ [Category("瑙嗚")]
[DisplayName("鏄剧ず妤煎眰")]
[Browsable(true)]
public int ShowFloor { get; set; } = int.MinValue;
- [Category("4銆佽瑙�")]
+ [Category("瑙嗚")]
[DisplayName("鏄剧ず鑳屾櫙")]
[Browsable(true)]
public bool isShowPic { get; set; } = true;
- [Category("4銆佽瑙�")]
+ [Category("瑙嗚")]
[DisplayName("鏄剧ず鏈�涓嶅埄鐐�")]
[Browsable(true)]
public bool isShowUnfavor { get; set; } = true;
@@ -68,7 +68,7 @@
//[Browsable(false)]
//public int LinkColourIndex { get; set; } = 0;
- [Category("4銆佽瑙�")]
+ [Category("瑙嗚")]
[DisplayName("閿佸畾骞抽潰瑙嗚")]
[Browsable(true)]
public bool Lock2DView { get; set; }=false;
diff --git a/Hydraulic/Hydro.MapView/Model/NozzleViewModel.cs b/Hydraulic/Hydro.MapView/Model/NozzleViewModel.cs
index 5706dd3..06b6715 100644
--- a/Hydraulic/Hydro.MapView/Model/NozzleViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Model/NozzleViewModel.cs
@@ -10,7 +10,7 @@
[Serializable]
public class NozzleViewModel:NodeViewModel
{
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[Description("娴侀噺绯绘暟")]
[DisplayName("娴侀噺绯绘暟K")]
public float FlowCoefficient { get; set; }
diff --git a/Hydraulic/Hydro.MapView/Model/PipeViewModel.cs b/Hydraulic/Hydro.MapView/Model/PipeViewModel.cs
index c331c3b..eafe7eb 100644
--- a/Hydraulic/Hydro.MapView/Model/PipeViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Model/PipeViewModel.cs
@@ -11,17 +11,17 @@
[Serializable]
public class PipeViewModel: LinkViewModel
{
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("闀垮害")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("闀垮害(m)")]
[Browsable(true)]
public float Length { get { return base.Length; } set { base.Length = value; } }
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("娴锋．濞佸粔绯绘暟")]
[Browsable(true)]
public float Roughness { get { return base.Roughness; } set { base.Roughness = value; } }
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("灞�閮ㄩ樆鍔涚郴鏁�")]
[Browsable(true)]
public float MinorLoss { get { return base.MinorLoss; } set { base.MinorLoss = value; } }
diff --git a/Hydraulic/Hydro.MapView/Model/PumpViewModel.cs b/Hydraulic/Hydro.MapView/Model/PumpViewModel.cs
index 5029577..b43469f 100644
--- a/Hydraulic/Hydro.MapView/Model/PumpViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Model/PumpViewModel.cs
@@ -26,7 +26,7 @@
get { return base.Name; }
set { base.Name = value; }
}
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[DisplayName("姘存车绫诲瀷")]
public new PumpType Type { get; set; }
@@ -34,20 +34,20 @@
public dict<string, Dataset> Datasets { get; set; } = new dict<string, Dataset>();
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
public double 棰濆畾杞�� { get; set; } = 1500;
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
public double 棰濆畾娴侀噺 { get; set; } = 200;
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
public double 棰濆畾鎵▼ { get; set; } = 50;
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
public double 棰濆畾鍔熺巼 { get; set; } = 75;
public double 杞�熸瘮 { get; set; } = 1;
[DisplayName("2)褰撳墠杞��")]
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
public double 褰撳墠杞�� { get; set; } = 1500;
[Browsable(false)]
@@ -530,7 +530,7 @@
return series;
}
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("3)娴侀噺鎵▼鏇茬嚎")]
public List<PointF> HeadCurvePoints
{
@@ -554,7 +554,7 @@
}
}
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("4)娴侀噺鏁堢巼鏇茬嚎")]
public List<PointF> EfficCurvePoints
{
@@ -585,7 +585,7 @@
public List<string> Parameters { get; set; }
//瀹為檯闇�姘撮噺
- [Category("3銆佽绠楃粨鏋�")]
+ [Category("璁＄畻缁撴灉")]
[DisplayName("2)鎵▼")]
[Browsable(true)]
public new float EN_HEADLOSS { get { return -base.EN_HEADLOSS; } }
diff --git a/Hydraulic/Hydro.MapView/Model/RepeaterViewModel.cs b/Hydraulic/Hydro.MapView/Model/RepeaterViewModel.cs
index b494343..2c476c5 100644
--- a/Hydraulic/Hydro.MapView/Model/RepeaterViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Model/RepeaterViewModel.cs
@@ -13,7 +13,7 @@
[Serializable]
public class RepeaterViewModel:LinkViewModel
{
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[DisplayName("瀵硅薄鍓嶇紑鍚嶇О")]
[Browsable(true)]
/// <summary>
@@ -21,7 +21,7 @@
/// </summary>
public string NetworkPreName { get; set; }
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[DisplayName("鏄剧ず鍚嶇О")]
[Browsable(true)]
/// <summary>
@@ -32,7 +32,7 @@
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[DisplayName("鍓嶇紑鏈�灏忓簭鍙�")]
[Browsable(true)]
/// <summary>
@@ -41,7 +41,7 @@
public int NetworkPreStartNum { get; set; } = 1;
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[DisplayName("鍓嶇紑姝ｅ簭")]
[Browsable(true)]
/// <summary>
@@ -51,7 +51,7 @@
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("妯℃澘ID")]
[Browsable(false)]
//[Editor(typeof(TemplatePropertyEditor), typeof(UITypeEditor))]
@@ -62,7 +62,7 @@
public string TemplateID { get; set; }
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("妯℃澘鍚嶇О")]
[Browsable(true)]
public string TempName => TemplateList.GetTemplate(TemplateID)?.Name;
@@ -83,7 +83,7 @@
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("閲嶅娆℃暟")]
[Browsable(true)]
/// <summary>
@@ -94,26 +94,26 @@
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("娴锋．濞佸粔绯绘暟")]
[Browsable(false)]
public new float Roughness { get; set; }
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("灞�閮ㄩ樆鍔涚郴鏁�")]
[Browsable(false)]
public override float MinorLoss { get; set; }
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("闀垮害")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("闀垮害(m)")]
[Browsable(false)]
public new float Length { get; set; }
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("鍙ｅ緞")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("鍙ｅ緞(mm)")]
[Browsable(false)]
public new float Diameter { get; set; }
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("鏄剧ず鐘舵��")]
[Browsable(true)]
public new RepeatStatus Status { get; set; }
diff --git a/Hydraulic/Hydro.MapView/Model/ReservoirViewModel.cs b/Hydraulic/Hydro.MapView/Model/ReservoirViewModel.cs
index 997bbd6..9b6db23 100644
--- a/Hydraulic/Hydro.MapView/Model/ReservoirViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Model/ReservoirViewModel.cs
@@ -10,14 +10,14 @@
[Serializable]
public class ReservoirViewModel:NodeViewModel
{
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[Description("闇�姘撮噺")]
- [DisplayName("闇�姘撮噺")]
+ [DisplayName("闇�姘撮噺(m)")]
[Browsable(false)]
public new float Demand { get; set; }
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[Description("鎬绘按澶�")]
- [DisplayName("缁濆姘村帇")]
+ [DisplayName("缁濆姘村帇(m)")]
public float Head { get; set; }
//public string Pattern { get; set; }
public override string ToString()
diff --git a/Hydraulic/Hydro.MapView/Model/TankViewModel.cs b/Hydraulic/Hydro.MapView/Model/TankViewModel.cs
index c5ba5de..7ed7abb 100644
--- a/Hydraulic/Hydro.MapView/Model/TankViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Model/TankViewModel.cs
@@ -10,21 +10,21 @@
[Serializable]
public class TankViewModel:NodeViewModel
{
- [Category("2銆佽绠楀弬鏁�")]
- [DisplayName("鍒濆姘翠綅")]
+ [Category("璁＄畻鍙傛暟")]
+ [DisplayName("鍒濆姘翠綅(m)")]
public float InitLevel { get; set; } = 5;
- [Category("2銆佽绠楀弬鏁�")]
- [DisplayName("鏈�浣庢按浣�")]
+ [Category("璁＄畻鍙傛暟")]
+ [DisplayName("鏈�浣庢按浣�(m)")]
public float MinLevel { get; set; } = 0;
- [Category("2銆佽绠楀弬鏁�")]
- [DisplayName("鏈�楂樻按浣�")]
+ [Category("璁＄畻鍙傛暟")]
+ [DisplayName("鏈�楂樻按浣�(m)")]
public float MaxLevel { get; set; } = 10;
- [Category("2銆佽绠楀弬鏁�")]
- [DisplayName("鐩村緞")]
+ [Category("璁＄畻鍙傛暟")]
+ [DisplayName("鐩村緞(mm)")]
[Browsable(false)]
public float Diameter { get; set; } = 10;
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("姹犲簳闈㈢Н")]
public double Area
{
@@ -37,14 +37,14 @@
Diameter = (float)Math.Pow(value / Math.PI, 0.5) * 2;
}
}
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("鏈�灏忓绉�")]
public float MinVol { get; set; } = 0;
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("瀹圭Н鏇茬嚎")]
public string VolCurve { get; set; } = "";
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("鏄惁鍏佽婧㈡祦")]
public string Overflow { get; set; } = "";
diff --git a/Hydraulic/Hydro.MapView/Model/ValveNodeViewModel.cs b/Hydraulic/Hydro.MapView/Model/ValveNodeViewModel.cs
index a68a6bc..58cfb94 100644
--- a/Hydraulic/Hydro.MapView/Model/ValveNodeViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Model/ValveNodeViewModel.cs
@@ -15,33 +15,33 @@
public string Node2 { get; set; }
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("闀垮害")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("闀垮害(m)")]
[Browsable(true)]
public float Length { get; set; }
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("鍙ｅ緞")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("鍙ｅ緞(mm)")]
[Browsable(true)]
public float Diameter { get; set; }
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("娴锋．濞佸粔绯绘暟")]
[Browsable(true)]
public float Roughness { get; set; } = 110;
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("灞�閮ㄩ樆鍔涚郴鏁�")]
[Browsable(true)]
public float MinorLoss { get; set; } = 0;
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("鍒濆鐘舵��")]
[Browsable(true)]
public new StatusType Status { get; set; }
- [Category("2銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[DisplayName("绫诲瀷")]
[Browsable(true)]
public new string Type { get; set; } = "GPV";
- [Category("2銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[DisplayName("鏇茬嚎")]
[Browsable(true)]
public string Setting { get; set; } = "GPVDefault";
diff --git a/Hydraulic/Hydro.MapView/Model/ValveViewModel.cs b/Hydraulic/Hydro.MapView/Model/ValveViewModel.cs
index 3966c1a..f8d25d0 100644
--- a/Hydraulic/Hydro.MapView/Model/ValveViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Model/ValveViewModel.cs
@@ -10,33 +10,33 @@
[Serializable]
public class ValveViewModel:LinkViewModel
{
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("闀垮害")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("闀垮害(m)")]
[Browsable(true)]
public new float Length { get; set; }
- [Category("1銆佸熀鏈俊鎭�")]
- [DisplayName("鍙ｅ緞")]
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("鍙ｅ緞(mm)")]
[Browsable(true)]
public new float Diameter { get; set; }
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("娴锋．濞佸粔绯绘暟")]
[Browsable(true)]
public new float Roughness { get; set; } = 110;
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("灞�閮ㄩ樆鍔涚郴鏁�")]
[Browsable(true)]
public new float MinorLoss { get; set; } = 0;
- //[Category("2銆佽绠楀弬鏁�")]
+ //[Category("璁＄畻鍙傛暟")]
//[DisplayName("鍒濆鐘舵��")]
//[Browsable(true)]
//public string Status { get; set; } = "";
- [Category("2銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[DisplayName("绫诲瀷")]
[Browsable(true)]
public new string Type { get; set; } = "GPV";
- [Category("2銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[DisplayName("鏇茬嚎")]
[Browsable(true)]
public string Setting { get; set; } = "GPVDefault";
diff --git a/Hydraulic/Hydro.MapView/Template/Template.cs b/Hydraulic/Hydro.MapView/Template/Template.cs
index 290dd3c..11d0233 100644
--- a/Hydraulic/Hydro.MapView/Template/Template.cs
+++ b/Hydraulic/Hydro.MapView/Template/Template.cs
@@ -19,12 +19,12 @@
public class Template
{
private string _ID;
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("瀵硅薄鐨処D鍞竴鏍囪瘑")]
[DisplayName("妯℃澘ID")]
[Browsable(true)]
public string ID { get { if (_ID == null || _ID == "") _ID = Guid.NewGuid().ToString(); return _ID; } set { _ID = value; } }
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[DisplayName("鍚嶇О")]
public string Name { get; set; }
@@ -32,7 +32,7 @@
private string _filePath = null;
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("璺緞INP")]
public string filePath
{
@@ -117,10 +117,10 @@
- [Category("2銆佽绠楀弬鏁�")]
+ [Category("璁＄畻鍙傛暟")]
[DisplayName("鏈�楂樼骇鏁�")]
public int MaxLevel { get; set; } = 99;
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[Description("绫诲瀷")]
[DisplayName("绫诲瀷")]
[Browsable(true)]
@@ -145,7 +145,7 @@
}
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[Description("瀵硅薄鐨処D鍞竴鏍囪瘑")]
[Browsable(false)]
[NonSerialized]
@@ -153,12 +153,12 @@
- [Category("5銆佹ゼ灞�")]
+ [Category("妤煎眰")]
[DisplayName("妤煎眰")]
public List<TRegion> Regions { get; set; } = null;// new List<TRegion>();
- [Category("1銆佸熀鏈俊鎭�")]
+ [Category("鍩烘湰淇℃伅")]
[DisplayName("鏍囬珮")]
[Browsable(false)]
public float Elev { get { return 0; } }
@@ -172,12 +172,12 @@
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[DisplayName("寮�濮嬭妭鐐�")]
public string Node1 { get; set; }
- [Category("4銆佸叾浠栧弬鏁�")]
+ [Category("鍏朵粬鍙傛暟")]
[DisplayName("缁撴潫鑺傜偣")]
public string Node2 { get; set; }
@@ -189,13 +189,13 @@
[Browsable(false)]
public string Visible { get; set; }
- [Category("4銆侀粯璁よ瑙�")]
+ [Category("榛樿瑙嗚")]
[DisplayName("瑙嗚")]
[Browsable(false)]
public MapDimensions view { get; set; } = null;
- [Category("4銆侀粯璁よ瑙�")]
+ [Category("榛樿瑙嗚")]
[DisplayName("涓績X")]
[Browsable(true)]
public float CenterX
@@ -211,7 +211,7 @@
view.Center = new PointF(value, view.Center.Y);
}
}
- [Category("4銆侀粯璁よ瑙�")]
+ [Category("榛樿瑙嗚")]
[DisplayName("涓績Y")]
[Browsable(true)]
public float CenterY
@@ -228,7 +228,7 @@
}
}
- [Category("4銆侀粯璁よ瑙�")]
+ [Category("榛樿瑙嗚")]
[DisplayName("缂╂斁")]
[Browsable(true)]
public float zoom
@@ -246,7 +246,7 @@
}
}
- [Category("4銆侀粯璁よ瑙�")]
+ [Category("榛樿瑙嗚")]
[DisplayName("鏃嬭浆瑙掑害")]
[Browsable(true)]
public double rotation
@@ -259,7 +259,7 @@
}
}
- [Category("4銆侀粯璁よ瑙�")]
+ [Category("榛樿瑙嗚")]
[DisplayName("淇瑙掑害")]
[Browsable(true)]
public double rotationF
diff --git a/Hydraulic/Hydro.Revit2022/.vs/Hydro.Revit2022.csproj.dtbcache.json b/Hydraulic/Hydro.Revit2022/.vs/Hydro.Revit2022.csproj.dtbcache.json
index f425205..64e4f78 100644
--- a/Hydraulic/Hydro.Revit2022/.vs/Hydro.Revit2022.csproj.dtbcache.json
+++ b/Hydraulic/Hydro.Revit2022/.vs/Hydro.Revit2022.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\Hydraulic\\Hydro.Revit2022","ProjectFileName":"Hydro.Revit2022.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Base\\IBaseInterface.cs"},{"SourceFile":"Model\\HydrantBoxViewModel.cs"},{"SourceFile":"Model\\JunctionViewModel.cs"},{"SourceFile":"Model\\NetWorkOutViewModel.cs"},{"SourceFile":"Model\\NozzleViewModel.cs"},{"SourceFile":"Model\\PipeViewModel.cs"},{"SourceFile":"Model\\PositionModel.cs"},{"SourceFile":"Model\\PumpAdapterViewModel.cs"},{"SourceFile":"Model\\ValveViewModel.cs"},{"SourceFile":"Model\\WaterPumpViewModel.cs"},{"SourceFile":"Model\\WaterTankViewModel.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"RevitNetWork.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkData\\YiWei\\Hydro\\Hydro.V1.1\\bin\\debug\\Hydro.Inp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\bin\\debug\\Hydro.Revit.dll","OutputItemRelativePath":"Hydro.Revit.dll"},{"OutputItemFullPath":"D:\\WorkData\\YiWei\\Hydro\\bin\\debug\\Hydro.Revit.pdb","OutputItemRelativePath":"Hydro.Revit.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\WorkDatas\\Hydro.V1.1\\Hydraulic\\Hydro.Revit2022","ProjectFileName":"Hydro.Revit2022.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Base\\IBaseInterface.cs"},{"SourceFile":"Model\\HydrantBoxViewModel.cs"},{"SourceFile":"Model\\JunctionViewModel.cs"},{"SourceFile":"Model\\NetWorkOutViewModel.cs"},{"SourceFile":"Model\\NozzleViewModel.cs"},{"SourceFile":"Model\\PipeViewModel.cs"},{"SourceFile":"Model\\PositionModel.cs"},{"SourceFile":"Model\\PumpAdapterViewModel.cs"},{"SourceFile":"Model\\ValveViewModel.cs"},{"SourceFile":"Model\\WaterPumpViewModel.cs"},{"SourceFile":"Model\\WaterTankViewModel.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"RevitNetWork.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.Inp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.Revit.dll","OutputItemRelativePath":"Hydro.Revit.dll"},{"OutputItemFullPath":"D:\\WorkDatas\\Hydro.V1.1\\bin\\debug\\Hydro.Revit.pdb","OutputItemRelativePath":"Hydro.Revit.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
--
Gitblit v1.9.3