@psdk/esc 0.2.52 → 0.2.53

package/build/args/image.d.ts

@@ -5,24 +5,24 @@ import { ImageMode } from "../types/image";
  * Image
  */
 export declare class EImage extends BasicESCArg<EImage> {
-    private width;
-    private height;
     private readonly compress;
     private readonly mode;
     private readonly image;
+    private readonly reverse;
+    private readonly threshold;
     constructor(options: {
         /**
-         * Specify the width, default is 0
+         * enable compress image data, default is true
          */
-        width?: number;
+        compress?: boolean;
         /**
-         * Specify the height, default is 0
+         * enable reverse image data, default is false
          */
-        height?: number;
+        reverse?: boolean;
         /**
-         * enable compress image data, default is true
+         * threshold, default is 190
          */
-        compress?: boolean;
+        threshold?: number;
         /**
          * modeGraphic modes listed below:
          * 0: NORMAL

package/build/args/image.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../src/args/image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,EAAC,aAAa,EAA0B,MAAM,oBAAoB,CAAC;AAE1E,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAEzC;;GAEG;AACH,qBAAa,MAAO,SAAQ,WAAW,CAAC,MAAM,CAAC;IAE7C,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAY;IACjC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoB;gBAE9B,OAAO,EAAE;QACnB;;WAEG;QACH,KAAK,CAAC,EAAE,MAAM,CAAC;QACf;;WAEG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB;;WAEG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB;;;;;;WAMG;QACH,IAAI,CAAC,EAAE,SAAS,CAAC;QACjB;;WAEG;QACH,KAAK,EAAE,iBAAiB,CAAC;KAC1B;IASD,MAAM,IAAI,aAAa;IAkBvB,MAAM,IAAI,UAAU;CAIrB"}
+{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../src/args/image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,EAAC,aAAa,EAAgB,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAGzC;;GAEG;AACH,qBAAa,MAAO,SAAQ,WAAW,CAAC,MAAM,CAAC;IAE7C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAY;IACjC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoB;IAC1C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;gBACvB,OAAO,EAAE;QAEnB;;WAEG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB;;WAEG;QACH,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB;;WAEG;QACH,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB;;;;;;WAMG;QACH,IAAI,CAAC,EAAE,SAAS,CAAC;QACjB;;WAEG;QACH,KAAK,EAAE,iBAAiB,CAAC;KAC1B;IASD,MAAM,IAAI,aAAa;IA0CvB,MAAM,IAAI,UAAU;CAIrB"}

package/build/args/image.js

@@ -1,33 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EImage = void 0;
 const basic_1 = require("./basic");
 const frame_father_1 = require("@psdk/frame-father");
-const pako = __importStar(require("pako"));
 const image_1 = require("../types/image");
+const pbita_1 = require("@psdk/frame-imageb/src/process/pbit/pbita");
 /**
  * Image
  */
@@ -35,25 +12,48 @@ class EImage extends basic_1.BasicESCArg {
     constructor(options) {
         var _a, _b, _c, _d;
         super();
-        this.width = (_a = options.width) !== null && _a !== void 0 ? _a : 0;
-        this.height = (_b = options.height) !== null && _b !== void 0 ? _b : 0;
-        this.compress = (_c = options.compress) !== null && _c !== void 0 ? _c : true;
+        this.compress = (_a = options.compress) !== null && _a !== void 0 ? _a : false;
+        this.reverse = (_b = options.reverse) !== null && _b !== void 0 ? _b : false;
+        this.threshold = (_c = options.threshold) !== null && _c !== void 0 ? _c : 190;
         this.mode = (_d = options.mode) !== null && _d !== void 0 ? _d : image_1.ImageMode.NORMAL;
         this.image = options.image;
     }
     clause() {
-        const width = this.image.width;
-        const height = this.image.height;
+        const processer = new pbita_1.Pbita({
+            threshold: this.threshold,
+            compress: this.compress,
+            reverse: this.reverse,
+        });
+        const info = processer.process(this.image);
+        const fimage = info.result.data;
+        const fbytes = info.result.bytes;
+        if (fimage == null) {
+            throw new Error('Wrong image data');
+        }
+        let width = fimage.width;
+        let height = fimage.height;
         const eWidth = Math.floor((width % 8 === 0) ? (width / 8) : (width / 8 + 1));
-        const bytes = frame_father_1.ImageKit.processImage(this.image, width, height);
-        const ccmd = frame_father_1.BinaryCommand.with(this.header())
+        if (this.compress) {
+            return frame_father_1.BinaryCommand.with(this.header())
+                .appendNumber(eWidth / 256)
+                .appendNumber(eWidth % 256)
+                .appendNumber(height / 256)
+                .appendNumber(height % 256)
+                .appendNumber((fbytes.length - 2) >> 24 & 0xff)
+                .appendNumber((fbytes.length - 2) >> 16 & 0xff)
+                .appendNumber((fbytes.length - 2) >> 8 & 0xff)
+                .appendNumber((fbytes.length - 2) & 0xff)
+                .appendU8A(fbytes.subarray(2, fbytes.length))
+                .clause();
+        }
+        return frame_father_1.BinaryCommand.with(this.header())
             .appendNumber(this.mode)
             .appendNumber(eWidth % 256)
             .appendNumber(eWidth / 256)
             .appendNumber(height % 256)
             .appendNumber(height / 256)
-            .appendU8A(this.compress ? pako.deflate(bytes) : bytes);
-        return ccmd.clause();
+            .appendU8A(fbytes)
+            .clause();
     }
     header() {
         return new Uint8Array([0x1D, 0x76, 0x30]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@psdk/esc",
-  "version": "0.2.52",
+  "version": "0.2.53",
   "description": "psdk",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -45,11 +45,12 @@
     "webpack-cli": "^4.9.2"
   },
   "dependencies": {
-    "@psdk/frame-father": "0.2.52"
+    "@psdk/frame-father": "0.2.53",
+    "@psdk/frame-imageb": "0.2.53"
   },
   "files": [
     "build",
     "!build/browser/psdk*"
   ],
-  "gitHead": "5208d7ff2b0c566b71705c67b06d2b9c8bb965db"
+  "gitHead": "ca54986c203c50fbca520339a0bef18805f11a4a"
 }