From 3c8e996db701f2744af261e876455754ad182b62 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期五, 09 五月 2025 16:19:36 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj | 435 +++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 299 insertions(+), 136 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 3eb37de..e7f2a4d 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj @@ -9,32 +9,44 @@ <ItemGroup> <Compile Remove="02-project\01-import\01-ModelFile\**" /> - <Compile Remove="02-project\01-import\04-completed\**" /> + <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="04-pump\02-analy\**" /> - <Compile Remove="04-pump\03-calc\**" /> + <Compile Remove="map\gaode\css\**" /> <Compile Remove="Resources\**" /> <EmbeddedResource Remove="02-project\01-import\01-ModelFile\**" /> - <EmbeddedResource Remove="02-project\01-import\04-completed\**" /> + <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="04-pump\02-analy\**" /> - <EmbeddedResource Remove="04-pump\03-calc\**" /> + <EmbeddedResource Remove="map\gaode\css\**" /> <EmbeddedResource Remove="Resources\**" /> <None Remove="02-project\01-import\01-ModelFile\**" /> - <None Remove="02-project\01-import\04-completed\**" /> + <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="04-pump\02-analy\**" /> - <None Remove="04-pump\03-calc\**" /> + <None Remove="map\gaode\css\**" /> <None Remove="Resources\**" /> <Page Remove="02-project\01-import\01-ModelFile\**" /> - <Page Remove="02-project\01-import\04-completed\**" /> + <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="04-pump\02-analy\**" /> - <Page Remove="04-pump\03-calc\**" /> + <Page Remove="map\gaode\css\**" /> <Page Remove="Resources\**" /> </ItemGroup> @@ -44,74 +56,53 @@ <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\01-add\00-viewmodel\SetSchemePipeViewModel.cs" /> - <Compile Remove="03-simulation\04-scheme\01-add\00-viewmodel\SetSchemePumpViewModel.cs" /> - <Compile Remove="03-simulation\04-scheme\01-add\00-viewmodel\SetSchemeValveViewModel.cs" /> - <Compile Remove="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl - 澶嶅埗.cs" /> - <Compile Remove="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl - 澶嶅埗.Designer.cs" /> - <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%282%29.cs" /> - <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%282%29.Designer.cs" /> - <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%283%29.cs" /> - <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%283%29.Designer.cs" /> - <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%284%29.cs" /> - <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%284%29.Designer.cs" /> - <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.cs" /> - <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.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\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.Designer.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.Designer.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.Designer.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.Designer.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingViewModel.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.Designer.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingViewModel.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.Designer.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingViewModel.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.Designer.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingViewModel.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.Designer.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingViewModel.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.Designer.cs" /> - <Compile Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingViewModel.cs" /> - <Compile Remove="04-pump\PumpFullInfoCtrl.cs" /> - <Compile Remove="04-pump\PumpFullInfoCtrl.designer.cs" /> - <Compile Remove="04-pump\PumpFullInfoViewDlg.cs" /> - <Compile Remove="04-pump\PumpFullInfoViewDlg.Designer.cs" /> - <Compile Remove="04-pump\SinglePumpInfoViewDLg.cs" /> - <Compile Remove="04-pump\SinglePumpInfoViewDLg.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-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl - 澶嶅埗.resx" /> - <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%282%29.resx" /> - <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%283%29.resx" /> - <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%284%29.resx" /> - <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.resx" /> - <EmbeddedResource Remove="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage.resx" /> - <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.resx" /> - <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.resx" /> - <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.resx" /> - <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.resx" /> - <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.resx" /> - <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.resx" /> - <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.resx" /> - <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.resx" /> - <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.resx" /> - <EmbeddedResource Remove="04-pump\PumpFullInfoCtrl.resx" /> - <EmbeddedResource Remove="04-pump\PumpFullInfoViewDlg.resx" /> - <EmbeddedResource Remove="04-pump\SinglePumpInfoViewDLg.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> @@ -130,6 +121,25 @@ <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" /> @@ -140,23 +150,20 @@ <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.Epanet.Calcu.Core" Version="1.1.3" /> <PackageReference Include="Yw.SkiaSharp.Core" Version="3.0.0" /> <PackageReference Include="Yw.ZipFile.Core" Version="3.0.2" /> </ItemGroup> <ItemGroup> - <Folder Include="03-simulation\04-scheme\01-info\" /> - <Folder Include="03-simulation\06-simulation\01-matching\00-core\" /> - <Folder Include="map\gaode\css\" /> - </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" /> @@ -168,72 +175,225 @@ <ItemGroup> <Reference Include="Aspose.Words"> - <HintPath>bin\Debug\net6.0-windows\Aspose.Words.dll</HintPath> - <Private>True</Private> + <HintPath>00-core\Aspose.Words.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> - <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationBimfaceInfoCtrl.cs" /> - <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationHydroInfoCtrl.cs" /> - <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationProjectInfoCtrl.cs" /> - <Compile Update="02-project\04-dlg\00-core\ImportXhsProjectFileDlg.cs" /> - <Compile Update="02-project\04-dlg\01-FileChoice\SelectXhsProjectFileModelFileWizardPage.cs" /> - <Compile Update="02-project\04-dlg\02-GeneralProject\GenerateXhsProjectFileWizardPage.cs" /> - <Compile Update="02-project\04-dlg\03-ImportCompleted\ImportXhsProjectFileCompletedCtrl.cs" /> - <Compile Update="02-project\04-dlg\04-ProjectResultShowPanel\ProjectFileResultShowPanel.cs" /> - <Compile Update="02-project\04-dlg\EditProjectDlg.cs" /> - <Compile Update="03-simulation\04-scheme\01-add\01-set\03-pipe\SetSchemePipeListCtrl.cs" /> - <Compile Update="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl.cs" /> - <Compile Update="03-simulation\04-scheme\01-add\01-set\02-valve\SetSchemeValveListCtrl.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\09-tank\TankChartShowDlg.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\09-tank\SimulationTankSingleMatchingDlg.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\09-tank\TankSingleMatchingCtrl.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\16-sprinkler\SprinklerSingleMatchingCtrl.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\16-sprinkler\SimulationSprinklerSingleMatchingDlg.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\15-translation\TranslationSingleMatchingCtrl.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\15-translation\SimulationTranslationSingleMatchingDlg.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\13-pressmeter\PressmeterSingleMatchingCtrl.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\13-pressmeter\SimulationPressmeterSingleMatchingDlg.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\12-hydrant\HydrantSingleMatchingCtrl.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\12-hydrant\SimulationHydrantSingleMatchingDlg.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\11-flowmeter\FlowmeterSingleMatchingCtrl.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\11-flowmeter\SimulationFlowmeterSingleMatchingDlg.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\10-meter\MeterSingleMatchingCtrl.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\10-meter\SimulationMeterSingleMatchingDlg.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\14-blunthead\BluntheadSingleMatchingForm.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\14-blunthead\SimulationBluntheadSingleMatchingDlg.cs" /> + <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\05-add\AddXhsProjectDlg.cs" /> + <Compile Update="02-project\08-view\ViewXhsProjectDlg.cs" /> + <Compile Update="02-project\06-edit\EditXhsProjectDlg.cs" /> + <Compile Update="03-simulation\03-q3d\XhsProjectSimulationL3d2Ctrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <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\06-simulation\01-matching\03-valve\01-valvesinglematching\SimulationValveSingleMatchingDlg.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingCtrl.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\SimulationPipeSing;eMatchingDlg.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingleMatchingCtrl.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingCtrl.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\SimulationElbowSingleMatchingDlg.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourlinkSingleMatchingCtrl.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\SimulationFourlinkSingleMatchingDlg.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\SimulationCompressorSingleMatchingDlg.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\CompressorChartShowDlg.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\CompressorSingleMatchingCtrl.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\ExchangerChartShowDlg.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\ExchangerSingleMatchingCtrl.cs" /> - <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\SimulationExchangerSingleMatchingDlg.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\07-l3d\XhsProjectSimulationL3dCtrl.cs" /> - <Compile Update="03-simulation\08-working\XhsProjectSimulationWorkingPage.cs" /> - <Compile Update="03-simulation\09-energy\SimulationMultiWorkingEnergyDlg.cs" /> - <Compile Update="03-simulation\10-analy\SimulationMultiWorkingAnalyDlg.cs" /> - <Compile Update="03-simulation\10-analy\SimulationSingleWorkingAnalyDlg.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\09-energy\SimulationSingleWorkingEnergyDlg.cs" /> - <Compile Update="03-simulation\11-pump\03-analy\SimulationMultiWorkingPumpAnalyDlg.cs" /> - <Compile Update="03-simulation\11-pump\03-analy\SimulationSingleWorkingPumpAnalyDlg.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> @@ -248,4 +408,7 @@ </EmbeddedResource> </ItemGroup> -</Project> + <ItemGroup> + <Folder Include="03-simulation\11-pump\03-analy\" /> + </ItemGroup> +</Project> \ No newline at end of file -- Gitblit v1.9.3