|
@@ -116,7 +116,6 @@ def get_specify_type_parent(vertex, type):
|
|
|
|
|
|
"""
|
|
|
import test
|
|
|
-import systemutils
|
|
|
|
|
|
|
|
|
def get_dicdata(sql,dic):
|
|
@@ -169,7 +168,7 @@ def get_project_models(project_id):
|
|
|
'project_id'
|
|
|
]
|
|
|
element_data.extend(get_dicdata(sql, COMPONENT_KEYS))
|
|
|
- element_data = list(map(systemutils.dic2obj, element_data))
|
|
|
+ element_data = list(map(dic2obj, element_data))
|
|
|
return element_data
|
|
|
def get_element_data(model_id):
|
|
|
"""
|
|
@@ -278,7 +277,7 @@ def get_element_data(model_id):
|
|
|
'parameters'
|
|
|
]
|
|
|
element_data.extend(get_dicdata(duct_sql,DUCT_KEYS))
|
|
|
- element_data=list(map(systemutils.dic2obj, element_data))
|
|
|
+ element_data=list(map(dic2obj, element_data))
|
|
|
return element_data
|
|
|
|
|
|
|
|
@@ -307,7 +306,7 @@ def get_connectors_data(model_id, system_name, domain):
|
|
|
'connect_id_json'
|
|
|
]
|
|
|
connector_data.extend(get_dicdata(connector_sql, CONNECTOR_KEYS))
|
|
|
- connector_data=list(map(systemutils.dic2obj, connector_data))
|
|
|
+ connector_data=list(map(dic2obj, connector_data))
|
|
|
return connector_data
|
|
|
|
|
|
def save_project_data(project_graph,project_id):
|
|
@@ -382,7 +381,7 @@ def get_connected_block_data(project_id,block_id):
|
|
|
'depth',
|
|
|
]
|
|
|
element_data.extend(get_dicdata(sql, KEYS))
|
|
|
- element_data = list(map(systemutils.dic2obj, element_data))
|
|
|
+ element_data = list(map(dic2obj, element_data))
|
|
|
return element_data
|
|
|
def get_connected_block_source_data(project_id,block_id):
|
|
|
'''
|
|
@@ -403,7 +402,7 @@ def get_connected_block_source_data(project_id,block_id):
|
|
|
'source_id',
|
|
|
]
|
|
|
element_data.extend(get_dicdata(sql, KEYS))
|
|
|
- element_data = list(map(systemutils.dic2obj, element_data))
|
|
|
+ element_data = list(map(dic2obj, element_data))
|
|
|
return element_data
|
|
|
def update_connected_block_data(block_datas):
|
|
|
'''
|
|
@@ -433,7 +432,7 @@ class SystemVertex:
|
|
|
self.parent= parent
|
|
|
|
|
|
def __str__(self):
|
|
|
- return str(systemutils.get_specify_type_parent(self, FloorGraph).model.floor_name) + ':' + str(self.system_data.source_id)
|
|
|
+ return str(get_specify_type_parent(self, FloorGraph).model.floor_name) + ':' + str(self.system_data.source_id)
|
|
|
|
|
|
def __eq__(self, other):
|
|
|
return self.system_data.source_id==other.system_data.source_id
|
|
@@ -455,7 +454,7 @@ class SystemVertex:
|
|
|
Get relation floorgraph.
|
|
|
:return:
|
|
|
'''
|
|
|
- model = systemutils.get_specify_type_parent(self, FloorGraph).model
|
|
|
+ model = get_specify_type_parent(self, FloorGraph).model
|
|
|
return model
|
|
|
class SystemEdge:
|
|
|
"""Graph Edge."""
|
|
@@ -527,7 +526,7 @@ class FloorGraph:
|
|
|
self.domain = domain
|
|
|
floor_connectors = get_connectors_data(self.model.file_id, system_name, domain)
|
|
|
floor_connectors = sort_connectors(floor_connectors)
|
|
|
- floor_connectors = list(map(systemutils.add_attr_is_used, floor_connectors))
|
|
|
+ floor_connectors = list(map(add_attr_is_used, floor_connectors))
|
|
|
self.connector_data = (floor_connectors)
|
|
|
self.element_data = list_to_dict(get_element_data(self.model.file_id))
|
|
|
self.system_graphs = []
|
|
@@ -576,7 +575,7 @@ class FloorGraph:
|
|
|
next_element = self.get_element(next_connector.belong)
|
|
|
edge_elements.append(next_element)
|
|
|
other_connectors = self.get_other_connectors(next_connector)
|
|
|
- if systemutils.is_break_condition(next_element) or len(other_connectors) != 1:
|
|
|
+ if is_break_condition(next_element) or len(other_connectors) != 1:
|
|
|
print(next_connector.source_id)
|
|
|
next_connector.is_used = True
|
|
|
if(len(other_connectors) != 1):
|
|
@@ -718,7 +717,7 @@ def combine_systemgraph(floorgraphs):
|
|
|
group_pipes = [v1]
|
|
|
for j in range(i + 1, len(open_vertical_pipes)):
|
|
|
v2 = open_vertical_pipes[j]
|
|
|
- if systemutils.is_xyz_equal(v1.connector.origin, v2.connector.origin):
|
|
|
+ if is_xyz_equal(v1.connector.origin, v2.connector.origin):
|
|
|
group_pipes.append(v2)
|
|
|
# combine systemgraph
|
|
|
for k in range(len(group_pipes)):
|