From 68489b619d6859e2a98b8f9acee4416508e2d830 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 24 十二月 2024 21:44:11 +0800
Subject: [PATCH] 优化单独匹配多条曲线聚焦
---
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj | 93 ++++++++++++++++++++++++++++++++--------------
1 files changed, 65 insertions(+), 28 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj
index 790aca5..8d5832e 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/HStation.WinFrmUI.PhartRelation.Core.csproj
@@ -7,33 +7,71 @@
</PropertyGroup>
<ItemGroup>
- <Compile Remove="00-helper\**" />
+ <Compile Remove="01-pump-main\**" />
+ <Compile Remove="01-viewmodel - 澶嶅埗\**" />
+ <Compile Remove="00-core\00-viewmodel\01-pump\01-feat\**" />
+ <Compile Remove="02-valve-main\**" />
<Compile Remove="03-variable-speed\**" />
- <EmbeddedResource Remove="00-helper\**" />
+ <EmbeddedResource Remove="01-pump-main\**" />
+ <EmbeddedResource Remove="01-viewmodel - 澶嶅埗\**" />
+ <EmbeddedResource Remove="00-core\00-viewmodel\01-pump\01-feat\**" />
+ <EmbeddedResource Remove="02-valve-main\**" />
<EmbeddedResource Remove="03-variable-speed\**" />
- <None Remove="00-helper\**" />
+ <None Remove="01-pump-main\**" />
+ <None Remove="01-viewmodel - 澶嶅埗\**" />
+ <None Remove="00-core\00-viewmodel\01-pump\01-feat\**" />
+ <None Remove="02-valve-main\**" />
<None Remove="03-variable-speed\**" />
- <Page Remove="00-helper\**" />
+ <Page Remove="01-pump-main\**" />
+ <Page Remove="01-viewmodel - 澶嶅埗\**" />
+ <Page Remove="00-core\00-viewmodel\01-pump\01-feat\**" />
+ <Page Remove="02-valve-main\**" />
<Page Remove="03-variable-speed\**" />
</ItemGroup>
<ItemGroup>
+ <Compile Remove="99-common\PumpParallelChartDlg.cs" />
+ <Compile Remove="99-common\PumpParallelChartDlg.Designer.cs" />
<Compile Remove="99-common\PumpPerform2dMultiViewDlg - 澶嶅埗.cs" />
<Compile Remove="99-common\PumpPerform2dMultiViewDlg - 澶嶅埗.Designer.cs" />
+ <Compile Remove="99-common\PumpSerialParallelChartDlg.cs" />
+ <Compile Remove="99-common\PumpSerialParallelChartDlg.Designer.cs" />
+ <Compile Remove="99-common\PumpVariableSpeedChartDlg.cs" />
+ <Compile Remove="99-common\PumpVariableSpeedChartDlg.Designer.cs" />
+ <Compile Remove="99-common\PumpWorkChartDlg.cs" />
+ <Compile Remove="99-common\PumpWorkChartDlg.Designer.cs" />
+ <Compile Remove="99-common\PumpWorkComparisonChartDlg.cs" />
+ <Compile Remove="99-common\PumpWorkComparisonChartDlg.Designer.cs" />
+ <Compile Remove="99-common\SelXhsPumpMainPhartDlg.cs" />
+ <Compile Remove="99-common\SelXhsPumpMainPhartDlg.Designer.cs" />
+ <Compile Remove="99-common\SelXhsValveMainPhartDlg.cs" />
+ <Compile Remove="99-common\SelXhsValveMainPhartDlg.Designer.cs" />
+ <Compile Remove="PumpCurveExpandDlg.cs" />
+ <Compile Remove="PumpCurveExpandDlg.Designer.cs" />
+ <Compile Remove="PumpParallelAnalyDlg - 澶嶅埗.cs" />
+ <Compile Remove="PumpParallelAnalyDlg - 澶嶅埗.Designer.cs" />
+ <Compile Remove="PumpParallelAnalyDlg.cs" />
+ <Compile Remove="PumpParallelAnalyDlg.Designer.cs" />
</ItemGroup>
<ItemGroup>
+ <EmbeddedResource Remove="99-common\PumpParallelChartDlg.resx" />
<EmbeddedResource Remove="99-common\PumpPerform2dMultiViewDlg - 澶嶅埗.resx" />
- </ItemGroup>
-
- <ItemGroup>
- <Compile Include="00-helper\PhartPerformCurveHelper.cs" />
+ <EmbeddedResource Remove="99-common\PumpSerialParallelChartDlg.resx" />
+ <EmbeddedResource Remove="99-common\PumpVariableSpeedChartDlg.resx" />
+ <EmbeddedResource Remove="99-common\PumpWorkChartDlg.resx" />
+ <EmbeddedResource Remove="99-common\PumpWorkComparisonChartDlg.resx" />
+ <EmbeddedResource Remove="99-common\SelXhsPumpMainPhartDlg.resx" />
+ <EmbeddedResource Remove="99-common\SelXhsValveMainPhartDlg.resx" />
+ <EmbeddedResource Remove="PumpCurveExpandDlg.resx" />
+ <EmbeddedResource Remove="PumpParallelAnalyDlg - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="PumpParallelAnalyDlg.resx" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
<PackageReference Include="NPOI" Version="2.7.1" />
- <PackageReference Include="Yw.BLL.Phart.Core" Version="3.0.2" />
+ <PackageReference Include="Yw.BLL.Phart.Core" Version="3.0.5" />
</ItemGroup>
<ItemGroup>
@@ -44,39 +82,38 @@
</ItemGroup>
<ItemGroup>
- <Compile Update="01-pump-main\SetOtherNameDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="01-pump-main\SetImportanceDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="01-pump-main\XhsPumpMainPhartPanel.cs">
+ <Compile Update="01-pump\02-edit\PumpChartEditCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="02-valve-main\XhsValveMainPhartListCtrl.cs">
+ <Compile Update="01-pump\03-import\01-excel\PumpChartExcelImportCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="99-common\PumpParallelChartDlg.cs">
- <SubType>Form</SubType>
+ <Compile Update="01-pump\03-import\02-image\PumpChartImageImportCtrl.cs">
+ <SubType>UserControl</SubType>
</Compile>
- <Compile Update="99-common\PumpVariableSpeedChartDlg.cs">
- <SubType>Form</SubType>
+ <Compile Update="01-pump\03-import\03-point\PumpChartPointImportCtrl.cs">
+ <SubType>UserControl</SubType>
</Compile>
- <Compile Update="99-common\PumpSerialParallelChartDlg.cs">
- <SubType>Form</SubType>
+ <Compile Update="02-universal\02-edit\UniversalChartEditCtrl.cs">
+ <SubType>UserControl</SubType>
</Compile>
- <Compile Update="99-common\SelXhsValveMainPhartDlg.cs">
- <SubType>Form</SubType>
+ <Compile Update="02-universal\03-import\01-excel\UniversalChartExcelImportCtrl.cs">
+ <SubType>UserControl</SubType>
</Compile>
- <Compile Update="99-common\PumpPerform2dMultiViewDlg.cs" />
- <Compile Update="99-common\PumpPerform2dViewDlg.cs">
- <SubType>Form</SubType>
+ <Compile Update="02-universal\03-import\02-image\UniversalChartImageImportCtrl.cs">
+ <SubType>UserControl</SubType>
</Compile>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
+ <Compile Update="relation\01-list\PhartDiagramRelationListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="SinglePumpAnalyDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="XhsProjectUserControl.cs">
<SubType>UserControl</SubType>
</Compile>
--
Gitblit v1.9.3