From 630b88ea44380933602ae73b725b3772fc105c35 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 23 十二月 2024 17:11:15 +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.user | 69 +++++++++++++++++++++++++++++++---
1 files changed, 63 insertions(+), 6 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
index 79458fe..160a605 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
@@ -34,7 +34,7 @@
<Compile Update="02-project\01-import\04-completed\00-core\XhsProjectResultWizardPage.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="02-project\01-import\04-completed\05-revit\XhsProjectResultRevitCtrl.cs">
+ <Compile Update="02-project\01-import\04-completed\01-info\XhsProjectResultInfoCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="02-project\01-import\04-completed\02-bimface\XhsProjectResultBimfaceCtrl.cs">
@@ -43,10 +43,10 @@
<Compile Update="02-project\01-import\04-completed\03-hydro\XhsProjectResultHydroCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="02-project\01-import\04-completed\01-info\XhsProjectResultInfoCtrl.cs">
+ <Compile Update="02-project\01-import\04-completed\04-map\XhsProjectResultMapCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="02-project\01-import\04-completed\04-map\XhsProjectResultMapCtrl.cs">
+ <Compile Update="02-project\01-import\04-completed\05-revit\XhsProjectResultRevitCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="02-project\02-bimface\XhsProjectBimfaceViewPage.cs">
@@ -58,10 +58,16 @@
<Compile Update="02-project\04-q3d\XhsProjectQ3dViewPage.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="02-project\05-add\AddXhsProjectDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="02-project\06-edit\EditXhsProjectDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="02-project\07-map\SetXhsProjectMapDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="02-project\08-view\ViewXhsProjectDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="03-simulation\01-info\XhsProjectSimulationBimfaceInfoCtrl.cs">
@@ -97,11 +103,26 @@
<Compile Update="03-simulation\04-scheme\01-info - 澶嶅埗\CreateXhsSchemeInfoPage.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="03-simulation\04-scheme\01-info\00-core\XhsSchemeChangeTypeCheckedListHorizCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="03-simulation\04-scheme\02-change\01-pump\CreateXhsSchemePumpChangePage.cs">
<SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\04-scheme\02-change\02-valve\CreateXhsSchemeValveChangePage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\04-scheme\02-change\03-pipe\CreateXhsSchemePipeChangePage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\04-scheme\02-change\99-change-record\CreateXhsSchemeChangeRecordPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\04-scheme\03-edit\EditXhsSchemeDlg.cs">
+ <SubType>Form</SubType>
</Compile>
<Compile Update="03-simulation\04-scheme\99-bak\01-set\01-pump\SetSchemePumpListCtrl.cs">
<SubType>UserControl</SubType>
@@ -118,13 +139,19 @@
<Compile Update="03-simulation\05-function\SimulationFunctionCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\04-scheme\03-edit\EditXhsSchemeDlg.cs">
- <SubType>Form</SubType>
+ <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs">
+ <SubType>UserControl</SubType>
</Compile>
<Compile Update="03-simulation\07-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="03-simulation\07-matching\02-pump\01-pumpsinglematching\SimulationPumpSingleMatchingDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\07-matching\03-valve\AssetsValveSingleMatchingCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\07-matching\03-valve\AssetsValveSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="03-simulation\07-matching\04-pipe\01-pipesinglematching\PipeSingleMatchingCtrl.cs">
@@ -151,6 +178,12 @@
<Compile Update="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\SimulationFourlinkSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="03-simulation\07-matching\09-Tank\AssetsTankSingleMatchingCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\07-matching\09-Tank\AssetsTankSingleMatchingDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="03-simulation\07-matching\12-Hydrant\HydrantSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -172,15 +205,39 @@
<Compile Update="03-simulation\07-matching\16-meter\AssetsMeterSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="03-simulation\07-matching\16-meter\AssetsMeterSingleMatchingDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="03-simulation\07-matching\16-sprinkler\SimulationSprinklerSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="03-simulation\07-matching\16-sprinkler\SprinklerSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs">
+ <Compile Update="03-simulation\07-matching\17-compressor\AssetsCompressorSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="03-simulation\07-matching\17-compressor\AssetsCompressorSingleMatchingDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\07-matching\17-flowmeter\AssetsFlowmeterSingleMatchingCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\07-matching\17-flowmeter\AssetsFlowmeterSingleMatchingDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\07-matching\18-exchanger\AssetsExchangerSingleMatchingCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\07-matching\18-exchanger\AssetsExchangerSingleMatchingDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\07-matching\18-pressmeter\AssetsPressmeterSingleMatchingCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\07-matching\18-pressmeter\AssetsPressmeterSingleMatchingDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="03-simulation\07-matching\21-cooling\AssetsCoolingSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
--
Gitblit v1.9.3