Now layout build works fine

This commit is contained in:
2024-12-01 04:12:25 +03:00
parent 34bded906c
commit 42dc811cf6
28 changed files with 4040 additions and 2640 deletions

View File

@@ -33,7 +33,7 @@ entries=[ {
"order": 4,
"type": "layout"
}, {
"children": [ 18, 19 ],
"children": [ 18, 19, 20 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 4,
"name": "zone_0",
@@ -41,7 +41,7 @@ entries=[ {
"type": "zone",
"zone_type": 1
}, {
"children": [ 20, 21, 22 ],
"children": [ 21, 22, 23 ],
"commands": [ [ 4, [ ] ] ],
"index": 5,
"name": "zone_1",
@@ -49,7 +49,7 @@ entries=[ {
"type": "zone",
"zone_type": 0
}, {
"children": [ 23, 24, 25, 26 ],
"children": [ 24, 25, 26, 27 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 6,
"name": "zone_1",
@@ -57,7 +57,7 @@ entries=[ {
"type": "zone",
"zone_type": 1
}, {
"children": [ 27, 28, 29 ],
"children": [ 28, 29, 30 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 7,
"name": "zone_0",
@@ -65,14 +65,14 @@ entries=[ {
"type": "zone",
"zone_type": 0
}, {
"children": [ 30, 31 ],
"children": [ 31, 32 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 8,
"name": "unit_0",
"order": 3,
"type": "unit"
}, {
"children": [ 32, 33 ],
"children": [ 33, 34 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 9,
"name": "zone_0",
@@ -80,35 +80,35 @@ entries=[ {
"type": "zone",
"zone_type": 1
}, {
"children": [ 34, 35 ],
"children": [ 35, 36 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 10,
"name": "unit_0",
"order": 0,
"type": "unit"
}, {
"children": [ 36, 37 ],
"children": [ 37, 38 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 11,
"name": "unit_1",
"order": 0,
"type": "unit"
}, {
"children": [ 38, 39 ],
"children": [ 39, 40 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 12,
"name": "unit_2",
"order": 0,
"type": "unit"
}, {
"children": [ 40, 41 ],
"children": [ 41, 42 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 13,
"name": "unit_3",
"order": 0,
"type": "unit"
}, {
"children": [ 42, 43 ],
"children": [ 43, 44 ],
"commands": [ ],
"index": 14,
"name": "zone_0",
@@ -116,7 +116,7 @@ entries=[ {
"type": "zone",
"zone_type": 0
}, {
"children": [ 44, 45 ],
"children": [ 45, 46 ],
"commands": [ ],
"index": 15,
"name": "zone_1",
@@ -124,7 +124,7 @@ entries=[ {
"type": "zone",
"zone_type": 0
}, {
"children": [ 46, 47, 48 ],
"children": [ 47, 48, 49 ],
"commands": [ ],
"index": 16,
"name": "zone_2",
@@ -132,7 +132,7 @@ entries=[ {
"type": "zone",
"zone_type": 0
}, {
"children": [ 49, 50, 51, 52, 53 ],
"children": [ 50, 51, 52, 53, 54 ],
"commands": [ ],
"index": 17,
"name": "zone_3",
@@ -161,8 +161,18 @@ entries=[ {
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"commands": [ ],
"index": 20,
"name": "office_0",
"order": 3,
"room_area": 16.0,
"room_type": 309,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 21,
"name": "wc_0",
"order": 0,
"room_area": 16.0,
@@ -172,7 +182,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ], [ 3, [ ] ] ],
"index": 21,
"index": 22,
"name": "bathroom_0",
"order": 1,
"room_area": 16.0,
@@ -182,7 +192,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 22,
"index": 23,
"name": "bedroom_0",
"order": 2,
"room_area": 64.0,
@@ -192,7 +202,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 23,
"index": 24,
"name": "living_room_0",
"order": 0,
"room_area": 144.0,
@@ -202,7 +212,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 24,
"index": 25,
"name": "kitchen_0",
"order": 1,
"room_area": 64.0,
@@ -212,7 +222,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 25,
"index": 26,
"name": "storage_room_0",
"order": 2,
"room_area": 16.0,
@@ -222,7 +232,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ], [ 4, [ ] ] ],
"index": 26,
"index": 27,
"name": "enterance_0",
"order": 3,
"room_area": 16.0,
@@ -232,7 +242,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 27,
"index": 28,
"name": "wc_0",
"order": 0,
"room_area": 16.0,
@@ -242,7 +252,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 28,
"index": 29,
"name": "bathroom_0",
"order": 1,
"room_area": 16.0,
@@ -252,7 +262,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 29,
"index": 30,
"name": "bedroom_0",
"order": 2,
"room_area": 64.0,
@@ -260,17 +270,17 @@ entries=[ {
"type": "room",
"window": true
}, {
"children": [ 54, 55, 56 ],
"children": [ 55, 56, 57 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 30,
"index": 31,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 0
}, {
"children": [ 57, 58 ],
"children": [ 58, 59 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 31,
"index": 32,
"name": "zone_1",
"order": 0,
"type": "zone",
@@ -278,7 +288,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 32,
"index": 33,
"name": "enterance_0",
"order": 0,
"room_area": 64.0,
@@ -286,9 +296,9 @@ entries=[ {
"type": "room",
"window": true
}, {
"children": [ 59 ],
"children": [ 60 ],
"commands": [ [ 5, [ ] ] ],
"index": 33,
"index": 34,
"name": "stair_0",
"order": 0,
"room_area": 16.0,
@@ -296,65 +306,65 @@ entries=[ {
"type": "room",
"window": true
}, {
"children": [ 60, 61, 62 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 34,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 0
}, {
"children": [ 63, 64 ],
"children": [ 61, 62, 63 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 35,
"name": "zone_1",
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 1
"zone_type": 0
}, {
"children": [ 65 ],
"children": [ 64, 65 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 36,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 0
}, {
"children": [ 66, 67 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 37,
"name": "zone_1",
"order": 0,
"type": "zone",
"zone_type": 1
}, {
"children": [ 68 ],
"children": [ 66 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 38,
"index": 37,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 0
}, {
"children": [ 67, 68 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 38,
"name": "zone_1",
"order": 0,
"type": "zone",
"zone_type": 1
}, {
"children": [ 69 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 39,
"name": "zone_1",
"order": 1,
"type": "zone",
"zone_type": 1
}, {
"children": [ 70 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 40,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 0
}, {
"children": [ 70 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 40,
"name": "zone_1",
"order": 1,
"type": "zone",
"zone_type": 1
}, {
"children": [ 71 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 41,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 0
}, {
"children": [ 72 ],
"commands": [ [ 3, [ ] ], [ 4, [ ] ] ],
"index": 42,
"name": "zone_1",
"order": 1,
"type": "zone",
@@ -362,7 +372,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ ],
"index": 42,
"index": 43,
"name": "wc_0",
"order": 1,
"room_area": 16.0,
@@ -372,27 +382,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ ],
"index": 43,
"name": "bedroom_0",
"order": 2,
"room_area": 64.0,
"room_type": 202,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ ],
"index": 44,
"name": "wc_0",
"order": 1,
"room_area": 16.0,
"room_type": 200,
"type": "room",
"window": false
}, {
"children": [ ],
"commands": [ ],
"index": 45,
"name": "bedroom_0",
"order": 2,
"room_area": 64.0,
@@ -402,7 +392,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ ],
"index": 46,
"index": 45,
"name": "wc_0",
"order": 1,
"room_area": 16.0,
@@ -412,7 +402,27 @@ entries=[ {
}, {
"children": [ ],
"commands": [ ],
"index": 46,
"name": "bedroom_0",
"order": 2,
"room_area": 64.0,
"room_type": 202,
"type": "room",
"window": true
}, {
"children": [ ],
"commands": [ ],
"index": 47,
"name": "wc_0",
"order": 1,
"room_area": 16.0,
"room_type": 200,
"type": "room",
"window": false
}, {
"children": [ ],
"commands": [ ],
"index": 48,
"name": "bathroom_0",
"order": 2,
"room_area": 16.0,
@@ -422,7 +432,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ ],
"index": 48,
"index": 49,
"name": "bathroom_1",
"order": 3,
"room_area": 144.0,
@@ -432,7 +442,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ ],
"index": 49,
"index": 50,
"name": "living_room_0",
"order": 1,
"room_area": 144.0,
@@ -442,7 +452,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ ],
"index": 50,
"index": 51,
"name": "kitchen_0",
"order": 2,
"room_area": 64.0,
@@ -452,7 +462,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ ],
"index": 51,
"index": 52,
"name": "dining_room_0",
"order": 3,
"room_area": 144.0,
@@ -462,7 +472,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ ],
"index": 52,
"index": 53,
"name": "enterance_0",
"order": 4,
"room_area": 16.0,
@@ -472,7 +482,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ ],
"index": 53,
"index": 54,
"name": "enterance_1",
"order": 5,
"room_area": 16.0,
@@ -482,7 +492,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 54,
"index": 55,
"name": "bathroom_0",
"order": 0,
"room_area": 16.0,
@@ -492,7 +502,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 55,
"index": 56,
"name": "wc_0",
"order": 1,
"room_area": 16.0,
@@ -502,7 +512,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 56,
"index": 57,
"name": "bedroom_0",
"order": 2,
"room_area": 36.0,
@@ -512,7 +522,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 57,
"index": 58,
"name": "living_room_0",
"order": 0,
"room_area": 36.0,
@@ -522,7 +532,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 58,
"index": 59,
"name": "kitchen_0",
"order": 1,
"room_area": 16.0,
@@ -530,17 +540,17 @@ entries=[ {
"type": "room",
"window": true
}, {
"children": [ 72, 73 ],
"children": [ 73, 74 ],
"commands": [ ],
"floor_index": 1,
"index": 59,
"index": 60,
"name": "floor_0",
"order": 0,
"type": "floor"
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 60,
"index": 61,
"name": "wc_0",
"order": 0,
"room_area": 16.0,
@@ -550,7 +560,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 61,
"index": 62,
"name": "bathroom_0",
"order": 1,
"room_area": 16.0,
@@ -560,7 +570,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 62,
"index": 63,
"name": "bedroom_0",
"order": 2,
"room_area": 64.0,
@@ -570,7 +580,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 63,
"index": 64,
"name": "kitchen_0",
"order": 0,
"room_area": 16.0,
@@ -580,7 +590,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 64,
"index": 65,
"name": "living_room_0",
"order": 1,
"room_area": 144.0,
@@ -590,7 +600,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 65,
"index": 66,
"name": "bathroom_0",
"order": 0,
"room_area": 16.0,
@@ -600,7 +610,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 66,
"index": 67,
"name": "kitchen_0",
"order": 0,
"room_area": 64.0,
@@ -610,7 +620,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 67,
"index": 68,
"name": "living_room_0",
"order": 1,
"room_area": 64.0,
@@ -620,7 +630,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 68,
"index": 69,
"name": "wc_0",
"order": 0,
"room_area": 16.0,
@@ -630,7 +640,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 69,
"index": 70,
"name": "living_room_0",
"order": 0,
"room_area": 64.0,
@@ -640,7 +650,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 70,
"index": 71,
"name": "bathroom_0",
"order": 0,
"room_area": 16.0,
@@ -650,7 +660,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ [ 5, [ ] ] ],
"index": 71,
"index": 72,
"name": "living_room_0",
"order": 0,
"room_area": 64.0,
@@ -658,24 +668,24 @@ entries=[ {
"type": "room",
"window": true
}, {
"children": [ 74 ],
"children": [ 75 ],
"commands": [ ],
"index": 72,
"index": 73,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 1
}, {
"children": [ 75, 76 ],
"children": [ 76, 77 ],
"commands": [ ],
"index": 73,
"index": 74,
"name": "unit_0",
"order": 0,
"type": "unit"
}, {
"children": [ ],
"commands": [ ],
"index": 74,
"index": 75,
"name": "storage_room_0",
"order": 0,
"room_area": 64.0,
@@ -683,17 +693,17 @@ entries=[ {
"type": "room",
"window": true
}, {
"children": [ 77 ],
"children": [ 78 ],
"commands": [ ],
"index": 75,
"index": 76,
"name": "zone_0",
"order": 0,
"type": "zone",
"zone_type": 0
}, {
"children": [ 78 ],
"children": [ 79 ],
"commands": [ ],
"index": 76,
"index": 77,
"name": "zone_1",
"order": 0,
"type": "zone",
@@ -701,7 +711,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ ],
"index": 77,
"index": 78,
"name": "wc_0",
"order": 0,
"room_area": 16.0,
@@ -711,7 +721,7 @@ entries=[ {
}, {
"children": [ ],
"commands": [ ],
"index": 78,
"index": 79,
"name": "living_room_0",
"order": 0,
"room_area": 16.0,