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

[Draft] fix diffuse color issue when creating arrays (#8436)

Browse Source
This commit is contained in:
Roy-043
2023-02-11 18:57:28 +01:00
committed by GitHub
parent a8a6a7ac25
commit 9c44d85161
4 changed files with 56 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/Draft/draftmake/make_array.py
View File

@@ -39,6 +39,7 @@ from draftutils.translate import translate
from draftobjects.array import Array
if App.GuiUp:
from draftutils.todo import ToDo
from draftviewproviders.view_array import ViewProviderDraftArray
from draftviewproviders.view_draftlink import ViewProviderDraftLink
@@ -128,13 +129,13 @@ def make_array(base_object,
if use_link:
ViewProviderDraftLink(new_obj.ViewObject)
else:
if new_obj.ArrayType == "circular":
new_obj.Proxy.execute(new_obj) # Updates Count which is required for correct DiffuseColor.
ViewProviderDraftArray(new_obj.ViewObject)
gui_utils.format_object(new_obj, new_obj.Base)
if hasattr(new_obj.Base.ViewObject, "DiffuseColor"):
if len(new_obj.Base.ViewObject.DiffuseColor) > 1:
new_obj.ViewObject.Proxy.resetColors(new_obj.ViewObject)
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)
@@ -154,4 +155,11 @@ def makeArray(baseobject,
arg1, arg2, arg3,
arg4, arg5, arg6, use_link)
def reapply_diffuse_color(vobj):
try:
vobj.DiffuseColor = vobj.DiffuseColor
except:
pass
## @}

24
src/Mod/Draft/draftmake/make_patharray.py
View File

@@ -46,6 +46,7 @@ from draftobjects.patharray import PathArray
from draftobjects.pathtwistedarray import PathTwistedArray
if App.GuiUp:
from draftutils.todo import ToDo
from draftviewproviders.view_array import ViewProviderDraftArray
from draftviewproviders.view_draftlink import ViewProviderDraftLink
@@ -294,11 +295,9 @@ def make_path_array(base_object, path_object, count=4,
else:
ViewProviderDraftArray(new_obj.ViewObject)
gui_utils.formatObject(new_obj, new_obj.Base)
if hasattr(new_obj.Base.ViewObject, "DiffuseColor"):
if len(new_obj.Base.ViewObject.DiffuseColor) > 1:
new_obj.ViewObject.Proxy.resetColors(new_obj.ViewObject)
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)
@@ -384,14 +383,19 @@ def make_path_twisted_array(base_object, path_object,
else:
ViewProviderDraftArray(new_obj.ViewObject)
gui_utils.formatObject(new_obj, new_obj.Base)
if hasattr(new_obj.Base.ViewObject, "DiffuseColor"):
if len(new_obj.Base.ViewObject.DiffuseColor) > 1:
new_obj.ViewObject.Proxy.resetColors(new_obj.ViewObject)
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
## @}

17
src/Mod/Draft/draftmake/make_pointarray.py
View File

@@ -43,6 +43,7 @@ from draftutils.translate import translate
from draftobjects.pointarray import PointArray
if App.GuiUp:
from draftutils.todo import ToDo
from draftviewproviders.view_array import ViewProviderDraftArray
from draftviewproviders.view_draftlink import ViewProviderDraftLink
@@ -152,13 +153,12 @@ def make_point_array(base_object, point_object, extra=None, use_link=True):
if use_link:
ViewProviderDraftLink(new_obj.ViewObject)
else:
new_obj.Proxy.execute(new_obj) # Updates Count which is required for correct DiffuseColor.
ViewProviderDraftArray(new_obj.ViewObject)
gui_utils.format_object(new_obj, new_obj.Base)
if hasattr(new_obj.Base.ViewObject, "DiffuseColor"):
if len(new_obj.Base.ViewObject.DiffuseColor) > 1:
new_obj.ViewObject.Proxy.resetColors(new_obj.ViewObject)
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)
@@ -171,4 +171,11 @@ def makePointArray(base, ptlst):
return make_point_array(base, ptlst)
def reapply_diffuse_color(vobj):
try:
vobj.DiffuseColor = vobj.DiffuseColor
except:
pass
## @}

37
src/Mod/Draft/draftviewproviders/view_array.py
View File

@@ -28,6 +28,7 @@
## \addtogroup draftviewproviders
# @{
from draftviewproviders.view_base import ViewProviderDraft
from draftutils import gui_utils
class ViewProviderDraftArray(ViewProviderDraft):
@@ -52,26 +53,22 @@ class ViewProviderDraftArray(ViewProviderDraft):
return ":/icons/Draft_PathArray.svg"
def resetColors(self, vobj):
colors = []
if vobj.Object.Base:
if vobj.Object.Base.isDerivedFrom("Part::Feature"):
if len(vobj.Object.Base.ViewObject.DiffuseColor) > 1:
colors = vobj.Object.Base.ViewObject.DiffuseColor
else:
c = vobj.Object.Base.ViewObject.ShapeColor
c = (c[0],c[1],c[2],vobj.Object.Base.ViewObject.Transparency/100.0)
colors += [c] * len(vobj.Object.Base.Shape.Faces)
if colors:
n = 1
if hasattr(vobj.Object,"ArrayType"):
if vobj.Object.ArrayType == "ortho":
n = vobj.Object.NumberX * vobj.Object.NumberY * vobj.Object.NumberZ
else:
n = vobj.Object.NumberPolar
elif hasattr(vobj.Object,"Count"):
n = vobj.Object.Count
colors = colors * n
vobj.DiffuseColor = colors
obj = vobj.Object
if obj.Base is not None:
colors = gui_utils.get_diffuse_color(obj.Base)
if colors:
n = 1
if hasattr(obj, "ArrayType"):
if obj.ArrayType == "ortho":
n = obj.NumberX * obj.NumberY * obj.NumberZ
elif obj.ArrayType == "polar":
n = obj.NumberPolar
else: # "circular"
n = obj.Count
elif hasattr(obj, "Count"):
n = obj.Count
colors = colors * n
vobj.DiffuseColor = colors
# Alias for compatibility with v0.18 and earlier