|
@@ -135,7 +135,7 @@ namespace SAGA.GplotRelationComputerManage
|
|
|
|
|
|
#region 如果是节点
|
|
#region 如果是节点
|
|
var existVertex = edges.GetAvailableVertexes(v => v.IsMatch(current)).Any();
|
|
var existVertex = edges.GetAvailableVertexes(v => v.IsMatch(current)).Any();
|
|
- if (existVertex || Setting.IsForkNode(current)||Setting.IsEquipment(current))
|
|
|
|
|
|
+ if (existVertex || Setting.IsForkNode(current)|| MBIInfoUtil.IsEquipment(current))
|
|
{
|
|
{
|
|
var newVertex = new ElementsVertex(current);
|
|
var newVertex = new ElementsVertex(current);
|
|
var paths = elements.GetRange(0, i).ToList();
|
|
var paths = elements.GetRange(0, i).ToList();
|
|
@@ -269,7 +269,7 @@ namespace SAGA.GplotRelationComputerManage
|
|
for (int j = 0; j < elements.Count; j++)
|
|
for (int j = 0; j < elements.Count; j++)
|
|
{
|
|
{
|
|
var currentElement = elements[j];
|
|
var currentElement = elements[j];
|
|
- if (Setting.IsEquipment(currentElement))
|
|
|
|
|
|
+ if (MBIInfoUtil.IsEquipment(currentElement))
|
|
{
|
|
{
|
|
var tempEnd = edgeArray.AddVertex(new ElementsVertex(currentElement));
|
|
var tempEnd = edgeArray.AddVertex(new ElementsVertex(currentElement));
|
|
var tempEdge = ElementsEdge.CreateEdge(start, tempEnd, elements.GetRange(0, j));
|
|
var tempEdge = ElementsEdge.CreateEdge(start, tempEnd, elements.GetRange(0, j));
|
|
@@ -307,7 +307,7 @@ namespace SAGA.GplotRelationComputerManage
|
|
foreach (var vertex in originVertexes)
|
|
foreach (var vertex in originVertexes)
|
|
{
|
|
{
|
|
var edges = edgeArray.GetEdges(vertex.Id);
|
|
var edges = edgeArray.GetEdges(vertex.Id);
|
|
- if (edges.Count == 2 && vertex.RefData.All(e=> !Setting.IsEquipment(e)))
|
|
|
|
|
|
+ if (edges.Count == 2 && vertex.RefData.All(e=> !MBIInfoUtil.IsEquipment(e)))
|
|
{
|
|
{
|
|
edgeArray.DeleteVertex(vertex.Id, null);
|
|
edgeArray.DeleteVertex(vertex.Id, null);
|
|
}
|
|
}
|
|
@@ -325,7 +325,7 @@ namespace SAGA.GplotRelationComputerManage
|
|
for (int i = 0; i < vertexes.Count; i++)
|
|
for (int i = 0; i < vertexes.Count; i++)
|
|
{
|
|
{
|
|
var current = vertexes[i];
|
|
var current = vertexes[i];
|
|
- if (current.RefData == null && current.RefData.Any(e => Setting.IsSpecialValve(e)))
|
|
|
|
|
|
+ if (current.RefData == null && current.RefData.Any(SystemCalcUtil.IsStartValve))
|
|
{
|
|
{
|
|
current.SetDisableCombine(true);
|
|
current.SetDisableCombine(true);
|
|
}
|
|
}
|
|
@@ -348,15 +348,15 @@ namespace SAGA.GplotRelationComputerManage
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
- var equipment = elements.FirstOrDefault(e => setting.IsEquipment(e));
|
|
|
|
|
|
+ var equipment = elements.FirstOrDefault(e => MBIInfoUtil.IsEquipment(e));
|
|
|
|
|
|
if (equipment != null)
|
|
if (equipment != null)
|
|
{
|
|
{
|
|
- string name = MBIInfoUtil.GetShowName(equipment);//equipment.Id + equipment.Name;
|
|
|
|
|
|
+ string name = MBIInfoUtil.GetShowName(equipment);
|
|
vertex.SetEquipment(new EquipmentItem() { Name = name, Id= equipment.Id.ToString() });
|
|
vertex.SetEquipment(new EquipmentItem() { Name = name, Id= equipment.Id.ToString() });
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- var valve = elements.FirstOrDefault(e => setting.IsSpecialValve(e));
|
|
|
|
|
|
+ var valve = elements.FirstOrDefault(e => SystemCalcUtil.IsStartValve(e));
|
|
if (valve != null)
|
|
if (valve != null)
|
|
{
|
|
{
|
|
vertex.SetEquipment(new EquipmentItem() {IsVirtual=true, Name = valve.GetFamily().Name, Id = valve.Id.ToString() });
|
|
vertex.SetEquipment(new EquipmentItem() {IsVirtual=true, Name = valve.GetFamily().Name, Id = valve.Id.ToString() });
|