From d51e75d8f08a9f48448ba48c700a337659680e9b Mon Sep 17 00:00:00 2001
From: Dion Moult <dion@thinkmoult.com>
Date: Fri, 1 Mar 2024 12:12:23 +1100
Subject: [PATCH] New cable carrier and cable tool grouped into MEP tool
 submenu

---
 .../blenderbim/bim/module/cad/__init__.py     |   2 +-
 .../blenderbim/bim/module/model/__init__.py   |  12 +++++--
 .../bim/module/model/ops.authoring.cable.dat  | Bin 0 -> 3878 bytes
 .../model/ops.authoring.cablecarrier.dat      | Bin 0 -> 458 bytes
 .../blenderbim/bim/module/model/workspace.py  |  30 ++++++++++++++++++
 5 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 src/blenderbim/blenderbim/bim/module/model/ops.authoring.cable.dat
 create mode 100644 src/blenderbim/blenderbim/bim/module/model/ops.authoring.cablecarrier.dat

diff --git a/src/blenderbim/blenderbim/bim/module/cad/__init__.py b/src/blenderbim/blenderbim/bim/module/cad/__init__.py
index a053e701c2..217528a574 100644
--- a/src/blenderbim/blenderbim/bim/module/cad/__init__.py
+++ b/src/blenderbim/blenderbim/bim/module/cad/__init__.py
@@ -37,7 +37,7 @@ classes = (
 
 def register():
     if not bpy.app.background:
-        bpy.utils.register_tool(workspace.CadTool, after={"builtin.transform"}, separator=True, group=True)
+        bpy.utils.register_tool(workspace.CadTool, after={"builtin.transform"}, separator=True, group=False)
     bpy.types.Scene.BIMCadProperties = bpy.props.PointerProperty(type=prop.BIMCadProperties)
 
 
diff --git a/src/blenderbim/blenderbim/bim/module/model/__init__.py b/src/blenderbim/blenderbim/bim/module/model/__init__.py
index 1c8f80fdd2..370c99793e 100644
--- a/src/blenderbim/blenderbim/bim/module/model/__init__.py
+++ b/src/blenderbim/blenderbim/bim/module/model/__init__.py
@@ -194,15 +194,18 @@ addon_keymaps = []
 
 def register():
     if not bpy.app.background:
-        bpy.utils.register_tool(workspace.WallTool, after={"builtin.transform"}, separator=True, group=False)
+        bpy.utils.register_tool(workspace.WallTool, after={"bim.explore_tool"}, separator=True, group=False)
         bpy.utils.register_tool(workspace.SlabTool, after={"bim.wall_tool"}, separator=False, group=False)
         bpy.utils.register_tool(workspace.DoorTool, after={"bim.slab_tool"}, separator=False, group=False)
         bpy.utils.register_tool(workspace.WindowTool, after={"bim.door_tool"}, separator=False, group=False)
         bpy.utils.register_tool(workspace.ColumnTool, after={"bim.window_tool"}, separator=False, group=False)
         bpy.utils.register_tool(workspace.BeamTool, after={"bim.column_tool"}, separator=False, group=False)
-        bpy.utils.register_tool(workspace.DuctTool, after={"bim.beam_tool"}, separator=False, group=False)
+        bpy.utils.register_tool(workspace.BimTool, after={"bim.beam_tool"}, separator=False, group=False)
+        bpy.utils.register_tool(workspace.DuctTool, after={"bim.beam_tool"}, separator=False, group=True)
         bpy.utils.register_tool(workspace.PipeTool, after={"bim.duct_tool"}, separator=False, group=False)
-        bpy.utils.register_tool(workspace.BimTool, after={"bim.pipe_tool"}, separator=False, group=False)
+        bpy.utils.register_tool(workspace.CableCarrierTool, after={"bim.pipe_tool"}, separator=False, group=False)
+        bpy.utils.register_tool(workspace.CableTool, after={"bim.cable_carrier_tool"}, separator=False, group=False)
+
     bpy.types.Scene.BIMModelProperties = bpy.props.PointerProperty(type=prop.BIMModelProperties)
     bpy.types.Object.BIMArrayProperties = bpy.props.PointerProperty(type=prop.BIMArrayProperties)
     bpy.types.Object.BIMStairProperties = bpy.props.PointerProperty(type=prop.BIMStairProperties)
@@ -211,6 +214,7 @@ def register():
     bpy.types.Object.BIMDoorProperties = bpy.props.PointerProperty(type=prop.BIMDoorProperties)
     bpy.types.Object.BIMRailingProperties = bpy.props.PointerProperty(type=prop.BIMRailingProperties)
     bpy.types.Object.BIMRoofProperties = bpy.props.PointerProperty(type=prop.BIMRoofProperties)
+
     bpy.types.VIEW3D_MT_mesh_add.append(ui.add_mesh_object_menu)
     bpy.types.VIEW3D_MT_add.append(ui.add_menu)
     bpy.app.handlers.load_post.append(handler.load_post)
@@ -232,6 +236,8 @@ def unregister():
         bpy.utils.unregister_tool(workspace.BeamTool)
         bpy.utils.unregister_tool(workspace.DuctTool)
         bpy.utils.unregister_tool(workspace.PipeTool)
+        bpy.utils.unregister_tool(workspace.CableCarrierTool)
+        bpy.utils.unregister_tool(workspace.CableTool)
         bpy.utils.unregister_tool(workspace.BimTool)
     del bpy.types.Scene.BIMModelProperties
     del bpy.types.Object.BIMArrayProperties
diff --git a/src/blenderbim/blenderbim/bim/module/model/ops.authoring.cable.dat b/src/blenderbim/blenderbim/bim/module/model/ops.authoring.cable.dat
new file mode 100644
index 0000000000000000000000000000000000000000..1dfb3a55f9acafafba4ad7bd26ab661eb6c50f62
GIT binary patch
literal 3878
zcmeHI-)q`h9Pi(=r@if=Pvbs}J&ZlbghH9!s?ivYIVL92r0IzyIaa-0jF!UfTE&h|
z+}2Cy96l&A2f@;Uup#UIn%?i(eYoMGFt{7^!i19?zxjTCd_NvF{M*Bo>+6*jrhV@P
z<K3^_s^2&7*KWVOb<DIM4DP*y`n!8CpneQbY7ZN?Uo!2~$%BDNR$Hsg9d@;Kr@h+B
ze7w^ZiTDBDv8xO`X^9^)AMc`2?e25_eW-?CV>46>F;HPbHU9nG=TI~8>rkyw%2!lU
zC~3dvEBT7{d%?|D3a+}#<~b#mXY&b#QwpvO6@P8~WEviA_Sx~19`}mxvz<&!c*P%~
zhR_l`v?DYGf(*FpSy3`j46tk-xIEcKxwyvWN1Hv4qK;5YI6@xaJVc<MAU$iqLOD^2
zfo5Eb;D{c}Ps8VrE<>s(f<D@lJk>*cJlu`4S(e=^_6s*lf8ploS=wLs*QVjm{5*ZB
zo~xJY1ds6q5A41*u-}lb^M<rZ(`l1^Qg`-ArBs4tmIXDgp_~C+qWhVr$n$T=@i%1O
zqR1|wnobi?b*Ju7WQmw%qwKGbHvP3B)8j^)Z~0E9$91wtsFOLAJamL=5`p;~NzW3b
z<xoz~Mq!?~b{U$5rs1d_*BB#$WBI5)U-Q?eVbzmhN<n3exHeCJ=IKO3X0$nE-ts*T
z__Li%CwnLzp+l(#3N^_A1xM0=S<4A3%JF-GD|rz+f}=XWm#hnJp=6XrcNY5eXd3?X
zXb$;&jb5=A><swNRbM_=$9QOrao;*C_N}gS0;}m9SWTGIwdziZ*mj8+WyuqEMHlIe
zA*h8CxZItkDc+YUerQnqS&`yT0DE8^0M@l!i{fqDC>Kip#*l%$l5cs)E8EG^c@EV>
z39?dZFb`22m`7J(8dZSn1$zZ9V<x0gjM$Kz88f4x4^BY+X*puYOr*z)jNz|Cej8Vh
zzeX=ue`Az{%#uCe2NfAIgX=dPmFjp3)gg+m>MGI&Rd7=kVK-Uls)8%xcoFHcE$pT$
zv-Cu~U?<|x7-$3Sta!S8x_x3D<70ea?c;syT2)-dwr#?zP?GIwbd>Zr#+hE0YIikI
zmYX{0stw&!JY`2GplobWT@fQa_UvgnL6Y^@Gp;IP)`=HoyHFB#=WADwr!dDfO7H&0
zd<{;4JP{|NFH<i=gL*kDQZFZv@;>;XUR;ZMv4LY69cM<#ai*{Ivb}6yp<cQg_0rU-
zmxfNg?C8{su_fXJi5FQXRY?%md0LK{2@-pjAk<Z=!a5i1I5Uk-#J)lqPq({TS3AZ{
zy{Yfx2Jlt!4)B?#v1M$@Hf4*M@uJ{z)l@~qvYo2X6vvr~IMDh^Um0kW<8+&H97B!`
z;GrB<OgT)GBDiXTto#wVUbJ%8e_k(Ii+X8oQ7^5neA50|0j*&FclG=i>=F;lX8BcL
zd?ps<68s#O?HA$xU0a6zQT3qSkK+6uo}lip{ep9~?7JDP2ls*Bfu(r{`+vrMnTMaD
pwTyF_hnr9jdcFyMf*yk2e(nGMZw}_OZ2y1H>L$;16TAgH`~`zFQ?md7

literal 0
HcmV?d00001

diff --git a/src/blenderbim/blenderbim/bim/module/model/ops.authoring.cablecarrier.dat b/src/blenderbim/blenderbim/bim/module/model/ops.authoring.cablecarrier.dat
new file mode 100644
index 0000000000000000000000000000000000000000..fb22227dfc6d82054f1132f90e14d72a865e2fb1
GIT binary patch
literal 458
zcmWG@_GkG2pMhaxZje)uX^_+WRtKLTCr@_=hmE-#tAJuo8>@g~4j?(8sE>og{F=qj
z=f7P1X7Tf7FP8z?iz|U5l|cFpQ1tn-nq@%pT0+vKYraX7=ILDX1+teWO-h=iRX9&)
zo;{Ro(JJ)z^55pYBN#~fd-(72-xj<BDB=O6y@GcD#ddiENrp?+|6#cF|N8$h%rGnd
kKO7UI23b848)hDehS>wADN%z<FOoRi?dW2}_yva=07xbP#sB~S

literal 0
HcmV?d00001

diff --git a/src/blenderbim/blenderbim/bim/module/model/workspace.py b/src/blenderbim/blenderbim/bim/module/model/workspace.py
index 43b1fbf5b6..100d59cb5d 100644
--- a/src/blenderbim/blenderbim/bim/module/model/workspace.py
+++ b/src/blenderbim/blenderbim/bim/module/model/workspace.py
@@ -176,6 +176,21 @@ class DuctTool(BimTool):
         BimToolUI.draw(context, layout, ifc_element_type=cls.ifc_element_type)
 
 
+class CableCarrierTool(BimTool):
+    bl_space_type = "VIEW_3D"
+    bl_context_mode = "OBJECT"
+    bl_idname = "bim.cable_carrier_tool"
+    bl_label = "Create Cable Carrier"
+    bl_description = "Create and edit cable carriers"
+    bl_icon = os.path.join(os.path.dirname(__file__), "ops.authoring.cablecarrier")
+    bl_widget = None
+    ifc_element_type = "IfcCableCarrierSegmentType"
+
+    @classmethod
+    def draw_settings(cls, context, layout, ws_tool):
+        BimToolUI.draw(context, layout, ifc_element_type=cls.ifc_element_type)
+
+
 class PipeTool(BimTool):
     bl_space_type = "VIEW_3D"
     bl_context_mode = "OBJECT"
@@ -191,6 +206,21 @@ class PipeTool(BimTool):
         BimToolUI.draw(context, layout, ifc_element_type=cls.ifc_element_type)
 
 
+class CableTool(BimTool):
+    bl_space_type = "VIEW_3D"
+    bl_context_mode = "OBJECT"
+    bl_idname = "bim.cable_tool"
+    bl_label = "Create Cable"
+    bl_description = "Create and edit cables"
+    bl_icon = os.path.join(os.path.dirname(__file__), "ops.authoring.cable")
+    bl_widget = None
+    ifc_element_type = "IfcCableSegmentType"
+
+    @classmethod
+    def draw_settings(cls, context, layout, ws_tool):
+        BimToolUI.draw(context, layout, ifc_element_type=cls.ifc_element_type)
+
+
 def add_layout_hotkey_operator(layout, text, hotkey, description):
     modifiers = {
         "A": "EVENT_ALT",