水泵曲线修改

duheng

2024-12-19 3af811d30c93995e2500bdd2f3795be77cc1a519

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

@@ -9,24 +9,28 @@

   <ItemGroup>
      <Compile Remove="02-project\01-import\01-ModelFile\**" />
      <Compile Remove="03-simulation\04-scheme\01-info - 复制\**" />
      <Compile Remove="03-ViewModel\**" />
      <Compile Remove="04-HomePageMainPanel\**" />
      <Compile Remove="04-pump\02-analy\**" />
      <Compile Remove="04-pump\03-calc\**" />
      <Compile Remove="Resources\**" />
      <EmbeddedResource Remove="02-project\01-import\01-ModelFile\**" />
      <EmbeddedResource Remove="03-simulation\04-scheme\01-info - 复制\**" />
      <EmbeddedResource Remove="03-ViewModel\**" />
      <EmbeddedResource Remove="04-HomePageMainPanel\**" />
      <EmbeddedResource Remove="04-pump\02-analy\**" />
      <EmbeddedResource Remove="04-pump\03-calc\**" />
      <EmbeddedResource Remove="Resources\**" />
      <None Remove="02-project\01-import\01-ModelFile\**" />
      <None Remove="03-simulation\04-scheme\01-info - 复制\**" />
      <None Remove="03-ViewModel\**" />
      <None Remove="04-HomePageMainPanel\**" />
      <None Remove="04-pump\02-analy\**" />
      <None Remove="04-pump\03-calc\**" />
      <None Remove="Resources\**" />
      <Page Remove="02-project\01-import\01-ModelFile\**" />
      <Page Remove="03-simulation\04-scheme\01-info - 复制\**" />
      <Page Remove="03-ViewModel\**" />
      <Page Remove="04-HomePageMainPanel\**" />
      <Page Remove="04-pump\02-analy\**" />
@@ -40,19 +44,25 @@
      <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\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\02-change\99-change-record\CreateXhsSchemeChangeRecordPage - 复制.cs" />
      <Compile Remove="03-simulation\04-scheme\02-change\99-change-record\CreateXhsSchemeChangeRecordPage - 复制.Designer.cs" />
      <Compile Remove="03-simulation\04-scheme\99-bak\00-viewmodel\SetSchemePipeViewModel.cs" />
      <Compile Remove="03-simulation\04-scheme\99-bak\00-viewmodel\SetSchemePumpViewModel.cs" />
      <Compile Remove="03-simulation\04-scheme\99-bak\00-viewmodel\SetSchemeValveViewModel.cs" />
      <Compile Remove="03-simulation\04-scheme\99-bak\01-set\01-pump\SetSchemePumpListCtrl - 复制.cs" />
      <Compile Remove="03-simulation\04-scheme\99-bak\01-set\01-pump\SetSchemePumpListCtrl - 复制.Designer.cs" />
      <Compile Remove="03-simulation\04-scheme\99-bak\AddXhsSchemeDlg - 复制%282%29.cs" />
      <Compile Remove="03-simulation\04-scheme\99-bak\AddXhsSchemeDlg - 复制%282%29.Designer.cs" />
      <Compile Remove="03-simulation\04-scheme\99-bak\AddXhsSchemeDlg - 复制%283%29.cs" />
      <Compile Remove="03-simulation\04-scheme\99-bak\AddXhsSchemeDlg - 复制%283%29.Designer.cs" />
      <Compile Remove="03-simulation\04-scheme\99-bak\AddXhsSchemeDlg - 复制%284%29.cs" />
      <Compile Remove="03-simulation\04-scheme\99-bak\AddXhsSchemeDlg - 复制%284%29.Designer.cs" />
      <Compile Remove="03-simulation\04-scheme\99-bak\AddXhsSchemeDlg - 复制.cs" />
      <Compile Remove="03-simulation\04-scheme\99-bak\AddXhsSchemeDlg - 复制.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" />
@@ -88,11 +98,14 @@
   <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\00-core\CreateXhsSchemeDlg - 复制.resx" />
      <EmbeddedResource Remove="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage - 复制.resx" />
      <EmbeddedResource Remove="03-simulation\04-scheme\02-change\99-change-record\CreateXhsSchemeChangeRecordPage - 复制.resx" />
      <EmbeddedResource Remove="03-simulation\04-scheme\99-bak\01-set\01-pump\SetSchemePumpListCtrl - 复制.resx" />
      <EmbeddedResource Remove="03-simulation\04-scheme\99-bak\AddXhsSchemeDlg - 复制%282%29.resx" />
      <EmbeddedResource Remove="03-simulation\04-scheme\99-bak\AddXhsSchemeDlg - 复制%283%29.resx" />
      <EmbeddedResource Remove="03-simulation\04-scheme\99-bak\AddXhsSchemeDlg - 复制%284%29.resx" />
      <EmbeddedResource Remove="03-simulation\04-scheme\99-bak\AddXhsSchemeDlg - 复制.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" />
@@ -123,6 +136,19 @@
      <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\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" />
@@ -138,6 +164,7 @@
      <None Include="Resources\Square32.png" />
      <None Include="Resources\SizeNormal32.png" />
      <None Include="Resources\SizeMin32.png" />
      <None Include="Resources\valve.svg" />
   </ItemGroup>

   <ItemGroup>
@@ -179,27 +206,48 @@
      <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\04-scheme\02-change\02-valve\CreateXhsSchemeValveChangePage.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\99-change-record\CreateXhsSchemeChangeRecordPage.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\04-scheme\99-bak\01-set\03-pipe\SetSchemePipeListCtrl.cs" />
      <Compile Update="03-simulation\04-scheme\99-bak\01-set\01-pump\SetSchemePumpListCtrl.cs" />
      <Compile Update="03-simulation\04-scheme\99-bak\01-set\02-valve\SetSchemeValveListCtrl.cs" />
      <Compile Update="03-simulation\04-scheme\01-info\00-core\XhsSchemeChangeTypeCheckedListHorizCtrl.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\07-matching\09-Tank\TankChartShowDlg.cs" />
      <Compile Update="03-simulation\07-matching\09-Tank\SimulationTankSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\09-Tank\TankSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\18-pressmeter\AssetsPressmeterSingleMatchingCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\07-matching\18-pressmeter\AssetsPressmeterSingleMatchingDlg.cs">
        <SubType>Form</SubType>
      </Compile>
      <Compile Update="03-simulation\07-matching\17-flowmeter\AssetsFlowmeterSingleMatchingCtrl.cs">
        <SubType>UserControl</SubType>
      </Compile>
      <Compile Update="03-simulation\07-matching\17-flowmeter\AssetsFlowmeterSingleMatchingDlg.cs">
        <SubType>Form</SubType>
      </Compile>
      <Compile Update="03-simulation\07-matching\16-meter\AssetsMeterSingleMatchingDlg.cs">
        <SubType>Form</SubType>
      </Compile>
      <Compile Update="03-simulation\07-matching\16-sprinkler\SprinklerSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\16-sprinkler\SimulationSprinklerSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\15-Translation\TranslationSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\15-Translation\SimulationTranslationSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\13-Pressmeter\PressmeterSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\13-Pressmeter\SimulationPressmeterSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\12-Hydrant\HydrantSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\12-Hydrant\SimulationHydrantSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\11-Flowmeter\FlowmeterSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\11-Flowmeter\SimulationFlowmeterSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\10-Meter\MeterSingleMatchingCtrl.cs" />
      <Compile Update="03-simulation\07-matching\10-Meter\SimulationMeterSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\07-matching\14-Blunthead\BluntheadSingleMatchingForm.cs" />
      <Compile Update="03-simulation\07-matching\14-Blunthead\SimulationBluntheadSingleMatchingDlg.cs" />
      <Compile Update="03-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs" />