Skip to content

Adjust to Networkx 2.5 #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
soniaradon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adjust to Networkx 2.5 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bpmn_python/bpmn_diagram_layouter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ def insert_into_grid(grid, row, col, node_id):
if occupied_cell:
for grid_cell in grid:
if grid_cell.row >= row:
grid_cell.row += consts.Consts.width
grid_cell.row += consts.Consts.grid_column_width
grid.append(cell_class.GridCell(row, col, node_id))


Expand Down
44 changes: 22 additions & 22 deletions bpmn_python/bpmn_diagram_rep.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,19 +256,19 @@ def add_flow_node_to_diagram(self, process_id, node_type, name, node_id=None):
if node_id is None:
node_id = BpmnDiagramGraph.id_prefix + str(uuid.uuid4())
self.diagram_graph.add_node(node_id)
self.diagram_graph.node[node_id][consts.Consts.id] = node_id
self.diagram_graph.node[node_id][consts.Consts.type] = node_type
self.diagram_graph.node[node_id][consts.Consts.node_name] = name
self.diagram_graph.node[node_id][consts.Consts.incoming_flow] = []
self.diagram_graph.node[node_id][consts.Consts.outgoing_flow] = []
self.diagram_graph.node[node_id][consts.Consts.process] = process_id
self.diagram_graph.nodes[node_id][consts.Consts.id] = node_id
self.diagram_graph.nodes[node_id][consts.Consts.type] = node_type
self.diagram_graph.nodes[node_id][consts.Consts.node_name] = name
self.diagram_graph.nodes[node_id][consts.Consts.incoming_flow] = []
self.diagram_graph.nodes[node_id][consts.Consts.outgoing_flow] = []
self.diagram_graph.nodes[node_id][consts.Consts.process] = process_id

# Adding some dummy constant values
self.diagram_graph.node[node_id][consts.Consts.width] = "100"
self.diagram_graph.node[node_id][consts.Consts.height] = "100"
self.diagram_graph.node[node_id][consts.Consts.x] = "100"
self.diagram_graph.node[node_id][consts.Consts.y] = "100"
return node_id, self.diagram_graph.node[node_id]
self.diagram_graph.nodes[node_id][consts.Consts.width] = "100"
self.diagram_graph.nodes[node_id][consts.Consts.height] = "100"
self.diagram_graph.nodes[node_id][consts.Consts.x] = "100"
self.diagram_graph.nodes[node_id][consts.Consts.y] = "100"
return node_id, self.diagram_graph.nodes[node_id]

def add_task_to_diagram(self, process_id, task_name="", node_id=None):
"""
Expand Down Expand Up @@ -304,8 +304,8 @@ def add_subprocess_to_diagram(self, process_id, subprocess_name, is_expanded=Fal
"""
subprocess_id, subprocess = self.add_flow_node_to_diagram(process_id, consts.Consts.subprocess, subprocess_name,
node_id)
self.diagram_graph.node[subprocess_id][consts.Consts.is_expanded] = "true" if is_expanded else "false"
self.diagram_graph.node[subprocess_id][consts.Consts.triggered_by_event] = \
self.diagram_graph.nodes[subprocess_id][consts.Consts.is_expanded] = "true" if is_expanded else "false"
self.diagram_graph.nodes[subprocess_id][consts.Consts.triggered_by_event] = \
"true" if triggered_by_event else "false"
return subprocess_id, subprocess

Expand Down Expand Up @@ -337,9 +337,9 @@ def add_start_event_to_diagram(self, process_id, start_event_name="", start_even
"""
start_event_id, start_event = self.add_flow_node_to_diagram(process_id, consts.Consts.start_event,
start_event_name, node_id)
self.diagram_graph.node[start_event_id][consts.Consts.parallel_multiple] = \
self.diagram_graph.nodes[start_event_id][consts.Consts.parallel_multiple] = \
"true" if parallel_multiple else "false"
self.diagram_graph.node[start_event_id][consts.Consts.is_interrupting] = "true" if is_interrupting else "false"
self.diagram_graph.nodes[start_event_id][consts.Consts.is_interrupting] = "true" if is_interrupting else "false"
start_event_definitions = {"message": "messageEventDefinition", "timer": "timerEventDefinition",
"conditional": "conditionalEventDefinition", "signal": "signalEventDefinition",
"escalation": "escalationEventDefinition"}
Expand All @@ -355,7 +355,7 @@ def add_start_event_to_diagram(self, process_id, start_event_name="", start_even
elif start_event_definition == "escalation":
event_def_list.append(BpmnDiagramGraph.add_event_definition_element("escalation", start_event_definitions))

self.diagram_graph.node[start_event_id][consts.Consts.event_definitions] = event_def_list
self.diagram_graph.nodes[start_event_id][consts.Consts.event_definitions] = event_def_list
return start_event_id, start_event

def add_end_event_to_diagram(self, process_id, end_event_name="", end_event_definition=None, node_id=None):
Expand Down Expand Up @@ -397,7 +397,7 @@ def add_end_event_to_diagram(self, process_id, end_event_name="", end_event_defi
elif end_event_definition == "error":
event_def_list.append(self.add_event_definition_element("error", end_event_definitions))

self.diagram_graph.node[end_event_id][consts.Consts.event_definitions] = event_def_list
self.diagram_graph.nodes[end_event_id][consts.Consts.event_definitions] = event_def_list
return end_event_id, end_event

@staticmethod
Expand Down Expand Up @@ -431,7 +431,7 @@ def add_gateway_to_diagram(self, process_id, gateway_type, gateway_name="", gate
if not (gateway_direction in ("Unspecified", "Converging", "Diverging", "Mixed")):
raise bpmn_exception.BpmnPythonError("Invalid value passed as gatewayDirection parameter. Value passed: "
+ gateway_direction)
self.diagram_graph.node[gateway_id][consts.Consts.gateway_direction] = gateway_direction
self.diagram_graph.nodes[gateway_id][consts.Consts.gateway_direction] = gateway_direction
return gateway_id, gateway

def add_exclusive_gateway_to_diagram(self, process_id, gateway_name="", gateway_direction="Unspecified",
Expand All @@ -453,7 +453,7 @@ def add_exclusive_gateway_to_diagram(self, process_id, gateway_name="", gateway_
gateway_name=gateway_name,
gateway_direction=gateway_direction,
node_id=node_id)
self.diagram_graph.node[exclusive_gateway_id][consts.Consts.default] = default
self.diagram_graph.nodes[exclusive_gateway_id][consts.Consts.default] = default
return exclusive_gateway_id, exclusive_gateway

def add_inclusive_gateway_to_diagram(self, process_id, gateway_name="", gateway_direction="Unspecified",
Expand All @@ -475,7 +475,7 @@ def add_inclusive_gateway_to_diagram(self, process_id, gateway_name="", gateway_
gateway_name=gateway_name,
gateway_direction=gateway_direction,
node_id=node_id)
self.diagram_graph.node[inclusive_gateway_id][consts.Consts.default] = default
self.diagram_graph.nodes[inclusive_gateway_id][consts.Consts.default] = default
return inclusive_gateway_id, inclusive_gateway

def add_parallel_gateway_to_diagram(self, process_id, gateway_name="", gateway_direction="Unspecified",
Expand Down Expand Up @@ -523,8 +523,8 @@ def add_sequence_flow_to_diagram(self, process_id, source_ref_id, target_ref_id,
flow[consts.Consts.process] = process_id
flow[consts.Consts.source_ref] = source_ref_id
flow[consts.Consts.target_ref] = target_ref_id
source_node = self.diagram_graph.node[source_ref_id]
target_node = self.diagram_graph.node[target_ref_id]
source_node = self.diagram_graph.nodes[source_ref_id]
target_node = self.diagram_graph.nodes[target_ref_id]
flow[consts.Consts.waypoints] = \
[(source_node[consts.Consts.x], source_node[consts.Consts.y]),
(target_node[consts.Consts.x], target_node[consts.Consts.y])]
Expand Down