Fix more bugs, refined round-trip tests pass now

3 files changed, 26 insertions, 21 deletions

diff --git a/gerbonara/gerber/tests/image_support.py b/gerbonara/gerber/tests/image_support.py
index e1b1c00..8ce0d72 100644
--- a/gerbonara/gerber/tests/image_support.py
+++ b/gerbonara/gerber/tests/image_support.py
@@ -8,8 +8,8 @@ import numpy as np
 from PIL import Image
 
 class ImageDifference:
-    def __init__(self, value, ref_path, act_path):
-        self.value, self.ref_path, self.act_path = value, ref_path, act_path
+    def __init__(self, value):
+        self.value = value
 
     def __float__(self):
         return float(self.value)
@@ -47,34 +47,32 @@ def gbr_to_svg(in_gbr, out_svg, origin=(0, 0), size=(10, 10)):
         '-o', str(out_svg), str(in_gbr)]
     subprocess.run(cmd, check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
-def gerber_difference(reference, actual):
+def gerber_difference(reference, actual, diff_out=None):
     with tempfile.NamedTemporaryFile(suffix='.svg') as act_svg,\
         tempfile.NamedTemporaryFile(suffix='.svg') as ref_svg:
 
         gbr_to_svg(reference, ref_svg.name)
         gbr_to_svg(actual, act_svg.name)
 
-        diff = svg_difference(ref_svg.name, act_svg.name)
-        diff.ref_path, diff.act_path = reference, actual
-        return diff
+        return svg_difference(ref_svg.name, act_svg.name, diff_out=diff_out)
 
-def svg_difference(reference, actual):
+def svg_difference(reference, actual, diff_out=None):
     with tempfile.NamedTemporaryFile(suffix='.png') as ref_png,\
         tempfile.NamedTemporaryFile(suffix='.png') as act_png:
 
         svg_to_png(reference, ref_png.name)
         svg_to_png(actual, act_png.name)
 
-        diff = image_difference(ref_png.name, act_png.name)
-        diff.ref_path, diff.act_path = reference, actual
-        return diff
+        return image_difference(ref_png.name, act_png.name, diff_out=diff_out)
 
-def image_difference(reference, actual):
+def image_difference(reference, actual, diff_out=None):
     ref = np.array(Image.open(reference)).astype(float)
     out = np.array(Image.open(actual)).astype(float)
 
     ref, out = ref.mean(axis=2), out.mean(axis=2) # convert to grayscale
     delta = np.abs(out - ref).astype(float) / 255
-    return ImageDifference(delta.mean(), reference, actual)
+    if diff_out:
+        Image.fromarray((delta*255).astype(np.uint8), mode='L').save(diff_out)
+    return ImageDifference(delta.mean()), ImageDifference(delta.max())
 
 
diff --git a/gerbonara/gerber/tests/resources/example_single_contour_1.gbr b/gerbonara/gerber/tests/resources/example_single_contour_1.gbr
index e9f9a75..545f757 100644
--- a/gerbonara/gerber/tests/resources/example_single_contour_1.gbr
+++ b/gerbonara/gerber/tests/resources/example_single_contour_1.gbr
@@ -12,4 +12,4 @@ Y60000D01*
 X50000D01*
 Y50000Y50000D01*
 G37*
-M02*
\ No newline at end of file
+M02*
diff --git a/gerbonara/gerber/tests/test_rs274x.py b/gerbonara/gerber/tests/test_rs274x.py
index f359ca9..28ee891 100644
--- a/gerbonara/gerber/tests/test_rs274x.py
+++ b/gerbonara/gerber/tests/test_rs274x.py
@@ -25,10 +25,11 @@ def clear_failure_dir(request):
 reference_path = lambda reference: Path(__file__).parent / 'resources' / reference
 
 @pytest.fixture
-def tmp_gbr(request):
-    with tempfile.NamedTemporaryFile(suffix='.gbr') as tmp_out_gbr:
+def temp_files(request):
+    with tempfile.NamedTemporaryFile(suffix='.gbr') as tmp_out_gbr,\
+         tempfile.NamedTemporaryFile(suffix='.png') as tmp_out_png:
 
-        yield Path(tmp_out_gbr.name)
+        yield Path(tmp_out_gbr.name), Path(tmp_out_png.name)
 
         if request.node.rep_call.failed:
             module, _, test_name = request.node.nodeid.rpartition('::')
@@ -36,9 +37,12 @@ def tmp_gbr(request):
             test_name, _, _ext = test_name.partition('.')
             test_name = re.sub(r'[^\w\d]', '_', test_name)
             fail_dir.mkdir(exist_ok=True)
-            perm_path = fail_dir / f'failure_{test_name}.gbr'
-            shutil.copy(tmp_out_gbr.name, perm_path)
-            print(f'Failing output saved to {perm_path}')
+            perm_path_gbr = fail_dir / f'failure_{test_name}.gbr'
+            perm_path_png = fail_dir / f'failure_{test_name}.png'
+            shutil.copy(tmp_out_gbr.name, perm_path_gbr)
+            shutil.copy(tmp_out_png.name, perm_path_png)
+            print(f'Failing output saved to {perm_path_gbr}')
+            print(f'Difference image saved to {perm_path_png}')
             print(f'Reference file is {reference_path(request.node.funcargs["reference"])}')
 
 @pytest.mark.filterwarnings('ignore:Deprecated.*statement found.*:DeprecationWarning')
@@ -88,8 +92,11 @@ top_copper.GTL
 top_mask.GTS
 top_silk.GTO
 '''.splitlines() if l ])
-def test_round_trip(tmp_gbr, reference):
+def test_round_trip(temp_files, reference):
+    tmp_gbr, tmp_png = temp_files
     ref = reference_path(reference)
     GerberFile.open(ref).save(tmp_gbr)
-    assert gerber_difference(ref, tmp_gbr) < 1e-5
+    mean, max = gerber_difference(ref, tmp_gbr, diff_out=tmp_png)
+    assert mean < 1e-6
+    assert max < 0.1