From 7c23373e8ce90ab99ddae6d92a7b16dbc6491ccb Mon Sep 17 00:00:00 2001
From: Dariusz L <dl122@wp.pl>
Date: Thu, 26 Jun 2025 05:09:21 +0200
Subject: [PATCH] Refactor file names and clean up imports

Renamed Mask_tool.js to MaskTool.js and Canvas_view.js to CanvasView.js for consistency. Removed unused imports and redundant properties/methods from Canvas.js and CanvasState.js to streamline the codebase.
---
 js/Canvas.js                         | 40 ++--------------------------
 js/CanvasState.js                    |  4 +--
 js/{Canvas_view.js => CanvasView.js} |  2 --
 js/{Mask_tool.js => MaskTool.js}     |  0
 4 files changed, 4 insertions(+), 42 deletions(-)
 rename js/{Canvas_view.js => CanvasView.js} (99%)
 rename js/{Mask_tool.js => MaskTool.js} (100%)

diff --git a/js/Canvas.js b/js/Canvas.js
index 3d72274..337dca9 100644
--- a/js/Canvas.js
+++ b/js/Canvas.js
@@ -1,13 +1,11 @@
-import {saveImage, getImage, removeImage} from "./db.js";
-import {MaskTool} from "./Mask_tool.js";
+import {removeImage} from "./db.js";
+import {MaskTool} from "./MaskTool.js";
 import {CanvasState} from "./CanvasState.js";
 import {CanvasInteractions} from "./CanvasInteractions.js";
 import {CanvasLayers} from "./CanvasLayers.js";
 import {CanvasRenderer} from "./CanvasRenderer.js";
 import {CanvasIO} from "./CanvasIO.js";
 import {createModuleLogger} from "./utils/LoggerUtils.js";
-import {generateUUID, snapToGrid, getSnapAdjustment, worldToLocal, localToWorld} from "./utils/CommonUtils.js";
-import {withErrorHandling, safeExecute} from "./ErrorHandler.js";
 const log = createModuleLogger('Canvas');
 
 export class Canvas {
@@ -34,12 +32,6 @@ export class Canvas {
         this.offscreenCtx = this.offscreenCanvas.getContext('2d', {
             alpha: false
         });
-        this.renderAnimationFrame = null;
-        this.lastRenderTime = 0;
-        this.internalClipboard = [];
-        this.isMouseOver = false;
-        this.renderInterval = 1000 / 60;
-        this.isDirty = false;
 
         this.dataInitialized = false;
         this.pendingDataCheck = null;
@@ -54,10 +46,6 @@ export class Canvas {
         
         this.setupEventListeners();
         this.initNodeData();
-        this.blendModes = this.canvasLayers.blendModes;
-        this.selectedBlendMode = this.canvasLayers.selectedBlendMode;
-        this.blendOpacity = this.canvasLayers.blendOpacity;
-        this.isAdjustingOpacity = this.canvasLayers.isAdjustingOpacity;
 
         this.layers = this.layers.map(layer => ({
             ...layer,
@@ -317,30 +305,6 @@ export class Canvas {
         return this.canvasLayers.addMattedLayer(image, mask);
     }
 
-    processInputData(nodeData) {
-        if (nodeData.input_image) {
-            this.addInputImage(nodeData.input_image);
-        }
-        if (nodeData.input_mask) {
-            this.addInputMask(nodeData.input_mask);
-        }
-    }
-
-    addInputImage(imageData) {
-        const layer = new ImageLayer(imageData);
-        this.layers.push(layer);
-        this.updateCanvas();
-    }
-
-    addInputMask(maskData) {
-        if (this.inputImage) {
-            const mask = new MaskLayer(maskData);
-            mask.linkToLayer(this.inputImage);
-            this.masks.push(mask);
-            this.updateCanvas();
-        }
-    }
-
     async addInputToCanvas(inputImage, inputMask) {
         return this.canvasIO.addInputToCanvas(inputImage, inputMask);
     }
diff --git a/js/CanvasState.js b/js/CanvasState.js
index 8165c19..f40e55d 100644
--- a/js/CanvasState.js
+++ b/js/CanvasState.js
@@ -1,7 +1,7 @@
-import {getCanvasState, setCanvasState, removeCanvasState, saveImage, getImage, removeImage} from "./db.js";
+import {getCanvasState, setCanvasState, saveImage, getImage} from "./db.js";
 import {createModuleLogger} from "./utils/LoggerUtils.js";
 import {generateUUID, cloneLayers, getStateSignature, debounce} from "./utils/CommonUtils.js";
-import {withErrorHandling, safeExecute} from "./ErrorHandler.js";
+import {withErrorHandling} from "./ErrorHandler.js";
 const log = createModuleLogger('CanvasState');
 
 export class CanvasState {
diff --git a/js/Canvas_view.js b/js/CanvasView.js
similarity index 99%
rename from js/Canvas_view.js
rename to js/CanvasView.js
index e5a7369..71f7d23 100644
--- a/js/Canvas_view.js
+++ b/js/CanvasView.js
@@ -5,9 +5,7 @@ import {$el} from "../../scripts/ui.js";
 import {Canvas} from "./Canvas.js";
 import {clearAllCanvasStates} from "./db.js";
 import {ImageCache} from "./ImageCache.js";
-import {validateImageData, convertImageData, applyMaskToImageData, prepareImageForCanvas, createImageFromSource} from "./utils/ImageUtils.js";
 import {generateUniqueFileName} from "./utils/CommonUtils.js";
-import {logger, LogLevel} from "./logger.js";
 import {createModuleLogger} from "./utils/LoggerUtils.js";
 
 const log = createModuleLogger('Canvas_view');
diff --git a/js/Mask_tool.js b/js/MaskTool.js
similarity index 100%
rename from js/Mask_tool.js
rename to js/MaskTool.js