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

Initialize mark and add compatibility for rebar.RebarShape

Browse Source 
- Initialize rebar mark with rebar label
- Add compatibility for attribute rebar.RebarShape to work with changes
  done in this PR:
  https://github.com/amrit3701/FreeCAD-Reinforcement/pull/65/commits
This commit is contained in:
SurajDadral
2020-08-05 00:22:38 +05:30
committed by Yorik van Havre
parent 69f43d7bf3
commit 38f74c815f
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Mod/Arch/ArchRebar.py
View File

@@ -92,6 +92,7 @@ def makeRebar(baseobj=None,sketch=None,diameter=None,amount=1,offset=None,name="
else:
obj.OffsetStart = p.GetFloat("RebarOffset",30)
obj.OffsetEnd = p.GetFloat("RebarOffset",30)
obj.Mark = obj.Label
return obj
@@ -278,7 +279,7 @@ class _Rebar(ArchComponent.Component):
baseoffset = DraftVecUtils.scaleTo(axis,obj.OffsetStart.Value)
else:
baseoffset = None
if obj.ViewObject.RebarShape == "Stirrup":
if hasattr(obj, "RebarShape") and obj.RebarShape == "Stirrup":
interval = size - (obj.OffsetStart.Value + obj.OffsetEnd.Value + obj.Diameter.Value)
else:
interval = size - (obj.OffsetStart.Value + obj.OffsetEnd.Value)
@@ -418,8 +419,8 @@ class _Rebar(ArchComponent.Component):
self.wires = []
rot = FreeCAD.Rotation()
if obj.Amount == 1:
if obj.ViewObject:
barplacement = CalculatePlacement(obj.Amount, 1, obj.Diameter.Value, size, axis, rot, obj.OffsetStart.Value, obj.OffsetEnd.Value, obj.ViewObject.RebarShape)
if hasattr(obj, "RebarShape"):
barplacement = CalculatePlacement(obj.Amount, 1, obj.Diameter.Value, size, axis, rot, obj.OffsetStart.Value, obj.OffsetEnd.Value, obj.RebarShape)
else:
barplacement = CalculatePlacement(obj.Amount, 1, obj.Diameter.Value, size, axis, rot, obj.OffsetStart.Value, obj.OffsetEnd.Value)
placementlist.append(barplacement)
@@ -430,14 +431,14 @@ class _Rebar(ArchComponent.Component):
baseoffset = DraftVecUtils.scaleTo(axis,obj.OffsetStart.Value)
else:
baseoffset = None
if obj.ViewObject and obj.ViewObject.RebarShape == "Stirrup":
if hasattr(obj, "RebarShape") and obj.RebarShape == "Stirrup":
interval = size - (obj.OffsetStart.Value + obj.OffsetEnd.Value + obj.Diameter.Value)
else:
interval = size - (obj.OffsetStart.Value + obj.OffsetEnd.Value)
interval = interval / (obj.Amount - 1)
for i in range(obj.Amount):
if obj.ViewObject:
barplacement = CalculatePlacement(obj.Amount, i+1, obj.Diameter.Value, size, axis, rot, obj.OffsetStart.Value, obj.OffsetEnd.Value, obj.ViewObject.RebarShape)
if hasattr(obj, "RebarShape"):
barplacement = CalculatePlacement(obj.Amount, i+1, obj.Diameter.Value, size, axis, rot, obj.OffsetStart.Value, obj.OffsetEnd.Value, obj.RebarShape)
else:
barplacement = CalculatePlacement(obj.Amount, i+1, obj.Diameter.Value, size, axis, rot, obj.OffsetStart.Value, obj.OffsetEnd.Value)
placementlist.append(barplacement)
@@ -446,7 +447,7 @@ class _Rebar(ArchComponent.Component):
# Calculate placement of bars from custom spacing.
if spacinglist:
placementlist[:] = []
if obj.ViewObject.RebarShape == "Stirrup":
if hasattr(obj, "RebarShape") and obj.RebarShape == "Stirrup":
reqInfluenceArea = size - (obj.OffsetStart.Value + obj.OffsetEnd.Value + obj.Diameter.Value)
else:
reqInfluenceArea = size - (obj.OffsetStart.Value + obj.OffsetEnd.Value)
@@ -513,7 +514,15 @@ class _ViewProviderRebar(ArchComponent.ViewProviderComponent):
def setEdit(self, vobj, mode):
if mode == 0:
if vobj.RebarShape:
if hasattr(vobj.Object, "RebarShape"):
try:
# Import module of RebarShape
module = __import__(vobj.Object.RebarShape)
except ImportError:
FreeCAD.Console.PrintError("Unable to import RebarShape module\n")
return
module.editDialog(vobj)
elif vobj.RebarShape:
try:
# Import module of RebarShape
module = __import__(vobj.RebarShape)