p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing layering issues

This commit is contained in:
Jonathan Bohren 2010-04-26 23:37:11 +00:00
parent 64e2b518ed
commit 23ee7332d4
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/xdot/src/xdot/xdot.py
View File

@ -399,7 +399,7 @@ class Edge(Element):
class Graph(Shape): class Graph(Shape):
def __init__(self, width=1, height=1, shapes=(), nodes=(), edges=()): def __init__(self, width=1, height=1, shapes=(), nodes=(), edges=(), subgraph_shapes={}):
Shape.__init__(self) Shape.__init__(self)
self.width = width self.width = width
@ -407,6 +407,7 @@ class Graph(Shape):
self.shapes = shapes self.shapes = shapes
self.nodes = nodes self.nodes = nodes
self.edges = edges self.edges = edges
self.subgraph_shapes = subgraph_shapes
def get_size(self): def get_size(self):
return self.width, self.height return self.width, self.height
@ -961,6 +962,7 @@ class DotParser(Parser):
def parse_subgraph(self): def parse_subgraph(self):
id = None id = None
shapes_before = set(self.shapes)
if self.lookahead.type == SUBGRAPH: if self.lookahead.type == SUBGRAPH:
self.consume() self.consume()
if self.lookahead.type == ID: if self.lookahead.type == ID:
@ -971,6 +973,8 @@ class DotParser(Parser):
while self.lookahead.type != RCURLY: while self.lookahead.type != RCURLY:
self.parse_stmt() self.parse_stmt()
self.consume() self.consume()
new_shapes = set(self.shapes) - shapes_before
self.subgraph_shapes[id] = [s for s in new_shapes if not any([s in ss for ss in self.subgraph_shapes.values()])]
return id return id
def parse_stmt(self): def parse_stmt(self):
@ -1070,6 +1074,7 @@ class XDotParser(DotParser):
self.shapes = [] self.shapes = []
self.node_by_name = {} self.node_by_name = {}
self.top_graph = True self.top_graph = True
self.subgraph_shapes = {}
def handle_graph(self, attrs): def handle_graph(self, attrs):
if self.top_graph: if self.top_graph:
@ -1140,7 +1145,12 @@ class XDotParser(DotParser):
def parse(self): def parse(self):
DotParser.parse(self) DotParser.parse(self)
return Graph(self.width, self.height, self.shapes, self.nodes, self.edges) """
for k,shapes in self.subgraph_shapes.iteritems():
self.shapes += shapes
"""
return Graph(self.width, self.height, self.shapes, self.nodes, self.edges, self.subgraph_shapes)
def parse_node_pos(self, pos): def parse_node_pos(self, pos):
x, y = pos.split(",") x, y = pos.split(",")