Briq
/
camelot-py
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix lattice fill

pull/2/head
Vinayak Mehta 2017-05-05 15:01:35 +05:30
parent e252e476b9
commit 861ed0b64e
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
camelot/lattice.py
View File

@ -98,13 +98,13 @@ def _fill_spanning(t, fill=None):
for i in range(len(t.cells)): for i in range(len(t.cells)):
for j in range(len(t.cells[i])): for j in range(len(t.cells[i])):
if t.cells[i][j].get_text().strip() == '': if t.cells[i][j].get_text().strip() == '':
if t.cells[i][j].spanning_h: if t.cells[i][j].spanning_h and not t.cells[i][j].left:
t.cells[i][j].add_text(t.cells[i][j - 1].get_text()) t.cells[i][j].add_text(t.cells[i][j - 1].get_text())
elif f == "v": elif f == "v":
for i in range(len(t.cells)): for i in range(len(t.cells)):
for j in range(len(t.cells[i])): for j in range(len(t.cells[i])):
if t.cells[i][j].get_text().strip() == '': if t.cells[i][j].get_text().strip() == '':
if t.cells[i][j].spanning_v: if t.cells[i][j].spanning_v and not t.cells[i][j].top:
t.cells[i][j].add_text(t.cells[i - 1][j].get_text()) t.cells[i][j].add_text(t.cells[i - 1][j].get_text())
return t return t
@ -267,11 +267,6 @@ class Lattice:
scale=self.scale, iterations=self.iterations) scale=self.scale, iterations=self.iterations)
if self.table_area is not None: if self.table_area is not None:
if self.fill is not None:
if len(self.table_area) != len(self.fill):
raise ValueError("{0}: Length of table area and fill should"
" be equal.".format(os.path.basename(bname)))
areas = [] areas = []
for area in self.table_area: for area in self.table_area:
x1, y1, x2, y2 = area.split(",") x1, y1, x2, y2 = area.split(",")
@ -368,7 +363,7 @@ class Lattice:
table_data['score'] = score table_data['score'] = score
if self.fill is not None: if self.fill is not None:
table = _fill_spanning(table, fill=self.fill[table_no]) table = _fill_spanning(table, fill=self.fill)
ar = table.get_list() ar = table.get_list()
ar = encode_list(ar) ar = encode_list(ar)
table_data['data'] = ar table_data['data'] = ar