Skip to content

Commit

Permalink
Section object
Browse files Browse the repository at this point in the history
  • Loading branch information
@s-leger
s-leger committed Mar 7, 2018
1 parent 2cfc715 commit 06ae590
Show file tree
Hide file tree
Showing 22 changed files with 1,284 additions and 887 deletions.
62 changes: 44 additions & 18 deletions __init__.py
View file
Expand Up @@ -69,6 +69,7 @@
imp.reload(archipack_kitchen)
imp.reload(archipack_molding)
imp.reload(archipack_rendering)
imp.reload(archipack_section)
# imp.reload(archipack_envi)
imp.reload(archipack_io)
imp.reload(archipack_2d_layout)
Expand Down Expand Up @@ -102,6 +103,7 @@
from . import archipack_kitchen
from . import archipack_molding
from . import archipack_rendering
from . import archipack_section
# from . import archipack_envi
from . import archipack_io
from . import archipack_2d_layout
Expand Down Expand Up @@ -532,8 +534,7 @@ def draw(self, context):

icons = icons_collection["main"]
layout = self.layout
row = layout.row(align=True)
box = row.box()
box = layout.box()
box.label("Objects")
row = box.row(align=True)
row.operator("archipack.wall2",
Expand Down Expand Up @@ -563,8 +564,7 @@ def draw(self, context):
text="Draw",
icon='GREASEPENCIL'
).preset_operator = "archipack.door_draw"
row = box.row(align=True)
row.operator("archipack.stair_preset_menu",
box.operator("archipack.stair_preset_menu",
text="Stair",
icon_value=icons["stair"].icon_id
).preset_operator = "archipack.stair"
Expand All @@ -574,8 +574,7 @@ def draw(self, context):
icon_value=icons["fence"].icon_id
).preset_operator = "archipack.fence"
row.operator("archipack.fence_from_curve", text="", icon='CURVE_DATA')
row = box.row(align=True)
row.operator("archipack.wall2_from_slab",
box.operator("archipack.wall2_from_slab",
icon_value=icons["wall_from_slab"].icon_id)

row = box.row(align=True)
Expand Down Expand Up @@ -620,37 +619,51 @@ def draw(self, context):
)
# .preset_operator = "archipack.molding_from_curve"


row = box.row(align=True)
row.operator("archipack.roof_preset_menu",
text="Roof",
icon_value=icons["roof"].icon_id
).preset_operator = "archipack.roof"
row.operator("archipack.roof_from_wall",
text="->Roof",
icon_value=icons["roof_from_wall"].icon_id
)
# toolkit
# row = box.row(align=True)
# row.operator("archipack.myobject")
row = box.row(align=True)
row.operator("archipack.kitchen_preset_menu",
box.operator("archipack.kitchen_preset_menu",
text="Kitchen",
icon_value=icons["kitchen"].icon_id
).preset_operator = "archipack.kitchen"

row = box.row(align=True)
row.operator("archipack.blind_preset_menu",
box.operator("archipack.blind_preset_menu",
text="Blind",
icon_value=icons["blind"].icon_id
).preset_operator = "archipack.blind"
row = box.row(align=True)
row.operator("archipack.truss",
box.operator("archipack.truss",
icon_value=icons["truss"].icon_id
)

box = layout.box()
box.label("2d Objects")
box.operator("archipack.dimension_auto",
icon_value=icons["dimension_auto"].icon_id
)
box.operator("archipack.layout",
icon_value=icons["layout"].icon_id
)
box.operator("archipack.section",
icon_value=icons["section"].icon_id
)
box.operator("archipack.section_camera",
text="Section cam",
icon='CAMERA_DATA'
).mode = 'CREATE'
if prefs.experimental_features:
box = layout.box()
box.label(text="Experimental features")
box.operator("archipack.floor_heating")
box.operator("archipack.dimension")
box.operator("archipack.dimension_auto")
box.operator("archipack.layout")


box = layout.box()
Expand Down Expand Up @@ -719,9 +732,20 @@ def draw_menu(self, context):
text="Truss",
icon_value=icons["truss"].icon_id
)
layout.operator("archipack.dimension")
layout.operator("archipack.layout")

layout.operator("archipack.dimension_auto",
icon_value=icons["dimension_auto"].icon_id
)
layout.operator("archipack.layout",
icon_value=icons["layout"].icon_id
)
layout.operator("archipack.section",
icon_value=icons["section"].icon_id
)
layout.operator("archipack.section_camera",
text="Section cam",
icon='CAMERA_DATA'
).mode = 'CREATE'


class ARCHIPACK_create_menu(Menu):
bl_label = 'Archipack'
Expand Down Expand Up @@ -796,6 +820,7 @@ def register():
archipack_floor.register()
archipack_floor_heating.register()
archipack_rendering.register()
archipack_section.register()
archipack_io.register()
archipack_2d_layout.register()
archipack_io_export_svg.register()
Expand Down Expand Up @@ -842,6 +867,7 @@ def unregister():
archipack_floor.unregister()
archipack_floor_heating.unregister()
archipack_rendering.unregister()
archipack_section.unregister()
archipack_io.unregister()
archipack_2d_layout.unregister()
archipack_io_export_svg.unregister()
Expand Down
10 changes: 9 additions & 1 deletion archipack_blind.py
View file
Expand Up @@ -34,6 +34,7 @@
EnumProperty
)
from math import sin, cos, tan, ceil, floor, pi, asin, acos, radians, atan2
from random import uniform
from mathutils import Vector, Matrix
from .bmesh_utils import BmeshEdit as bmed
from .archipack_manipulator import Manipulable
Expand Down Expand Up @@ -906,7 +907,11 @@ class ARCHIPACK_OT_blind(ArchipackCreateTool, Operator):
min=0.02, default=0.04, precision=3,
description='Frame depth'
)

randomize = BoolProperty(
name='Randomize',
description='Randomize slats opening',
default=False
)
style = EnumProperty(
items=(
('VENITIAN', 'Venitian', 'Venitian', 0),
Expand Down Expand Up @@ -940,6 +945,9 @@ def create(self, context):
d.frame_height = self.frame_height
d.frame_depth = self.frame_depth
d.style = self.style
if self.randomize:
d.ratio = uniform(0, 100)
d.angle = -pi / 200 * uniform(0, 100)

# Link object into scene
context.scene.objects.link(o)
Expand Down

0 comments on commit 06ae590

Please sign in to comment.