Commit e0717323 by sikang

bug fix

parent 7d8b8480
...@@ -38,8 +38,8 @@ class LayoutGarble: ...@@ -38,8 +38,8 @@ class LayoutGarble:
.replace("${gravity}", self.__rand_item(gravity))\ .replace("${gravity}", self.__rand_item(gravity))\
.replace("${visibility}", self.__rand_item(visibility))\ .replace("${visibility}", self.__rand_item(visibility))\
.replace("${boolean}", self.__rand_item(boolean))\ .replace("${boolean}", self.__rand_item(boolean))\
.replace("${number}", random.randint(0, 10000))\ .replace("${number}", "%d"%random.randint(0, 10000))\
.replace("${size}", self.__rand_item(size).replace("${number}", random.randint(0, 10000)))\ .replace("${size}", self.__rand_item(size).replace("${number}", "%d"%random.randint(0, 10000)))\
.replace("${orientation}", self.__rand_item(orientation))\ .replace("${orientation}", self.__rand_item(orientation))\
.replace("${scaleType}", self.__rand_item(scale_type)) .replace("${scaleType}", self.__rand_item(scale_type))
...@@ -85,7 +85,7 @@ class LayoutGarble: ...@@ -85,7 +85,7 @@ class LayoutGarble:
def layout_garble(self, config): def layout_garble(self, config):
self.__config = config self.__config = config
with open("tools/garble/model/layout_model.xml", "r", encoding="utf-8") as fin: with open("tools/garble/model/layout_model.xml", "r", encoding="utf-8") as fin:
self.__logic_model = fin.read().split("@code\n") self.__layout_model = fin.read().split("@code\n")
with open("tools/garble/model/colors.json", "r", encoding="utf-8") as fin: with open("tools/garble/model/colors.json", "r", encoding="utf-8") as fin:
self.__colors = json.loads(fin.read()) self.__colors = json.loads(fin.read())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment