From f1dd96fcf0f0397b0cbcca3ee6ef1936f1e86e45 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期五, 07 三月 2025 13:02:57 +0800
Subject: [PATCH] math net 版本统一
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj | 451 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 379 insertions(+), 72 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
index 6eb039b..db64a61 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
@@ -2,20 +2,160 @@
<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
- <Nullable>warnings</Nullable>
+ <Nullable>disable</Nullable>
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<Compile Remove="02-UICore\**" />
+ <Compile Remove="03-valve\01-series-----bak\**" />
+ <Compile Remove="03-valve\02-main---bak\**" />
+ <Compile Remove="03-valve\04-chart-edit\**" />
+ <Compile Remove="03-valve\05-import\**" />
+ <Compile Remove="04-pipe\01-series-bak\**" />
+ <Compile Remove="04-pipe\02-main-bak\**" />
+ <Compile Remove="04-pipe\03-coefficient\**" />
+ <Compile Remove="05-elbow\01-series-bak\**" />
+ <Compile Remove="05-elbow\02-main-bak\**" />
+ <Compile Remove="05-elbow\03-coefficient\**" />
+ <Compile Remove="06-threeLink\01-series-bak\**" />
+ <Compile Remove="06-threeLink\02-main-bak\**" />
+ <Compile Remove="06-threeLink\03-coefficient\**" />
+ <Compile Remove="07-fourlink\01-series-bak\**" />
+ <Compile Remove="07-fourlink\02-main-bak\**" />
+ <Compile Remove="07-fourlink\03-coefficient\**" />
+ <Compile Remove="08-sprinkler\01-series-bak\**" />
+ <Compile Remove="08-sprinkler\02-main-bak\**" />
+ <Compile Remove="08-sprinkler\03-coefficient\**" />
<Compile Remove="10-equipment\**" />
+ <Compile Remove="11-compressor\04-chart-edit\**" />
+ <Compile Remove="11-compressor\05-import\**" />
+ <Compile Remove="13-blunthead\01-series-bak\**" />
+ <Compile Remove="13-blunthead\02-main-bak\**" />
+ <Compile Remove="13-blunthead\03-coefficient\**" />
+ <Compile Remove="14-tank\01-series-bak\**" />
+ <Compile Remove="14-tank\02-main-bak\**" />
+ <Compile Remove="14-tank\03-factor\**" />
+ <Compile Remove="14-tank\04-chart-edit\**" />
+ <Compile Remove="14-tank\05-import\**" />
+ <Compile Remove="17-hydrant\01-series-bak\**" />
+ <Compile Remove="17-hydrant\02-main-bak\**" />
+ <Compile Remove="17-hydrant\03-coefficient\**" />
+ <Compile Remove="19-translation\01-series-bak\**" />
+ <Compile Remove="19-translation\02-main-bak\**" />
+ <Compile Remove="19-translation\03-coefficient\**" />
<EmbeddedResource Remove="02-UICore\**" />
+ <EmbeddedResource Remove="03-valve\01-series-----bak\**" />
+ <EmbeddedResource Remove="03-valve\02-main---bak\**" />
+ <EmbeddedResource Remove="03-valve\04-chart-edit\**" />
+ <EmbeddedResource Remove="03-valve\05-import\**" />
+ <EmbeddedResource Remove="04-pipe\01-series-bak\**" />
+ <EmbeddedResource Remove="04-pipe\02-main-bak\**" />
+ <EmbeddedResource Remove="04-pipe\03-coefficient\**" />
+ <EmbeddedResource Remove="05-elbow\01-series-bak\**" />
+ <EmbeddedResource Remove="05-elbow\02-main-bak\**" />
+ <EmbeddedResource Remove="05-elbow\03-coefficient\**" />
+ <EmbeddedResource Remove="06-threeLink\01-series-bak\**" />
+ <EmbeddedResource Remove="06-threeLink\02-main-bak\**" />
+ <EmbeddedResource Remove="06-threeLink\03-coefficient\**" />
+ <EmbeddedResource Remove="07-fourlink\01-series-bak\**" />
+ <EmbeddedResource Remove="07-fourlink\02-main-bak\**" />
+ <EmbeddedResource Remove="07-fourlink\03-coefficient\**" />
+ <EmbeddedResource Remove="08-sprinkler\01-series-bak\**" />
+ <EmbeddedResource Remove="08-sprinkler\02-main-bak\**" />
+ <EmbeddedResource Remove="08-sprinkler\03-coefficient\**" />
<EmbeddedResource Remove="10-equipment\**" />
+ <EmbeddedResource Remove="11-compressor\04-chart-edit\**" />
+ <EmbeddedResource Remove="11-compressor\05-import\**" />
+ <EmbeddedResource Remove="13-blunthead\01-series-bak\**" />
+ <EmbeddedResource Remove="13-blunthead\02-main-bak\**" />
+ <EmbeddedResource Remove="13-blunthead\03-coefficient\**" />
+ <EmbeddedResource Remove="14-tank\01-series-bak\**" />
+ <EmbeddedResource Remove="14-tank\02-main-bak\**" />
+ <EmbeddedResource Remove="14-tank\03-factor\**" />
+ <EmbeddedResource Remove="14-tank\04-chart-edit\**" />
+ <EmbeddedResource Remove="14-tank\05-import\**" />
+ <EmbeddedResource Remove="17-hydrant\01-series-bak\**" />
+ <EmbeddedResource Remove="17-hydrant\02-main-bak\**" />
+ <EmbeddedResource Remove="17-hydrant\03-coefficient\**" />
+ <EmbeddedResource Remove="19-translation\01-series-bak\**" />
+ <EmbeddedResource Remove="19-translation\02-main-bak\**" />
+ <EmbeddedResource Remove="19-translation\03-coefficient\**" />
<None Remove="02-UICore\**" />
+ <None Remove="03-valve\01-series-----bak\**" />
+ <None Remove="03-valve\02-main---bak\**" />
+ <None Remove="03-valve\04-chart-edit\**" />
+ <None Remove="03-valve\05-import\**" />
+ <None Remove="04-pipe\01-series-bak\**" />
+ <None Remove="04-pipe\02-main-bak\**" />
+ <None Remove="04-pipe\03-coefficient\**" />
+ <None Remove="05-elbow\01-series-bak\**" />
+ <None Remove="05-elbow\02-main-bak\**" />
+ <None Remove="05-elbow\03-coefficient\**" />
+ <None Remove="06-threeLink\01-series-bak\**" />
+ <None Remove="06-threeLink\02-main-bak\**" />
+ <None Remove="06-threeLink\03-coefficient\**" />
+ <None Remove="07-fourlink\01-series-bak\**" />
+ <None Remove="07-fourlink\02-main-bak\**" />
+ <None Remove="07-fourlink\03-coefficient\**" />
+ <None Remove="08-sprinkler\01-series-bak\**" />
+ <None Remove="08-sprinkler\02-main-bak\**" />
+ <None Remove="08-sprinkler\03-coefficient\**" />
<None Remove="10-equipment\**" />
+ <None Remove="11-compressor\04-chart-edit\**" />
+ <None Remove="11-compressor\05-import\**" />
+ <None Remove="13-blunthead\01-series-bak\**" />
+ <None Remove="13-blunthead\02-main-bak\**" />
+ <None Remove="13-blunthead\03-coefficient\**" />
+ <None Remove="14-tank\01-series-bak\**" />
+ <None Remove="14-tank\02-main-bak\**" />
+ <None Remove="14-tank\03-factor\**" />
+ <None Remove="14-tank\04-chart-edit\**" />
+ <None Remove="14-tank\05-import\**" />
+ <None Remove="17-hydrant\01-series-bak\**" />
+ <None Remove="17-hydrant\02-main-bak\**" />
+ <None Remove="17-hydrant\03-coefficient\**" />
+ <None Remove="19-translation\01-series-bak\**" />
+ <None Remove="19-translation\02-main-bak\**" />
+ <None Remove="19-translation\03-coefficient\**" />
<Page Remove="02-UICore\**" />
+ <Page Remove="03-valve\01-series-----bak\**" />
+ <Page Remove="03-valve\02-main---bak\**" />
+ <Page Remove="03-valve\04-chart-edit\**" />
+ <Page Remove="03-valve\05-import\**" />
+ <Page Remove="04-pipe\01-series-bak\**" />
+ <Page Remove="04-pipe\02-main-bak\**" />
+ <Page Remove="04-pipe\03-coefficient\**" />
+ <Page Remove="05-elbow\01-series-bak\**" />
+ <Page Remove="05-elbow\02-main-bak\**" />
+ <Page Remove="05-elbow\03-coefficient\**" />
+ <Page Remove="06-threeLink\01-series-bak\**" />
+ <Page Remove="06-threeLink\02-main-bak\**" />
+ <Page Remove="06-threeLink\03-coefficient\**" />
+ <Page Remove="07-fourlink\01-series-bak\**" />
+ <Page Remove="07-fourlink\02-main-bak\**" />
+ <Page Remove="07-fourlink\03-coefficient\**" />
+ <Page Remove="08-sprinkler\01-series-bak\**" />
+ <Page Remove="08-sprinkler\02-main-bak\**" />
+ <Page Remove="08-sprinkler\03-coefficient\**" />
<Page Remove="10-equipment\**" />
+ <Page Remove="11-compressor\04-chart-edit\**" />
+ <Page Remove="11-compressor\05-import\**" />
+ <Page Remove="13-blunthead\01-series-bak\**" />
+ <Page Remove="13-blunthead\02-main-bak\**" />
+ <Page Remove="13-blunthead\03-coefficient\**" />
+ <Page Remove="14-tank\01-series-bak\**" />
+ <Page Remove="14-tank\02-main-bak\**" />
+ <Page Remove="14-tank\03-factor\**" />
+ <Page Remove="14-tank\04-chart-edit\**" />
+ <Page Remove="14-tank\05-import\**" />
+ <Page Remove="17-hydrant\01-series-bak\**" />
+ <Page Remove="17-hydrant\02-main-bak\**" />
+ <Page Remove="17-hydrant\03-coefficient\**" />
+ <Page Remove="19-translation\01-series-bak\**" />
+ <Page Remove="19-translation\02-main-bak\**" />
+ <Page Remove="19-translation\03-coefficient\**" />
</ItemGroup>
<ItemGroup>
@@ -23,27 +163,69 @@
<Compile Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.Designer.cs" />
<Compile Remove="01-pump\PumpProductMainPanel - 澶嶅埗.cs" />
<Compile Remove="01-pump\PumpProductMainPanel - 澶嶅埗.Designer.cs" />
+ <Compile Remove="03-valve\SetValveCoefficientDlg.cs" />
+ <Compile Remove="03-valve\SetValveCoefficientDlg.Designer.cs" />
+ <Compile Remove="03-valve\ValveManageMainPage.cs" />
+ <Compile Remove="03-valve\ValveManageMainPage.Designer.cs" />
+ <Compile Remove="04-pipe\PipeManageMainPage.cs" />
+ <Compile Remove="04-pipe\PipeManageMainPage.Designer.cs" />
+ <Compile Remove="05-elbow\ElbowManageMainPage.cs" />
+ <Compile Remove="05-elbow\ElbowManageMainPage.Designer.cs" />
+ <Compile Remove="06-threeLink\ThreeLinkManageMainPage.cs" />
+ <Compile Remove="06-threeLink\ThreeLinkManageMainPage.Designer.cs" />
+ <Compile Remove="06-threeLink\ThreeLinkViewModel.cs" />
+ <Compile Remove="07-fourlink\FourLinkManageMainPage.cs" />
+ <Compile Remove="07-fourlink\FourLinkManageMainPage.Designer.cs" />
+ <Compile Remove="08-sprinkler\SprinklerManageMainPage.cs" />
+ <Compile Remove="08-sprinkler\SprinklerManageMainPage.Designer.cs" />
+ <Compile Remove="08-sprinkler\SprinklerViewModel.cs" />
<Compile Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.cs" />
<Compile Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.Designer.cs" />
<Compile Remove="12-package\02-main\01-EditPumpPartProp\PropGroupChoiceViewModel.cs" />
+ <Compile Remove="13-blunthead\BluntheadManageMainPage.cs" />
+ <Compile Remove="13-blunthead\BluntheadManageMainPage.Designer.cs" />
+ <Compile Remove="13-blunthead\BluntheadViewModel.cs" />
+ <Compile Remove="14-tank\TankManageMainPage.cs" />
+ <Compile Remove="14-tank\TankManageMainPage.Designer.cs" />
+ <Compile Remove="17-hydrant\HydrantManageMainPage.cs" />
+ <Compile Remove="17-hydrant\HydrantManageMainPage.Designer.cs" />
+ <Compile Remove="17-hydrant\HydrantViewModel.cs" />
+ <Compile Remove="19-translation\TranslationManageMainPage.cs" />
+ <Compile Remove="19-translation\TranslationManageMainPage.Designer.cs" />
+ <Compile Remove="19-translation\TranslationViewModel.cs" />
+ <Compile Remove="20-exchanger\ExchangerManageMainPage.cs" />
+ <Compile Remove="20-exchanger\ExchangerManageMainPage.Designer.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.resx" />
<EmbeddedResource Remove="01-pump\PumpProductMainPanel - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="03-valve\SetValveCoefficientDlg.resx" />
+ <EmbeddedResource Remove="03-valve\ValveManageMainPage.resx" />
+ <EmbeddedResource Remove="04-pipe\PipeManageMainPage.resx" />
+ <EmbeddedResource Remove="05-elbow\ElbowManageMainPage.resx" />
+ <EmbeddedResource Remove="06-threeLink\ThreeLinkManageMainPage.resx" />
+ <EmbeddedResource Remove="07-fourlink\FourLinkManageMainPage.resx" />
+ <EmbeddedResource Remove="08-sprinkler\SprinklerManageMainPage.resx" />
<EmbeddedResource Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.resx" />
+ <EmbeddedResource Remove="13-blunthead\BluntheadManageMainPage.resx" />
+ <EmbeddedResource Remove="14-tank\TankManageMainPage.resx" />
+ <EmbeddedResource Remove="17-hydrant\HydrantManageMainPage.resx" />
+ <EmbeddedResource Remove="19-translation\TranslationManageMainPage.resx" />
+ <EmbeddedResource Remove="20-exchanger\ExchangerManageMainPage.resx" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" />
<PackageReference Include="Yw.BLL.Assets.Core" Version="3.0.1" />
+ <PackageReference Include="Yw.BLL.Phart.Core" Version="3.0.6" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\BLL\HStation.BLL.Assets.Core\HStation.BLL.Assets.Core.csproj" />
- <ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" />
<ProjectReference Include="..\..\Dto\HStation.Dto.Assets.Core\HStation.Dto.Assets.Core.csproj" />
+ <ProjectReference Include="..\HStation.WinFrmUI.Auth.Core\HStation.WinFrmUI.Auth.Core.csproj" />
<ProjectReference Include="..\HStation.WinFrmUI.Basic.Core\HStation.WinFrmUI.Basic.Core.csproj" />
<ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
<ProjectReference Include="..\HStation.WinFrmUI.Dict.Core\HStation.WinFrmUI.Dict.Core.csproj" />
@@ -51,131 +233,256 @@
</ItemGroup>
<ItemGroup>
+ <Compile Update="01-pump\07-PumpChart\01-import\01-excel\ImportPumpPerform2dByExcelDlg.cs" />
+ <Compile Update="01-pump\07-PumpChart\01-import\02-image\ImportPumpPerform2dByImageDlg.cs" />
+ <Compile Update="01-pump\07-PumpChart\02-Eidt\EditAssetsPumpPerform2dDlg.cs" />
+ <Compile Update="01-pump\07-PumpChart\02-Eidt\SetImportanceDlg.cs" />
+ <Compile Update="01-pump\07-PumpChart\02-Eidt\SetOtherNameDlg.cs" />
+ <Compile Update="01-pump\07-PumpChart\03-excelHelper\ImportPumpExcel.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="01-pump\07-PumpChart\AssetsPumpCurveQLViewDlg.cs" />
<Compile Update="02-adapting\EditAdaptingMainDlg.cs" />
<Compile Update="02-adapting\AddAdaptingMainDlg.cs" />
<Compile Update="01-pump\03-AssetsPumpType\EditAssetsPumpTypeDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="01-pump\EditPumpProductMainDlg.cs" />
- <Compile Update="01-pump\EditPumpProductGroupDlg.cs" />
- <Compile Update="01-pump\AddPumpProductGroupDlg.cs" />
- <Compile Update="01-pump\AddPumpProductMainDlg.cs" />
- <Compile Update="01-pump\EditPumpProductSeriesDlg.cs" />
- <Compile Update="03-valve\01-series\EditAssetsValveSeriesDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="03-valve\01-series\AddAssetsValveSeriesDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="03-valve\04-chart-edit\ValvePerform2dEditChart.cs" />
- <Compile Update="03-valve\04-chart-edit\ValvePerform2dEditCtrl.cs" />
- <Compile Update="03-valve\04-chart-edit\ValvePerform2dEditDlg.cs" />
- <Compile Update="03-valve\05-import\01-excel\ImportValvePerform2dByExcelCtrl.cs" />
- <Compile Update="03-valve\05-import\01-excel\ImportValvePerform2dByExcelDlg.cs" />
- <Compile Update="03-valve\SetValveCoefficientDlg.cs" />
- <Compile Update="03-valve\01-series\ValveTypeTreeListCtrl.cs" />
+ <Compile Update="01-pump\04-PumpMain\EditPumpProductMainDlg.cs" />
+ <Compile Update="01-pump\06-PumpGroup\EditPumpProductGroupDlg.cs" />
+ <Compile Update="01-pump\06-PumpGroup\AddPumpProductGroupDlg.cs" />
+ <Compile Update="01-pump\04-PumpMain\AddPumpProductMainDlg.cs" />
+ <Compile Update="01-pump\05-PumpSeries\EditPumpProductSeriesDlg.cs" />
<Compile Update="02-adapting\AdaptingManageMainPage.cs" />
- <Compile Update="03-valve\04-chart-edit\XhsValveMainPhartMinorLossPanel.cs" />
- <Compile Update="04-pipe\03-coefficient\SetPipeLineCoefficientDlg.cs">
+ <Compile Update="03-valve\04-curve\AssetsValveCurveMgrPage.cs" />
+ <Compile Update="03-valve\04-curve\AssetsValveCurveViewDlg.cs" />
+ <Compile Update="03-valve\04-curve\EditAssetsValveCurveDlg.cs" />
+ <Compile Update="03-valve\04-curve\ImportAssetsValveCurveByExcelDlg.cs" />
+ <Compile Update="03-valve\04-curve\ImportAssetsValveCurveByPictureDlg.cs" />
+ <Compile Update="03-valve\05-excelHelper\ImportValveExcel.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="05-elbow\02-main\AddAssetsElbowMainDlg.cs">
+ <Compile Update="04-pipe\01-series\AddAssetsPipeSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="05-elbow\02-main\EditAssetsElbowMainDlg.cs">
+ <Compile Update="04-pipe\01-series\AssetsPipeSeriesMgrTreeCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="04-pipe\01-series\EditAssetsPipeSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="05-elbow\03-coefficient\SetElbowCoefficientDlg.cs">
+ <Compile Update="04-pipe\01-series\ViewAssetsPipeSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="06-threeLink\01-series\AddAssetsThreelinkSeriesDlg.cs" />
- <Compile Update="06-threeLink\01-series\EditAssetsThreelinkSeriesDlg.cs" />
- <Compile Update="06-threeLink\01-series\ThreeLinkTreeListCtrl.cs" />
- <Compile Update="06-threeLink\02-main\AddAssetsThreelinkMainDlg.cs">
+ <Compile Update="04-pipe\02-main\AddAssetsPipeMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="06-threeLink\02-main\EditAssetsThreelinkMainDlg.cs">
+ <Compile Update="04-pipe\02-main\AssetsPipeMainMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="04-pipe\02-main\EditAssetsPipeMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="06-threeLink\03-coefficient\SetThreelinkCoefficientDlg.cs">
+ <Compile Update="04-pipe\02-main\ViewAssetsPipeMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="06-threeLink\ThreeLinkManageMainPage.cs" />
- <Compile Update="05-elbow\01-series\AddAssetsElbowSeriesDlg.cs" />
- <Compile Update="05-elbow\01-series\EditAssetsElbowSeriesDlg.cs" />
- <Compile Update="05-elbow\01-series\ElbowTreeListCtrl.cs" />
- <Compile Update="05-elbow\ElbowManageMainPage.cs" />
- <Compile Update="04-pipe\01-series\AddPipeLineSeriesDlg.cs" />
- <Compile Update="04-pipe\01-series\EditPipeLineSeriesDlg.cs" />
+ <Compile Update="04-pipe\03-factor\AddAssetsPipeFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\03-factor\AssetsPipeFactorMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="04-pipe\03-factor\EditAssetsPipeFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\03-factor\ViewAssetsPipeFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="04-pipe\AssetsPipeMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="05-elbow\AssetsElbowMgrPage.cs" />
<Compile Update="04-pipe\02-main\EditAssetsPipeMainDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="04-pipe\02-main\AddAssetsPipeMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="04-pipe\PipeManageMainPage.cs" />
- <Compile Update="04-pipe\01-series\PipeLineTreeListCtrl.cs" />
- <Compile Update="07-fourLink\03-coefficient\SetFourlinkCoefficientDlg.cs">
+ <Compile Update="07-fourlink\01-series\AddAssetsFourlinkSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="08-sprinkler\03-coefficient\SetSprinklerCoefficientDlg.cs">
+ <Compile Update="07-fourlink\01-series\AssetsFourlinkSeriesMgrTreeCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="07-fourlink\01-series\EditAssetsFourlinkSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="10-exchanger\03-coefficient\SetExchangerCoefficientDlg.cs">
+ <Compile Update="07-fourlink\01-series\ViewAssetsFourlinkSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="07-fourlink\02-main\AddAssetsFourlinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourlink\02-main\AssetsFourlinkMainMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="07-fourlink\02-main\EditAssetsFourlinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourlink\02-main\ViewAssetsFourlinkMainDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourlink\03-factor\AddAssetsFourlinkFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourlink\03-factor\AssetsFourlinkFactorMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="07-fourlink\03-factor\EditAssetsFourlinkFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourlink\03-factor\ViewAssetsFourlinkFactorDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="07-fourlink\AssetsFourlinkMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="10-exchanger\04-chart-edit\ExchangerMainPhartMinorLossPanel.cs" />
+ <Compile Update="10-exchanger\04-chart-edit\ExchangerPerform2dEditChart.cs" />
+ <Compile Update="10-exchanger\04-chart-edit\ExchangerPerform2dEditCtrl.cs" />
+ <Compile Update="10-exchanger\04-chart-edit\ExchangerPerform2dEditDlg.cs" />
+ <Compile Update="10-exchanger\05-import\01-excel\ImportExchangerPerform2dByExcelCtrl.cs" />
+ <Compile Update="10-exchanger\05-import\01-excel\ImportTankPerform2dByExcelDlg.cs" />
+ <Compile Update="10-exchanger\06-prop\EditPackagePartPropDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="11-compressor\06-prop\EditPackagePartPropDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="11-compressor\06-prop\ExchangerProductListBox.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="13-blunthead\02-main\AssetsBluntheadMainMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="13-blunthead\AssetsBluntheadMgrPage.cs" />
+ <Compile Update="14-tank\01-series\AddAssetsTankSeriesDlg.cs" />
+ <Compile Update="14-tank\01-series\AssetsTankSeriesMgrTreeCtrl.cs" />
+ <Compile Update="14-tank\01-series\EditAssetsTankSeriesDlg.cs" />
+ <Compile Update="14-tank\01-series\ViewAssetsTankSeriesDlg.cs" />
+ <Compile Update="14-tank\02-main\AddAssetsTankMainDlg.cs" />
+ <Compile Update="14-tank\02-main\AssetsTankMainMgrPage.cs" />
+ <Compile Update="14-tank\02-main\EditAssetsTankMainDlg.cs" />
+ <Compile Update="14-tank\02-main\ViewAssetsTankMainDlg.cs" />
+ <Compile Update="14-tank\03-curveVol\AssetsTankCurveVOLMgrPage.cs" />
+ <Compile Update="14-tank\03-curveVol\AssetsTankCurveVOLViewDlg.cs" />
+ <Compile Update="14-tank\03-curveVol\EditAssetsTankCurveVOLDlg.cs" />
+ <Compile Update="14-tank\03-curveVol\ImportAssetsTankCurveVOLByExcelDlg.cs" />
+ <Compile Update="14-tank\03-curveVol\ImportAssetsTankCurveVOLByPictureDlg.cs" />
+ <Compile Update="14-tank\AssetsTankMgrPage.cs" />
+ <Compile Update="15-meter\01-series\AddAssetsMeterSeriesDlg.cs" />
+ <Compile Update="15-meter\01-series\AssetsMeterSeriesMgrTreeCtrl.cs" />
+ <Compile Update="15-meter\01-series\EditAssetsMeterSeriesDlg.cs" />
+ <Compile Update="15-meter\01-series\ViewAssetsMeterSeriesDlg.cs" />
+ <Compile Update="15-meter\02-main\AddAssetsMeterMainDlg.cs" />
+ <Compile Update="15-meter\02-main\AssetsMeterMainMgrPage.cs" />
+ <Compile Update="15-meter\02-main\EditAssetsMeterMainDlg.cs" />
+ <Compile Update="15-meter\02-main\ViewAssetsMeterMainDlg.cs" />
+ <Compile Update="15-meter\03-factor\AddAssetsMeterFactorDlg.cs" />
+ <Compile Update="15-meter\03-factor\AssetsMeterFactorMgrPage.cs" />
+ <Compile Update="15-meter\03-factor\EditAssetsMeterFactorDlg.cs" />
+ <Compile Update="15-meter\03-factor\ViewAssetsMeterFactorDlg.cs" />
+ <Compile Update="15-meter\AssetsMeterMgrPage.cs" />
+ <Compile Update="16-flowmeter\01-series\AddAssetsFlowmeterSeriesDlg.cs" />
+ <Compile Update="16-flowmeter\01-series\AssetsFlowmeterSeriesMgrTreeCtrl.cs" />
+ <Compile Update="16-flowmeter\01-series\EditAssetsFlowmeterSeriesDlg.cs" />
+ <Compile Update="16-flowmeter\01-series\ViewAssetsFlowmeterSeriesDlg.cs" />
+ <Compile Update="16-flowmeter\02-main\AddAssetsFlowmeterMainDlg.cs" />
+ <Compile Update="16-flowmeter\02-main\AssetsFlowmeterMainMgrPage.cs" />
+ <Compile Update="16-flowmeter\02-main\EditAssetsFlowmeterMainDlg.cs" />
+ <Compile Update="16-flowmeter\02-main\ViewAssetsFlowmeterMainDlg.cs" />
+ <Compile Update="16-flowmeter\03-factor\AddAssetsFlowmeterFactorDlg.cs" />
+ <Compile Update="16-flowmeter\03-factor\AssetsFlowmeterFactorMgrPage.cs" />
+ <Compile Update="16-flowmeter\03-factor\EditAssetsFlowmeterFactorDlg.cs" />
+ <Compile Update="16-flowmeter\03-factor\ViewAssetsFlowmeterFactorDlg.cs" />
+ <Compile Update="16-flowmeter\AssetsFlowmeterMgrPage.cs" />
+ <Compile Update="18-pressmeter\01-series\AddAssetsPressmeterSeriesDlg.cs" />
+ <Compile Update="18-pressmeter\01-series\AssetsPressmeterSeriesMgrTreeCtrl.cs" />
+ <Compile Update="18-pressmeter\01-series\EditAssetsPressmeterSeriesDlg.cs" />
+ <Compile Update="18-pressmeter\01-series\ViewAssetsPressmeterSeriesDlg.cs" />
+ <Compile Update="18-pressmeter\02-main\AddAssetsPressmeterMainDlg.cs" />
+ <Compile Update="18-pressmeter\02-main\AssetsPressmeterMainMgrPage.cs" />
+ <Compile Update="18-pressmeter\02-main\EditAssetsPressmeterMainDlg.cs" />
+ <Compile Update="18-pressmeter\02-main\ViewAssetsPressmeterMainDlg.cs" />
+ <Compile Update="18-pressmeter\03-factor\AddAssetsPressmeterFactorDlg.cs" />
+ <Compile Update="18-pressmeter\03-factor\AssetsPressmeterFactorMgrPage.cs" />
+ <Compile Update="18-pressmeter\03-factor\EditAssetsPressmeterFactorDlg.cs" />
+ <Compile Update="18-pressmeter\03-factor\ViewAssetsPressmeterFactorDlg.cs" />
+ <Compile Update="18-pressmeter\AssetsPressmeterMgrPage.cs" />
+ <Compile Update="10-exchanger\03-coefficient\SetExchangerCoefficientDlg.cs" />
<Compile Update="11-compressor\01-series\AddAssetsCompressorSeriesDlg.cs" />
<Compile Update="11-compressor\01-series\EditAssetsExchangerSeriesDlg.cs" />
<Compile Update="11-compressor\01-series\CompressorTreeListCtrl.cs" />
- <Compile Update="11-compressor\02-main\01-EditPumpPartProp\EditExchangerPartPropDlg.cs" />
- <Compile Update="11-compressor\02-main\01-EditPumpPartProp\ExchangerProductListBox.cs" />
- <Compile Update="11-compressor\02-main\AddAssetsExchangerMainDlg.cs" />
+ <Compile Update="11-compressor\02-main\AddExchangerMainDlg.cs" />
<Compile Update="11-compressor\02-main\EditExchangerMainDlg.cs" />
- <Compile Update="11-compressor\ExchangerManageMainPage.cs" />
+ <Compile Update="11-compressor\CompressorManageMainPage.cs" />
<Compile Update="10-exchanger\01-series\AddAssetsExchangerSeriesDlg.cs" />
<Compile Update="10-exchanger\01-series\EditAssetsExchangerSeriesDlg.cs" />
<Compile Update="10-exchanger\01-series\ExchangerTreeListCtrl.cs" />
- <Compile Update="10-exchanger\02-main\01-EditPumpPartProp\EditExchangerPartPropDlg.cs" />
- <Compile Update="10-exchanger\02-main\01-EditPumpPartProp\ExchangerProductListBox.cs" />
+ <Compile Update="10-exchanger\06-prop\ExchangerProductListBox.cs" />
<Compile Update="10-exchanger\02-main\AddExchangerMainDlg.cs" />
<Compile Update="10-exchanger\02-main\EditExchangerMainDlg.cs" />
- <Compile Update="07-fourLink\02-main\AddAssetsFourlinkMainDlg.cs">
+ <Compile Update="07-fourlink\02-main\AddAssetsFourlinkMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="07-fourLink\02-main\EditAssetsFourlinkMainDlg.cs">
+ <Compile Update="07-fourlink\02-main\EditAssetsFourlinkMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="08-sprinkler\01-series\AddAssetsSprinklerSeriesDlg.cs" />
- <Compile Update="08-sprinkler\01-series\EditAssetsSprinklerSeriesDlg.cs" />
- <Compile Update="08-sprinkler\01-series\SprinklerTreeListCtrl.cs" />
<Compile Update="08-nozzle\02-main\AddAssetsNozzleMainDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="08-nozzle\02-main\EditAssetsNozzleMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="08-sprinkler\SprinklerManageMainPage.cs" />
- <Compile Update="11-compressor\03-coefficient\SetCompressorCoefficientDlg.cs">
+ <Compile Update="11-compressor\03-coefficient\SetCompressorCoefficientDlg.cs" />
+ <Compile Update="12-package\01-series\AddAssetsPackageSeriesDlg.cs" />
+ <Compile Update="12-package\01-series\PackageTreeListCtrl.cs" />
+ <Compile Update="12-package\01-series\EditAssetsPackageSeriesDlg.cs" />
+ <Compile Update="12-package\02-main\EditAssetsPackageMainDlg.cs" />
+ <Compile Update="12-package\02-main\AddAssetsPackageMainDlg.cs" />
+ <Compile Update="12-package\EditPackagePartPropDlg.cs" />
+ <Compile Update="12-package\PackageManageMainPage.cs" />
+ <Compile Update="12-package\PackageProductListBox.cs" />
+ <Compile Update="19-translation\04-excelHelper\ImportTranslationExcel.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="12-package\01-series\AddAssetsPackageSeriesDlg.cs">
+ <Compile Update="20-exchanger\01-series\AddAssetsExchangerSeriesDlg.cs" />
+ <Compile Update="20-exchanger\01-series\AssetsExchangerSeriesMgrTreeCtrl.cs" />
+ <Compile Update="20-exchanger\01-series\EditAssetsExchangerSeriesDlg.cs" />
+ <Compile Update="20-exchanger\01-series\ViewAssetsExchangerSeriesDlg.cs" />
+ <Compile Update="20-exchanger\02-main\AddAssetsExchangerMainDlg.cs" />
+ <Compile Update="20-exchanger\02-main\AssetsExchangerMainMgrPage.cs" />
+ <Compile Update="20-exchanger\02-main\EditAssetsExchangerMainDlg.cs" />
+ <Compile Update="20-exchanger\02-main\ViewAssetsExchangerMainDlg.cs" />
+ <Compile Update="20-exchanger\03-factor\AddAssetsExchangerFactorDlg.cs" />
+ <Compile Update="20-exchanger\03-factor\AssetsExchangerFactorMgrPage.cs" />
+ <Compile Update="20-exchanger\03-factor\EditAssetsExchangerFactorDlg.cs" />
+ <Compile Update="20-exchanger\03-factor\ViewAssetsCoolingFactorDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="12-package\01-series\PackageTreeListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="12-package\01-series\EditAssetsPackageSeriesDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="12-package\02-main\EditAssetsPackageMainDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="12-package\02-main\AddAssetsPackageMainDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="12-package\KitManageMainPage.cs">
- <SubType>UserControl</SubType>
- </Compile>
+ <Compile Update="20-exchanger\04-curveql\AssetsExchangerCurveQLViewDlg.cs" />
+ <Compile Update="20-exchanger\04-curveql\ImportAssetsExchangerCurveQLByPictureDlg.cs" />
+ <Compile Update="20-exchanger\AssetsExchangerMgrPage.cs" />
+ <Compile Update="22-cooling\01-series\ViewAssetsCoolingSeriesDlg.cs" />
+ <Compile Update="22-cooling\01-series\EditAssetsCoolingSeriesDlg.cs" />
+ <Compile Update="22-cooling\01-series\AddAssetsCoolingSeriesDlg.cs" />
+ <Compile Update="22-cooling\01-series\AssetsCoolingSeriesMgrTreeCtrl.cs" />
+ <Compile Update="22-cooling\02-main\ViewAssetsCoolingMainDlg.cs" />
+ <Compile Update="22-cooling\02-main\EditAssetsCoolingMainDlg.cs" />
+ <Compile Update="22-cooling\02-main\AddAssetsCoolingMainDlg.cs" />
+ <Compile Update="22-cooling\02-main\AssetsCoolingMainMgrPage.cs" />
+ <Compile Update="22-cooling\03-factor\ViewAssetsCoolingFactorDlg.cs" />
+ <Compile Update="22-cooling\03-factor\EditAssetsCoolingFactorDlg.cs" />
+ <Compile Update="22-cooling\03-factor\AssetsCoolingFactorMgrPage.cs" />
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
--
Gitblit v1.9.3