Merge branch 'master' of http://47.103.154.90:83/r/Yw/Hydro.V1.1

cloudflight

2024-05-07 2646029d2b97f6835062d45d2cfa632838c527ca

 HydroV1.1.sln

@@ -5,15 +5,11 @@
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Calc", "Calc", "{F976F42E-15B8-40BB-8132-80FBE0CAAD43}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{5B5DE24F-D205-4B5A-A439-8EA61C1B23C7}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WinfrmUI", "WinfrmUI", "{5B5DE24F-D205-4B5A-A439-8EA61C1B23C7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hydro.Core", "Hydraulic\Hydro.Core\Hydro.Core.csproj", "{CA211620-16A7-4953-929D-723A5F9D3239}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hydro.Inp2.2", "Hydraulic\Hydro.Inp2.2\Hydro.Inp2.2.csproj", "{FFFBE974-BA86-420D-AA27-6DB215017C8C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hydro.MapUI", "Hydraulic\Hydro.MapUI\Hydro.MapUI.csproj", "{50A0264A-17C1-4132-BF90-91E4BA593C88}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hydro.MapView", "Hydraulic\Hydro.MapView\Hydro.MapView.csproj", "{18E2E3D7-508E-4781-A760-BA852564E409}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hydro.Revit2022", "Hydraulic\Hydro.Revit2022\Hydro.Revit2022.csproj", "{78653BED-368A-470D-A021-929F2E583313}"
EndProject
@@ -29,7 +25,21 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hydro.HydraulicOptimizer", "Hydraulic\Hydro.HydraulicOptimizer\Hydro.HydraulicOptimizer.csproj", "{0F5C43E6-97BA-457C-954D-62EAB47A38A9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hydro.ClientTool", "Hydro.ClientTool\Hydro.ClientTool.csproj", "{A87A91DE-3A66-4305-8C4D-61927C4F2D4F}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{46182416-57AD-48DC-978F-807BA1963DC6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Revit", "Revit", "{A37F6E29-D269-4477-BCD5-E1067EE72B8C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Inp", "Inp", "{96196846-4C86-4764-97B5-CEA924F25F07}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hydro.MapView", "WinfrmUI\Hydro.MapView\Hydro.MapView.csproj", "{18E2E3D7-508E-4781-A760-BA852564E409}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hydro.MapUI", "WinfrmUI\Hydro.MapUI\Hydro.MapUI.csproj", "{50A0264A-17C1-4132-BF90-91E4BA593C88}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hydro.WinfrmUI.Browser", "WinfrmUI\Hydro.WinfrmUI.Browser\Hydro.WinfrmUI.Browser.csproj", "{930AD465-19DE-42C2-BB14-C090D01E7B59}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hydro.WinfrmUI.Viewer", "WinfrmUI\Hydro.WinfrmUI.Viewer\Hydro.WinfrmUI.Viewer.csproj", "{18F0B3F6-59FD-4328-916C-A183EDD3B8F9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hydro.ClientTool", "Client\Hydro.ClientTool.csproj", "{A87A91DE-3A66-4305-8C4D-61927C4F2D4F}"
EndProject
Global
   GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -65,30 +75,6 @@
      {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
      {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}.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
      {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}.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
      {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
@@ -173,6 +159,54 @@
      {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
      {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}.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
      {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}.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
      {930AD465-19DE-42C2-BB14-C090D01E7B59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
      {930AD465-19DE-42C2-BB14-C090D01E7B59}.Debug|Any CPU.Build.0 = Debug|Any CPU
      {930AD465-19DE-42C2-BB14-C090D01E7B59}.Debug|x64.ActiveCfg = Debug|Any CPU
      {930AD465-19DE-42C2-BB14-C090D01E7B59}.Debug|x64.Build.0 = Debug|Any CPU
      {930AD465-19DE-42C2-BB14-C090D01E7B59}.Debug|x86.ActiveCfg = Debug|Any CPU
      {930AD465-19DE-42C2-BB14-C090D01E7B59}.Debug|x86.Build.0 = Debug|Any CPU
      {930AD465-19DE-42C2-BB14-C090D01E7B59}.Release|Any CPU.ActiveCfg = Release|Any CPU
      {930AD465-19DE-42C2-BB14-C090D01E7B59}.Release|Any CPU.Build.0 = Release|Any CPU
      {930AD465-19DE-42C2-BB14-C090D01E7B59}.Release|x64.ActiveCfg = Release|Any CPU
      {930AD465-19DE-42C2-BB14-C090D01E7B59}.Release|x64.Build.0 = Release|Any CPU
      {930AD465-19DE-42C2-BB14-C090D01E7B59}.Release|x86.ActiveCfg = Release|Any CPU
      {930AD465-19DE-42C2-BB14-C090D01E7B59}.Release|x86.Build.0 = Release|Any CPU
      {18F0B3F6-59FD-4328-916C-A183EDD3B8F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
      {18F0B3F6-59FD-4328-916C-A183EDD3B8F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
      {18F0B3F6-59FD-4328-916C-A183EDD3B8F9}.Debug|x64.ActiveCfg = Debug|Any CPU
      {18F0B3F6-59FD-4328-916C-A183EDD3B8F9}.Debug|x64.Build.0 = Debug|Any CPU
      {18F0B3F6-59FD-4328-916C-A183EDD3B8F9}.Debug|x86.ActiveCfg = Debug|Any CPU
      {18F0B3F6-59FD-4328-916C-A183EDD3B8F9}.Debug|x86.Build.0 = Debug|Any CPU
      {18F0B3F6-59FD-4328-916C-A183EDD3B8F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
      {18F0B3F6-59FD-4328-916C-A183EDD3B8F9}.Release|Any CPU.Build.0 = Release|Any CPU
      {18F0B3F6-59FD-4328-916C-A183EDD3B8F9}.Release|x64.ActiveCfg = Release|Any CPU
      {18F0B3F6-59FD-4328-916C-A183EDD3B8F9}.Release|x64.Build.0 = Release|Any CPU
      {18F0B3F6-59FD-4328-916C-A183EDD3B8F9}.Release|x86.ActiveCfg = Release|Any CPU
      {18F0B3F6-59FD-4328-916C-A183EDD3B8F9}.Release|x86.Build.0 = Release|Any CPU
      {A87A91DE-3A66-4305-8C4D-61927C4F2D4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
      {A87A91DE-3A66-4305-8C4D-61927C4F2D4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
      {A87A91DE-3A66-4305-8C4D-61927C4F2D4F}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -190,17 +224,19 @@
      HideSolutionNode = FALSE
   EndGlobalSection
   GlobalSection(NestedProjects) = preSolution
      {CA211620-16A7-4953-929D-723A5F9D3239} = {5B5DE24F-D205-4B5A-A439-8EA61C1B23C7}
      {FFFBE974-BA86-420D-AA27-6DB215017C8C} = {5B5DE24F-D205-4B5A-A439-8EA61C1B23C7}
      {50A0264A-17C1-4132-BF90-91E4BA593C88} = {5B5DE24F-D205-4B5A-A439-8EA61C1B23C7}
      {18E2E3D7-508E-4781-A760-BA852564E409} = {5B5DE24F-D205-4B5A-A439-8EA61C1B23C7}
      {78653BED-368A-470D-A021-929F2E583313} = {5B5DE24F-D205-4B5A-A439-8EA61C1B23C7}
      {CA211620-16A7-4953-929D-723A5F9D3239} = {46182416-57AD-48DC-978F-807BA1963DC6}
      {FFFBE974-BA86-420D-AA27-6DB215017C8C} = {96196846-4C86-4764-97B5-CEA924F25F07}
      {78653BED-368A-470D-A021-929F2E583313} = {A37F6E29-D269-4477-BCD5-E1067EE72B8C}
      {791F7359-A30D-4401-B712-0E8E841840D9} = {F976F42E-15B8-40BB-8132-80FBE0CAAD43}
      {84E17BA3-BA03-43C1-9D19-8CE64508F2B5} = {F976F42E-15B8-40BB-8132-80FBE0CAAD43}
      {5F33CE64-2329-422C-9DDA-903CEEF25A6E} = {F976F42E-15B8-40BB-8132-80FBE0CAAD43}
      {D2B8356F-0EA6-4167-8119-57B3E49A55CF} = {F976F42E-15B8-40BB-8132-80FBE0CAAD43}
      {D66081C0-21B2-4B2A-A4AD-DAE293271972} = {F976F42E-15B8-40BB-8132-80FBE0CAAD43}
      {D2B8356F-0EA6-4167-8119-57B3E49A55CF} = {46182416-57AD-48DC-978F-807BA1963DC6}
      {D66081C0-21B2-4B2A-A4AD-DAE293271972} = {46182416-57AD-48DC-978F-807BA1963DC6}
      {0F5C43E6-97BA-457C-954D-62EAB47A38A9} = {F976F42E-15B8-40BB-8132-80FBE0CAAD43}
      {18E2E3D7-508E-4781-A760-BA852564E409} = {5B5DE24F-D205-4B5A-A439-8EA61C1B23C7}
      {50A0264A-17C1-4132-BF90-91E4BA593C88} = {5B5DE24F-D205-4B5A-A439-8EA61C1B23C7}
      {930AD465-19DE-42C2-BB14-C090D01E7B59} = {5B5DE24F-D205-4B5A-A439-8EA61C1B23C7}
      {18F0B3F6-59FD-4328-916C-A183EDD3B8F9} = {5B5DE24F-D205-4B5A-A439-8EA61C1B23C7}
   EndGlobalSection
   GlobalSection(ExtensibilityGlobals) = postSolution
      SolutionGuid = {04D92980-B7F3-4AC8-B744-D6A674322C27}