From 00bcee19c5dff21a9848c16b45419efb74bf07e9 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期一, 11 十一月 2024 11:58:27 +0800 Subject: [PATCH] Epanet.Calcu修改 --- WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj | 375 +++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 278 insertions(+), 97 deletions(-) diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj index 9ac67eb..02fa24b 100644 --- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj +++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj @@ -1,106 +1,287 @@ 锘�<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> - <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" /> - <PackageReference Include="Yw.BLL.Basic.Core" Version="3.2.8" /> - <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.3.1" /> - </ItemGroup> + <ItemGroup> + <Compile Remove="04-viewmodel\07-curve\SetHydroCurveCtrl - 澶嶅埗.cs" /> + <Compile Remove="04-viewmodel\07-curve\SetHydroCurveCtrl - 澶嶅埗.Designer.cs" /> + <Compile Remove="06-visual\00-core\HydroParterListCtrl.cs" /> + <Compile Remove="06-visual\00-core\HydroParterListCtrl.Designer.cs" /> + <Compile Remove="06-visual\00-core\HydroParterViewModel.cs" /> + <Compile Remove="06-visual\01-reservoir\HydroReservoirViewModel.cs" /> + <Compile Remove="06-visual\02-tank\HydroTankViewModel.cs" /> + <Compile Remove="06-visual\03-waterbox\HydroWaterboxViewModel.cs" /> + <Compile Remove="06-visual\04-junction\HydroJunctionViewModel.cs" /> + <Compile Remove="06-visual\05-blunthead\HydroBluntheadViewModel.cs" /> + <Compile Remove="06-visual\06-elbow\HydroElbowViewModel.cs" /> + <Compile Remove="06-visual\07-threelink\HydroThreelinkViewModel.cs" /> + <Compile Remove="06-visual\08-fourlink\HydroFourlinkViewModel.cs" /> + <Compile Remove="06-visual\09-hydrant\HydroHydrantViewModel.cs" /> + <Compile Remove="06-visual\10-nozzle\HydroNozzleViewModel.cs" /> + <Compile Remove="06-visual\11-meter\HydroMeterViewModel.cs" /> + <Compile Remove="06-visual\12-flowmeter\HydroFlowmeterViewModel.cs" /> + <Compile Remove="06-visual\13-pressmeter\HydroPressmeterViewModel.cs" /> + <Compile Remove="06-visual\14-pipe\HydroPipeViewModel.cs" /> + <Compile Remove="06-visual\15-translation\HydroTranslationViewModel.cs" /> + <Compile Remove="06-visual\18-exchanger\HydroExchangerViewModel.cs" /> + <Compile Remove="06-visual\19-compressor\HydroCompressorViewModel.cs" /> + <Compile Remove="06-visual\16-pump\HydroPumpViewModel.cs" /> + <Compile Remove="06-visual\17-valve\HydroValveViewModel.cs" /> + </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\Hydro\Yw.Hydro.Core\Yw.Hydro.Core.csproj" /> - <ProjectReference Include="..\Yw.WinFrmUI.Core\Yw.WinFrmUI.Core.csproj" /> - <ProjectReference Include="..\Yw.WinFrmUI.Hydro.L2d.Core\Yw.WinFrmUI.Hydro.L2d.Core.csproj" /> - <ProjectReference Include="..\Yw.WinFrmUI.Hydro.L3d.Core\Yw.WinFrmUI.Hydro.L3d.Core.csproj" /> - <ProjectReference Include="..\Yw.WinFrmUI.Hydro.Q3d.Core\Yw.WinFrmUI.Hydro.Q3d.Core.csproj" /> - </ItemGroup> + <ItemGroup> + <EmbeddedResource Remove="04-viewmodel\07-curve\SetHydroCurveCtrl - 澶嶅埗.resx" /> + <EmbeddedResource Remove="06-visual\00-core\HydroParterListCtrl.resx" /> + </ItemGroup> - <ItemGroup> - <Compile Update="01-scene\HydroSceneMgrPage.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="02-model\HydroModelMgrPage.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="03-property\HydroParterPropertyCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-parter\02-node\02-junction\01-coupling\01-blunthead\HydroBluntheadListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-parter\02-node\02-junction\04-other\02-pressmeter\HydroPressmeterListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-parter\02-node\02-junction\04-other\01-flowmeter\HydroFlowmeterListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-parter\02-node\02-junction\03-meter\HydroMeterListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-parter\02-node\02-junction\01-coupling\04-fourlink\HydroFourlinkListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-parter\02-node\02-junction\01-coupling\03-threelink\HydroThreelinkListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-parter\02-node\02-junction\01-coupling\02-elbow\HydroElbowListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-parter\02-node\02-junction\02-emitter\01-hydrant\HydroHydrantListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-parter\02-node\01-source\02-tank\01-waterbox\HydroWaterboxListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-parter\02-node\01-source\02-tank\00-core\HydroTankListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-parter\02-node\01-source\01-reservoir\HydroReservoirListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-parter\03-link\01-pipe\02-exchanger\HydroExchangerListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-parter\03-link\03-valve\HydroValveListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-parter\03-link\02-pump\HydroPumpListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-parter\03-link\01-pipe\01-translation\HydroTranslationListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-parter\03-link\01-pipe\00-core\HydroPipeListCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="07-l2d\HydroL2dViewPage.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="08-l3d\HydroL3dViewPage.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="Properties\Resources.Designer.cs"> - <DesignTime>True</DesignTime> - <AutoGen>True</AutoGen> - <DependentUpon>Resources.resx</DependentUpon> - </Compile> - </ItemGroup> + <ItemGroup> + <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" /> + <PackageReference Include="Yw.BLL.Basic.Core" Version="3.3.0" /> + <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.5.3" /> + </ItemGroup> - <ItemGroup> - <EmbeddedResource Update="Properties\Resources.resx"> - <Generator>ResXFileCodeGenerator</Generator> - <LastGenOutput>Resources.Designer.cs</LastGenOutput> - </EmbeddedResource> - </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\Hydro\Yw.Hydro.Core\Yw.Hydro.Core.csproj" /> + <ProjectReference Include="..\Yw.WinFrmUI.Core\Yw.WinFrmUI.Core.csproj" /> + <ProjectReference Include="..\Yw.WinFrmUI.Hydro.L2d.Core\Yw.WinFrmUI.Hydro.L2d.Core.csproj" /> + <ProjectReference Include="..\Yw.WinFrmUI.Hydro.L3d.Core\Yw.WinFrmUI.Hydro.L3d.Core.csproj" /> + <ProjectReference Include="..\Yw.WinFrmUI.Hydro.Q3d.Core\Yw.WinFrmUI.Hydro.Q3d.Core.csproj" /> + </ItemGroup> - <ItemGroup> - <Folder Include="10-grading\01-set\" /> - </ItemGroup> + <ItemGroup> + <Compile Update="01-scene\HydroSceneMgrPage.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="02-model\HydroModelMgrPage.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="05-property\HydroVisualPropertyCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\01-reservoir\SetHydroReservoirListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\02-tank\SetHydroTankListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\05-blunthead\HydroBluntheadListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\13-pressmeter\HydroPressmeterListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\12-flowmeter\HydroFlowmeterListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\11-meter\HydroMeterListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\08-fourlink\HydroFourlinkListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\07-threelink\HydroThreelinkListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\06-elbow\HydroElbowListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\09-hydrant\HydroHydrantListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\03-waterbox\HydroWaterboxListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\02-tank\HydroTankListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\01-reservoir\HydroReservoirListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\15-translation\SetHydroTranslationListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\15-translation\SetHydroTranslationDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\18-exchanger\SetHydroExchangerDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\18-exchanger\SetHydroExchangerListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\18-exchanger\HydroExchangerListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\17-valve\HydroValveListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\16-pump\HydroPumpListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\15-translation\HydroTranslationListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\14-pipe\HydroPipeListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\19-compressor\HydroCompressorListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\19-compressor\SetHydroCompressorDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\19-compressor\SetHydroCompressorListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="10-working\00-core\SetHydroWorkingInfoDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="10-working\01-waterbox\SetHydroWaterboxWorkingInfoCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="10-working\02-pump\SetHydroPumpWorkingInfoCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="10-working\03-valve\SetHydroValveWorkingInfoCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="10-working\05-pressmeter\SetHydroPressmeterWorkingInfoCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="10-working\04-flowmeter\SetHydroFlowmeterWorkingInfoCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="11-search\HydroVisualSearchListCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="14-l2d\HydroL2dViewPage.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="15-l3d\HydroL3dViewPage.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="08-grading\04-tree\SelectHydroGradingPropTreeCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="08-grading\05-set\SetHydroGradingModelTreeDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="08-grading\05-set\SetHydroGradingTreeDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="08-grading\06-apply\01-control\ApplyHydroGradingCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="08-grading\06-apply\02-dlg\ApplyHydroGradingDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="10-working\99-failed\HydroCalcuFailedCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="06-visual\02-tank\SetHydroTankDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\03-waterbox\SetHydroWaterboxListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\03-waterbox\SetHydroWaterboxDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\04-junction\SetHydroJunctionDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\04-junction\SetHydroJunctionListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\05-blunthead\SetHydroBluntheadDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\05-blunthead\SetHydroBluntheadListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\06-elbow\SetHydroElbowListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\06-elbow\SetHydroElbowDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\07-threelink\SetHydroThreelinkListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\07-threelink\SetHydroThreelinkDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\08-fourlink\SetHydroFourlinkDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\08-fourlink\SetHydroFourlinkListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\09-hydrant\SetHydroHydrantDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\09-hydrant\SetHydroHydrantListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\10-nozzle\SetHydroNozzleListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\10-nozzle\SetHydroNozzleDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\11-meter\SetHydroMeterListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\11-meter\SetHydroMeterDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\12-flowmeter\SetHydroFlowmeterDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\12-flowmeter\SetHydroFlowmeterListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\13-pressmeter\SetHydroPressmeterListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\13-pressmeter\SetHydroPressmeterDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\14-pipe\SetHydroPipeDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\14-pipe\SetHydroPipeListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\16-pump\SetHydroPumpListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\16-pump\SetHydroPumpDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\17-valve\SetHydroValveListDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="06-visual\17-valve\SetHydroValveDlg.cs"> + <SubType>Form</SubType> + </Compile> + <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> </Project> -- Gitblit v1.9.3