From f4f45f8dff2768d257e65f01a6865def48206ce3 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 22 二月 2025 16:23:17 +0800
Subject: [PATCH] 综合分析修改

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj |  562 +++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 399 insertions(+), 163 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
index 66754a0..15923e8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
@@ -1,176 +1,412 @@
 锘�<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <Nullable>disable</Nullable>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0-windows</TargetFramework>
+		<Nullable>disable</Nullable>
+		<UseWindowsForms>true</UseWindowsForms>
+		<ImplicitUsings>enable</ImplicitUsings>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="02-project\01-import\01-ModelFile\**" />
-    <Compile Remove="03-ViewModel\**" />
-    <Compile Remove="04-HomePageMainPanel\**" />
-    <EmbeddedResource Remove="02-project\01-import\01-ModelFile\**" />
-    <EmbeddedResource Remove="03-ViewModel\**" />
-    <EmbeddedResource Remove="04-HomePageMainPanel\**" />
-    <None Remove="02-project\01-import\01-ModelFile\**" />
-    <None Remove="03-ViewModel\**" />
-    <None Remove="04-HomePageMainPanel\**" />
-    <Page Remove="02-project\01-import\01-ModelFile\**" />
-    <Page Remove="03-ViewModel\**" />
-    <Page Remove="04-HomePageMainPanel\**" />
-  </ItemGroup>
+	<ItemGroup>
+		<Compile Remove="02-project\01-import\01-ModelFile\**" />
+		<Compile Remove="03-simulation\04-scheme\01-info - 澶嶅埗\**" />
+		<Compile Remove="03-simulation\07-matching\04-pipe\01-pipesinglematching\**" />
+		<Compile Remove="03-simulation\07-matching\05-elbows\01-elbowsinglematching\**" />
+		<Compile Remove="03-simulation\07-matching\06-threelink\01-threelinksinglematching\**" />
+		<Compile Remove="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\**" />
+		<Compile Remove="03-ViewModel\**" />
+		<Compile Remove="04-HomePageMainPanel\**" />
+		<Compile Remove="map\gaode\css\**" />
+		<Compile Remove="Resources\**" />
+		<EmbeddedResource Remove="02-project\01-import\01-ModelFile\**" />
+		<EmbeddedResource Remove="03-simulation\04-scheme\01-info - 澶嶅埗\**" />
+		<EmbeddedResource Remove="03-simulation\07-matching\04-pipe\01-pipesinglematching\**" />
+		<EmbeddedResource Remove="03-simulation\07-matching\05-elbows\01-elbowsinglematching\**" />
+		<EmbeddedResource Remove="03-simulation\07-matching\06-threelink\01-threelinksinglematching\**" />
+		<EmbeddedResource Remove="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\**" />
+		<EmbeddedResource Remove="03-ViewModel\**" />
+		<EmbeddedResource Remove="04-HomePageMainPanel\**" />
+		<EmbeddedResource Remove="map\gaode\css\**" />
+		<EmbeddedResource Remove="Resources\**" />
+		<None Remove="02-project\01-import\01-ModelFile\**" />
+		<None Remove="03-simulation\04-scheme\01-info - 澶嶅埗\**" />
+		<None Remove="03-simulation\07-matching\04-pipe\01-pipesinglematching\**" />
+		<None Remove="03-simulation\07-matching\05-elbows\01-elbowsinglematching\**" />
+		<None Remove="03-simulation\07-matching\06-threelink\01-threelinksinglematching\**" />
+		<None Remove="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\**" />
+		<None Remove="03-ViewModel\**" />
+		<None Remove="04-HomePageMainPanel\**" />
+		<None Remove="map\gaode\css\**" />
+		<None Remove="Resources\**" />
+		<Page Remove="02-project\01-import\01-ModelFile\**" />
+		<Page Remove="03-simulation\04-scheme\01-info - 澶嶅埗\**" />
+		<Page Remove="03-simulation\07-matching\04-pipe\01-pipesinglematching\**" />
+		<Page Remove="03-simulation\07-matching\05-elbows\01-elbowsinglematching\**" />
+		<Page Remove="03-simulation\07-matching\06-threelink\01-threelinksinglematching\**" />
+		<Page Remove="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\**" />
+		<Page Remove="03-ViewModel\**" />
+		<Page Remove="04-HomePageMainPanel\**" />
+		<Page Remove="map\gaode\css\**" />
+		<Page Remove="Resources\**" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.cs" />
-    <Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.Designer.cs" />
-    <Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.cs" />
-    <Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.Designer.cs" />
-    <Compile Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainChoicePage.cs" />
-    <Compile Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainChoicePage.Designer.cs" />
-    <Compile Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainForm-bak.cs" />
-    <Compile Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainForm-bak.Designer.cs" />
-  </ItemGroup>
+	<ItemGroup>
+		<Compile Remove="00-core\AssetsMatchingHelper-Bak.cs" />
+		<Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.cs" />
+		<Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.Designer.cs" />
+		<Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.cs" />
+		<Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.Designer.cs" />
+		<Compile Remove="03-simulation\04-scheme\00-core\CreateXhsSchemeDlg - 澶嶅埗.cs" />
+		<Compile Remove="03-simulation\04-scheme\00-core\CreateXhsSchemeDlg - 澶嶅埗.Designer.cs" />
+		<Compile Remove="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage - 澶嶅埗.cs" />
+		<Compile Remove="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage - 澶嶅埗.Designer.cs" />
+		<Compile Remove="03-simulation\04-scheme\05-record\CreateXhsSchemeChangeRecordPage - 澶嶅埗.cs" />
+		<Compile Remove="03-simulation\04-scheme\05-record\CreateXhsSchemeChangeRecordPage - 澶嶅埗.Designer.cs" />
+		<Compile Remove="03-simulation\07-matching\00-core\XhsProjectSimulationMatchingListCtrl.cs" />
+		<Compile Remove="03-simulation\07-matching\00-core\XhsProjectSimulationMatchingListCtrl.Designer.cs" />
+		<Compile Remove="03-simulation\07-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.cs" />
+		<Compile Remove="03-simulation\07-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.Designer.cs" />
+		<Compile Remove="03-simulation\07-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.cs" />
+		<Compile Remove="03-simulation\07-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.Designer.cs" />
+		<Compile Remove="03-simulation\07-matching\02-pump\XhsPumpMatchingListCtrl.cs" />
+		<Compile Remove="03-simulation\07-matching\02-pump\XhsPumpMatchingListCtrl.Designer.cs" />
+		<Compile Remove="03-simulation\07-matching\02-pump\XhsPumpMatchingViewModel.cs" />
+		<Compile Remove="03-simulation\07-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.cs" />
+		<Compile Remove="03-simulation\07-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.Designer.cs" />
+		<Compile Remove="03-simulation\07-matching\03-valve\XhsProjectSimulationValveMatchingViewModel.cs" />
+		<Compile Remove="03-simulation\07-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.cs" />
+		<Compile Remove="03-simulation\07-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.Designer.cs" />
+		<Compile Remove="03-simulation\07-matching\04-pipe\XhsProjectSimulationPipeMatchingViewModel.cs" />
+		<Compile Remove="03-simulation\07-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.cs" />
+		<Compile Remove="03-simulation\07-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.Designer.cs" />
+		<Compile Remove="03-simulation\07-matching\05-elbows\XhsProjectSimulationElbowsMatchingViewModel.cs" />
+		<Compile Remove="03-simulation\07-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.cs" />
+		<Compile Remove="03-simulation\07-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.Designer.cs" />
+		<Compile Remove="03-simulation\07-matching\06-threelink\XhsProjectSimulationThreelinkMatchingViewModel.cs" />
+		<Compile Remove="03-simulation\07-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs" />
+		<Compile Remove="03-simulation\07-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.Designer.cs" />
+		<Compile Remove="03-simulation\07-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingViewModel.cs" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.resx" />
-    <EmbeddedResource Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.resx" />
-    <EmbeddedResource Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainChoicePage.resx" />
-    <EmbeddedResource Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainForm-bak.resx" />
-  </ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.resx" />
+		<EmbeddedResource Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.resx" />
+		<EmbeddedResource Remove="03-simulation\04-scheme\00-core\CreateXhsSchemeDlg - 澶嶅埗.resx" />
+		<EmbeddedResource Remove="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage - 澶嶅埗.resx" />
+		<EmbeddedResource Remove="03-simulation\04-scheme\05-record\CreateXhsSchemeChangeRecordPage - 澶嶅埗.resx" />
+		<EmbeddedResource Remove="03-simulation\07-matching\00-core\XhsProjectSimulationMatchingListCtrl.resx" />
+		<EmbeddedResource Remove="03-simulation\07-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.resx" />
+		<EmbeddedResource Remove="03-simulation\07-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.resx" />
+		<EmbeddedResource Remove="03-simulation\07-matching\02-pump\XhsPumpMatchingListCtrl.resx" />
+		<EmbeddedResource Remove="03-simulation\07-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.resx" />
+		<EmbeddedResource Remove="03-simulation\07-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.resx" />
+		<EmbeddedResource Remove="03-simulation\07-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.resx" />
+		<EmbeddedResource Remove="03-simulation\07-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.resx" />
+		<EmbeddedResource Remove="03-simulation\07-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.resx" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Remove="map\gaode\html\ViewProjectList.html" />
-    <None Remove="map\gaode\img\xhs_project.png" />
-    <None Remove="map\gaode\js\xhs_base64.js" />
-  </ItemGroup>
+	<ItemGroup>
+		<None Remove="map\gaode\html\ViewProjectList.html" />
+		<None Remove="map\gaode\img\xhs_project.png" />
+		<None Remove="map\gaode\js\xhs_base64.js" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Content Include="map\gaode\html\ViewProjectList.html">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="map\gaode\img\xhs_project.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="map\gaode\js\xhs_base64.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
+	<ItemGroup>
+		<Content Include="map\gaode\html\ViewProjectList.html">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Include="map\gaode\img\xhs_project.png">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Include="map\gaode\js\xhs_base64.js">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<None Include="Resources\apply_32x32.png" />
+		<None Include="Resources\clear_32x32.png" />
+		<None Include="Resources\home.svg" />
+		<None Include="Resources\map.svg" />
+		<None Include="Resources\project.svg" />
+		<None Include="Resources\pump128.png" />
+		<None Include="Resources\omit.svg" />
+		<None Include="Resources\pipe.svg" />
+		<None Include="Resources\pump.svg" />
+		<None Include="Resources\technology_32x32.png" />
+		<None Include="Resources\omit.png" />
+		<None Include="Resources\question_32x321.png" />
+		<None Include="Resources\question_32x32.png" />
+		<None Include="Resources\index_32x32.png" />
+		<None Include="Resources\bo_sale_item.svg" />
+		<None Include="Resources\bo_sale_item1.svg" />
+		<None Include="Resources\Local_resistance.png" />
+		<None Include="Resources\Pressure_conversion_formula_big1.2.png" />
+		<None Include="Resources\Pressure_conversion_formula_small1.2.png" />
+		<None Include="Resources\pump_run_32.png" />
+		<None Include="Resources\Cancel.svg" />
+		<None Include="Resources\Close32.png" />
+		<None Include="Resources\Folder.svg" />
+		<None Include="Resources\IncomingCall.svg" />
+		<None Include="Resources\MapLayers.svg" />
+		<None Include="Resources\Remove.svg" />
+		<None Include="Resources\Square32.png" />
+		<None Include="Resources\SizeNormal32.png" />
+		<None Include="Resources\SizeMin32.png" />
+		<None Include="Resources\valve.svg" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
-    <PackageReference Include="Yw.ZipFile.Core" Version="3.0.0" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
+		<PackageReference Include="Yw.SkiaSharp.Core" Version="3.0.0" />
+		<PackageReference Include="Yw.ZipFile.Core" Version="3.0.2" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="04-simulation\02-bimface\" />
-    <Folder Include="map\gaode\css\" />
-    <Folder Include="Resources\" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\BLL\HStation.BLL.TransferFile.Core\HStation.BLL.TransferFile.Core.csproj" />
+		<ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" />
+		<ProjectReference Include="..\..\Component\HStation.ReportFile.SDK.Core\HStation.ReportFile.SDK.Core.csproj" />
+		<ProjectReference Include="..\..\Hydro\HStation.Hydro.Core\HStation.Hydro.Core.csproj" />
+		<ProjectReference Include="..\HStation.WinFrmUI.Assets.Core\HStation.WinFrmUI.Assets.Core.csproj" />
+		<ProjectReference Include="..\HStation.WinFrmUI.Bimface.Core\HStation.WinFrmUI.Bimface.Core.csproj" />
+		<ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
+		<ProjectReference Include="..\HStation.WinFrmUI.Hydro.Core\HStation.WinFrmUI.Hydro.Core.csproj" />
+		<ProjectReference Include="..\Yw.WinFrmUI.Map.Core\Yw.WinFrmUI.Map.Core.csproj" />
+		<ProjectReference Include="..\Yw.WinFrmUI.Phart.Core\Yw.WinFrmUI.Phart.Core.csproj" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" />
-    <ProjectReference Include="..\..\Hydro\HStation.Hydro.Core\HStation.Hydro.Core.csproj" />
-    <ProjectReference Include="..\HStation.WinFrmUI.Assets.Core\HStation.WinFrmUI.Assets.Core.csproj" />
-    <ProjectReference Include="..\HStation.WinFrmUI.Bimface.Core\HStation.WinFrmUI.Bimface.Core.csproj" />
-    <ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
-    <ProjectReference Include="..\HStation.WinFrmUI.Hydro.Core\HStation.WinFrmUI.Hydro.Core.csproj" />
-    <ProjectReference Include="..\Yw.WinFrmUI.Map.Core\Yw.WinFrmUI.Map.Core.csproj" />
-    <ProjectReference Include="..\Yw.WinFrmUI.Phart.Core\Yw.WinFrmUI.Phart.Core.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+	  <Reference Include="Aspose.Words">
+	    <HintPath>00-core\Aspose.Words.dll</HintPath>
+	  </Reference>
+	</ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="02-project\04-dlg\00-core\ImportXhsProjectFileDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="02-project\04-dlg\01-FileChoice\SelectXhsProjectFileModelFileWizardPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="02-project\04-dlg\02-GeneralProject\GenerateXhsProjectFileWizardPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="02-project\04-dlg\03-ImportCompleted\ImportXhsProjectFileCompletedCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="02-project\04-dlg\04-ProjectResultShowPanel\ProjectFileResultShowPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="02-project\04-dlg\EditProjectDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\ChoicePumpMainDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="03-scheme\03-hydraulic-simulation\XhsSchemeHydraulicSimulationPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="03-scheme\02-asset-mgr\XhsSchemeAssetMgrPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="03-scheme\04-scheme-mgr\02-comparison\SelectSchemeDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="03-scheme\04-scheme-mgr\02-comparison\XhsSchemeComparisonPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="03-scheme\XhsSchemeMultiMgrPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="03-scheme\XhsSchemeMultiMgrPage_Bak2.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="03-scheme\XhsSchemeMultiMgrPage_Bak.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\01-info\XhsProjectSimulationProjectInfoCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\01-info\XhsProjectSimulationBimfaceInfoCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\01-info\XhsProjectSimulationInfoPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\01-autoMatching\02-AsstesFormCtrl\PipeLineMatchingCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\01-autoMatching\02-AsstesFormCtrl\ValveMatchingCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\01-autoMatching\02-AsstesFormCtrl\PumpMatchingCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\01-autoMatching\02-AsstesFormCtrl\ThreeLinkMatchingCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\01-autoMatching\02-AsstesFormCtrl\FourLinkMatchingCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\XhsProjectSimulationCorePage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="04-simulation\06-simulation\03-calcu\XhsProjectSimulationHydroCalcuFailedDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
+	<ItemGroup>
+		<Compile Update="02-project\01-import\04-completed\02-bimface\XhsProjectResultBimfaceCtrl.cs" />
+		<Compile Update="02-project\01-import\04-completed\03-hydro\XhsProjectResultHydroCtrl.cs" />
+		<Compile Update="02-project\01-import\04-completed\01-info\XhsProjectResultInfoCtrl.cs" />
+		<Compile Update="02-project\04-q3d\XhsProjectQ3dViewPage.cs" />
+		<Compile Update="02-project\05-add\AddXhsProjectDlg.cs" />
+		<Compile Update="02-project\08-view\ViewXhsProjectDlg.cs" />
+		<Compile Update="02-project\06-edit\EditXhsProjectDlg.cs" />
+		<Compile Update="03-simulation\04-scheme\02-change\00-core\CreateXhsSchemeBimfaceCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\01-pump\CreateXhsSchemePumpChangePage.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\01-pump\XhsSchemePumpChangeListCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\02-valve\CreateXhsSchemeValveChangePage.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\02-valve\XhsSchemeValveChangeListCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\18-compressor\CreateXhsSchemeCompressorChangePage.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\18-compressor\XhsSchemeCompressorChangeListCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\17-exchanger\CreateXhsSchemeExchangerChangePage.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\17-exchanger\XhsSchemeExchangerChangeListCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\16-translation\CreateXhsSchemeTranslationChangePage.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\16-translation\XhsSchemeTranslationChangeListCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\03-pipe\CreateXhsSchemePipeChangePage.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\03-pipe\XhsSchemePipeChangeListCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\04-blunthead\CreateXhsSchemeBluntheadChangePage.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\04-blunthead\XhsSchemeBluntheadChangeListCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\15-nozzle\CreateXhsSchemeNozzleChangePage.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\15-nozzle\XhsSchemeNozzleChangeListCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\14-hydrant\CreateXhsSchemeHydrantChangePage.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\14-hydrant\XhsSchemeHydrantChangeListCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\13-cooling\CreateXhsSchemeCoolingChangePage.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\13-cooling\XhsSchemeCoolingChangeListCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\12-waterbox\CreateXhsSchemeWaterboxChangePage.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\12-waterbox\XhsSchemeWaterboxChangeListCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\11-tank\CreateXhsSchemeTankChangePage.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\11-tank\XhsSchemeTankChangeListCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\10-pressmeter\CreateXhsSchemePressmeterChangePage.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\10-pressmeter\XhsSchemePressmeterChangeListCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\09-flowmeter\CreateXhsSchemeFlowmeterChangePage.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\09-flowmeter\XhsSchemeFlowmeterChangeListCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\08-meter\CreateXhsSchemeMeterChangePage.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\08-meter\XhsSchemeMeterChangeListCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\07-elbow\CreateXhsSchemeElbowChangePage.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\07-elbow\XhsSchemeElbowChangeListCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\06-fourlink\CreateXhsSchemeFourlinkChangePage.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\06-fourlink\XhsSchemeFourlinkChangeListCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\05-threelink\CreateXhsSchemeThreelinkChangePage.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\02-change\05-threelink\XhsSchemeThreelinkChangeListCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\04-scheme\04-generate\CreateXhsSchemeGeneralWizardPage.cs" />
+		<Compile Update="03-simulation\04-scheme\05-record\CreateXhsSchemeChangeRecordPage.cs" />
+		<Compile Update="03-simulation\04-scheme\01-info\00-core\XhsSchemeChangeTypeCheckedListHorizCtrl.cs" />
+		<Compile Update="03-simulation\07-matching\03-valve\AssetsValveSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\07-matching\03-valve\AssetsValveSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\07-matching\04-pipe\AssetsPipeSingleMatchingCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\04-pipe\AssetsPipeSingleMatchingDlg.cs">
+		  <SubType>Form</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\05-elbows\AssetsElbowSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\07-matching\05-elbows\AssetsElbowSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\07-matching\06-threelink\AssetsThreelinkSingleMatchingCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\06-threelink\AssetsThreelinkSingleMatchingDlg.cs">
+		  <SubType>Form</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\06-threelink\AssetsThreelinkSingleMatchingCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\07-fourlink\AssetsFourlinkSingleMatchingCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\07-fourlink\AssetsFourlinkSingleMatchingDlg.cs">
+		  <SubType>Form</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\07-fourlink\AssetsFourlinkSingleMatchingCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\07-fourlink\BluntheadSingleMatchingForm.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\09-Tank\AssetsTankSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\07-matching\09-Tank\AssetsTankSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\07-matching\12-Hydrant\AssetsHydrantSingleMatchingCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\12-Hydrant\AssetsHydrantSingleMatchingDlg.cs">
+		  <SubType>Form</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\14-Blunthead\AssetsBluntheadSingleMatchingCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\14-Blunthead\AssetsBluntheadSingleMatchingDlg.cs">
+		  <SubType>Form</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\15-Translation\AssetsTranslationSingleMatchingCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\15-Translation\AssetsTranslationSingleMatchingDlg.cs">
+		  <SubType>Form</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\16-sprinkler\AssetsSprinklerSingleMatchingCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\16-sprinkler\AssetsSprinklerSingleMatchingDlg.cs">
+		  <SubType>Form</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\17-compressor\AssetsCompressorSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\07-matching\17-compressor\AssetsCompressorSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\07-matching\18-exchanger\AssetsExchangerSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\07-matching\18-exchanger\AssetsExchangerSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\07-matching\18-pressmeter\AssetsPressmeterSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\07-matching\18-pressmeter\AssetsPressmeterSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\07-matching\17-flowmeter\AssetsFlowmeterSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\07-matching\17-flowmeter\AssetsFlowmeterSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\07-matching\16-meter\AssetsMeterSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs" />
+		<Compile Update="03-simulation\01-info\XhsProjectSimulationProjectInfoCtrl.cs" />
+		<Compile Update="03-simulation\01-info\XhsProjectSimulationBimfaceInfoCtrl.cs" />
+		<Compile Update="03-simulation\01-info\XhsProjectSimulationInfoPage.cs" />
+		<Compile Update="03-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs" />
+		<Compile Update="03-simulation\11-pump\05-edit\SimulationPumpCurveEditDlg.cs">
+		  <SubType>Form</SubType>
+		</Compile>
+		<Compile Update="03-simulation\09-energy-analy\SimulationEnergyAnalyCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\09-energy-analy\SimulationEnergyAnalyDlg.cs">
+		  <SubType>Form</SubType>
+		</Compile>
+		<Compile Update="03-simulation\09-energy-analy\SimulationEnergyAnalyWorkingDlg.cs">
+		  <SubType>Form</SubType>
+		</Compile>
+		<Compile Update="eMatchingDlg.cs" />
+		<Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs" />
+		<Compile Update="03-simulation\10-multi-analy\SimulationMultiAnalyWorkingDlg.cs" />
+		<Compile Update="03-simulation\10-multi-analy\SimulationMultiAnalyDlg.cs" />
+		<Compile Update="03-simulation\11-pump\01-parallel\SimulationPumpParallelDlg.cs" />
+		<Compile Update="03-simulation\11-pump\02-feat\SimulationSinglePumpFeatDlg.cs" />
+		<Compile Update="03-simulation\11-pump\02-feat\SimulationPumpFeatDlg.cs" />
+		<Compile Update="03-simulation\10-pump-analy\SimulationPumpAnalyWorkingDlg.cs" />
+		<Compile Update="03-simulation\10-pump-analy\SimulationPumpAnalyDlg.cs" />
+		<Compile Update="Properties\Resources.Designer.cs">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Resources.resx</DependentUpon>
+		</Compile>
+	</ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Update="Properties\Resources.resx">
+			<Generator>ResXFileCodeGenerator</Generator>
+			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
+		</EmbeddedResource>
+	</ItemGroup>
 
-</Project>
+	<ItemGroup>
+	  <Folder Include="03-simulation\11-pump\03-analy\" />
+	</ItemGroup>
+</Project>
\ No newline at end of file

--
Gitblit v1.9.3