From bb5865148234cad04ae31d4de9264f4209a3fa6d Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 24 十月 2024 14:02:29 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj | 156 +++++++++++++++++++++++-----------------------------
1 files changed, 69 insertions(+), 87 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 741d8b5..b3dfdc2 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
@@ -9,17 +9,25 @@
<ItemGroup>
<Compile Remove="02-project\01-import\01-ModelFile\**" />
+ <Compile Remove="02-project\01-import\04-completed\**" />
<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-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-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-ViewModel\**" />
<Page Remove="04-HomePageMainPanel\**" />
+ <Page Remove="Resources\**" />
</ItemGroup>
<ItemGroup>
@@ -27,17 +35,18 @@
<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-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainChoicePage.cs" />
- <Compile Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainChoicePage.Designer.cs" />
- <Compile Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainForm-bak.cs" />
- <Compile Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainForm-bak.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="04-pump\02-analy\SinglePumpSectPointViewModel.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-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainChoicePage.resx" />
- <EmbeddedResource Remove="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\PumpMainForm-bak.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" />
</ItemGroup>
<ItemGroup>
@@ -56,17 +65,27 @@
<Content Include="map\gaode\js\xhs_base64.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <None Include="Resources\Cancel.svg" />
+ <None Include="Resources\Close32.png" />
+ <None Include="Resources\Folder.svg" />
+ <None Include="Resources\IncomingCall.svg" />
+ <None Include="Resources\MapLayers.svg" />
+ <None Include="Resources\Remove.svg" />
+ <None Include="Resources\Square32.png" />
+ <None Include="Resources\SizeNormal32.png" />
+ <None Include="Resources\SizeMin32.png" />
</ItemGroup>
<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="04-simulation\02-bimface\" />
+ <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\" />
- <Folder Include="Resources\" />
</ItemGroup>
<ItemGroup>
@@ -81,84 +100,47 @@
</ItemGroup>
<ItemGroup>
- <Compile Update="02-project\04-dlg\00-core\ImportXhsProjectFileDlg.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">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="03-scheme\03-hydraulic-simulation\01-PumpMainCurveChoice\ChoicePumpMainDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="04-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="04-simulation\01-info\XhsProjectSimulationProjectInfoCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="04-simulation\01-info\XhsProjectSimulationBimfaceInfoCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="04-simulation\01-info\XhsProjectSimulationInfoPage.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="04-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="04-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="04-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="04-simulation\06-simulation\01-matching\02-pump\XhsProjectSimulationPumpMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="04-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="04-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="04-simulation\06-simulation\04-unmatching\00-core\XhsProjectSimulationUnMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="04-simulation\06-simulation\04-unmatching\02-valve\XhsProjectSimulationValveUnMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="04-simulation\06-simulation\04-unmatching\03-pipe\XhsProjectSimulationPipeUnMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="04-simulation\06-simulation\04-unmatching\06-fourlink\XhsProjectSimulationFourlinkUnMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="04-simulation\06-simulation\04-unmatching\05-threelink\XhsProjectSimulationThreelinkUnMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="04-simulation\06-simulation\04-unmatching\04-elbow\XhsProjectSimulationElbowUnMatchingListCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="04-simulation\06-simulation\XhsProjectSimulationCorePage.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="04-simulation\06-simulation\03-calcu\XhsProjectSimulationHydroCalcuFailedDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="04-simulation\07-l3d\XhsProjectSimulationL3dCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
+ <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\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-threelinksinglematching\FourLinkSingleMatchingForm.cs" />
+ <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-threelinksinglematching\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\03-calcu\02-prefix\02-valve\XhsProjectSimulationValveCalcuPrefixCtrl.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\06-simulation\03-calcu\01-failed\XhsProjectSimulationCalcuFailedDlg.cs" />
+ <Compile Update="03-simulation\07-l3d\XhsProjectSimulationL3dCtrl.cs" />
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
--
Gitblit v1.9.3