Spaces:
Sleeping
Sleeping
Update app.py
Browse files
app.py
CHANGED
|
@@ -80,7 +80,7 @@ def prepare_rects(df: pd.DataFrame, margin: float):
|
|
| 80 |
continue
|
| 81 |
for i in range(qty):
|
| 82 |
rid = f"{label}#{i + 1}"
|
| 83 |
-
rects.append((w + margin, h + margin, rid))
|
| 84 |
original_dims[rid] = (w, h)
|
| 85 |
if not rects:
|
| 86 |
return None, None, 0, 0
|
|
@@ -222,8 +222,8 @@ def render_multi_roll(rolls, original_dims, margin, px_per_unit=4.0):
|
|
| 222 |
y1 = roll_y0 + (used_height - r.y) * px_per_unit
|
| 223 |
|
| 224 |
m = margin * px_per_unit
|
| 225 |
-
ix0, iy0 = x0 + m
|
| 226 |
-
ix1, iy1 = x1 - m
|
| 227 |
|
| 228 |
draw.rectangle([x0, y0, x1, y1], fill=outer_color, outline="black", width=2)
|
| 229 |
if ix1 > ix0 and iy1 > iy0:
|
|
|
|
| 80 |
continue
|
| 81 |
for i in range(qty):
|
| 82 |
rid = f"{label}#{i + 1}"
|
| 83 |
+
rects.append((w + margin * 2, h + margin * 2, rid))
|
| 84 |
original_dims[rid] = (w, h)
|
| 85 |
if not rects:
|
| 86 |
return None, None, 0, 0
|
|
|
|
| 222 |
y1 = roll_y0 + (used_height - r.y) * px_per_unit
|
| 223 |
|
| 224 |
m = margin * px_per_unit
|
| 225 |
+
ix0, iy0 = x0 + m, y0 + m
|
| 226 |
+
ix1, iy1 = x1 - m, y1 - m
|
| 227 |
|
| 228 |
draw.rectangle([x0, y0, x1, y1], fill=outer_color, outline="black", width=2)
|
| 229 |
if ix1 > ix0 and iy1 > iy0:
|