Update app.py

app.py

@@ -1,24 +1,18 @@
+import os
 import math
 import re
 import tempfile
-
-
 from flask import Flask, render_template, request, send_file, Response
-from PIL import Image, ImageOps, ImageDraw, ImageColor
+from PIL import Image, ImageOps, ImageDraw
 import numpy as np
 
 # Проверка наличия MoviePy
-
 try:
     from moviepy.editor import VideoFileClip
     MOVIEPY_AVAILABLE = True
 except ImportError:
     MOVIEPY_AVAILABLE = False
 
-
-
-
-
 app = Flask(__name__)
 
 # --- Вспомогательные функции ---
@@ -34,13 +28,11 @@ def prepare_svg_content(file_storage):
         inner = re.sub(r'</svg>', '', inner, flags=re.I)
         inner = re.sub(r'<\?xml[^>]*\?>|<!DOCTYPE[^>]*>', '', inner, flags=re.I)
         
-        # Удаляем явные заливки, чтобы управлять цветом через группу
-        # (Опционально, но помогает для монохромных иконок)
-        # inner = re.sub(r'fill="[^"]*"', '', inner) 
-        
+        if 'fill=' not in inner:
+            inner = f'<g fill="black">{inner}</g>'
         return inner, vbox
     except:
-        return '<rect width="100" height="100" />', "0 0 100 100"
+        return '<rect width="100" height="100" fill="black"/>', "0 0 100 100"
 
 def calculate_grid_items(width, height, density, gap_x, gap_y, shift, base_scale, growth, growth_type, invert, pixel_data=None):
     """Математическое ядро расчета сетки"""
@@ -52,11 +44,6 @@ def calculate_grid_items(width, height, density, gap_x, gap_y, shift, base_scale
     
     items = []
     
-
-
-
-
-
     for r in range(rows):
         row_shift = (r * shift * step)
         # Оптимизация цикла по колонкам
@@ -68,13 +55,9 @@ def calculate_grid_items(width, height, density, gap_x, gap_y, shift, base_scale
             grid_y = r * step
             
             if grid_x < -step or grid_x > width:
-
                 continue
 
             # Логика яркости
-
-
-
             is_visible = True
             
             if pixel_data is not None:
@@ -89,7 +72,6 @@ def calculate_grid_items(width, height, density, gap_x, gap_y, shift, base_scale
                 except:
                     pass
 
-
             if not is_visible:
                 continue
 
@@ -105,11 +87,6 @@ def calculate_grid_items(width, height, density, gap_x, gap_y, shift, base_scale
             mod_w = 1.0 - (wave * growth)
             mod_w = max(0.01, min(1.0, mod_w))
 
-
-
-
-
-
             content_w = cell_w_max * base_scale * mod_w
             content_h = cell_h_max * base_scale
             
@@ -119,8 +96,6 @@ def calculate_grid_items(width, height, density, gap_x, gap_y, shift, base_scale
             items.append({
                 'cx': cx, 'cy': cy, 
                 'w': content_w, 'h': content_h
-
-
             })
             
     return items, step
@@ -130,6 +105,7 @@ def calculate_grid_items(width, height, density, gap_x, gap_y, shift, base_scale
 @app.route('/')
 def index():
     return render_template('index.html')
+
 @app.route('/download_svg', methods=['POST'])
 def download_svg():
     try:
@@ -137,22 +113,21 @@ def download_svg():
         density = int(request.form.get('density', 40))
         gap_x = float(request.form.get('gap_x', 0))
         gap_y = float(request.form.get('gap_y', 0))
+        shift = float(request.form.get('shift_stagger', 0))
         base_scale = float(request.form.get('base_scale', 1.0))
         growth = float(request.form.get('growth', 0))
         growth_type = request.form.get('growth_type', 'sine')
-
         invert = request.form.get('invert') == 'true'
         
-        # Цвета
-        bg_color = request.form.get('bg_color', '#ffffff')
-        fill_color = request.form.get('fill_color', '#000000')
-        
         canvas_w, canvas_h = 1400, 900
         
         # SVG Symbol
         svg_file = request.files.get('shape_svg')
         if svg_file and svg_file.filename != '':
             symbol_content, v_box = prepare_svg_content(svg_file)
+        else:
+            symbol_content, v_box = ('<rect width="100" height="100" fill="black"/>', "0 0 100 100")
+            
         vb_parts = [float(x) for x in v_box.split()]
         vb_w, vb_h = vb_parts[2], vb_parts[3]
 
@@ -172,10 +147,9 @@ def download_svg():
             sx = item['w'] / vb_w
             sy = item['h'] / vb_h
             transform = f'translate({item["cx"]:.2f} {item["cy"]:.2f}) scale({sx:.4f} {sy:.4f}) translate({-vb_w/2:.2f} {-vb_h/2:.2f})'
-            # Применяем цвет заливки к группе
-            body.append(f'<g transform="{transform}" fill="{fill_color}">{symbol_content}</g>')
+            body.append(f'<g transform="{transform}">{symbol_content}</g>')
             
-        svg_str = f'<svg xmlns="http://www.w3.org/2000/svg" width="{canvas_w}" height="{canvas_h}" viewBox="0 0 {canvas_w} {canvas_h}" style="background:{bg_color};">{"".join(body)}</svg>'
+        svg_str = f'<svg xmlns="http://www.w3.org/2000/svg" width="{canvas_w}" height="{canvas_h}" viewBox="0 0 {canvas_w} {canvas_h}" style="background:white;">{"".join(body)}</svg>'
         
         return Response(svg_str, mimetype="image/svg+xml", headers={"Content-disposition": "attachment; filename=pattern.svg"})
 
@@ -190,15 +164,13 @@ def process_video():
     temp_dir = tempfile.mkdtemp()
     try:
         density = int(request.form.get('density', 40))
+        gap_x = float(request.form.get('gap_x', 0))
+        gap_y = float(request.form.get('gap_y', 0))
+        shift = float(request.form.get('shift_stagger', 0))
         base_scale = float(request.form.get('base_scale', 1.0))
         growth = float(request.form.get('growth', 0))
         growth_type = request.form.get('growth_type', 'sine')
-
         invert = request.form.get('invert') == 'true'
-        
-        # Цвета
-        bg_color = request.form.get('bg_color', '#ffffff')
-        fill_color = request.form.get('fill_color', '#000000')
 
         video_file = request.files.get('video_file')
         if not video_file:
@@ -212,22 +184,24 @@ def process_video():
             img_pil = Image.fromarray(frame).convert("L")
             w, h = img_pil.size
             
-            # Рендеринг кадра с цветом фона
-            canvas = Image.new("RGB", (w, h), bg_color)
+            # Рендеринг кадра
+            canvas = Image.new("RGB", (w, h), "white")
             draw = ImageDraw.Draw(canvas)
             
             # Используем ту же логику расчета
             items, _ = calculate_grid_items(w, h, density, gap_x, gap_y, shift, base_scale, growth, growth_type, invert, img_pil)
             
             for item in items:
+                # Рисуем прямоугольники (быстро для видео)
+                # Если нужно SVG в видео, это сильно замедлит процесс
                 x0 = item['cx'] - item['w']/2
                 y0 = item['cy'] - item['h']/2
-                # Рисуем прямоугольники с цветом паттерна
-                draw.rectangle([x0, y0, x0 + item['w'], y0 + item['h']], fill=fill_color)
+                draw.rectangle([x0, y0, x0 + item['w'], y0 + item['h']], fill="black")
 
             return np.array(canvas)
 
         clip = VideoFileClip(input_path)
+        # Ограничение FPS для ускорения, если видео большое
         # clip = clip.set_fps(24) 
         
         new_clip = clip.fl(process_frame)