From 2a204b951ab4cae767e219d11dc68d324ea33b7f Mon Sep 17 00:00:00 2001 From: Raykosan <71210053+Raykosan@users.noreply.github.com> Date: Thu, 16 Apr 2026 07:16:08 +0300 Subject: [PATCH] Delete log strings --- Rayko_Outpaint.py | 15 ++------------- web/rs_outpaint.js | 4 ---- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/Rayko_Outpaint.py b/Rayko_Outpaint.py index 81426fb..62e98a4 100644 --- a/Rayko_Outpaint.py +++ b/Rayko_Outpaint.py @@ -48,7 +48,6 @@ class RSOutpaint: }, } - # ✅ ДОБАВЛЕН mask_image RETURN_TYPES = ("IMAGE", "MASK", "IMAGE", "INT", "INT") RETURN_NAMES = ("control_image", "control_mask", "mask_image", "width", "height") FUNCTION = "outpaint_prep" @@ -147,9 +146,8 @@ class RSOutpaint: output_width = output_height = 0 use_crop_state = False - # ✅ ДЕФОЛТНЫЕ ЦВЕТА - color_r, color_g, color_b = 255, 0, 0 # Красный для маски - bg_r, bg_g, bg_b = 20, 20, 20 # Темный для фона + color_r, color_g, color_b = 255, 0, 0 + bg_r, bg_g, bg_b = 20, 20, 20 if crop_state: try: @@ -161,10 +159,8 @@ class RSOutpaint: use_crop_state = True if len(parts) >= 6: output_width, output_height = parts[4], parts[5] - # ✅ ПАРСИНГ ЦВЕТОВ (RGB) if len(parts) >= 9: color_r, color_g, color_b = parts[6], parts[7], parts[8] - # Если есть и цвета фона (для полноты, хотя используем 3 для маски) if len(parts) >= 12: bg_r, bg_g, bg_b = parts[9], parts[10], parts[11] except ValueError: @@ -222,18 +218,11 @@ class RSOutpaint: control_image = torch.from_numpy(out).unsqueeze(0) control_mask = torch.from_numpy(mask).unsqueeze(0) - # ✅ ГЕНЕРАЦИЯ MASK_IMAGE (RGB) - # control_mask shape: (1, H, W) - # Нам нужно (1, H, W, 3) - - # Нормализуем цвета 0-255 -> 0.0-1.0 norm_color = torch.tensor([color_r/255.0, color_g/255.0, color_b/255.0]).view(1, 1, 1, 3) norm_bg = torch.tensor([bg_r/255.0, bg_g/255.0, bg_b/255.0]).view(1, 1, 1, 3) - # Расширяем маску до (1, H, W, 1) для вещания mask_exp = control_mask.unsqueeze(3) - # Формула: mask_color * mask_value + bg_color * (1 - mask_value) mask_image = mask_exp * norm_color + (1.0 - mask_exp) * norm_bg mask_image = torch.clamp(mask_image, 0.0, 1.0) diff --git a/web/rs_outpaint.js b/web/rs_outpaint.js index ec931d0..0933aea 100644 --- a/web/rs_outpaint.js +++ b/web/rs_outpaint.js @@ -8,7 +8,6 @@ const CANVAS_H = 320; const MARGIN = 22; const GRID = 16; const OVERHANG = 1; -// ✅ УВЕЛИЧЕНА ВЫСОТА БЛОКА УПРАВЛЕНИЯ (было 200) const CTRL_H = 240; function clamp(v, lo, hi) { return Math.max(lo, Math.min(hi, v)); } @@ -177,14 +176,12 @@ function buildUI() { outSizeRow.append(outLabel, outWInput, outXLabel, outHInput); ctrl.append(cropSizeRow, presetRow, snapRow, outSizeRow); - // ✅ УБРАН MARGIN-TOP ДЛЯ ПЛОТНОСТИ const maskColorInput = mkColorInput("mask:", "#ff0000"); const bgColorInput = mkColorInput("bg:", "#141414"); const colorRow = mkEl("div", "display:flex;align-items:center;gap:8px;flex-wrap:wrap;"); colorRow.append(maskColorInput.row, bgColorInput.row); ctrl.appendChild(colorRow); - // ✅ УБРАН MARGIN-TOP ДЛЯ ПЛОТНОСТИ const acceptBtn = mkEl("button", "padding:4px 12px;font-size:11px;font-weight:600;border:1px solid #28a745;border-radius:4px;background:#1a2a1a;color:#aaffaa;cursor:pointer;width:100%;text-align:center;display:none;"); acceptBtn.textContent = "✔️ ACCEPT"; ctrl.appendChild(acceptBtn); @@ -417,7 +414,6 @@ app.registerExtension({ const domWidget = node.addDOMWidget("rs_outpaint_canvas", "custom", dom.root, { serialize: false, hideOnZoom: false }); domWidget.computeSize = () => [440, CANVAS_H + CTRL_H]; - // ✅ УВЕЛИЧЕНА МИНИМАЛЬНАЯ ВЫСОТА НОДЫ node.setSize([Math.max(node.size[0], 520), Math.max(node.size[1], CANVAS_H + CTRL_H + 72)]); let _prevNodeX = node.pos[0];