From a234486afe7d632b46cd65fa2cffbd07d93d4285 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期一, 10 二月 2025 13:49:02 +0800 Subject: [PATCH] 并联曲线bug修复及单泵性能曲线编辑功能优化 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj | 28 +++++++--------------------- 1 files changed, 7 insertions(+), 21 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj index c4c7252..a67c4f8 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj @@ -16,8 +16,7 @@ <Compile Remove="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\**" /> <Compile Remove="03-ViewModel\**" /> <Compile Remove="04-HomePageMainPanel\**" /> - <Compile Remove="04-pump\02-analy\**" /> - <Compile Remove="04-pump\03-calc\**" /> + <Compile Remove="map\gaode\css\**" /> <Compile Remove="Resources\**" /> <EmbeddedResource Remove="02-project\01-import\01-ModelFile\**" /> <EmbeddedResource Remove="03-simulation\04-scheme\01-info - 澶嶅埗\**" /> @@ -27,8 +26,7 @@ <EmbeddedResource Remove="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\**" /> <EmbeddedResource Remove="03-ViewModel\**" /> <EmbeddedResource Remove="04-HomePageMainPanel\**" /> - <EmbeddedResource Remove="04-pump\02-analy\**" /> - <EmbeddedResource Remove="04-pump\03-calc\**" /> + <EmbeddedResource Remove="map\gaode\css\**" /> <EmbeddedResource Remove="Resources\**" /> <None Remove="02-project\01-import\01-ModelFile\**" /> <None Remove="03-simulation\04-scheme\01-info - 澶嶅埗\**" /> @@ -38,8 +36,7 @@ <None Remove="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\**" /> <None Remove="03-ViewModel\**" /> <None Remove="04-HomePageMainPanel\**" /> - <None Remove="04-pump\02-analy\**" /> - <None Remove="04-pump\03-calc\**" /> + <None Remove="map\gaode\css\**" /> <None Remove="Resources\**" /> <Page Remove="02-project\01-import\01-ModelFile\**" /> <Page Remove="03-simulation\04-scheme\01-info - 澶嶅埗\**" /> @@ -49,8 +46,7 @@ <Page Remove="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\**" /> <Page Remove="03-ViewModel\**" /> <Page Remove="04-HomePageMainPanel\**" /> - <Page Remove="04-pump\02-analy\**" /> - <Page Remove="04-pump\03-calc\**" /> + <Page Remove="map\gaode\css\**" /> <Page Remove="Resources\**" /> </ItemGroup> @@ -90,12 +86,6 @@ <Compile Remove="03-simulation\07-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs" /> <Compile Remove="03-simulation\07-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.Designer.cs" /> <Compile Remove="03-simulation\07-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingViewModel.cs" /> - <Compile Remove="04-pump\PumpFullInfoCtrl.cs" /> - <Compile Remove="04-pump\PumpFullInfoCtrl.designer.cs" /> - <Compile Remove="04-pump\PumpFullInfoViewDlg.cs" /> - <Compile Remove="04-pump\PumpFullInfoViewDlg.Designer.cs" /> - <Compile Remove="04-pump\SinglePumpInfoViewDLg.cs" /> - <Compile Remove="04-pump\SinglePumpInfoViewDLg.Designer.cs" /> </ItemGroup> <ItemGroup> @@ -113,9 +103,6 @@ <EmbeddedResource Remove="03-simulation\07-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.resx" /> <EmbeddedResource Remove="03-simulation\07-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.resx" /> <EmbeddedResource Remove="03-simulation\07-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.resx" /> - <EmbeddedResource Remove="04-pump\PumpFullInfoCtrl.resx" /> - <EmbeddedResource Remove="04-pump\PumpFullInfoViewDlg.resx" /> - <EmbeddedResource Remove="04-pump\SinglePumpInfoViewDLg.resx" /> </ItemGroup> <ItemGroup> @@ -170,10 +157,6 @@ <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" /> <PackageReference Include="Yw.SkiaSharp.Core" Version="3.0.0" /> <PackageReference Include="Yw.ZipFile.Core" Version="3.0.2" /> - </ItemGroup> - - <ItemGroup> - <Folder Include="map\gaode\css\" /> </ItemGroup> <ItemGroup> @@ -388,6 +371,9 @@ <Compile Update="03-simulation\01-info\XhsProjectSimulationBimfaceInfoCtrl.cs" /> <Compile Update="03-simulation\01-info\XhsProjectSimulationInfoPage.cs" /> <Compile Update="03-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs" /> + <Compile Update="03-simulation\11-pump\05-edit\SimulationPumpCurveEditDlg.cs"> + <SubType>Form</SubType> + </Compile> <Compile Update="eMatchingDlg.cs" /> <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs" /> <Compile Update="03-simulation\09-energy\SimulationMultiWorkingEnergyDlg.cs" /> -- Gitblit v1.9.3