From 14cccf079662c052b2e04d30b9d9082ada1272ff Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 23 八月 2024 10:01:16 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Service/HStation.Service.Revit.Core/01-model/RevitModel.cs | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs b/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs
index e3beba0..af3b80d 100644
--- a/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs
+++ b/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs
@@ -16,21 +16,19 @@
this.Junctions = new List<RevitJunction>();
this.Nozzles = new List<RevitNozzle>();
this.Hydrants = new List<RevitHydrant>();
+ this.Elbows = new List<RevitElbow>();
+ this.Bluntheads = new List<RevitBlunthead>();
+ this.Threelinks = new List<RevitThreelink>();
+ this.Fourlinks = new List<RevitFourlink>();
this.Meters = new List<RevitMeter>();
this.Flowmeters = new List<RevitFlowmeter>();
this.Pressmeters = new List<RevitPressmeter>();
- this.Elbows = new List<RevitElbow>();
- this.Threelinks = new List<RevitThreelink>();
- this.Fourlinks = new List<RevitFourlink>();
- this.Bluntheads = new List<RevitBlunthead>();
- this.Pumps = new List<RevitPump>();
- this.Valves = new List<RevitValve>();
this.Pipes = new List<RevitPipe>();
this.Translations = new List<RevitTranslation>();
this.Exchangers = new List<RevitExchanger>();
-
- this.Decorators = new List<RevitDecorator>();
+ this.Pumps = new List<RevitPump>();
+ this.Valves = new List<RevitValve>();
}
/// <summary>
@@ -40,32 +38,28 @@
{
this.Name = rhs.Name;
this.Description = rhs.Description;
-
this.Reservoirs = rhs.Reservoirs;
this.Tanks = rhs.Tanks;
this.Waterboxs = rhs.Waterboxs;
this.Junctions = rhs.Junctions;
this.Nozzles = rhs.Nozzles;
this.Hydrants = rhs.Hydrants;
+ this.Elbows = rhs.Elbows;
+ this.Bluntheads = rhs.Bluntheads;
+ this.Threelinks = rhs.Threelinks;
+ this.Fourlinks = rhs.Fourlinks;
this.Meters = rhs.Meters;
this.Flowmeters = rhs.Flowmeters;
this.Pressmeters = rhs.Pressmeters;
- this.Elbows = rhs.Elbows;
- this.Threelinks = rhs.Threelinks;
- this.Fourlinks = rhs.Fourlinks;
- this.Bluntheads = rhs.Bluntheads;
-
- this.Pumps = rhs.Pumps;
- this.Valves = rhs.Valves;
this.Pipes = rhs.Pipes;
this.Translations = rhs.Translations;
this.Exchangers = rhs.Exchangers;
-
+ this.Pumps = rhs.Pumps;
+ this.Valves = rhs.Valves;
this.Decorators = rhs.Decorators;
}
-
- #region 鍩虹淇℃伅
+ #region 鍩虹
/// <summary>
/// 鍚嶇О
@@ -79,7 +73,7 @@
#endregion
- #region Node
+ #region 鑺傜偣
/// <summary>
/// 姘村簱鍒楄〃
@@ -149,7 +143,7 @@
#endregion
- #region Link
+ #region 绠℃
/// <summary>
/// 姘存车鍒楄〃
--
Gitblit v1.9.3