rename 'file' parameter to 'name' because it no longer refers to a DX…

…F file #52

molior/repeat.py

@@ -58,7 +58,7 @@ def execute(self):
                 height = self.style_families[self.family][index]["height"]
                 if height >= self.height - self.ceiling:
                     break
-            asset_name = self.style_families[self.family][index]["file"]
+            asset_name = self.style_families[self.family][index]["name"]
         else:
             asset_name = "error"
 

molior/wall.py

@@ -476,7 +476,7 @@ def execute(self):
             for id_opening in range(len(self.openings[id_segment])):
                 db = self.get_family(segment[id_opening]["name"])
                 opening = db["list"][segment[id_opening]["size"]]
-                name = opening["file"]
+                name = opening["name"]
 
                 l, r = self.opening_coor(id_segment, id_opening)
                 opening_offset = scale_2d(-self.offset, self.normal_segment(id_segment))
@@ -780,28 +780,28 @@ def get_family(self, usage):
         return {
             "list": [
                 {
-                    "file": "error",
+                    "name": "error",
                     "height": 1.0,
                     "width": 1.0,
                     "side": 0.1,
                     "end": 0.0,
                 },
                 {
-                    "file": "error",
+                    "name": "error",
                     "height": 2.0,
                     "width": 1.0,
                     "side": 0.1,
                     "end": 0.0,
                 },
                 {
-                    "file": "error",
+                    "name": "error",
                     "height": 2.0,
                     "width": 2.0,
                     "side": 0.1,
                     "end": 0.0,
                 },
                 {
-                    "file": "error",
+                    "name": "error",
                     "height": 1.0,
                     "width": 2.0,
                     "side": 0.1,

share/cinema/families.yml

@@ -1,5 +1,5 @@
 ---
 Cinema seat:
   -
-    file: 'Cinema seat 600'
+    name: 'Cinema seat 600'
     height: 0.0

share/courtyard/families.yml

@@ -1,184 +1,184 @@
 ---
 tunis entry:
   -
-    file: tunis_entry_tall
+    name: tunis_entry_tall
     height: 2.545
     width: 1.22
     side: 0.8
     end: 0.2
   -
-    file: tunis_entry_short
+    name: tunis_entry_short
     height: 2.2
     width: 1.22
     side: 0.8
     end: 0.2
 tunis entry short:
   -
-    file: tunis_entry_short
+    name: tunis_entry_short
     height: 2.2
     width: 1.22
     side: 0.8
     end: 0.2
 tunis entry no roof:
   -
-    file: tunis_entry_noroof
+    name: tunis_entry_noroof
     height: 2.2
     width: 1.22
     side: 0.8
     end: 0.2
 tunis shopfront:
   -
-    file: shopfront
+    name: shopfront
     height: 2.545
     width: 5.0
     side: 0.8
     end: 0.4
   -
-    file: shopfront_smaller
+    name: shopfront_smaller
     height: 2.545
     width: 3.98
     side: 0.8
     end: 0.4
   -
-    file: shopfront_smallest
+    name: shopfront_smallest
     height: 2.545
     width: 2.96
     side: 0.8
     end: 0.4
   -
-    file: tunis_entry_tall
+    name: tunis_entry_tall
     height: 2.545
     width: 1.22
     side: 0.8
     end: 0.2
   -
-    file: tunis_entry_short
+    name: tunis_entry_short
     height: 2.2
     width: 1.22
     side: 0.8
     end: 0.2
 single inside door:
   -
-    file: door-three-panel
+    name: door-three-panel
     height: 2.075
     width: 0.8
     side: 0.1
     end: 0.1
   -
-    file: door-three-panel-taller
+    name: door-three-panel-taller
     height: 2.4
     width: 0.8
     side: 0.1
     end: 0.1
 arch:
   -
-    file: arch-1800x2300
+    name: arch-1800x2300
     height: 2.3
     width: 1.8
     side: 1.9
     end: 0.95
   -
-    file: arch-1500x2300
+    name: arch-1500x2300
     height: 2.3
     width: 1.5
     side: 1.6
     end: 0.8
   -
-    file: arch-1200x2300
+    name: arch-1200x2300
     height: 2.3
     width: 1.2
     side: 1.3
     end: 0.65
   -
-    file: arch-900x2300
+    name: arch-900x2300
     height: 2.3
     width: 0.9
     side: 1.0
     end: 0.5
   -
-    file: arch-800x2300
+    name: arch-800x2300
     height: 2.3
     width: 0.8
     side: 0.6
     end: 0.05
 arch thin:
   -
-    file: arch-2400x2300-thin
+    name: arch-2400x2300-thin
     height: 2.3
     width: 2.4
     side: 0.2
     end: 0.1
   -
-    file: arch-2100x2300-thin
+    name: arch-2100x2300-thin
     height: 2.3
     width: 2.1
     side: 0.2
     end: 0.1
   -
-    file: arch-1800x2300-thin
+    name: arch-1800x2300-thin
     height: 2.3
     width: 1.8
     side: 0.2
     end: 0.1
   -
-    file: arch-1500x2300-thin
+    name: arch-1500x2300-thin
     height: 2.3
     width: 1.5
     side: 0.2
     end: 0.1
   -
-    file: arch-1200x2300-thin
+    name: arch-1200x2300-thin
     height: 2.3
     width: 1.2
     side: 0.2
     end: 0.1
   -
-    file: arch-900x2300-thin
+    name: arch-900x2300-thin
     height: 2.3
     width: 0.9
     side: 0.2
     end: 0.1
 shuttered window:
   -
-    file: shuttered_big
+    name: shuttered_big
     height: 1.82
     width: 0.91
     side: 0.8
     end: 0.2
   -
-    file: shuttered_shorter
+    name: shuttered_shorter
     height: 1.445
     width: 0.91
     side: 0.8
     end: 0.2
   -
-    file: shuttered_big_narrow
+    name: shuttered_big_narrow
     height: 1.82
     width: 0.61
     side: 0.65
     end: 0.2
   -
-    file: shuttered_shorter_narrow
+    name: shuttered_shorter_narrow
     height: 1.445
     width: 0.61
     side: 0.65
     end: 0.2
 fancy shuttered window:
   -
-    file: shuttered_big_fancy
+    name: shuttered_big_fancy
     height: 1.82
     width: 0.91
     side: 0.8
     end: 0.3
   -
-    file: shuttered_shorter_fancy
+    name: shuttered_shorter_fancy
     height: 1.445
     width: 0.91
     side: 0.8
     end: 0.3
 tiny window:
   -
-    file: barred_window
+    name: barred_window
     height: 0.4
     width: 0.4
     side: 3.0