Bugfix, back to old version

Corriger.py

@@ -164,6 +164,7 @@ elif authentication_status:
         buf = BytesIO()
         # img_stacked = np.hstack((resized_image_input, resized_img_final))
         img_final = Image.fromarray(resized_img_final).convert("L")
+
         img_final.save(buf, format="PNG")
         byte_im = buf.getvalue()
 

code/functions.py

@@ -2,15 +2,16 @@ import cv2
 import numpy as np
 import matplotlib.pyplot as plt
 import os
+import copy
 import cairosvg
 from potrace import POTRACE_CORNER, Path, Bitmap
 import io
 from PIL import Image, ImageStat
 
-import streamlit
+import streamlit as st
 from PIL import Image
 
-@streamlit.cache_data
+@st.cache_data
 def pipeline_svg(image_input, size_value, level=3, streamlit=False, threshold=0, kernel_type=cv2.MORPH_ELLIPSE, dilate_lines_value=0):
     """
     uint8 ==> uint8
@@ -40,17 +41,22 @@ def process_svg(img, size_value=12, level=1, streamlit=False, kernel_type=cv2.MO
         kernel = get_kernel_ellipse(size, kernel_type=kernel_type)
         img = cv2.erode(img, kernel, iterations=1)
 
-    #cv2.imwrite(image_path, img)
-    img_array = convert_to_svg_and_back(img)
+    cv2.imwrite(image_path, img)
+
+    #st.image(img / 255.0, caption="Image après premiere svg and back", use_column_width='auto')
+
+    img_array = convert_to_svg_and_back(image_path)
+
+    #st.image(img_array / 255.0, caption="Image après premiere svg and back", use_column_width='auto')
 
     img_array = binarise(img_array)
-    img_bin = (255 - img_array)
+    img_bin = 255 - img_array
     img_bin = img_bin.astype('uint8')
     image_already_added = np.zeros_like(img_bin)
 
     target_min_size = max(1, size_value)
 
-    image_final = img_bin
+    image_final = copy.deepcopy(img_bin)
     for i in range(target_min_size+1):
         size = 2 * i + 1
         kernel = get_kernel_ellipse(size, kernel_type=kernel_type)
@@ -65,14 +71,22 @@ def process_svg(img, size_value=12, level=1, streamlit=False, kernel_type=cv2.MO
         kernel = get_kernel_ellipse(size, kernel_type=kernel_type)
         dilate_image_petits_objets = cv2.dilate(image_petits_objets, kernel, iterations=1)
 
-        image_already_added = (image_already_added + image_petits_objets)
+        image_already_added += image_petits_objets
 
         if i > level:
-            image_final = (image_final + dilate_image_petits_objets)
+            image_final += dilate_image_petits_objets
+
+    cv2.imwrite("image_finale.png", (255 - image_final))
+    #st.image((255 - image_final) / 255.0, caption="(255 - image_final)", use_column_width='auto')
+
+    #image = convert_to_svg_and_back((255-image_final))
+    #image = 255 - image
+    #st.image((image) / 255.0, caption="convert_to_svg_and_back_new", use_column_width='auto')
+
+    image = convert_to_svg_and_back("image_finale.png")
 
-    #cv2.imwrite("image_finale.png", (255 - image_final))
-    image = convert_to_svg_and_back((255 - image_final))
     return image
+
 def get_kernel_ellipse(size, kernel_type=cv2.MORPH_ELLIPSE):
     list_coords = [size, size]
     return cv2.getStructuringElement(kernel_type, (list_coords[0], list_coords[1]),
@@ -101,7 +115,16 @@ def remove_solo_pixels(image, kernel_size=3):
     dilation = dilation.astype('uint8')
     return dilation
 
-def convert_to_svg_and_back(image_array) -> np.array:
+def convert_to_svg_and_back(image_path):
+    cmd_to_svg = f"potracer {image_path} -b svg -o images/image.svg"
+    cmd_to_raster = f"convert images/image.svg -colorspace Gray images/output.png"
+
+    assert (os.system(cmd_to_svg)) == 0, f"Error with {cmd_to_svg}"
+    assert (os.system(cmd_to_raster)) == 0, f"Error with {cmd_to_raster}"
+
+    return np.array(Image.open("images/output.png").convert('L'))
+
+def convert_to_svg_and_back_new(image_array) -> np.array:
     image_pil = Image.fromarray(image_array)
 
     bm = Bitmap(image_pil, blacklevel=0.5)
@@ -115,7 +138,9 @@ def convert_to_svg_and_back(image_array) -> np.array:
 
     image = backend_svg_no_file(image_pil, plist)
 
-    return np.array(image)
+    image = np.array(image)
+
+    return image
 
 def backend_svg_no_file(image, path: Path):
     output = f'<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="{image.width}" height="{image.height}" viewBox="0 0 {image.width} {image.height}">'
@@ -139,6 +164,7 @@ def backend_svg_no_file(image, path: Path):
     output += f'<path stroke="none" fill="#000000" fill-rule="evenodd" d="{"".join(parts)}"/>'
 
     output += "</svg>"
+    print(output)
     # From svg to png (bytes)
     image_data = cairosvg.surface.PNGSurface.convert(output)
     image = Image.open(io.BytesIO(image_data)).split()[-1]