|
@@ -127,6 +127,7 @@ def get_dicdata(sql,dic):
|
|
|
:return:
|
|
|
"""
|
|
|
data=test.get_data(sql)
|
|
|
+ print(data)
|
|
|
dic_data=[dict(zip(dic,item)) for item in data]
|
|
|
return list(dic_data)
|
|
|
def get_project_models(project_id):
|
|
@@ -520,15 +521,14 @@ class FloorGraph:
|
|
|
May contain one or more SystemGraph.
|
|
|
"""
|
|
|
|
|
|
- def __init__(self,model, system_name, domain):
|
|
|
+ def __init__(self,model, system_name, domain,floor_connectors,element_data):
|
|
|
self.model=model;
|
|
|
self.system_name = system_name
|
|
|
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(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.connector_data = floor_connectors
|
|
|
+ self.element_data = list_to_dict(element_data)
|
|
|
self.system_graphs = []
|
|
|
|
|
|
def get_floor_graphs(self):
|
|
@@ -748,4 +748,4 @@ if '__main__'==__name__:
|
|
|
floorgraphs.append(g)
|
|
|
projectgraph= combine_systemgraph(floorgraphs)
|
|
|
save_project_data(projectgraph, project_id)
|
|
|
- #systemgraph_display.show_project(projectgraph)
|
|
|
+ # systemgraph_display.show_project(projectgraph)
|