cloudflight
2023-12-20 ac3e88e5dc69c74c80045a86abe38caae81d0101
Merge branch 'master' of http://47.103.154.90:83/r/Yw/Hydro.V1.0
已修改16个文件
已添加1个文件
545 ■■■■■ 文件已修改
Hydro.Core/Common/CheckModel.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.Core/Enum/ObjectEnum.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.Core/Node/NozzleModel.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.Revit/Base/IBaseInterface.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.Revit/Hydro.Revit2022.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.Revit/Model/HydrantBoxViewModel.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.Revit/Model/JunctionViewModel.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.Revit/Model/NetWorkOutViewModel.cs 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.Revit/Model/NozzleViewModel.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.Revit/Model/PipeViewModel.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.Revit/Model/PumpAdapterViewModel.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.Revit/Model/ValveViewModel.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.Revit/Model/WaterPumpViewModel.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.Revit/Model/WaterTankViewModel.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.Revit/RevitNetWork.cs 93 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.sln 181 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Test/Program.cs 190 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro.Core/Common/CheckModel.cs
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static Hydro.Core.ObjectEnum;
namespace Hydro.Core.Model
{
@@ -20,5 +21,10 @@
    public class FailModel : BaseModel
    {
        public string FailReason { get; set; }
        public FailType Type { get; set; }
        public string ModelName { get; set; }
    }
}
Hydro.Core/Enum/ObjectEnum.cs
@@ -28,5 +28,13 @@
            æµé‡åŠŸçŽ‡æ›²çº¿ = 2,
            æµé‡æ•ˆçŽ‡æ›²çº¿ = 3
        }
        public enum FailType
        {
            ç¼ºå°‘Node1或Node2连接属性 = 1,
            å–·å¤´åªèƒ½è¿žæŽ¥ç®¡é“ = 2,
            ç¼ºå°‘水箱或水池对象 = 3,
            ç®¡ä»¶å¯¹è±¡è¿žç®¡ä»¶å¯¹è±¡ = 4
        }
    }
}
Hydro.Core/Node/NozzleModel.cs
@@ -22,6 +22,9 @@
        /// </summary>
        public string PatternID { get; set; }
        public string Node1 { get; set; }
        public string Node2 { get; set; }
        public override string ToString()
        {
            if (string.IsNullOrEmpty(PatternID)) PatternID = "";
Hydro.Revit/Base/IBaseInterface.cs
@@ -18,5 +18,10 @@
        /// </summary>
        string SystemType { get; set; }
        /// <summary>
        /// æ¥¼å±‚
        /// </summary>
        string Floor { get; set; }
    }
}
Hydro.Revit/Hydro.Revit2022.csproj
@@ -45,6 +45,7 @@
    <Compile Include="Base\IBaseInterface.cs" />
    <Compile Include="Model\HydrantBoxViewModel.cs" />
    <Compile Include="Model\JunctionViewModel.cs" />
    <Compile Include="Model\NetWorkOutViewModel.cs" />
    <Compile Include="Model\NozzleViewModel.cs" />
    <Compile Include="Model\PipeViewModel.cs" />
    <Compile Include="Model\PositionModel.cs" />
Hydro.Revit/Model/HydrantBoxViewModel.cs
@@ -17,5 +17,6 @@
    {
        public string PositionJson { get; set; }
        public string SystemType { get; set; }
        public string Floor { get; set; }
    }
}
Hydro.Revit/Model/JunctionViewModel.cs
@@ -9,11 +9,15 @@
namespace Hydro.Revit.Model
{
    public class JunctionViewModel:JunctionModel,IBaseInterface
    public class JunctionViewModel : JunctionModel, IBaseInterface
    {
        public string PositionJson { get; set; }
        public string SystemType { get; set; }
        public string Floor { get; set; }
        public string Node1 { get; set; }
        public string Node2 { get; set; }
        public void Draw()
        {
            throw new NotImplementedException();
Hydro.Revit/Model/NetWorkOutViewModel.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
using Hydro.Core.Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Hydro.Revit.Model
{
    public class NetWorkOutViewModel
    {
        public long BimFaceID { get; set; }
        public List<HydrantBoxViewModel> HydrantBoxes { get; set; } = new List<HydrantBoxViewModel>();
        public List<JunctionViewModel> Junctions { get; set; } = new List<JunctionViewModel>();
        public List<NozzleViewModel> Nozzles { get; set; } = new List<NozzleViewModel>();
        public List<PipeViewModel> Pipes { get; set; } = new List<PipeViewModel>();
        public List<PumpAdapterViewModel> PumpAdapters { get; set; } = new List<PumpAdapterViewModel>();
        public List<ValveViewModel> Valves { get; set; } = new List<ValveViewModel>();
        public List<WaterPumpViewModel> Pumps { get; set; } = new List<WaterPumpViewModel>();
        public List<WaterTankViewModel> Tanks { get; set; } = new List<WaterTankViewModel>();
        public List<ReservoisModel> Reservos { get; set; } = new List<ReservoisModel>();
        public List<MeterModel> Meters { get; set; }= new List<MeterModel>();
        public List<NodeCalcModel> Nodes { get; set; } = new List<NodeCalcModel>();
        public List<LinkCalcModel> Links { get; set; } = new List<LinkCalcModel>();
    }
}
Hydro.Revit/Model/NozzleViewModel.cs
@@ -14,5 +14,7 @@
    {
        public string PositionJson { get; set; }
        public string SystemType { get; set; }
        public string Floor { get; set; }
    }
}
Hydro.Revit/Model/PipeViewModel.cs
@@ -13,5 +13,7 @@
    {
        public string PositionJson { get; set; }
        public string SystemType { get; set; }
        public string Floor { get; set; }
    }
}
Hydro.Revit/Model/PumpAdapterViewModel.cs
@@ -14,5 +14,7 @@
    {
        public string PositionJson { get; set; }
        public string SystemType { get; set; }
        public string Floor { get; set; }
    }
}
Hydro.Revit/Model/ValveViewModel.cs
@@ -12,5 +12,7 @@
    {
        public string PositionJson { get; set; }
        public string SystemType { get; set; }
        public string Floor { get; set; }
    }
}
Hydro.Revit/Model/WaterPumpViewModel.cs
@@ -12,5 +12,7 @@
    {
        public string PositionJson { get; set; }
        public string SystemType { get; set; }
        public string Floor { get; set; }
    }
}
Hydro.Revit/Model/WaterTankViewModel.cs
@@ -12,5 +12,7 @@
    {
        public string PositionJson { get; set; }
        public string SystemType { get; set; }
        public string Floor { get; set; }
    }
}
Hydro.Revit/RevitNetWork.cs
@@ -11,52 +11,79 @@
{
    public class RevitNetWork : NetWork
    {
        public  void AddJunction(JunctionViewModel junction)
        public void AddJunction(JunctionViewModel junction)
        {
            CheckNodesExist(junction);
            Nodes.Add(junction);
            if (!CheckNodesExist(junction))
                Nodes.Add(junction);
        }
        public  void AddJunctions(List<JunctionViewModel> junctions)
        public new List<PipeViewModel> Pipes
        {
            get
            {
                var js = Links.Where(d => d is PipeViewModel);
                return js?.Select(d => d as PipeViewModel).ToList();
            }
        }
        public new List<NozzleViewModel> Nozzles
        {
            get
            {
                var js = Nodes.Where(d => d is NozzleViewModel);
                return js?.Select(d => d as NozzleViewModel).ToList();
            }
        }
        public void AddJunctions(List<JunctionViewModel> junctions)
        {
            junctions.ForEach(junction => { AddJunction(junction); });
        }
        public  void AddTank(WaterTankViewModel tank)
        public void AddTank(WaterTankViewModel tank)
        {
            CheckNodesExist(tank);
            Nodes.Add(tank);
            if (!CheckNodesExist(tank))
                Nodes.Add(tank);
        }
        public  void AddTanks(List<WaterTankViewModel> tanks)
        public List<HydrantBoxViewModel> HydrantBoxes => Nodes.Where((NodeCalcModel d) => d is HydrantBoxViewModel)?.Select((NodeCalcModel d) => d as HydrantBoxViewModel).ToList();
        public void AddTanks(List<WaterTankViewModel> tanks)
        {
            tanks.ForEach(tank => { AddTank(tank); });
            // WaterTankViewModel kk=null;
            // Nodes.Select(n => (WaterTankViewModel)n).ToList().Sort(o => o.PositionJson);
            // WaterTankViewModels
            //((WaterTankViewModel) Nodes[0]).PositionJson
        }
        public  void AddPipe(PipeViewModel pipe)
        public void AddPipe(PipeViewModel pipe)
        {
            CheckLinksExist(pipe);
            Links.Add(pipe);
            if (!CheckLinksExist(pipe))
                Links.Add(pipe);
        }
        public  void AddPipes(List<PipeViewModel> pipes)
        public void AddPipes(List<PipeViewModel> pipes)
        {
            pipes.ForEach(pipe => { AddPipe(pipe); });
        }
        public  void AddPump(WaterPumpViewModel pump)
        public void AddPump(WaterPumpViewModel pump)
        {
            CheckLinksExist(pump);
            Links.Add(pump);
            if (!CheckLinksExist(pump))
                Links.Add(pump);
        }
        public  void AddPumps(List<WaterPumpViewModel> pumps)
        public void AddPumps(List<WaterPumpViewModel> pumps)
        {
            pumps.ForEach(pump => { AddPump(pump); });
        }
        public  void AddValve(ValveViewModel valve)
        public void AddValve(ValveViewModel valve)
        {
            CheckLinksExist(valve);
            Links.Add(valve);
            if (!CheckLinksExist(valve))
                Links.Add(valve);
        }
        public void AddValves(List<ValveViewModel> valves)
@@ -66,35 +93,35 @@
        public void AddHydrantBox(HydrantBoxViewModel hydrantBox)
        {
            CheckNodesExist(hydrantBox);
            Nodes.Add(hydrantBox);
            if (!CheckNodesExist(hydrantBox))
                Nodes.Add(hydrantBox);
        }
        public  void AddHydrantBoxs(List<HydrantBoxViewModel> hydrantBoxs)
        public void AddHydrantBoxs(List<HydrantBoxViewModel> hydrantBoxs)
        {
            hydrantBoxs.ForEach(hydrantBox => { AddHydrantBox(hydrantBox); });
        }
        public  void AddNozzle(NozzleViewModel nozzle)
        public void AddNozzle(NozzleViewModel nozzle)
        {
            CheckNodesExist(nozzle);
            Nodes.Add(nozzle);
            if (!CheckNodesExist(nozzle))
                Nodes.Add(nozzle);
        }
        public  void AddNozzles(List<NozzleViewModel> nozzles)
        public void AddNozzles(List<NozzleViewModel> nozzles)
        {
            nozzles.ForEach(nozzle => { AddNozzle(nozzle); });
        }
        private void CheckNodesExist(NodeCalcModel node)
        private bool CheckNodesExist(NodeCalcModel node)
        {
            if (Nodes.Any(d => d.ID == node.ID))
                throw new Exception("已存在重复的对象");
            return Nodes.Any(d => d.ID == node.ID);
            //   throw new Exception("已存在重复的对象");
        }
        private void CheckLinksExist(LinkCalcModel link)
        private bool CheckLinksExist(LinkCalcModel link)
        {
            if (Links.Any(d => d.ID == link.ID))
                throw new Exception("已存在重复的对象");
            return Links.Any(d => d.ID == link.ID);
            //throw new Exception("已存在重复的对象");
        }
    }
}
Hydro.sln
@@ -27,419 +27,240 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestForm", "TestForm\TestForm.csproj", "{C544D069-8DFD-4779-83CD-D54C6B84AE56}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hydro.CodeProvider", "Hydro.CodeProvider\Hydro.CodeProvider.csproj", "{791F7359-A30D-4401-B712-0E8E841840D9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HydraulicCore", "Hydro.HydraulicCore\HydraulicCore.vcxproj", "{D2B8356F-0EA6-4167-8119-57B3E49A55CF}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
        Debug_new|Any CPU = Debug_new|Any CPU
        Debug_new|x64 = Debug_new|x64
        Debug_new|x86 = Debug_new|x86
        Debug|Any CPU = Debug|Any CPU
        Debug|x64 = Debug|x64
        Debug|x86 = Debug|x86
        Debug1|Any CPU = Debug1|Any CPU
        Debug1|x64 = Debug1|x64
        Debug1|x86 = Debug1|x86
        dll_test|Any CPU = dll_test|Any CPU
        dll_test|x64 = dll_test|x64
        dll_test|x86 = dll_test|x86
        Release|Any CPU = Release|Any CPU
        Release|x64 = Release|x64
        Release|x86 = Release|x86
    EndGlobalSection
    GlobalSection(ProjectConfigurationPlatforms) = postSolution
        {CA211620-16A7-4953-929D-723A5F9D3239}.Debug_new|Any CPU.ActiveCfg = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Debug_new|Any CPU.Build.0 = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Debug_new|x64.ActiveCfg = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Debug_new|x64.Build.0 = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Debug_new|x86.ActiveCfg = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Debug_new|x86.Build.0 = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Debug|x64.ActiveCfg = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Debug|x64.Build.0 = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Debug|x86.ActiveCfg = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Debug|x86.Build.0 = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Debug1|Any CPU.ActiveCfg = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Debug1|Any CPU.Build.0 = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Debug1|x64.ActiveCfg = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Debug1|x64.Build.0 = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Debug1|x86.ActiveCfg = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Debug1|x86.Build.0 = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.dll_test|Any CPU.Build.0 = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.dll_test|x64.ActiveCfg = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.dll_test|x64.Build.0 = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.dll_test|x86.ActiveCfg = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.dll_test|x86.Build.0 = Debug|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Release|Any CPU.Build.0 = Release|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Release|x64.ActiveCfg = Release|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Release|x64.Build.0 = Release|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Release|x86.ActiveCfg = Release|Any CPU
        {CA211620-16A7-4953-929D-723A5F9D3239}.Release|x86.Build.0 = Release|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Debug_new|Any CPU.ActiveCfg = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Debug_new|Any CPU.Build.0 = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Debug_new|x64.ActiveCfg = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Debug_new|x64.Build.0 = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Debug_new|x86.ActiveCfg = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Debug_new|x86.Build.0 = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Debug|x64.ActiveCfg = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Debug|x64.Build.0 = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Debug|x86.ActiveCfg = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Debug|x86.Build.0 = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Debug1|Any CPU.ActiveCfg = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Debug1|Any CPU.Build.0 = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Debug1|x64.ActiveCfg = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Debug1|x64.Build.0 = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Debug1|x86.ActiveCfg = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Debug1|x86.Build.0 = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.dll_test|Any CPU.Build.0 = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.dll_test|x64.ActiveCfg = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.dll_test|x64.Build.0 = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.dll_test|x86.ActiveCfg = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.dll_test|x86.Build.0 = Debug|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Release|Any CPU.Build.0 = Release|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Release|x64.ActiveCfg = Release|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Release|x64.Build.0 = Release|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Release|x86.ActiveCfg = Release|Any CPU
        {FFFBE974-BA86-420D-AA27-6DB215017C8C}.Release|x86.Build.0 = Release|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Debug_new|Any CPU.ActiveCfg = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Debug_new|Any CPU.Build.0 = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Debug_new|x64.ActiveCfg = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Debug_new|x64.Build.0 = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Debug_new|x86.ActiveCfg = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Debug_new|x86.Build.0 = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Debug|x64.ActiveCfg = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Debug|x64.Build.0 = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Debug|x86.ActiveCfg = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Debug|x86.Build.0 = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Debug1|Any CPU.ActiveCfg = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Debug1|Any CPU.Build.0 = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Debug1|x64.ActiveCfg = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Debug1|x64.Build.0 = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Debug1|x86.ActiveCfg = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Debug1|x86.Build.0 = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.dll_test|Any CPU.Build.0 = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.dll_test|x64.ActiveCfg = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.dll_test|x64.Build.0 = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.dll_test|x86.ActiveCfg = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.dll_test|x86.Build.0 = Debug|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Release|Any CPU.Build.0 = Release|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Release|x64.ActiveCfg = Release|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Release|x64.Build.0 = Release|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Release|x86.ActiveCfg = Release|Any CPU
        {78653BED-368A-470D-A021-929F2E583313}.Release|x86.Build.0 = Release|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Debug_new|Any CPU.ActiveCfg = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Debug_new|Any CPU.Build.0 = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Debug_new|x64.ActiveCfg = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Debug_new|x64.Build.0 = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Debug_new|x86.ActiveCfg = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Debug_new|x86.Build.0 = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Debug|x64.ActiveCfg = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Debug|x64.Build.0 = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Debug|x86.ActiveCfg = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Debug|x86.Build.0 = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Debug1|Any CPU.ActiveCfg = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Debug1|Any CPU.Build.0 = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Debug1|x64.ActiveCfg = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Debug1|x64.Build.0 = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Debug1|x86.ActiveCfg = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Debug1|x86.Build.0 = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.dll_test|Any CPU.Build.0 = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.dll_test|x64.ActiveCfg = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.dll_test|x64.Build.0 = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.dll_test|x86.ActiveCfg = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.dll_test|x86.Build.0 = Debug|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Release|Any CPU.Build.0 = Release|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Release|x64.ActiveCfg = Release|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Release|x64.Build.0 = Release|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Release|x86.ActiveCfg = Release|Any CPU
        {83776DD7-89FF-4ACF-980F-E135E5596FC2}.Release|x86.Build.0 = Release|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Debug_new|Any CPU.ActiveCfg = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Debug_new|Any CPU.Build.0 = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Debug_new|x64.ActiveCfg = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Debug_new|x64.Build.0 = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Debug_new|x86.ActiveCfg = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Debug_new|x86.Build.0 = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Debug|x64.ActiveCfg = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Debug|x64.Build.0 = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Debug|x86.ActiveCfg = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Debug|x86.Build.0 = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Debug1|Any CPU.ActiveCfg = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Debug1|Any CPU.Build.0 = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Debug1|x64.ActiveCfg = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Debug1|x64.Build.0 = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Debug1|x86.ActiveCfg = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Debug1|x86.Build.0 = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.dll_test|Any CPU.Build.0 = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.dll_test|x64.ActiveCfg = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.dll_test|x64.Build.0 = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.dll_test|x86.ActiveCfg = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.dll_test|x86.Build.0 = Debug|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Release|Any CPU.Build.0 = Release|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Release|x64.ActiveCfg = Release|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Release|x64.Build.0 = Release|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Release|x86.ActiveCfg = Release|Any CPU
        {18E2E3D7-508E-4781-A760-BA852564E409}.Release|x86.Build.0 = Release|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Debug_new|Any CPU.ActiveCfg = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Debug_new|Any CPU.Build.0 = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Debug_new|x64.ActiveCfg = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Debug_new|x64.Build.0 = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Debug_new|x86.ActiveCfg = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Debug_new|x86.Build.0 = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Debug|x64.ActiveCfg = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Debug|x64.Build.0 = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Debug|x86.ActiveCfg = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Debug|x86.Build.0 = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Debug1|Any CPU.ActiveCfg = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Debug1|Any CPU.Build.0 = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Debug1|x64.ActiveCfg = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Debug1|x64.Build.0 = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Debug1|x86.ActiveCfg = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Debug1|x86.Build.0 = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.dll_test|Any CPU.Build.0 = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.dll_test|x64.ActiveCfg = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.dll_test|x64.Build.0 = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.dll_test|x86.ActiveCfg = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.dll_test|x86.Build.0 = Debug|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Release|Any CPU.Build.0 = Release|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Release|x64.ActiveCfg = Release|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Release|x64.Build.0 = Release|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Release|x86.ActiveCfg = Release|Any CPU
        {D66081C0-21B2-4B2A-A4AD-DAE293271972}.Release|x86.Build.0 = Release|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Debug_new|Any CPU.ActiveCfg = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Debug_new|Any CPU.Build.0 = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Debug_new|x64.ActiveCfg = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Debug_new|x64.Build.0 = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Debug_new|x86.ActiveCfg = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Debug_new|x86.Build.0 = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Debug|x64.ActiveCfg = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Debug|x64.Build.0 = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Debug|x86.ActiveCfg = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Debug|x86.Build.0 = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Debug1|Any CPU.ActiveCfg = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Debug1|Any CPU.Build.0 = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Debug1|x64.ActiveCfg = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Debug1|x64.Build.0 = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Debug1|x86.ActiveCfg = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Debug1|x86.Build.0 = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.dll_test|Any CPU.Build.0 = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.dll_test|x64.ActiveCfg = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.dll_test|x64.Build.0 = Debug|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.dll_test|x86.ActiveCfg = dll_test|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.dll_test|x86.Build.0 = dll_test|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Release|Any CPU.Build.0 = Release|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Release|x64.ActiveCfg = Release|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Release|x64.Build.0 = Release|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Release|x86.ActiveCfg = Release|Any CPU
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5}.Release|x86.Build.0 = Release|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Debug_new|Any CPU.ActiveCfg = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Debug_new|Any CPU.Build.0 = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Debug_new|x64.ActiveCfg = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Debug_new|x64.Build.0 = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Debug_new|x86.ActiveCfg = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Debug_new|x86.Build.0 = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Debug|x64.ActiveCfg = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Debug|x64.Build.0 = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Debug|x86.ActiveCfg = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Debug|x86.Build.0 = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Debug1|Any CPU.ActiveCfg = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Debug1|Any CPU.Build.0 = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Debug1|x64.ActiveCfg = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Debug1|x64.Build.0 = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Debug1|x86.ActiveCfg = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Debug1|x86.Build.0 = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.dll_test|Any CPU.Build.0 = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.dll_test|x64.ActiveCfg = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.dll_test|x64.Build.0 = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.dll_test|x86.ActiveCfg = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.dll_test|x86.Build.0 = Debug|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Release|Any CPU.Build.0 = Release|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Release|x64.ActiveCfg = Release|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Release|x64.Build.0 = Release|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Release|x86.ActiveCfg = Release|Any CPU
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9}.Release|x86.Build.0 = Release|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Debug_new|Any CPU.ActiveCfg = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Debug_new|Any CPU.Build.0 = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Debug_new|x64.ActiveCfg = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Debug_new|x64.Build.0 = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Debug_new|x86.ActiveCfg = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Debug_new|x86.Build.0 = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Debug|x64.ActiveCfg = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Debug|x64.Build.0 = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Debug|x86.ActiveCfg = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Debug|x86.Build.0 = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Debug1|Any CPU.ActiveCfg = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Debug1|Any CPU.Build.0 = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Debug1|x64.ActiveCfg = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Debug1|x64.Build.0 = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Debug1|x86.ActiveCfg = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Debug1|x86.Build.0 = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.dll_test|Any CPU.Build.0 = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.dll_test|x64.ActiveCfg = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.dll_test|x64.Build.0 = Debug|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.dll_test|x86.ActiveCfg = dll_test|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.dll_test|x86.Build.0 = dll_test|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Release|Any CPU.Build.0 = Release|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Release|x64.ActiveCfg = Release|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Release|x64.Build.0 = Release|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Release|x86.ActiveCfg = Release|Any CPU
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E}.Release|x86.Build.0 = Release|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Debug_new|Any CPU.ActiveCfg = Debug_new|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Debug_new|Any CPU.Build.0 = Debug_new|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Debug_new|x64.ActiveCfg = Debug_new|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Debug_new|x64.Build.0 = Debug_new|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Debug_new|x86.ActiveCfg = Debug_new|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Debug_new|x86.Build.0 = Debug_new|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Debug|x64.ActiveCfg = Debug|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Debug|x64.Build.0 = Debug|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Debug|x86.ActiveCfg = Debug|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Debug|x86.Build.0 = Debug|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Debug1|Any CPU.ActiveCfg = Debug1|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Debug1|Any CPU.Build.0 = Debug1|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Debug1|x64.ActiveCfg = Debug1|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Debug1|x64.Build.0 = Debug1|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Debug1|x86.ActiveCfg = Debug1|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Debug1|x86.Build.0 = Debug1|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.dll_test|Any CPU.Build.0 = Debug|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.dll_test|x64.ActiveCfg = Debug|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.dll_test|x64.Build.0 = Debug|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.dll_test|x86.ActiveCfg = Debug1|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.dll_test|x86.Build.0 = Debug1|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Release|Any CPU.Build.0 = Release|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Release|x64.ActiveCfg = Release|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Release|x64.Build.0 = Release|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Release|x86.ActiveCfg = Release|Any CPU
        {50A0264A-17C1-4132-BF90-91E4BA593C88}.Release|x86.Build.0 = Release|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Debug_new|Any CPU.ActiveCfg = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Debug_new|Any CPU.Build.0 = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Debug_new|x64.ActiveCfg = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Debug_new|x64.Build.0 = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Debug_new|x86.ActiveCfg = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Debug_new|x86.Build.0 = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Debug|x64.ActiveCfg = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Debug|x64.Build.0 = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Debug|x86.ActiveCfg = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Debug|x86.Build.0 = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Debug1|Any CPU.ActiveCfg = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Debug1|Any CPU.Build.0 = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Debug1|x64.ActiveCfg = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Debug1|x64.Build.0 = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Debug1|x86.ActiveCfg = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Debug1|x86.Build.0 = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.dll_test|Any CPU.ActiveCfg = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.dll_test|Any CPU.Build.0 = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.dll_test|x64.ActiveCfg = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.dll_test|x64.Build.0 = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.dll_test|x86.ActiveCfg = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.dll_test|x86.Build.0 = Debug|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Release|Any CPU.Build.0 = Release|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Release|x64.ActiveCfg = Release|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Release|x64.Build.0 = Release|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Release|x86.ActiveCfg = Release|Any CPU
        {C544D069-8DFD-4779-83CD-D54C6B84AE56}.Release|x86.Build.0 = Release|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Debug_new|Any CPU.ActiveCfg = Debug|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Debug_new|Any CPU.Build.0 = Debug|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Debug_new|x64.ActiveCfg = Debug|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Debug_new|x64.Build.0 = Debug|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Debug_new|x86.ActiveCfg = Debug|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Debug_new|x86.Build.0 = Debug|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Debug|x64.ActiveCfg = Debug|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Debug|x64.Build.0 = Debug|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Debug|x86.ActiveCfg = Debug|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Debug|x86.Build.0 = Debug|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Debug1|Any CPU.ActiveCfg = Debug|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Debug1|Any CPU.Build.0 = Debug|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Debug1|x64.ActiveCfg = Debug|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Debug1|x64.Build.0 = Debug|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Debug1|x86.ActiveCfg = Debug|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Debug1|x86.Build.0 = Debug|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.dll_test|Any CPU.ActiveCfg = dll_test|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.dll_test|Any CPU.Build.0 = dll_test|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.dll_test|x64.ActiveCfg = dll_test|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.dll_test|x64.Build.0 = dll_test|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.dll_test|x86.ActiveCfg = dll_test|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.dll_test|x86.Build.0 = dll_test|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Release|Any CPU.Build.0 = Release|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Release|x64.ActiveCfg = Release|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Release|x64.Build.0 = Release|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Release|x86.ActiveCfg = Release|Any CPU
        {791F7359-A30D-4401-B712-0E8E841840D9}.Release|x86.Build.0 = Release|Any CPU
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Debug_new|Any CPU.ActiveCfg = Debug|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Debug_new|Any CPU.Build.0 = Debug|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Debug_new|x64.ActiveCfg = Debug|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Debug_new|x64.Build.0 = Debug|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Debug_new|x86.ActiveCfg = Debug|Win32
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Debug_new|x86.Build.0 = Debug|Win32
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Debug|Any CPU.ActiveCfg = Debug|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Debug|Any CPU.Build.0 = Debug|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Debug|x64.ActiveCfg = Debug|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Debug|x64.Build.0 = Debug|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Debug|x86.ActiveCfg = Debug|Win32
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Debug|x86.Build.0 = Debug|Win32
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Debug1|Any CPU.ActiveCfg = Debug|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Debug1|Any CPU.Build.0 = Debug|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Debug1|x64.ActiveCfg = Debug|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Debug1|x64.Build.0 = Debug|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Debug1|x86.ActiveCfg = Debug|Win32
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Debug1|x86.Build.0 = Debug|Win32
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.dll_test|Any CPU.ActiveCfg = dll_test|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.dll_test|Any CPU.Build.0 = dll_test|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.dll_test|x64.ActiveCfg = dll_test|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.dll_test|x64.Build.0 = dll_test|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.dll_test|x86.ActiveCfg = dll_test|Win32
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.dll_test|x86.Build.0 = dll_test|Win32
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Release|Any CPU.ActiveCfg = Release|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Release|Any CPU.Build.0 = Release|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Release|x64.ActiveCfg = Release|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Release|x64.Build.0 = Release|x64
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Release|x86.ActiveCfg = Release|Win32
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF}.Release|x86.Build.0 = Release|Win32
    EndGlobalSection
    GlobalSection(SolutionProperties) = preSolution
        HideSolutionNode = FALSE
@@ -449,8 +270,6 @@
        {84E17BA3-BA03-43C1-9D19-8CE64508F2B5} = {BF2EE4DA-0821-403B-A88C-13A2ADF8F34D}
        {0F5C43E6-97BA-457C-954D-62EAB47A38A9} = {BF2EE4DA-0821-403B-A88C-13A2ADF8F34D}
        {5F33CE64-2329-422C-9DDA-903CEEF25A6E} = {BF2EE4DA-0821-403B-A88C-13A2ADF8F34D}
        {791F7359-A30D-4401-B712-0E8E841840D9} = {BF2EE4DA-0821-403B-A88C-13A2ADF8F34D}
        {D2B8356F-0EA6-4167-8119-57B3E49A55CF} = {BF2EE4DA-0821-403B-A88C-13A2ADF8F34D}
    EndGlobalSection
    GlobalSection(ExtensibilityGlobals) = postSolution
        SolutionGuid = {5A3FD1E7-1F24-4EA8-8D68-9465BDE67E2D}
Test/Program.cs
@@ -1,11 +1,10 @@
using Hydro.Core.Model;
using Hydro.Inp;
//using Hydro.Revit;
//using Hydro.Revit.Model;
using Hydro.Revit;
using Hydro.Revit.Model;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -14,11 +13,11 @@
{
    internal class Program
    {
        static string inpPath = Directory.GetCurrentDirectory()+@"\inp\t1.inp";
        const string inpPath = "d:\\t1.inp";
        const string revitInpPath = "d:\\t2.inp";
        static void Main(string[] args)
        {
            Test1();
            Test3();
        }
        static void Test1()
@@ -93,7 +92,6 @@
            });
            nw.BuildToInp(inpPath);
            var result=nw.Calc();
        }
        static void Test2()
@@ -140,7 +138,7 @@
        static void Test3()
        {
            var nw = new NetWorkMapModel();
            var result = nw.Calc("d:\\revitinp.inp");
            var result = nw.Calc("d:\\xiaofang.inp");
            Console.WriteLine(result);
            Console.ReadLine();
        }
@@ -154,102 +152,102 @@
        }
        //static void TestRevit1()
        //{
        //    var nw = new RevitNetWork();
        //    var systemType = "test";
        //    var postionJson = "[]";
        //    nw.AddPipe(new PipeViewModel()
        //    {
        //        ID = "p_1",
        //        Name = "Pipe1",
        //        Length = 10,
        //        Node1 = "j_1",
        //        Node2 = "n_1",
        //        Diameter = 100,
        //        PositionJson = postionJson,
        //        SystemType = systemType
        //    });
        static void TestRevit1()
        {
            var nw = new RevitNetWork();
            var systemType = "test";
            var postionJson = "[]";
            nw.AddPipe(new PipeViewModel()
            {
                ID = "p_1",
                Name = "Pipe1",
                Length = 10,
                Node1 = "j_1",
                Node2 = "n_1",
                Diameter = 100,
                PositionJson = postionJson,
                SystemType = systemType
            });
        //    nw.AddValve(new ValveViewModel()
        //    {
        //        ID = "v_1",
        //        Name = "Value1",
        //        Node1 = "j_2",
        //        Node2 = "j_3",
        //        Length = 10,
        //        Diameter = 100,
        //        PositionJson = postionJson,
        //        SystemType = systemType,
        //    });
            nw.AddValve(new ValveViewModel()
            {
                ID = "v_1",
                Name = "Value1",
                Node1 = "j_2",
                Node2 = "j_3",
                Length = 10,
                Diameter = 100,
                PositionJson = postionJson,
                SystemType = systemType,
            });
        //    nw.AddJunction(new JunctionViewModel()
        //    {
        //        ID = "j_1",
        //        Name = "Junction1",
        //        Elev = 10,
        //        X = 10,
        //        PositionJson = postionJson,
        //        SystemType = systemType,
        //        Y = 10
        //    });
        //    nw.AddJunction(new JunctionViewModel()
        //    {
        //        ID = "j_2",
        //        Name = "Junction2",
        //        Elev = 15,
        //        X = 15,
        //        PositionJson = postionJson,
        //        SystemType = systemType,
        //        Y = 15
        //    });
        //    nw.AddJunction(new JunctionViewModel()
        //    {
        //        ID = "j_3",
        //        Name = "Junction3",
        //        Elev = 13,
        //        X = 13,
        //        PositionJson = postionJson,
        //        SystemType = systemType,
        //        Y = 13
        //    });
            nw.AddJunction(new JunctionViewModel()
            {
                ID = "j_1",
                Name = "Junction1",
                Elev = 10,
                X = 10,
                PositionJson = postionJson,
                SystemType = systemType,
                Y = 10
            });
            nw.AddJunction(new JunctionViewModel()
            {
                ID = "j_2",
                Name = "Junction2",
                Elev = 15,
                X = 15,
                PositionJson = postionJson,
                SystemType = systemType,
                Y = 15
            });
            nw.AddJunction(new JunctionViewModel()
            {
                ID = "j_3",
                Name = "Junction3",
                Elev = 13,
                X = 13,
                PositionJson = postionJson,
                SystemType = systemType,
                Y = 13
            });
        //    nw.AddReservos(new PumpAdapterViewModel()
        //    {
        //        ID = "r_1",
        //        Name = "PumpAdapter1",
        //        PositionJson = postionJson,
        //        SystemType = systemType
        //    });
            nw.AddReservos(new PumpAdapterViewModel()
            {
                ID = "r_1",
                Name = "PumpAdapter1",
                PositionJson = postionJson,
                SystemType = systemType
            });
        //    nw.AddPump(new WaterPumpViewModel()
        //    {
        //        ID = "pump_1",
        //        Name = "Pump1",
        //        Node1 = "j_3",
        //        Node2 = "j_1",
        //        PositionJson = postionJson,
        //        SystemType = systemType
        //    });
        //    nw.AddNozzle(new NozzleViewModel()
        //    {
        //        ID = "n_1",
        //        Name = "Nozzle1",
        //        X = 5,
        //        Y = 5,
        //        Elev = 20,
        //        FlowCoefficient = 160,
        //        PositionJson = postionJson,
        //        SystemType = systemType
        //    });
            nw.AddPump(new WaterPumpViewModel()
            {
                ID = "pump_1",
                Name = "Pump1",
                Node1 = "j_3",
                Node2 = "j_1",
                PositionJson = postionJson,
                SystemType = systemType
            });
            nw.AddNozzle(new NozzleViewModel()
            {
                ID = "n_1",
                Name = "Nozzle1",
                X = 5,
                Y = 5,
                Elev = 20,
                FlowCoefficient = 160,
                PositionJson = postionJson,
                SystemType = systemType
            });
        //    nw.BuildToInp(revitInpPath);
            nw.BuildToInp(revitInpPath);
        //    var json = JsonConvert.SerializeObject(nw);
        //    Console.WriteLine(json);
            var json = JsonConvert.SerializeObject(nw);
            Console.WriteLine(json);
        //    Console.WriteLine("生成成功");
        //}
            Console.WriteLine("生成成功");
        }
    }
}