Skip to content

Commit

Permalink
Draft: remove reapply_diffuse_color workaround
Browse files Browse the repository at this point in the history
The function would trigger the creation of duplicate Draft Polar Arrays (only on Linux and only if the Fuse option is selected and the Link Array option deselected).
Forum topic:
https://forum.freecad.org/viewtopic.php?t=84090

The reapply_diffuse_color function is no longer required anyway as Issue FreeCAD#8340 has been fixed.
  • Loading branch information
Roy-043 committed Jan 10, 2024
1 parent d3049de commit 35f10ad
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 38 deletions.
9 changes: 0 additions & 9 deletions src/Mod/Draft/draftmake/make_array.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@ def make_array(base_object,
ViewProviderDraftArray(new_obj.ViewObject)
gui_utils.format_object(new_obj, new_obj.Base)
new_obj.ViewObject.Proxy.resetColors(new_obj.ViewObject)
# Workaround to trigger update of DiffuseColor:
ToDo.delay(reapply_diffuse_color, new_obj.ViewObject)
new_obj.Base.ViewObject.hide()
gui_utils.select(new_obj)

Expand All @@ -155,11 +153,4 @@ def makeArray(baseobject,
arg1, arg2, arg3,
arg4, arg5, arg6, use_link)


def reapply_diffuse_color(vobj):
try:
vobj.DiffuseColor = vobj.DiffuseColor
except:
pass

## @}
11 changes: 0 additions & 11 deletions src/Mod/Draft/draftmake/make_clone.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ def make_clone(obj, delta=None, forcedraft=False):
pass
if App.GuiUp:
gui_utils.format_object(cl, base)
# Workaround to trigger update of DiffuseColor:
ToDo.delay(reapply_diffuse_color, cl.ViewObject)
gui_utils.select(cl)
return cl

Expand All @@ -118,19 +116,10 @@ def make_clone(obj, delta=None, forcedraft=False):
if App.GuiUp:
ViewProviderClone(cl.ViewObject)
gui_utils.format_object(cl, obj[0])
# Workaround to trigger update of DiffuseColor:
ToDo.delay(reapply_diffuse_color, cl.ViewObject)
gui_utils.select(cl)
return cl


def reapply_diffuse_color(vobj):
try:
vobj.DiffuseColor = vobj.DiffuseColor
except:
pass


clone = make_clone

## @}
9 changes: 0 additions & 9 deletions src/Mod/Draft/draftmake/make_patharray.py
Original file line number Diff line number Diff line change
Expand Up @@ -413,18 +413,9 @@ def make_path_twisted_array(base_object, path_object,
ViewProviderDraftArray(new_obj.ViewObject)
gui_utils.formatObject(new_obj, new_obj.Base)
new_obj.ViewObject.Proxy.resetColors(new_obj.ViewObject)
# Workaround to trigger update of DiffuseColor:
ToDo.delay(reapply_diffuse_color, new_obj.ViewObject)
new_obj.Base.ViewObject.hide()
gui_utils.select(new_obj)

return new_obj


def reapply_diffuse_color(vobj):
try:
vobj.DiffuseColor = vobj.DiffuseColor
except:
pass

## @}
9 changes: 0 additions & 9 deletions src/Mod/Draft/draftmake/make_pointarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,6 @@ def make_point_array(base_object, point_object, extra=None, use_link=True):
ViewProviderDraftArray(new_obj.ViewObject)
gui_utils.format_object(new_obj, new_obj.Base)
new_obj.ViewObject.Proxy.resetColors(new_obj.ViewObject)
# Workaround to trigger update of DiffuseColor:
ToDo.delay(reapply_diffuse_color, new_obj.ViewObject)
new_obj.Base.ViewObject.hide()
gui_utils.select(new_obj)

Expand All @@ -171,11 +169,4 @@ def makePointArray(base, ptlst):

return make_point_array(base, ptlst)


def reapply_diffuse_color(vobj):
try:
vobj.DiffuseColor = vobj.DiffuseColor
except:
pass

## @}

0 comments on commit 35f10ad

Please sign in to comment.