From 59f2c4c04e06d77de7f10ab96d1a5c73ccd01262 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 05 十二月 2024 16:23:42 +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 | 131 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 121 insertions(+), 10 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 5497054..151c17c 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
@@ -94,22 +94,34 @@
<Compile Update="03-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\04-scheme\01-add\01-set\02-valve\SetSchemeValveListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\04-scheme\01-add\01-set\03-pipe\SetSchemePipeListCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="03-simulation\04-scheme\01-add\AddXhsSchemeDlg.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="03-simulation\04-scheme\02-page\XhsProjectSimulationSchemePage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="03-simulation\05-function\XhsProjectSimulationFunctionCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\SimulationPumpSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveChartShowDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\SimulationValveSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\SimulationValveSingleMatchingDlg.cs">
+ <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveChartShowDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingCtrl.cs">
@@ -127,16 +139,85 @@
<Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\SimulationElbowSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\ThreelinkSingleMatchingCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
<Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\SimulationThreelinkSingleMatchingDlg.cs">
<SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\06-threelink\01-threelinksinglematching\ThreelinkSingleMatchingCtrl.cs">
+ <SubType>UserControl</SubType>
</Compile>
<Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourlinkSingleMatchingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\SimulationFourlinkSingleMatchingDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\09-tank\SimulationTankSingleMatchingDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\09-tank\TankChartShowDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\09-tank\TankSingleMatchingCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\10-meter\MeterSingleMatchingCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\10-meter\SimulationMeterSingleMatchingDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\11-flowmeter\FlowmeterSingleMatchingCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\11-flowmeter\SimulationFlowmeterSingleMatchingDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\12-hydrant\HydrantSingleMatchingCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\12-hydrant\SimulationHydrantSingleMatchingDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\13-pressmeter\PressmeterSingleMatchingCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\13-pressmeter\SimulationPressmeterSingleMatchingDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\14-blunthead\BluntheadSingleMatchingForm.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\14-blunthead\SimulationBluntheadSingleMatchingDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\15-translation\SimulationTranslationSingleMatchingDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\15-translation\TranslationSingleMatchingCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\16-sprinkler\SimulationSprinklerSingleMatchingDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\16-sprinkler\SprinklerSingleMatchingCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\CompressorChartShowDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\CompressorSingleMatchingCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\SimulationCompressorSingleMatchingDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\ExchangerChartShowDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\ExchangerSingleMatchingCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\SimulationExchangerSingleMatchingDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixCtrl.cs">
@@ -166,26 +247,56 @@
<Compile Update="03-simulation\07-l3d\XhsProjectSimulationL3dCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="03-simulation\08-working\XhsProjectSimulationWorkingPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\09-energy\SimulationMultiWorkingEnergyDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="03-simulation\09-energy\SimulationSingleWorkingEnergyCtrl.cs">
<SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\09-energy\SimulationSingleWorkingEnergyDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\10-analy\SimulationMultiWorkingAnalyDlg.cs">
+ <SubType>Form</SubType>
</Compile>
<Compile Update="03-simulation\10-analy\SimulationSingleWorkingAnalyCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="03-simulation\10-analy\SimulationSingleWorkingAnalyDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="03-simulation\11-pump\01-parallel\SimulationPumpParallelCtrl.cs">
<SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\11-pump\01-parallel\SimulationPumpParallelDlg.cs">
+ <SubType>Form</SubType>
</Compile>
<Compile Update="03-simulation\11-pump\02-feat\SimulationPumpFeatCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="03-simulation\11-pump\02-feat\SimulationPumpFeatDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="03-simulation\11-pump\02-feat\SimulationSinglePumpFeatCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\11-pump\02-feat\SimulationSinglePumpFeatDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="03-simulation\11-pump\03-analy\SimulationMultiWorkingPumpAnalyCtrl.cs">
<SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="03-simulation\11-pump\03-analy\SimulationMultiWorkingPumpAnalyDlg.cs">
+ <SubType>Form</SubType>
</Compile>
<Compile Update="03-simulation\11-pump\03-analy\SimulationSingleWorkingPumpAnalyCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="03-simulation\11-pump\02-feat\SimulationSinglePumpFeatCtrl.cs">
- <SubType>UserControl</SubType>
+ <Compile Update="03-simulation\11-pump\03-analy\SimulationSingleWorkingPumpAnalyDlg.cs">
+ <SubType>Form</SubType>
</Compile>
<Compile Update="03-simulation\XhsProjectSimulationMgrPage.cs">
<SubType>UserControl</SubType>
--
Gitblit v1.9.3