修改并联模拟窗体

lixiaojun

2024-12-02 f54adb8f368def21b9aa01e466b09bed6cd8347c

 WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj

@@ -8,58 +8,54 @@
  </PropertyGroup>

  <ItemGroup>
    <Compile Remove="01-perform\01-pump-chart\05-import\**" />
    <Compile Remove="01-perform\01-cubic\**" />
    <EmbeddedResource Remove="01-perform\01-pump-chart\05-import\**" />
    <EmbeddedResource Remove="01-perform\01-cubic\**" />
    <None Remove="01-perform\01-pump-chart\05-import\**" />
    <None Remove="01-perform\01-cubic\**" />
    <Page Remove="01-perform\01-pump-chart\05-import\**" />
    <Page Remove="01-perform\01-cubic\**" />
    <Compile Remove="v1 - 复制\**" />
    <Compile Remove="v1\01-perform\01-cubic\**" />
    <Compile Remove="bak\**" />
    <Compile Remove="v2\**" />
    <EmbeddedResource Remove="v1 - 复制\**" />
    <EmbeddedResource Remove="v1\01-perform\01-cubic\**" />
    <EmbeddedResource Remove="bak\**" />
    <EmbeddedResource Remove="v2\**" />
    <None Remove="v1 - 复制\**" />
    <None Remove="v1\01-perform\01-cubic\**" />
    <None Remove="bak\**" />
    <None Remove="v2\**" />
    <Page Remove="v1 - 复制\**" />
    <Page Remove="v1\01-perform\01-cubic\**" />
    <Page Remove="bak\**" />
    <Page Remove="v2\**" />
  </ItemGroup>

  <ItemGroup>
    <Compile Remove="01-perform\01-pump-chart\01-chart\PumpPerform2dMultiChart.cs" />
    <Compile Remove="01-perform\01-pump-chart\01-chart\PumpPerform2dMultiChart.Designer.cs" />
    <Compile Remove="01-perform\01-pump-chart\01-chart\XtrPerform2dChartUpdate.cs" />
    <Compile Remove="01-perform\01-pump-chart\01-chart\XtrPerform2dChartUpdate.Designer.cs" />
    <Compile Remove="01-perform\01-pump-chart\03-chart-view\XtrPerform2dViewDlg.cs" />
    <Compile Remove="01-perform\01-pump-chart\03-chart-view\XtrPerform2dViewDlg.Designer.cs" />
    <Compile Remove="01-perform\01-pump-chart\XtrPerform2dChart - 复制.cs" />
    <Compile Remove="01-perform\01-pump-chart\XtrPerform2dChart - 复制.Designer.cs" />
    <Compile Remove="v1\01-perform\01-pump-chart\01-chart\03-serial-parallel\PumpSerialParallelChart - 复制.cs" />
    <Compile Remove="v1\01-perform\01-pump-chart\01-chart\03-serial-parallel\PumpSerialParallelChart - 复制.Designer.cs" />
    <Compile Remove="v1\01-perform\01-pump-chart\01-chart\PumpPerform2dMultiChart.cs" />
    <Compile Remove="v1\01-perform\01-pump-chart\01-chart\PumpPerform2dMultiChart.Designer.cs" />
    <Compile Remove="v1\01-perform\01-pump-chart\01-chart\XtrPerform2dChartUpdate.cs" />
    <Compile Remove="v1\01-perform\01-pump-chart\01-chart\XtrPerform2dChartUpdate.Designer.cs" />
    <Compile Remove="v1\01-perform\01-pump-chart\03-chart-view\XtrPerform2dViewDlg.cs" />
    <Compile Remove="v1\01-perform\01-pump-chart\03-chart-view\XtrPerform2dViewDlg.Designer.cs" />
    <Compile Remove="v1\01-perform\01-pump-chart\XtrPerform2dChart - 复制.cs" />
    <Compile Remove="v1\01-perform\01-pump-chart\XtrPerform2dChart - 复制.Designer.cs" />
    <Compile Remove="Title - 复制.cs" />
    <Compile Remove="v3\02-pump\01-single\02-operation\PumpOperationChart.cs" />
    <Compile Remove="v3\02-pump\01-single\02-operation\PumpOperationChart.Designer.cs" />
    <Compile Remove="v3\02-pump\01-single\02-operation\PumpOperationViewModel.cs" />
  </ItemGroup>

  <ItemGroup>
    <EmbeddedResource Remove="01-perform\01-pump-chart\01-chart\PumpPerform2dMultiChart.resx" />
    <EmbeddedResource Remove="01-perform\01-pump-chart\01-chart\XtrPerform2dChartUpdate.resx" />
    <EmbeddedResource Remove="01-perform\01-pump-chart\03-chart-view\XtrPerform2dViewDlg.resx" />
    <EmbeddedResource Remove="01-perform\01-pump-chart\XtrPerform2dChart - 复制.resx" />
  </ItemGroup>

  <ItemGroup>
    <Compile Include="01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelCtrl.cs" />
    <Compile Include="01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelCtrl.designer.cs" />
    <Compile Include="01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelDlg.cs" />
    <Compile Include="01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelDlg.Designer.cs" />
    <Compile Include="01-perform\01-pump-chart\05-import\03-one-point\ImportPumpPerform2dByOnePointCtrl.cs" />
    <Compile Include="01-perform\01-pump-chart\05-import\03-one-point\ImportPumpPerform2dByOnePointCtrl.designer.cs" />
    <Compile Include="01-perform\01-pump-chart\05-import\03-one-point\ImportPumpPerform2dByOnePointDlg.cs" />
    <Compile Include="01-perform\01-pump-chart\05-import\03-one-point\ImportPumpPerform2dByOnePointDlg.Designer.cs" />
  </ItemGroup>

  <ItemGroup>
    <EmbeddedResource Include="01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelCtrl.en-US.resx" />
    <EmbeddedResource Include="01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelCtrl.resx" />
    <EmbeddedResource Include="01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelDlg.resx" />
    <EmbeddedResource Include="01-perform\01-pump-chart\05-import\03-one-point\ImportPumpPerform2dByOnePointCtrl.resx" />
    <EmbeddedResource Include="01-perform\01-pump-chart\05-import\03-one-point\ImportPumpPerform2dByOnePointDlg.resx" />
    <EmbeddedResource Remove="v1\01-perform\01-pump-chart\01-chart\03-serial-parallel\PumpSerialParallelChart - 复制.resx" />
    <EmbeddedResource Remove="v1\01-perform\01-pump-chart\01-chart\PumpPerform2dMultiChart.resx" />
    <EmbeddedResource Remove="v1\01-perform\01-pump-chart\01-chart\XtrPerform2dChartUpdate.resx" />
    <EmbeddedResource Remove="v1\01-perform\01-pump-chart\03-chart-view\XtrPerform2dViewDlg.resx" />
    <EmbeddedResource Remove="v1\01-perform\01-pump-chart\XtrPerform2dChart - 复制.resx" />
    <EmbeddedResource Remove="v3\02-pump\01-single\02-operation\PumpOperationChart.resx" />
  </ItemGroup>

  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="NPOI" Version="2.7.1" />
    <PackageReference Include="Yw.Pump.Core" Version="3.1.1" />
    <PackageReference Include="Yw.Pump.Core" Version="3.1.2" />
  </ItemGroup>

  <ItemGroup>
@@ -68,26 +64,80 @@
  </ItemGroup>

  <ItemGroup>
    <Folder Include="01-perform\01-pump-chart\03-chart-view\" />
    <Folder Include="01-perform\01-pump-chart\05-import\02-picture%28待恢复，需引用单位%29\" />
    <Folder Include="01-perform\01-pump-chart\99-calculate\" />
    <Folder Include="01-perform\02-valve-chart\03-chart-view\" />
    <Folder Include="v1\01-perform\01-pump-chart\02-chart-edit\" />
    <Folder Include="v1\01-perform\01-pump-chart\03-chart-view\" />
    <Folder Include="v1\01-perform\01-pump-chart\99-calculate\" />
    <Folder Include="v1\01-perform\02-valve-chart\03-chart-view\" />
    <Folder Include="v3\01-base\" />
    <Folder Include="v3\02-pump\01-single\01-view\" />
    <Folder Include="v3\02-pump\01-single\02-operation\" />
    <Folder Include="v3\02-pump\03-dlg\" />
    <Folder Include="v3\03-valve\" />
  </ItemGroup>

  <ItemGroup>
    <Compile Update="01-perform\01-pump-chart\01-chart\01-perform\PumpPerformInfoCtrl.cs">
    <Compile Update="v1\01-perform\01-pump-chart\01-chart\01-view\PumpViewInfoCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-perform\01-pump-chart\01-chart\02-variable-speed\PumpVariableSpeedChart.cs">
    <Compile Update="v1\01-perform\01-pump-chart\01-chart\02-perform-compare(作废)\PumpPerformCompareChart.cs" />
    <Compile Update="v1\01-perform\01-pump-chart\01-chart\02-perform-compare(作废)\PumpPerformCompareInfoCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-perform\01-pump-chart\01-chart\02-variable-speed\PumpVariableSpeedInfoCtrl.cs">
    <Compile Update="v3\02-pump\01-single\03-edit\PumpEditChart.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-perform\01-pump-chart\01-chart\03-serial-parallel\PumpSerialParallelChart.cs">
    <Compile Update="v3\02-pump\02-multi\01-parallel\PumpParallelChart.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-perform\02-valve-chart\01-chart\ValvePerform2dChart.cs">
    <Compile Update="v3\02-pump\01-chart\PumpVariableSpeedChart.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="v3\02-pump\01-chart\PumpViewChart.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="v3\02-pump\01-chart\PumpWorkComparisonChart.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="v3\02-pump\01-single\03-edit\PumpEditChartCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="v3\02-pump\01-single\03-edit\InputXYDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="v3\02-pump\01-single\03-edit\PumpEditChartDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="v3\02-pump\05-import\01-excel\PumpImportByExcelCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="v3\02-pump\05-import\01-excel\PumpImportByExcelDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="v3\02-pump\05-import\02-picture\PickEqupPointDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="v3\02-pump\05-import\02-picture\PumpImportByPictureCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="v3\02-pump\05-import\02-picture\PumpImportByPictureDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="v3\02-pump\05-import\02-picture\PumpPictureBoxCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="v3\02-pump\05-import\03-one-point\PumpImportByOnePointCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="v3\02-pump\05-import\03-one-point\PumpImportByOnePointDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="v1\01-perform\01-pump-chart\01-chart\04-variable-speed\PumpVariableSpeedInfoCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="v1\01-perform\01-pump-chart\01-chart\03-serial-parallel\PumpSingleSerialParallelInfoCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="v1\01-perform\02-valve-chart\01-chart\ValvePerform2dChart.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="Properties\Resources.Designer.cs">