kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Draft: support experimental BIM wall in Draft_Edit

Browse Source
This commit is contained in:
carlopav
2020-08-13 23:23:46 +02:00
committed by Yorik van Havre
parent 7f415b4b58
commit 8e1bb66cf2
2 changed files with 82 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/Mod/Draft/draftguitools/gui_edit.py
View File

@@ -882,6 +882,9 @@ class Edit(gui_base_original.Modifier):
actions = ["set last angle"]
elif ep == 3: # user is over arc mid point
actions = ["set radius"]
elif utils.get_type(obj) == "Arch_Wall":
if ep == 0 or ep == 1: # user is a wall endpoint
actions = ["reset end", "align"]
else:
return
else:
@@ -904,16 +907,22 @@ class Edit(gui_base_original.Modifier):
def evaluate_menu_action(self, labelname):
action_label = str(labelname.text())
# addPoint and deletePoint menu
if action_label == "delete point":
self.delPoint(self.event)
elif action_label == "add point":
self.addPoint(self.event)
# Bezier curve menu
elif action_label in ["make sharp", "make tangent", "make symmetric"]:
if self.overNode:
doc = self.overNode.get_doc_name()
obj = App.getDocument(doc).getObject(self.overNode.get_obj_name())
idx = self.overNode.get_subelement_index()
# addPoint and deletePoint menu
if action_label == "delete point":
self.delPoint(self.event)
elif action_label == "add point":
self.addPoint(self.event)
# Bezier curve menu
elif action_label in ["make sharp", "make tangent", "make symmetric"]:
if action_label == "make sharp":
edit_draft.smoothBezPoint(obj, idx, 'Sharp')
elif action_label == "make tangent":
@@ -921,15 +930,27 @@ class Edit(gui_base_original.Modifier):
elif action_label == "make symmetric":
edit_draft.smoothBezPoint(obj, idx, 'Symmetric')
self.resetTrackers(obj)
# arc tools
elif action_label in ("move arc", "set radius",
"set first angle", "set last angle"):
self.alt_edit_mode = 1
self.startEditing(self.event)
elif action_label == "invert arc":
pos = self.event.getPosition()
obj = self.get_selected_obj_at_position(pos)
edit_draft.arcInvert(obj)
# experimental wall tools
elif action_label in ["reset end", "align"]:
if action_label == "reset end":
obj.Proxy.reset_end(obj, idx)
obj.recompute()
if action_label == "align":
self.alt_edit_mode = 1
self.startEditing(self.event)
del self.event
@@ -946,6 +967,8 @@ class Edit(gui_base_original.Modifier):
eps = None
objectType = utils.get_type(obj)
is_global = False # set to true if the editpoints are returned in global coordinates system
if objectType in ["Wire", "BSpline"]:
eps = edit_draft.getWirePts(obj)
@@ -975,7 +998,11 @@ class Edit(gui_base_original.Modifier):
for point in basepoints:
eps.append(obj.Placement.multVec(point)) #works ok except if App::Part is rotated... why?
return eps
elif objectType == "Arch_Wall":
eps = edit_arch.getArchWallPts(obj)
is_global = True
elif objectType == "Window":
eps = edit_arch.getWindowPts(obj)
@@ -1009,8 +1036,11 @@ class Edit(gui_base_original.Modifier):
elif objectType == "Sketch":
eps = edit_sketcher.getSketchPts(obj)
if not is_global:
eps = self.globalize_vectors(obj, eps)
if eps:
return self.globalize_vectors(obj, eps)
return eps
else:
return None
@@ -1063,6 +1093,9 @@ class Edit(gui_base_original.Modifier):
"Polygon", "Sketch"]:
self.update(obj.Base, nodeIndex - 1, v)
elif objectType == "Arch_Wall":
eps = edit_arch.updateArchWall(obj, nodeIndex, v, self.alt_edit_mode)
elif objectType == "Window":
edit_arch.updateWindow(obj, nodeIndex, v)

41
src/Mod/Draft/draftguitools/gui_edit_arch_objects.py
View File

@@ -41,7 +41,7 @@ import draftutils.utils as utils
def get_supported_arch_objects():
return ["Wall", "Window", "Structure", "Space", "PanelCut", "PanelSheet"]
return ["Arch_Wall", "Wall", "Window", "Structure", "Space", "PanelCut", "PanelSheet"]
# WALL---------------------------------------------------------------------
@@ -65,6 +65,45 @@ def updateWall(obj, nodeIndex, v):
obj.Height = vz.Length
obj.recompute()
# Arch_Wall ---------------------------------------------------------------------
# support for new experimental Arch_Wall
def getArchWallPts(obj):
"""Return the list of edipoints for the given Arch Wall object.
"""
editpoints = []
# height of the wall
editpoints.append(obj.Proxy.get_first_point(obj))
editpoints.append(obj.Proxy.get_last_point(obj))
return editpoints
def updateArchWall(obj, nodeIndex, v, alt_edit_mode):
if alt_edit_mode == 0:
# trim/extend endpoint
if nodeIndex == 0:
obj.Proxy.set_first_point(obj, v, local=True)
elif nodeIndex == 1:
obj.Proxy.set_last_point(obj, v, local=True)
elif alt_edit_mode == 1:
# rotate wall on the opposite endpoint (context menu "align")
import Draft
global_v = obj.getGlobalPlacement().multVec(v)
p1 = obj.Proxy.get_first_point(obj)
p2 = obj.Proxy.get_last_point(obj)
if nodeIndex == 0:
current_angle = DraftVecUtils.angle(App.Vector(1,0,0), p1.sub(p2))
new_angle = DraftVecUtils.angle(App.Vector(1,0,0), global_v.sub(p2))
Draft.rotate(obj, math.degrees(new_angle - current_angle), p2)
# obj.Proxy.set_first_point(obj, global_v) # this causes frequent hard crashes, probably to delay
elif nodeIndex == 1:
current_angle = DraftVecUtils.angle(App.Vector(1,0,0), p2.sub(p1))
new_angle = DraftVecUtils.angle(App.Vector(1,0,0), global_v.sub(p1))
Draft.rotate(obj, math.degrees(new_angle - current_angle), p1)
#obj.Proxy.set_last_point(obj, global_v) # this causes frequent hard crashes, probably to delay
obj.recompute()
# WINDOW-------------------------------------------------------------------