luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make tilegrid["tiles"] the tilegrid top-level object 

Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-02-06 20:12:50 +01:00
parent 27a0b4836c
commit 0f67fcf1d2
6 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuzzers/005-tilegrid/generate.py
View File

@ -226,6 +226,8 @@ for segment_name in database["segments"].keys():
# print(tile_type, offset) # print(tile_type, offset)
assert False assert False
database = database["tiles"]
####################################### #######################################
# Write # Write

8
fuzzers/070-tileconn/generate.py
View File

@ -11,7 +11,7 @@ with open("%s/%s/tilegrid.json" % (os.getenv("XRAY_DATABASE_DIR"),
os.getenv("XRAY_DATABASE")), "r") as f: os.getenv("XRAY_DATABASE")), "r") as f:
grid = json.load(f) grid = json.load(f)
for tile, tiledata in grid["tiles"].items(): for tile, tiledata in grid.items():
grid_xy = (tiledata["grid_x"], tiledata["grid_y"]) grid_xy = (tiledata["grid_x"], tiledata["grid_y"])
grid2tile[grid_xy] = tile grid2tile[grid_xy] = tile
@ -61,8 +61,8 @@ def handle_pair(tile1, tile2):
if tile1 not in tilenodes: return if tile1 not in tilenodes: return
if tile2 not in tilenodes: return if tile2 not in tilenodes: return
tile1data = grid["tiles"][tile1] tile1data = grid[tile1]
tile2data = grid["tiles"][tile2] tile2data = grid[tile2]
grid1_xy = (tile1data["grid_x"], tile1data["grid_y"]) grid1_xy = (tile1data["grid_x"], tile1data["grid_y"])
grid2_xy = (tile2data["grid_x"], tile2data["grid_y"]) grid2_xy = (tile2data["grid_x"], tile2data["grid_y"])
@ -91,7 +91,7 @@ def handle_pair(tile1, tile2):
database[key] &= wire_pairs database[key] &= wire_pairs
for tile, tiledata in grid["tiles"].items(): for tile, tiledata in grid.items():
grid_right_xy = (tiledata["grid_x"] + 1, tiledata["grid_y"]) grid_right_xy = (tiledata["grid_x"] + 1, tiledata["grid_y"])
grid_below_xy = (tiledata["grid_x"], tiledata["grid_y"] + 1) grid_below_xy = (tiledata["grid_x"], tiledata["grid_y"] + 1)

11
htmlgen/htmlgen.py
View File

@ -160,13 +160,10 @@ with db_open("tilegrid.json") as f:
data = f.read() data = f.read()
if not data: if not data:
grid = { grid = {
"segments": {}, "NULL": {
"tiles": { "grid_x": 0,
"NULL": { "grid_y": 0,
"grid_x": 0, "type": "NULL",
"grid_y": 0,
"type": "NULL",
}
} }
} }
else: else:

8
tools/simpleroute.py
View File

@ -27,7 +27,7 @@ def db_gen():
with open("%s/%s/tilegrid.json" % (os.getenv("XRAY_DATABASE_DIR"), with open("%s/%s/tilegrid.json" % (os.getenv("XRAY_DATABASE_DIR"),
os.getenv("XRAY_DATABASE")), "r") as f: os.getenv("XRAY_DATABASE")), "r") as f:
tiles = json.load(f)["tiles"] tilegrid = json.load(f)
with open("%s/%s/tileconn.json" % (os.getenv("XRAY_DATABASE_DIR"), with open("%s/%s/tileconn.json" % (os.getenv("XRAY_DATABASE_DIR"),
os.getenv("XRAY_DATABASE")), "r") as f: os.getenv("XRAY_DATABASE")), "r") as f:
@ -37,7 +37,7 @@ def db_gen():
grid_to_tile = dict() grid_to_tile = dict()
nodes = MergeFind() nodes = MergeFind()
for tile, tiledata in tiles.items(): for tile, tiledata in tilegrid.items():
if tiledata["type"] not in type_to_tiles: if tiledata["type"] not in type_to_tiles:
type_to_tiles[tiledata["type"]] = list() type_to_tiles[tiledata["type"]] = list()
type_to_tiles[tiledata["type"]].append(tile) type_to_tiles[tiledata["type"]].append(tile)
@ -48,7 +48,7 @@ def db_gen():
for entry in tileconn: for entry in tileconn:
type_a, type_b = entry["tile_types"] type_a, type_b = entry["tile_types"]
for tile_a in type_to_tiles[type_a]: for tile_a in type_to_tiles[type_a]:
tiledata_a = tiles[tile_a] tiledata_a = tilegrid[tile_a]
grid_a = (tiledata_a["grid_x"], tiledata_a["grid_y"]) grid_a = (tiledata_a["grid_x"], tiledata_a["grid_y"])
grid_b = ( grid_b = (
grid_a[0] + entry["grid_deltas"][0], grid_a[0] + entry["grid_deltas"][0],
@ -58,7 +58,7 @@ def db_gen():
continue continue
tile_b = grid_to_tile[grid_b] tile_b = grid_to_tile[grid_b]
tiledata_b = tiles[tile_b] tiledata_b = tilegrid[tile_b]
if tiledata_b["type"] != type_b: if tiledata_b["type"] != type_b:
continue continue

2
utils/segmaker.py
View File

@ -39,7 +39,7 @@ class segmaker:
self.segments_by_type = dict() self.segments_by_type = dict()
for tilename, tiledata in self.grid["tiles"].items(): for tilename, tiledata in self.grid.items():
if "baseaddr" not in tiledata: if "baseaddr" not in tiledata:
continue continue

2
utils/tileconnloops.py
View File

@ -7,7 +7,7 @@ import os, sys, json
with open("%s/%s/tilegrid.json" % (os.getenv("XRAY_DATABASE_DIR"), with open("%s/%s/tilegrid.json" % (os.getenv("XRAY_DATABASE_DIR"),
os.getenv("XRAY_DATABASE")), "r") as f: os.getenv("XRAY_DATABASE")), "r") as f:
tilegrid = json.load(f)["tiles"] tilegrid = json.load(f)
with open("%s/%s/tileconn.json" % (os.getenv("XRAY_DATABASE_DIR"), with open("%s/%s/tileconn.json" % (os.getenv("XRAY_DATABASE_DIR"),
os.getenv("XRAY_DATABASE")), "r") as f: os.getenv("XRAY_DATABASE")), "r") as f: