Bring up to date with mainline CQ-editor ec81ad9

partial pull for tests/tes_app.py only
This commit is contained in:
jdegenstein
2022-10-19 13:27:09 -05:00
committed by GitHub
parent c9c9d8e40a
commit 339d871516

View File

@@ -114,7 +114,7 @@ def get_rgba(ais):
alpha = ais.Transparency()
color = get_occ_color(ais)
return color.redF(),color.redF(),color.redF(),alpha
return color.redF(), color.greenF(), color.blueF(), alpha
@pytest.fixture
def main(qtbot,mocker):
@@ -1017,14 +1017,13 @@ def test_render_colors(main_clean):
CQ = obj_tree.CQ
# object 1 (defualt color)
r,g,b,a = get_rgba(CQ.child(0).ais)
assert( a == 0 )
assert( r != 1.0 )
assert not CQ.child(0).ais.HasColor()
# object 2
r,g,b,a = get_rgba(CQ.child(1).ais)
assert( a == 0.5 )
assert( r == 1.0 )
assert( g == 0.0 )
# object 3
r,g,b,a = get_rgba(CQ.child(2).ais)
@@ -1060,19 +1059,10 @@ def test_render_colors_console(main_clean):
console.execute_command(code_color)
def get_rgba(ais):
alpha = ais.Transparency()
color = get_occ_color(ais)
return color.redF(),color.redF(),color.redF(),alpha
CQ = obj_tree.CQ
# object 1 (defualt color)
r,g,b,a = get_rgba(CQ.child(0).ais)
assert( a == 0 )
assert( r != 1.0 )
assert not CQ.child(0).ais.HasColor()
# object 2
r,g,b,a = get_rgba(CQ.child(1).ais)