From 175472475dadbd80e9c23e043ab6cdce36082d6a Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 27 十一月 2024 16:42:09 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj | 208 +++++++++++++++++++++++----------------------------
1 files changed, 93 insertions(+), 115 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 4fa3adb..f486a6b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
@@ -10,42 +10,80 @@
<ItemGroup>
<Compile Remove="02-project\01-import\01-ModelFile\**" />
<Compile Remove="02-project\01-import\04-completed\**" />
+ <Compile Remove="03-simulation\06-simulation\03-calcu\00-core\**" />
+ <Compile Remove="03-simulation\06-simulation\03-calcu\01-failed\**" />
<Compile Remove="03-ViewModel\**" />
<Compile Remove="04-HomePageMainPanel\**" />
<Compile Remove="Resources\**" />
<EmbeddedResource Remove="02-project\01-import\01-ModelFile\**" />
<EmbeddedResource Remove="02-project\01-import\04-completed\**" />
+ <EmbeddedResource Remove="03-simulation\06-simulation\03-calcu\00-core\**" />
+ <EmbeddedResource Remove="03-simulation\06-simulation\03-calcu\01-failed\**" />
<EmbeddedResource Remove="03-ViewModel\**" />
<EmbeddedResource Remove="04-HomePageMainPanel\**" />
<EmbeddedResource Remove="Resources\**" />
<None Remove="02-project\01-import\01-ModelFile\**" />
<None Remove="02-project\01-import\04-completed\**" />
+ <None Remove="03-simulation\06-simulation\03-calcu\00-core\**" />
+ <None Remove="03-simulation\06-simulation\03-calcu\01-failed\**" />
<None Remove="03-ViewModel\**" />
<None Remove="04-HomePageMainPanel\**" />
<None Remove="Resources\**" />
<Page Remove="02-project\01-import\01-ModelFile\**" />
<Page Remove="02-project\01-import\04-completed\**" />
+ <Page Remove="03-simulation\06-simulation\03-calcu\00-core\**" />
+ <Page Remove="03-simulation\06-simulation\03-calcu\01-failed\**" />
<Page Remove="03-ViewModel\**" />
<Page Remove="04-HomePageMainPanel\**" />
<Page Remove="Resources\**" />
</ItemGroup>
<ItemGroup>
+ <Compile Remove="00-core\AssetsMatchingHelper-Bak.cs" />
<Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.cs" />
<Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.Designer.cs" />
<Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.cs" />
<Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.Designer.cs" />
+ <Compile Remove="03-simulation\04-scheme\01-add\00-viewmodel\SetSchemePipeViewModel.cs" />
+ <Compile Remove="03-simulation\04-scheme\01-add\00-viewmodel\SetSchemePumpViewModel.cs" />
+ <Compile Remove="03-simulation\04-scheme\01-add\00-viewmodel\SetSchemeValveViewModel.cs" />
+ <Compile Remove="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl - 澶嶅埗.cs" />
+ <Compile Remove="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl - 澶嶅埗.Designer.cs" />
+ <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%282%29.cs" />
+ <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%282%29.Designer.cs" />
+ <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%283%29.cs" />
+ <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%283%29.Designer.cs" />
+ <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%284%29.cs" />
+ <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%284%29.Designer.cs" />
+ <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.cs" />
+ <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.Designer.cs" />
<Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.cs" />
<Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.Designer.cs" />
<Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.cs" />
<Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.Designer.cs" />
+ <Compile Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixCtrl - 澶嶅埗.cs" />
+ <Compile Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixCtrl - 澶嶅埗.Designer.cs" />
+ <Compile Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixDlg2.cs" />
+ <Compile Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixDlg2.Designer.cs" />
+ <Compile Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixViewModel.cs" />
+ <Compile Remove="04-pump\02-analy\SinglePumpSectPointViewModel.cs" />
+ <Compile Remove="04-pump\03-calc\SinglePumpCalcCtrl - 澶嶅埗.cs" />
+ <Compile Remove="04-pump\03-calc\SinglePumpCalcCtrl - 澶嶅埗.Designer.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.resx" />
<EmbeddedResource Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%282%29.resx" />
+ <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%283%29.resx" />
+ <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%284%29.resx" />
+ <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.resx" />
<EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.resx" />
<EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.resx" />
+ <EmbeddedResource Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixCtrl - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixDlg2.resx" />
+ <EmbeddedResource Remove="04-pump\03-calc\SinglePumpCalcCtrl - 澶嶅埗.resx" />
</ItemGroup>
<ItemGroup>
@@ -77,15 +115,18 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
- <PackageReference Include="Yw.ZipFile.Core" Version="3.0.0" />
+ <PackageReference Include="Yw.ZipFile.Core" Version="3.0.2" />
</ItemGroup>
<ItemGroup>
- <Folder Include="03-simulation\06-simulation\06-curve\" />
+ <Folder Include="03-simulation\06-simulation\07-bulkset\05-nozzle\" />
+ <Folder Include="03-simulation\06-simulation\07-bulkset\03-valve\" />
+ <Folder Include="03-simulation\06-simulation\07-bulkset\04-pipe\" />
<Folder Include="map\gaode\css\" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\BLL\HStation.BLL.TransferFile.Core\HStation.BLL.TransferFile.Core.csproj" />
<ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" />
<ProjectReference Include="..\..\Hydro\HStation.Hydro.Core\HStation.Hydro.Core.csproj" />
<ProjectReference Include="..\HStation.WinFrmUI.Assets.Core\HStation.WinFrmUI.Assets.Core.csproj" />
@@ -97,128 +138,65 @@
</ItemGroup>
<ItemGroup>
- <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationBimfaceInfoCtrl.cs">
+ <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationBimfaceInfoCtrl.cs" />
+ <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationHydroInfoCtrl.cs" />
+ <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationProjectInfoCtrl.cs" />
+ <Compile Update="02-project\04-dlg\00-core\ImportXhsProjectFileDlg.cs" />
+ <Compile Update="02-project\04-dlg\01-FileChoice\SelectXhsProjectFileModelFileWizardPage.cs" />
+ <Compile Update="02-project\04-dlg\02-GeneralProject\GenerateXhsProjectFileWizardPage.cs" />
+ <Compile Update="02-project\04-dlg\03-ImportCompleted\ImportXhsProjectFileCompletedCtrl.cs" />
+ <Compile Update="02-project\04-dlg\04-ProjectResultShowPanel\ProjectFileResultShowPanel.cs" />
+ <Compile Update="02-project\04-dlg\EditProjectDlg.cs" />
+ <Compile Update="03-simulation\04-scheme\01-add\01-set\03-pipe\SetSchemePipeListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationHydroInfoCtrl.cs">
+ <Compile Update="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationProjectInfoCtrl.cs">
+ <Compile Update="03-simulation\04-scheme\01-add\01-set\02-valve\SetSchemeValveListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="02-project\04-dlg\00-core\ImportXhsProjectFileDlg.cs">
+ <Compile Update="03-simulation\04-scheme\XhsProjectSimulationSchemeMgrPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingDlg.cs" />
+ <Compile Update="03-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs" />
+ <Compile Update="03-simulation\01-info\XhsProjectSimulationProjectInfoCtrl.cs" />
+ <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\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingDlg.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingForm.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingMatchingDlg.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingleMatchingForm.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingForm.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingMatchingDlg.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\ThreeLinkSingleMatchingForm.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\ThreeLinkSingMatchingDlg.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourLinkSingleMatchingForm.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourLinkSingMatchingDlg.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs" />
+ <Compile Update="03-simulation\06-simulation\02-check\XhsProjectSimulationHydroCheckResultCtrl.cs" />
+ <Compile Update="03-simulation\06-simulation\04-unmatching\00-core\XhsProjectSimulationUnMatchingListCtrl.cs" />
+ <Compile Update="03-simulation\06-simulation\04-unmatching\02-valve\XhsProjectSimulationValveUnMatchingListCtrl.cs" />
+ <Compile Update="03-simulation\06-simulation\04-unmatching\03-pipe\XhsProjectSimulationPipeUnMatchingListCtrl.cs" />
+ <Compile Update="03-simulation\06-simulation\04-unmatching\06-fourlink\XhsProjectSimulationFourlinkUnMatchingListCtrl.cs" />
+ <Compile Update="03-simulation\06-simulation\04-unmatching\05-threelink\XhsProjectSimulationThreelinkUnMatchingListCtrl.cs" />
+ <Compile Update="03-simulation\06-simulation\04-unmatching\04-elbow\XhsProjectSimulationElbowUnMatchingListCtrl.cs" />
+ <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs" />
+ <Compile Update="03-simulation\07-l3d\XhsProjectSimulationL3dCtrl.cs" />
+ <Compile Update="03-simulation\08-working\XhsProjectSimulationWorkingPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="04-pump\03-calc\SinglePumpCalcCtrl.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="02-project\04-dlg\01-FileChoice\SelectXhsProjectFileModelFileWizardPage.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="02-project\04-dlg\02-GeneralProject\GenerateXhsProjectFileWizardPage.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="02-project\04-dlg\03-ImportCompleted\ImportXhsProjectFileCompletedCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="02-project\04-dlg\04-ProjectResultShowPanel\ProjectFileResultShowPanel.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="02-project\04-dlg\EditProjectDlg.cs">
+ <Compile Update="03-simulation\09-energy\01-single\SimulationSingleWorkingEnergyDlg.cs">
<SubType>Form</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="03-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\01-info\XhsProjectSimulationProjectInfoCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\01-info\XhsProjectSimulationBimfaceInfoCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\01-info\XhsProjectSimulationInfoPage.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingForm.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingMatchingDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingleMatchingForm.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingForm.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingMatchingDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\ThreeLinkSingleMatchingForm.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\ThreeLinkSingMatchingDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-threelinksinglematching\FourLinkSingleMatchingForm.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-threelinksinglematching\FourLinkSingMatchingDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\02-check\XhsProjectSimulationHydroCheckResultCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\03-calcu\02-prefix\02-valve\XhsProjectSimulationValveCalcuPrefixCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\04-unmatching\00-core\XhsProjectSimulationUnMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\04-unmatching\02-valve\XhsProjectSimulationValveUnMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\04-unmatching\03-pipe\XhsProjectSimulationPipeUnMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\04-unmatching\06-fourlink\XhsProjectSimulationFourlinkUnMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\04-unmatching\05-threelink\XhsProjectSimulationThreelinkUnMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\04-unmatching\04-elbow\XhsProjectSimulationElbowUnMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\03-calcu\01-failed\XhsProjectSimulationHydroCalcuFailedDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="03-simulation\07-l3d\XhsProjectSimulationL3dCtrl.cs">
- <SubType>UserControl</SubType>
</Compile>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
--
Gitblit v1.9.3