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

Merge pull request #21046 from davesrocketshop/issue_13922_2

Browse Source 
Update module dependencies to ensure that automated testing code is considered as well as direct dependencies. Update some automated tests to eliminate unwanted dependencies.
This commit is contained in:
David Carter
2025-05-04 22:02:50 +00:00
committed by GitHub
parent bf09cfdb2b
commit ba9624d8d4
7 changed files with 448 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/Mod/Material/materialtests/TestMaterialDocument.py
View File

@@ -36,34 +36,36 @@ class DocumentTestCases(unittest.TestCase):
def testApplyDiffuseColorCheckShapeAppearance(self):
""" Test that applying a DiffuseColor with transparency results in a correct ShapeAppearance """
dif_col_1 = (1.0, 1.0, 0.0, 1.0) # yellow 0% transparent
dif_col_2 = (1.0, 0.0, 0.0, 0.5) # red 50% transparent
dif_col = [dif_col_1] + [dif_col_2] + 4 * [dif_col_1]
if "BUILD_PART" in FreeCAD.__cmake__:
dif_col_1 = (1.0, 1.0, 0.0, 1.0) # yellow 0% transparent
dif_col_2 = (1.0, 0.0, 0.0, 0.5) # red 50% transparent
dif_col = [dif_col_1] + [dif_col_2] + 4 * [dif_col_1]
obj = self.doc.addObject("Part::Box")
vobj = obj.ViewObject
vobj.DiffuseColor = dif_col
obj = self.doc.addObject("Part::Box")
vobj = obj.ViewObject
vobj.DiffuseColor = dif_col
self.assertEqual(
[m.DiffuseColor[:3] + (1.0 - m.Transparency, ) for m in vobj.ShapeAppearance],
vobj.DiffuseColor
)
self.assertEqual(
[m.DiffuseColor[:3] + (1.0 - m.Transparency, ) for m in vobj.ShapeAppearance],
vobj.DiffuseColor
)
def testApplyShapeAppearanceCheckDiffuseColor(self):
""" Test that applying a ShapeAppearance with transparency results in a correct DiffuseColor """
sapp_1 = FreeCAD.Material()
sapp_1.DiffuseColor = (0.0, 1.0, 1.0, 0.0) # cyan
sapp_1.Transparency = 0.0 # 0% transparent
sapp_2 = FreeCAD.Material()
sapp_2.DiffuseColor = (0.0, 1.0, 0.0, 0.0) # green
sapp_2.Transparency = 0.3 # 30% transparent
sapp = [sapp_1] + [sapp_2] + 4 * [sapp_1]
if "BUILD_PART" in FreeCAD.__cmake__:
sapp_1 = FreeCAD.Material()
sapp_1.DiffuseColor = (0.0, 1.0, 1.0, 0.0) # cyan
sapp_1.Transparency = 0.0 # 0% transparent
sapp_2 = FreeCAD.Material()
sapp_2.DiffuseColor = (0.0, 1.0, 0.0, 0.0) # green
sapp_2.Transparency = 0.3 # 30% transparent
sapp = [sapp_1] + [sapp_2] + 4 * [sapp_1]
obj = self.doc.addObject("Part::Box")
vobj = obj.ViewObject
vobj.ShapeAppearance = sapp
obj = self.doc.addObject("Part::Box")
vobj = obj.ViewObject
vobj.ShapeAppearance = sapp
self.assertEqual(
[m.DiffuseColor[:3] + (1.0 - m.Transparency, ) for m in vobj.ShapeAppearance],
vobj.DiffuseColor
)
self.assertEqual(
[m.DiffuseColor[:3] + (1.0 - m.Transparency, ) for m in vobj.ShapeAppearance],
vobj.DiffuseColor
)