冲突（变速曲线）

Shuxia Ning

2024-10-14 02cde90c53b4a80252be2944f6d53a368b7252ba

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

@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup />
  <ItemGroup>
    <Compile Update="01-home\00-core\HomeXhsProjectPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-home\01-project\HomeXhsProjectTreeListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
@@ -12,6 +8,9 @@
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-home\03-property\HomeXhsProjectPropertyCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-home\00-core\HomeXhsProjectPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-project\01-import\00-core\ImportXhsProjectDlg.cs">
@@ -26,6 +25,9 @@
    <Compile Update="02-project\01-import\03-generate\GenerateXhsProjectWizardPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-project\01-import\04-completed\ImportXhsProjectCompletedCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-project\01-import\05-completed\ProjectResultShowPanel.cs">
      <SubType>UserControl</SubType>
    </Compile>
@@ -37,6 +39,15 @@
    </Compile>
    <Compile Update="02-project\04-dlg\AddProjectDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingForm.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\01-property\XhsProjectSimulationPropertyCtrl.cs">
      <SubType>UserControl</SubType>
@@ -53,17 +64,23 @@
    <Compile Update="03-simulation\05-function\XhsProjectSimulationFunctionMgrCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.cs">
    <Compile Update="03-simulation\06-simulation\03-calcu\00-core\XhsProjectSimulationCalcuCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingForm.cs">
    <Compile Update="03-simulation\06-simulation\03-calcu\01-failed\XhsProjectSimulationCalcuFailedCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.cs">
    <Compile Update="03-simulation\06-simulation\03-calcu\02-prefix\00-core\XhsProjectSimulationCalcuPrefixCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\03-calcu\XhsProjectSimulationHydroCalcuFailedCtrl.cs">
    <Compile Update="03-simulation\06-simulation\03-calcu\02-prefix\00-core\XhsProjectSimulationCalcuPrefixPureCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\03-calcu\02-prefix\01-pump\XhsProjectSimulationPumpCalcuPrefixCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\03-calcu\02-prefix\00-core\XhsProjectSimulationCalcuPrefixDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\04-unmatching\01-pump\XhsProjectSimulationPumpUnMatchingListCtrl.cs">
      <SubType>UserControl</SubType>
@@ -71,6 +88,9 @@
    <Compile Update="03-simulation\06-simulation\05-search\XhsProjectSimulationSearchCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\07-bulkset\01-pump\XhsProjectSimulationPumpBulkSetCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\XhsProjectSimulationMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>