冲突（变速曲线）

Shuxia Ning

2024-10-14 02cde90c53b4a80252be2944f6d53a368b7252ba

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj

@@ -9,14 +9,15 @@

  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Yw.BLL.Basic.Core" Version="3.2.6" />
    <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.2.0" />
    <PackageReference Include="Yw.BLL.Basic.Core" Version="3.2.8" />
    <PackageReference Include="Yw.BLL.Hydro.Core" Version="3.2.9" />
  </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>

@@ -33,52 +34,55 @@
    <Compile Update="04-parter\09-blunthead\HydroBluntheadListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\08-pressmeter\HydroPressmeterListCtrl.cs">
    <Compile Update="04-parter\12-pressmeter\HydroPressmeterListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\07-flowmeter\HydroFlowmeterListCtrl.cs">
    <Compile Update="04-parter\11-flowmeter\HydroFlowmeterListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\06-meter\HydroMeterListCtrl.cs">
    <Compile Update="04-parter\10-meter\HydroMeterListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\06-fourlink\HydroFourlinkListCtrl.cs">
    <Compile Update="04-parter\08-fourlink\HydroFourlinkListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\05-threelink\HydroThreelinkListCtrl.cs">
    <Compile Update="04-parter\07-threelink\HydroThreelinkListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\04-elbow\HydroElbowListCtrl.cs">
    <Compile Update="04-parter\06-elbow\HydroElbowListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\03-hydrant\HydroHydrantListCtrl.cs">
    <Compile Update="04-parter\04-hydrant\HydroHydrantListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\12-waterbox\HydroWaterboxListCtrl.cs">
    <Compile Update="04-parter\16-waterbox\HydroWaterboxListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\11-tank\HydroTankListCtrl.cs">
    <Compile Update="04-parter\15-tank\HydroTankListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\10-reservoir\HydroReservoirListCtrl.cs">
    <Compile Update="04-parter\14-reservoir\HydroReservoirListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\14-exchanger\HydroExchangerListCtrl.cs">
    <Compile Update="04-parter\18-exchanger\HydroExchangerListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\17-valve\HydroValveListCtrl.cs">
    <Compile Update="04-parter\21-valve\HydroValveListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\16-pump\HydroPumpListCtrl.cs">
    <Compile Update="04-parter\20-pump\HydroPumpListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\15-translation\HydroTranslationListCtrl.cs">
    <Compile Update="04-parter\19-translation\HydroTranslationListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\13-pipe\HydroPipeListCtrl.cs">
    <Compile Update="04-parter\17-pipe\HydroPipeListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="06-l2d\HydroL2dViewPage.cs">
    <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">