From e47f92df1569e16a19deed592f773591da02d890 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期三, 11 十二月 2024 10:28:55 +0800 Subject: [PATCH] 水泵分析优化 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user | 219 +++++++++++++++++++++++++++++++++--------------------- 1 files changed, 135 insertions(+), 84 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 27b8cba..6c4e441 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 @@ -28,22 +28,19 @@ <Compile Update="02-project\01-import\03-generate\GenerateXhsProjectWizardPage.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="02-project\01-import\04-completed\ImportXhsProjectCompletedCtrl.cs"> + <Compile Update="02-project\01-import\04-completed\00-core\ProjectResultShowPanel.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="02-project\01-import\05-completed\ProjectResultShowPanel.cs"> + <Compile Update="02-project\01-import\04-completed\02-analysis\XhsProjectImportRevitAnalysisResultCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationAnalysisCtrl.cs"> + <Compile Update="02-project\01-import\04-completed\XhsProjectSimulationBimfaceInfoCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationBimfaceInfoCtrl.cs"> + <Compile Update="02-project\01-import\04-completed\XhsProjectSimulationHydroInfoCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationHydroInfoCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationProjectInfoCtrl.cs"> + <Compile Update="02-project\01-import\04-completed\01-info\XhsProjectSimulationProjectInfoCtrl.cs"> <SubType>UserControl</SubType> </Compile> <Compile Update="02-project\02-bimface\ViewXhsProjectBimfacePage.cs"> @@ -85,145 +82,208 @@ <Compile Update="03-simulation\01-info\XhsProjectSimulationProjectInfoCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\01-property\XhsProjectSimulationPropertyCtrl.cs"> + <Compile Update="03-simulation\01-property\SimulationPropertyCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\02-bimface\XhsProjectSimulationBimfaceCtrl.cs"> + <Compile Update="03-simulation\02-bimface\SimulationBimfaceCtrl.cs"> <SubType>UserControl</SubType> </Compile> <Compile Update="03-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\04-scheme\AddXhsProjectSimulationSchemeDlg.cs"> + <Compile Update="03-simulation\04-scheme\00-core\CreateXhsSchemeDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="03-simulation\04-scheme\XhsProjectSimulationSchemeMgrCtrl.cs"> + <Compile Update="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\05-function\XhsProjectSimulationFunctionMgrCtrl.cs"> + <Compile Update="03-simulation\04-scheme\01-add\01-set\02-valve\SetSchemeValveListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.cs"> + <Compile Update="03-simulation\04-scheme\01-add\01-set\03-pipe\SetSchemePipeListCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpMatchingDlg.cs"> + <Compile Update="03-simulation\04-scheme\01-add\AddXhsSchemeDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingCtrl.cs"> + <Compile Update="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingDlg.cs"> + <Compile Update="03-simulation\05-function\SimulationFunctionCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="03-simulation\06-simulation\EditXhsSchemeDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.cs"> + <Compile Update="03-simulation\07-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\07-matching\02-pump\01-pumpsinglematching\SimulationPumpSingleMatchingDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingDlg.cs"> + <Compile Update="03-simulation\07-matching\03-valve\01-valvesinglematching\SimulationValveSingleMatchingDlg.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\03-valve\XhsProjectSimulationValveMatchingListCtrl.cs"> - <SubType>UserControl</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\01-pipesinglematching\PipeSingMatchingDlg.cs"> + <Compile Update="03-simulation\07-matching\03-valve\01-valvesinglematching\ValveChartShowDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.cs"> + <Compile Update="03-simulation\07-matching\03-valve\01-valvesinglematching\ValveSingleMatchingCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingForm.cs"> + <Compile Update="03-simulation\07-matching\04-pipe\01-pipesinglematching\PipeSingleMatchingCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingMatchingDlg.cs"> + <Compile Update="03-simulation\07-matching\04-pipe\01-pipesinglematching\SimulationPipeSingleMatchingDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.cs"> + <Compile Update="03-simulation\07-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingCtrl.cs"> <SubType>UserControl</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"> + <Compile Update="03-simulation\07-matching\05-elbows\01-elbowsinglematching\SimulationElbowSingleMatchingDlg.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"> + <Compile Update="03-simulation\07-matching\06-threelink\01-threelinksinglematching\SimulationThreelinkSingleMatchingDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs"> + <Compile Update="03-simulation\07-matching\06-threelink\01-threelinksinglematching\ThreelinkSingleMatchingCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\02-check\XhsProjectSimulationHydroCheckResultCtrl.cs"> + <Compile Update="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\FourlinkSingleMatchingCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixDlg.cs"> + <Compile Update="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\SimulationFourlinkSingleMatchingDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\03-calcu\01-prefix\00-core\SetHydroCalcuPrefixDlg1.cs"> + <Compile Update="03-simulation\07-matching\09-Tank\SimulationTankSingleMatchingDlg.cs"> <SubType>Form</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\03-calcu\01-prefix\01-waterbox\SetHydroWaterboxCalcuPrefixListCtrl.cs"> + <Compile Update="03-simulation\07-matching\09-Tank\TankChartShowDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\07-matching\09-Tank\TankSingleMatchingCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\03-calcu\01-prefix\02-pump\SetHydroPumpCalcuPrefixListCtrl.cs"> + <Compile Update="03-simulation\07-matching\10-Meter\MeterSingleMatchingCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\03-calcu\01-prefix\03-nozzle\SetHydroNozzleCalcuPrefixListCtrl.cs"> + <Compile Update="03-simulation\07-matching\10-Meter\SimulationMeterSingleMatchingDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\07-matching\11-Flowmeter\FlowmeterSingleMatchingCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\03-calcu\99-failed\HydroCalcuFailedCtrl.cs"> + <Compile Update="03-simulation\07-matching\11-Flowmeter\SimulationFlowmeterSingleMatchingDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\07-matching\12-Hydrant\HydrantSingleMatchingCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\04-unmatching\00-core\XhsProjectSimulationUnMatchingListCtrl.cs"> + <Compile Update="03-simulation\07-matching\12-Hydrant\SimulationHydrantSingleMatchingDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\07-matching\13-Pressmeter\PressmeterSingleMatchingCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\04-unmatching\01-pump\XhsProjectSimulationPumpUnMatchingListCtrl.cs"> + <Compile Update="03-simulation\07-matching\13-Pressmeter\SimulationPressmeterSingleMatchingDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\07-matching\14-Blunthead\BluntheadSingleMatchingForm.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\04-unmatching\02-valve\XhsProjectSimulationValveUnMatchingListCtrl.cs"> + <Compile Update="03-simulation\07-matching\14-Blunthead\SimulationBluntheadSingleMatchingDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\07-matching\15-Translation\SimulationTranslationSingleMatchingDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\07-matching\15-Translation\TranslationSingleMatchingCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\04-unmatching\03-pipe\XhsProjectSimulationPipeUnMatchingListCtrl.cs"> + <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\04-unmatching\04-elbow\XhsProjectSimulationElbowUnMatchingListCtrl.cs"> + <Compile Update="03-simulation\07-matching\17-compressor\CompressorChartShowDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\07-matching\17-compressor\CompressorSingleMatchingCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\06-simulation\04-unmatching\05-threelink\XhsProjectSimulationThreelinkUnMatchingListCtrl.cs"> + <Compile Update="03-simulation\07-matching\17-compressor\SimulationCompressorSingleMatchingDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\07-matching\18-exchanger\ExchangerChartShowDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\07-matching\18-exchanger\ExchangerSingleMatchingCtrl.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\05-search\XhsProjectSimulationSearchCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="03-simulation\06-simulation\07-bulkset\00-core\XhsProjectSimulationBulksetCtrl.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Update="03-simulation\06-simulation\07-bulkset\02-pump\XhsProjectSimulationPumpBulkSetCtrl.cs"> - <SubType>UserControl</SubType> + <Compile Update="03-simulation\07-matching\18-exchanger\SimulationExchangerSingleMatchingDlg.cs"> + <SubType>Form</SubType> </Compile> <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="03-simulation\07-l3d\XhsProjectSimulationL3dCtrl.cs"> + <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\SimulationPumpAnalyChartCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="03-simulation\11-pump\03-analy\SimulationSingleWorkingPumpAnalyCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="03-simulation\11-pump\03-analy\SimulationSingleWorkingPumpAnalyDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Update="03-simulation\11-pump\04-working\SimulationPumpSingleWorkingChartCtrl.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Update="03-simulation\12-report\test.cs"> <SubType>UserControl</SubType> </Compile> <Compile Update="03-simulation\XhsProjectSimulationMgrPage.cs"> @@ -232,20 +292,11 @@ <Compile Update="04-pump\01-Prop\PumpPropViewCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="04-pump\02-analy\SinglePumpAnalyDlg.cs"> - <SubType>Form</SubType> - </Compile> <Compile Update="04-pump\02-analy\SinglePumpAnalyInfoCtrl.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Update="04-pump\PumpFullInfoCtrl.cs"> + <Compile Update="04-pump\03-calc\SinglePumpCalcCtrl.cs"> <SubType>UserControl</SubType> - </Compile> - <Compile Update="04-pump\PumpFullInfoViewDlg.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Update="04-pump\SinglePumpInfoViewDlg.cs"> - <SubType>Form</SubType> </Compile> </ItemGroup> </Project> \ No newline at end of file -- Gitblit v1.9.3