canvas-editor-engine 1.1.12 → 1.1.14

package/dist/filters/collection/vague.d.ts

@@ -1,10 +1,10 @@
-import type { IFilterOptions, IImageOptions, TFilterMethod } from "../../types/image";
+import type { IFilterOptions, IImageLoggingDataVague, IImageOptions, TFilterMethod } from "../../types/image";
 import { Filter } from "../../utils/filter";
 export default class VagueFilter extends Filter {
     options: IImageOptions;
     filterList: TFilterMethod[];
     constructor(ctx: CanvasRenderingContext2D, options: IImageOptions);
-    on(action: TFilterMethod, filterOptions: IFilterOptions): Promise<unknown>;
+    on(action: TFilterMethod, filterOptions: IFilterOptions): Promise<IImageLoggingDataVague>;
     pixel(imageData: ImageData, filterOptions: IFilterOptions): ImageData;
     private getQualityBuff;
     private getMostCommonQuanlityBuff;

package/dist/filters/collection/vague.js

@@ -12,10 +12,22 @@ class VagueFilter extends filter_1.Filter {
     }
     on(action, filterOptions) {
         return new Promise((resolve) => {
-            const imageData = this.copy(this.options);
+            const options = this.options;
+            const imageData = this.copy(options);
             const rowImageData = this[action](imageData, filterOptions);
-            this.update(rowImageData, this.options);
-            return resolve('complite');
+            this.update(rowImageData, options);
+            return resolve({
+                imageData: rowImageData,
+                position: {
+                    x: options.x,
+                    y: options.y,
+                },
+                size: {
+                    width: rowImageData.width,
+                    height: rowImageData.height,
+                },
+                quality: filterOptions.quality,
+            });
         });
     }
     pixel(imageData, filterOptions) {

package/dist/services/crop.service.js

@@ -13,18 +13,18 @@ class CropService {
             return;
         const filter = new filter_1.Filter(ctx);
         const options = CropService.options;
-        const imageData = filter.copy(options);
-        const putOptions = {
-            x: (config_1.default.CANVAS_SIZE.width / 2) - (options.width / 2),
-            y: (config_1.default.CANVAS_SIZE.height / 2) - (options.height / 2),
+        const { imageData, size } = filter.copyExtendedModel(options);
+        const position = {
+            x: (config_1.default.CANVAS_SIZE.width / 2) - (size.width / 2),
+            y: (config_1.default.CANVAS_SIZE.height / 2) - (size.height / 2),
         };
-        filter.update(imageData, putOptions);
+        filter.update(imageData, position);
         store_1.default.store.imageState.reduce({
             tempImageData: imageData,
-            position: putOptions,
+            position: position,
             size: {
-                width: options.width,
-                height: options.height,
+                width: size.width,
+                height: size.height,
             }
         }, "Use crop");
     }

package/dist/services/draw.service.d.ts

@@ -11,5 +11,5 @@ export declare class SCImage {
     constructor(src: string, ctx: CanvasRenderingContext2D);
     get(): HTMLImageElement;
     draw(options: IDrawImageArgs): Promise<unknown>;
-    vague(options: IImageOptions, filterOptions: IFilterOptions): Promise<unknown>;
+    vague(options: IImageOptions, filterOptions: IFilterOptions): Promise<import("../types/image").IImageLoggingDataVague>;
 }

package/dist/services/draw.service.js

@@ -27,7 +27,18 @@ class DrawService {
     static drawSmoothImage(useStore, options, filterOptions) {
         const filterArgs = DrawService.getFilterArgs(useStore, options);
         event_service_1.default.dispatch('loading-start');
-        this.scImage.vague(filterArgs, filterOptions).finally(() => {
+        this.scImage.vague(filterArgs, filterOptions)
+            .then(({ imageData, position, size, quality }) => {
+            store_1.default.store.imageState.reduce({
+                tempImageData: imageData,
+                position: position,
+                size: {
+                    width: size.width,
+                    height: size.height,
+                }
+            }, `[Filter Vague] quality: ${quality}`);
+        })
+            .finally(() => {
             event_service_1.default.dispatch('loading-end');
         });
     }

package/dist/types/history.d.ts

@@ -1,6 +1,15 @@
+import { IPosition, ISize } from "./general";
 export interface IHistoryLine {
     stateName: string;
     stateValue: any;
     view: string;
 }
 export type TReducerNames = 'SET_HISTORY' | 'UPDATE_HISTORY' | 'UNDO' | 'REDO';
+export interface IImageLoggingData {
+    imageData: ImageData;
+    size: ISize;
+    position: IPosition;
+}
+export interface IImageLoggingDataVague extends IImageLoggingData {
+    quality: number;
+}

package/dist/types/image.d.ts

@@ -31,3 +31,14 @@ export declare const enum E_RGBA {
     b = 2,
     a = 3
 }
+export interface IExtendedImageDataModel {
+    imageData: ImageData;
+    size: ISize;
+}
+export interface IImageLoggingData {
+    imageData: ImageData;
+    size: ISize;
+    position: IPosition;
+}
+export interface IImageLoggingDataVague extends IImageLoggingData, IFilterOptions {
+}

package/dist/types/image.js

@@ -7,3 +7,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 ;
 ;
 ;
+;

package/dist/utils/filter.d.ts

@@ -1,4 +1,4 @@
-import { type IImageOptions, type IImageSize, type TBuff, type TRGBABuff } from "../types/image";
+import { IExtendedImageDataModel, type IImageOptions, type IImageSize, type TBuff, type TRGBABuff } from "../types/image";
 import type { ISize } from '../types/general';
 export declare class Filter {
     ctx: CanvasRenderingContext2D;
@@ -6,8 +6,9 @@ export declare class Filter {
     constructor(ctx: CanvasRenderingContext2D);
     setImageSize(size: IImageSize): void;
     copy(options: IImageOptions): ImageData;
+    copyExtendedModel(options: IImageOptions): IExtendedImageDataModel;
     update(imgData: ImageData, options: IImageOptions): void;
-    clearEmptyPixels(imageData: ImageData): ImageData;
+    clearEmptyPixels(imageData: ImageData): IExtendedImageDataModel;
     getSizeOfSparseMatrix(RGBAMatrix: TBuff<number[]>, tempSize: ISize): ISize;
     getBuffCollection(imageData: ImageData): {
         rowRGBABuff: TRGBABuff;

package/dist/utils/filter.js

@@ -17,8 +17,14 @@ class Filter {
         const width = (options?.width) ? options.width : config_1.default.CANVAS_SIZE.width;
         const height = (options?.height) ? options.height : config_1.default.CANVAS_SIZE.height;
         const imgData = this.ctx.getImageData(options.x, options.y, width, height);
-        const clearedImageData = this.clearEmptyPixels(imgData);
-        return clearedImageData;
+        return imgData;
+    }
+    copyExtendedModel(options) {
+        const width = (options?.width) ? options.width : config_1.default.CANVAS_SIZE.width;
+        const height = (options?.height) ? options.height : config_1.default.CANVAS_SIZE.height;
+        const imgData = this.ctx.getImageData(options.x, options.y, width, height);
+        const extendedImageData = this.clearEmptyPixels(imgData);
+        return extendedImageData;
     }
     update(imgData, options) {
         this.ctx.clearRect(0, 0, config_1.default.CANVAS_SIZE.width, config_1.default.CANVAS_SIZE.height);
@@ -42,7 +48,10 @@ class Filter {
         const tempImageData = tempCtx.createImageData(tempSize.width, tempSize.height);
         clearedBuff.forEach((_, i) => tempImageData.data[i] = clearedBuff[i]);
         console.log('cleared', cleared);
-        return tempImageData;
+        return {
+            imageData: tempImageData,
+            size: tempSize
+        };
     }
     getSizeOfSparseMatrix(RGBAMatrix, tempSize) {
         // case 1: Xcanvas -> Ximage && case 3: Ycanvas -> Yimage
@@ -83,11 +92,11 @@ class Filter {
         console.log('case 4: Yimage <- Ycanvas; downIndex:', downIndex);
         const reduceWidth = (tempWidth) => tempWidth - (leftIndex + rightIndex);
         const reduceHeight = (tempHeight) => tempHeight - (upIndex + downIndex);
-        const result = {
+        const resultSize = {
             width: reduceWidth(tempSize.width),
             height: reduceHeight(tempSize.height),
         };
-        return result;
+        return resultSize;
     }
     getBuffCollection(imageData) {
         const rowRGBABuff = this.getRowRGBABuff(imageData);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canvas-editor-engine",
-  "version": "1.1.12",
+  "version": "1.1.14",
   "description": "CanvasEditorEngine library, use: [typescript] [canvas]",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",