From 9be9ba4e159969fb5e32648c2c34e912ccc3ae6d Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 14:22:42 +0800
Subject: [PATCH] 优化细节问题
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj | 144 +++++++++++++++++++++++++++++++----------------
1 files changed, 94 insertions(+), 50 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
index 9b07dfe..4d7d019 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
@@ -8,62 +8,86 @@
</PropertyGroup>
<ItemGroup>
- <Compile Remove="01-perform\01-pump-chart\05-import\**" />
- <Compile Remove="01-perform\01-cubic\**" />
+ <Compile Remove="01-pump\04-special\04-variable-speed\**" />
+ <Compile Remove="02-valve\**" />
+ <Compile Remove="bak2\**" />
+ <Compile Remove="bak3\**" />
+ <Compile Remove="v1 - 澶嶅埗\**" />
<Compile Remove="bak\**" />
- <EmbeddedResource Remove="01-perform\01-pump-chart\05-import\**" />
- <EmbeddedResource Remove="01-perform\01-cubic\**" />
+ <Compile Remove="v2\**" />
+ <EmbeddedResource Remove="01-pump\04-special\04-variable-speed\**" />
+ <EmbeddedResource Remove="02-valve\**" />
+ <EmbeddedResource Remove="bak2\**" />
+ <EmbeddedResource Remove="bak3\**" />
+ <EmbeddedResource Remove="v1 - 澶嶅埗\**" />
<EmbeddedResource Remove="bak\**" />
- <None Remove="01-perform\01-pump-chart\05-import\**" />
- <None Remove="01-perform\01-cubic\**" />
+ <EmbeddedResource Remove="v2\**" />
+ <None Remove="01-pump\04-special\04-variable-speed\**" />
+ <None Remove="02-valve\**" />
+ <None Remove="bak2\**" />
+ <None Remove="bak3\**" />
+ <None Remove="v1 - 澶嶅埗\**" />
<None Remove="bak\**" />
- <Page Remove="01-perform\01-pump-chart\05-import\**" />
- <Page Remove="01-perform\01-cubic\**" />
+ <None Remove="v2\**" />
+ <Page Remove="01-pump\04-special\04-variable-speed\**" />
+ <Page Remove="02-valve\**" />
+ <Page Remove="bak2\**" />
+ <Page Remove="bak3\**" />
+ <Page Remove="v1 - 澶嶅埗\**" />
<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="00-core\Point2dComparer.cs" />
+ <Compile Remove="00-core\Point2dListExtensions.cs" />
+ <Compile Remove="00-core\LineHelper.cs" />
+ <Compile Remove="01-pump\01-view\01-viewmodel\PumpCurveEqualPowerViewModel.cs" />
+ <Compile Remove="01-pump\01-view\PumpViewChart - 澶嶅埗.cs" />
+ <Compile Remove="01-pump\01-view\PumpViewChart - 澶嶅埗.Designer.cs" />
+ <Compile Remove="01-pump\03-import\02-image\PumpCharImageImportCtrl - 澶嶅埗%282%29.cs" />
+ <Compile Remove="01-pump\03-import\02-image\PumpCharImageImportCtrl - 澶嶅埗%282%29.Designer.cs" />
+ <Compile Remove="01-pump\03-import\02-image\PumpCharImageImportCtrl - 澶嶅埗.cs" />
+ <Compile Remove="01-pump\03-import\02-image\PumpCharImageImportCtrl - 澶嶅埗.Designer.cs" />
+ <Compile Remove="01-pump\03-import\03-point\PumpChartPointImportCtrl - 澶嶅埗%282%29.cs" />
+ <Compile Remove="01-pump\03-import\03-point\PumpChartPointImportCtrl - 澶嶅埗%282%29.designer.cs" />
+ <Compile Remove="01-pump\03-import\03-point\PumpChartPointImportCtrl - 澶嶅埗.cs" />
+ <Compile Remove="01-pump\03-import\03-point\PumpChartPointImportCtrl - 澶嶅埗.designer.cs" />
+ <Compile Remove="01-pump\04-special\03-run-view\PumpRunViewChart - 澶嶅埗.cs" />
+ <Compile Remove="01-pump\04-special\03-run-view\PumpRunViewChart - 澶嶅埗.Designer.cs" />
+ <Compile Remove="02-universal\02-edit\UniversalEditCtrl.cs" />
+ <Compile Remove="02-universal\02-edit\UniversalEditCtrl.Designer.cs" />
<Compile Remove="Title - 澶嶅埗.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" />
+ <EmbeddedResource Remove="01-pump\01-view\PumpViewChart - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="01-pump\03-import\02-image\PumpCharImageImportCtrl - 澶嶅埗%282%29.resx" />
+ <EmbeddedResource Remove="01-pump\03-import\02-image\PumpCharImageImportCtrl - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="01-pump\03-import\03-point\PumpChartPointImportCtrl - 澶嶅埗%282%29.resx" />
+ <EmbeddedResource Remove="01-pump\03-import\03-point\PumpChartPointImportCtrl - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="01-pump\04-special\03-run-view\PumpRunViewChart - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="02-universal\02-edit\UniversalEditCtrl.resx" />
+ <EmbeddedResource Remove="03-valve\02-edit\ValveChartExcelEditCtrl.en-US.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" />
+ <Compile Include="01-pump\04-special\04-variable-speed\SetPointDlg.cs" />
+ <Compile Include="01-pump\04-special\04-variable-speed\SetPointDlg.designer.cs" />
+ <Compile Include="01-pump\04-special\04-variable-speed\SetValueDlg.cs" />
+ <Compile Include="01-pump\04-special\04-variable-speed\SetValueDlg.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 Include="01-pump\04-special\04-variable-speed\SetPointDlg.resx" />
+ <EmbeddedResource Include="01-pump\04-special\04-variable-speed\SetValueDlg.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.2" />
+ <PackageReference Include="Yw.Pump.Core" Version="3.2.4" />
+ <PackageReference Include="Yw.Service.Phart.Core" Version="3.2.9" />
</ItemGroup>
<ItemGroup>
@@ -72,37 +96,50 @@
</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\" />
- </ItemGroup>
-
- <ItemGroup>
- <Compile Update="01-perform\01-pump-chart\01-chart\01-perform\PumpPerformInfoCtrl.cs">
+ <Compile Update="01-pump\01-view\SetEffDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\02-edit\PumpEditChart.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="01-perform\01-pump-chart\01-chart\02-perform-compare\PumpPerformCompareChart.cs" />
- <Compile Update="01-perform\01-pump-chart\01-chart\02-perform-compare\PumpPerformCompareInfoCtrl.cs">
+ <Compile Update="01-pump\02-edit\PumpChartExcelEditCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="01-perform\01-pump-chart\01-chart\03-serial-parallel\PumpParallelInfoCtrl.cs">
+ <Compile Update="01-pump\03-import\02-image\PickEqupPointDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\03-import\03-point\PumpChartPointImportCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="01-perform\01-pump-chart\01-chart\04-variable-speed\PumpVariableSpeedChart.cs">
+ <Compile Update="01-pump\04-special\02-working-view\PumpWorkingViewChart.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="01-perform\01-pump-chart\01-chart\04-variable-speed\PumpVariableSpeedInfoCtrl.cs">
+ <Compile Update="01-pump\04-special\04-parallel\PumpParallelChart.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="01-perform\01-pump-chart\01-chart\03-serial-parallel\PumpSerialParallelChart.cs">
+ <Compile Update="02-universal\01-view\UniversalViewChart.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="01-perform\01-pump-chart\01-chart\03-serial-parallel\PumpSingleSerialParallelInfoCtrl.cs">
+ <Compile Update="02-universal\02-edit\UniversalChartExcelEditCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="01-perform\02-valve-chart\01-chart\ValvePerform2dChart.cs">
+ <Compile Update="03-valve\00-core\01-coordinate\ValveAxisValueDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-valve\00-core\01-coordinate\ValveCoordinateDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-valve\01-view\ValveViewChart.cs">
<SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-valve\02-edit\ValveEditChart.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-valve\TestDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="99-temp\Clipboard\ClipboardCurveTextSelDlg.cs">
+ <SubType>Form</SubType>
</Compile>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
@@ -118,4 +155,11 @@
</EmbeddedResource>
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="00-core\03-view-model\02-paras\disp-paras\" />
+ <Folder Include="01-pump\03-import\01-excel\" />
+ <Folder Include="02-universal\03-import\01-excel\" />
+ <Folder Include="Properties\DataSources\" />
+ </ItemGroup>
+
</Project>
--
Gitblit v1.9.3