epanet 计算完善

lixiaojun

2024-11-30 8eb1a19c55846f70b3b6bf43e32c2e94333d52e7

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj

@@ -9,35 +9,75 @@

  <ItemGroup>
    <Compile Remove="02-project\01-import\01-ModelFile\**" />
    <Compile Remove="02-project\01-import\04-completed\**" />
    <Compile Remove="03-ViewModel\**" />
    <Compile Remove="04-HomePageMainPanel\**" />
    <Compile Remove="Resources\**" />
    <EmbeddedResource Remove="02-project\01-import\01-ModelFile\**" />
    <EmbeddedResource Remove="02-project\01-import\04-completed\**" />
    <EmbeddedResource Remove="03-ViewModel\**" />
    <EmbeddedResource Remove="04-HomePageMainPanel\**" />
    <EmbeddedResource Remove="Resources\**" />
    <None Remove="02-project\01-import\01-ModelFile\**" />
    <None Remove="02-project\01-import\04-completed\**" />
    <None Remove="03-ViewModel\**" />
    <None Remove="04-HomePageMainPanel\**" />
    <None Remove="Resources\**" />
    <Page Remove="02-project\01-import\01-ModelFile\**" />
    <Page Remove="02-project\01-import\04-completed\**" />
    <Page Remove="03-ViewModel\**" />
    <Page Remove="04-HomePageMainPanel\**" />
    <Page Remove="Resources\**" />
  </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-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" />
    <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\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="04-pump\02-analy\SinglePumpSectPointViewModel.cs" />
    <Compile Remove="04-pump\03-calc\SinglePumpCalcCtrl - 复制.cs" />
    <Compile Remove="04-pump\03-calc\SinglePumpCalcCtrl - 复制.Designer.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" />
  </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" />
    <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\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="04-pump\03-calc\SinglePumpCalcCtrl - 复制.resx" />
    <EmbeddedResource Remove="04-pump\PumpFullInfoCtrl.resx" />
    <EmbeddedResource Remove="04-pump\PumpFullInfoViewDlg.resx" />
    <EmbeddedResource Remove="04-pump\SinglePumpInfoViewDLg.resx" />
  </ItemGroup>

  <ItemGroup>
@@ -56,20 +96,29 @@
    <Content Include="map\gaode\js\xhs_base64.js">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
    <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" />
  </ItemGroup>

  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Yw.ZipFile.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="..\..\Hydro\HStation.Hydro.Core\HStation.Hydro.Core.csproj" />
    <ProjectReference Include="..\HStation.WinFrmUI.Assets.Core\HStation.WinFrmUI.Assets.Core.csproj" />
@@ -81,104 +130,67 @@
  </ItemGroup>

  <ItemGroup>
    <Compile Update="02-project\04-dlg\00-core\ImportXhsProjectFileDlg.cs">
    <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">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\04-scheme\01-add\01-set\02-valve\SetSchemeValveListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\04-scheme\02-page\XhsProjectSimulationSchemePage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingDlg.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\ValveSingleMatchingDlg.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingForm.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingMatchingDlg.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingleMatchingForm.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingForm.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingMatchingDlg.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\ThreeLinkSingleMatchingForm.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\ThreeLinkSingMatchingDlg.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourLinkSingleMatchingForm.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourLinkSingMatchingDlg.cs" />
    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.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">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\09-energy\SimulationMultiWorkingEnergyDlg.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">
    <Compile Update="03-simulation\10-analy\SimulationMultiWorkingAnalyDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\ChoicePumpMainDlg.cs">
    <Compile Update="03-simulation\10-analy\SimulationSingleWorkingAnalyDlg.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">
    <Compile Update="04-pump\03-calc\SinglePumpCalcCtrl.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\04-unmatching\00-core\XhsProjectSimulationUnMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\04-unmatching\02-valve\XhsProjectSimulationValveUnMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\04-unmatching\03-pipe\XhsProjectSimulationPipeUnMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\04-unmatching\06-fourlink\XhsProjectSimulationFourlinkUnMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\04-unmatching\05-threelink\XhsProjectSimulationThreelinkUnMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\04-unmatching\04-elbow\XhsProjectSimulationElbowUnMatchingListCtrl.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">
    <Compile Update="03-simulation\09-energy\SimulationSingleWorkingEnergyDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-simulation\07-l3d\XhsProjectSimulationL3dCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="Properties\Resources.Designer.cs">
      <DesignTime>True</DesignTime>