From b0944e2f380a3d538e6cc740673ea49c67abfebf Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 22 十月 2024 16:33:45 +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 | 76 +++++++++++++++++++++++--------------
1 files changed, 47 insertions(+), 29 deletions(-)
diff --git a/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs b/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs
index 006f47d..c9fa568 100644
--- a/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs
+++ b/Service/HStation.Service.Revit.Core/01-model/RevitModel.cs
@@ -16,17 +16,20 @@
this.Junctions = new List<RevitJunction>();
this.Nozzles = new List<RevitNozzle>();
this.Hydrants = new List<RevitHydrant>();
- this.Flowmeters = new List<RevitFlowmeter>();
- this.Pressmeters = new List<RevitPressmeter>();
+ this.Bluntheads = new List<RevitBlunthead>();
this.Elbows = new List<RevitElbow>();
this.Threelinks = new List<RevitThreelink>();
this.Fourlinks = new List<RevitFourlink>();
- this.Bluntheads = new List<RevitBlunthead>();
+ this.Meters = new List<RevitMeter>();
+ this.Flowmeters = new List<RevitFlowmeter>();
+ this.Pressmeters = new List<RevitPressmeter>();
- 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.Compressors = new List<RevitCompressor>();
+ this.Pumps = new List<RevitPump>();
+ this.Valves = new List<RevitValve>();
this.Decorators = new List<RevitDecorator>();
}
@@ -38,30 +41,29 @@
{
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.Flowmeters = rhs.Flowmeters;
- this.Pressmeters = rhs.Pressmeters;
+ this.Bluntheads = rhs.Bluntheads;
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.Meters = rhs.Meters;
+ this.Flowmeters = rhs.Flowmeters;
+ this.Pressmeters = rhs.Pressmeters;
this.Pipes = rhs.Pipes;
this.Translations = rhs.Translations;
-
+ this.Exchangers = rhs.Exchangers;
+ this.Compressors = rhs.Compressors;
+ this.Pumps = rhs.Pumps;
+ this.Valves = rhs.Valves;
this.Decorators = rhs.Decorators;
}
-
- #region 鍩虹淇℃伅
+ #region 鍩虹
/// <summary>
/// 鍚嶇О
@@ -75,7 +77,7 @@
#endregion
- #region Node
+ #region 鑺傜偣
/// <summary>
/// 姘村簱鍒楄〃
@@ -108,6 +110,11 @@
public List<RevitHydrant> Hydrants { get; set; }
/// <summary>
+ /// 闂峰ご鍒楄〃
+ /// </summary>
+ public List<RevitBlunthead> Bluntheads { get; set; }
+
+ /// <summary>
/// 寮ご鍒楄〃
/// </summary>
public List<RevitElbow> Elbows { get; set; }
@@ -123,9 +130,9 @@
public List<RevitFourlink> Fourlinks { get; set; }
/// <summary>
- /// 闂峰ご鍒楄〃
+ /// 姘磋〃
/// </summary>
- public List<RevitBlunthead> Bluntheads { get; set; }
+ public List<RevitMeter> Meters { get; set; }
/// <summary>
/// 娴侀噺璁″垪琛�
@@ -137,19 +144,10 @@
/// </summary>
public List<RevitPressmeter> Pressmeters { get; set; }
+
#endregion
- #region Link
-
- /// <summary>
- /// 姘存车鍒楄〃
- /// </summary>
- public List<RevitPump> Pumps { get; set; }
-
- /// <summary>
- /// 闃�闂ㄥ垪琛�
- /// </summary>
- public List<RevitValve> Valves { get; set; }
+ #region 绠℃
/// <summary>
/// 绠￠亾鍒楄〃
@@ -161,6 +159,26 @@
/// </summary>
public List<RevitTranslation> Translations { get; set; }
+ /// <summary>
+ /// 鎹㈢儹鍣ㄥ垪琛�
+ /// </summary>
+ public List<RevitExchanger> Exchangers { get; set; }
+
+ /// <summary>
+ /// 绌哄帇鏈哄垪琛�
+ /// </summary>
+ public List<RevitCompressor> Compressors { get; set; }
+
+ /// <summary>
+ /// 姘存车鍒楄〃
+ /// </summary>
+ public List<RevitPump> Pumps { get; set; }
+
+ /// <summary>
+ /// 闃�闂ㄥ垪琛�
+ /// </summary>
+ public List<RevitValve> Valves { get; set; }
+
#endregion
#region 瑁呴グ浠�
--
Gitblit v1.9.3