|
@@ -436,7 +436,7 @@ namespace SAGA.GplotRelationComputerManage
|
|
|
/// <summary>
|
|
|
/// 计算立面数据
|
|
|
/// </summary>
|
|
|
- public static List<VerticalResult> ComputerVerticalDatas(List<VerticalPipe> pipeDatas)
|
|
|
+ public static List<VerticalResult> ComputerVerticalDatas(List<VerticalPipe> pipeDatas, List<LevelData> inputLevels)
|
|
|
{
|
|
|
List<VerticalResult> results = new List<VerticalResult>();
|
|
|
var groupBuilding = pipeDatas.GroupBy(p => p.BuildingId);
|
|
@@ -444,10 +444,8 @@ namespace SAGA.GplotRelationComputerManage
|
|
|
{
|
|
|
var buildPipeDatas = building.ToList();
|
|
|
var firstData = buildPipeDatas.FirstOrDefault();
|
|
|
- var levelDatas = buildPipeDatas
|
|
|
- .Select(vp => new LevelData(){Name = vp.FloorName, FloorId = vp.FloorId, Id = vp.LevelId})
|
|
|
- .Distinct(new CommonEqualComparer<LevelData>((l1, l2) => l1.FloorId == l2.FloorId))
|
|
|
- .ToList();
|
|
|
+ var levelDatas = inputLevels.Where(v => v.BuildingId == building.Key).ToList();
|
|
|
+ levelDatas = levelDatas.OrderBy(c => c.Elevation).ToList();
|
|
|
var buildingResult = ComputerVerticalData(buildPipeDatas, levelDatas);
|
|
|
if (firstData != null)
|
|
|
{
|
|
@@ -642,7 +640,6 @@ namespace SAGA.GplotRelationComputerManage
|
|
|
}
|
|
|
|
|
|
}
|
|
|
-
|
|
|
nodeGraph.Nodes.Add(node);
|
|
|
}
|
|
|
#region 调整入度为零的点的顺序
|