diff --git a/scripts/render.py b/scripts/render.py index 18c3648..a7907b3 100755 --- a/scripts/render.py +++ b/scripts/render.py @@ -26,7 +26,7 @@ from set_config import * from exports import bom_to_parts import os import openscad -from tests import do_cmd, update_image, colour_scheme, background +from tests import do_cmd, update_image, colour_scheme, background, image_size from deps import mtime from colorama import init import json @@ -95,7 +95,7 @@ def render(target, type): render = "--preview" if type == 'stl' or colour != pp1 else "--render" tmp_name = tmp_dir + '/' + part[:-4] + '.png' dummy_deps_name = tmp_dir + '/tmp.deps' # work around for OpenSCAD issue #3879 - openscad.run("-o", tmp_name, png_maker_name, colour_scheme, "--projection=p", "--imgsize=4096,4096", cam, render, "--autocenter", "--viewall", "-d", dummy_deps_name) + openscad.run("-o", tmp_name, png_maker_name, colour_scheme, "--projection=p", image_size, cam, render, "--autocenter", "--viewall", "-d", dummy_deps_name) do_cmd(("magick "+ tmp_name + " -trim -resize 280x280 -background %s -gravity Center -extent 280x280 -bordercolor %s -border 10 %s" % (background, background, tmp_name)).split()) update_image(tmp_name, png_name) diff --git a/scripts/tests.py b/scripts/tests.py index 8640c9e..a267c49 100755 --- a/scripts/tests.py +++ b/scripts/tests.py @@ -36,8 +36,7 @@ from blurb import * from colorama import Fore from tmpdir import * -w = 4096 -h = w +image_size = "--imgsize=4096,4096" threshold = 20 # Image comparison allowed number of different pixels fuzz = 5 # Image comparison allowed percentage error in pixel value @@ -119,7 +118,7 @@ def tests(tests): libtest = True lib_blurb = scrape_blurb(scad_name) if not os.path.isfile(png_name): - openscad.run(scad_name, "-o", png_name, colour_scheme, "--projection=p", "--imgsize=%d,%d" % (w, h), "--camera=0,0,0,50,0,340,500", "--autocenter", "--viewall"); + openscad.run(scad_name, "-o", png_name, colour_scheme, "--projection=p", image_size, "--camera=0,0,0,50,0,340,500", "--autocenter", "--viewall"); do_cmd(["magick", png_name, "-trim", "-resize", "1280", "-bordercolor", background, "-border", "10", png_name]) else: # @@ -240,7 +239,7 @@ def tests(tests): print(changed) t = time.time() tmp_name = tmp_dir + '/tmp.png' - openscad.run_list([scad_name, "-o", tmp_name] + options.list() + ["-D$bom=2", colour_scheme, "--projection=p", "--imgsize=%d,%d" % (w, h), "--camera=0,0,0,70,0,315,500", "--autocenter", "--viewall", "-d", dname]); + openscad.run_list([scad_name, "-o", tmp_name] + options.list() + ["-D$bom=2", colour_scheme, "--projection=p", image_size, "--camera=0,0,0,70,0,315,500", "--autocenter", "--viewall", "-d", dname]); times.add_time(scad_name, t) do_cmd(["magick", tmp_name, "-trim", "-resize", "1000x600", "-bordercolor", background, "-border", "10", tmp_name]) update_image(tmp_name, png_name) diff --git a/scripts/views.py b/scripts/views.py index c69b81c..157e8a3 100755 --- a/scripts/views.py +++ b/scripts/views.py @@ -25,7 +25,7 @@ from __future__ import print_function from set_config import * import openscad -from tests import do_cmd, update_image, colour_scheme, background +from tests import do_cmd, update_image, colour_scheme, background, image_size import time import times import options @@ -223,7 +223,7 @@ def views(target, do_assemblies = None): target_def = ['-D$target="%s"' % target] if target else [] cwd_def = ['-D$cwd="%s"' % os.getcwd().replace('\\', '/')] view_def = ['--viewall', '--autocenter'] if not (zoomed & (1 << explode)) else ['--camera=0,0,0,55,0,25,140'] - openscad.run_list(["-o", tmp_name, png_maker_name] + options.list() + target_def + cwd_def + view_def + ["-D$pose=1", "-D$explode=%d" % explode, colour_scheme, "--projection=p", "--imgsize=4096,4096", "-d", dname]); + openscad.run_list(["-o", tmp_name, png_maker_name] + options.list() + target_def + cwd_def + view_def + ["-D$pose=1", "-D$explode=%d" % explode, colour_scheme, "--projection=p", image_size, "-d", dname]); times.add_time(png_name, t) do_cmd(["magick", tmp_name, "-trim", "-resize", "1004x1004", "-bordercolor", background, "-border", "10", tmp_name]) update_image(tmp_name, png_name)