dytools-capture-engine 1.1.0 → 1.1.1

package/dist/index.cjs

@@ -27,212 +27,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_dytools_canvas_engine = require("dytools-canvas-engine");
-
-// node_modules/dytools-geometry/dist/index.js
-var Point = class _Point {
-  constructor(x, y) {
-    this.x = x;
-    this.y = y;
-  }
-  equals(other) {
-    return this.x === other.x && this.y === other.y;
-  }
-  static equals(a, b) {
-    return a.x === b.x && a.y === b.y;
-  }
-  getDeltaFromPoint(other) {
-    return new Vector(this.x - other.x, this.y - other.y);
-  }
-  getDeltaToPoint(other) {
-    return new Vector(this.x + other.x, this.y + other.y);
-  }
-  add(vector) {
-    return new _Point(this.x + vector.x, this.y + vector.y);
-  }
-  asVector() {
-    return new Vector(this.x, this.y);
-  }
-  subtract(vector) {
-    return new _Point(this.x - vector.x, this.y - vector.y);
-  }
-  isInside(rect) {
-    return rect.contains(this);
-  }
-  clone() {
-    return new _Point(this.x, this.y);
-  }
-  isInPolygon(poly) {
-    return poly.containsPoint(this);
-  }
-  toString() {
-    return `Point(${this.x}, ${this.y})`;
-  }
-};
-var Size = class _Size {
-  constructor(width, height) {
-    this.width = width;
-    this.height = height;
-  }
-  equals(other) {
-    return this.width === other.width && this.height === other.height;
-  }
-  static equals(a, b) {
-    return a.width === b.width && a.height === b.height;
-  }
-  clone() {
-    return new _Size(this.width, this.height);
-  }
-  toString() {
-    return `Size(${this.width}, ${this.height})`;
-  }
-};
-var Rectangle = class _Rectangle {
-  constructor(originOrX, sizeOrY, width, height) {
-    const origin = typeof originOrX === "number" && typeof sizeOrY === "number" ? new Point(originOrX, sizeOrY) : originOrX;
-    const size = typeof sizeOrY === "number" && typeof width === "number" && typeof height === "number" ? new Size(width, height) : sizeOrY;
-    this.origin = origin;
-    this.size = size;
-  }
-  equals(other) {
-    return this.origin.equals(other.origin) && this.size.equals(other.size);
-  }
-  static equals(a, b) {
-    return a.origin.equals(b.origin) && a.size.equals(b.size);
-  }
-  contains(point) {
-    return point.x >= this.origin.x && point.x <= this.origin.x + this.size.width && point.y >= this.origin.y && point.y <= this.origin.y + this.size.height;
-  }
-  clone() {
-    return new _Rectangle(new Point(this.origin.x, this.origin.y), new Size(this.size.width, this.size.height));
-  }
-  center() {
-    return new Point(
-      this.origin.x + this.size.width / 2,
-      this.origin.y + this.size.height / 2
-    );
-  }
-  normalized() {
-    if (this.isNormalized()) {
-      return this;
-    }
-    const normalized = this.clone();
-    normalized.normalize();
-    return normalized;
-  }
-  isNormalized() {
-    return this.size.width >= 0 && this.size.height >= 0;
-  }
-  normalize() {
-    if (this.size.width < 0) {
-      this.origin.x += this.size.width;
-      this.size.width = -this.size.width;
-    }
-    if (this.size.height < 0) {
-      this.origin.y += this.size.height;
-      this.size.height = -this.size.height;
-    }
-  }
-  expand(rect) {
-    const newOrigin = new Point(
-      Math.min(this.origin.x, rect.origin.x),
-      Math.min(this.origin.y, rect.origin.y)
-    );
-    const newWidth = Math.max(this.origin.x + this.size.width, rect.origin.x + rect.size.width) - newOrigin.x;
-    const newHeight = Math.max(this.origin.y + this.size.height, rect.origin.y + rect.size.height) - newOrigin.y;
-    return new _Rectangle(newOrigin, new Size(newWidth, newHeight));
-  }
-  move(vector) {
-    return new _Rectangle(
-      new Point(this.origin.x + vector.x, this.origin.y + vector.y),
-      new Size(this.size.width, this.size.height)
-    );
-  }
-  toPolygon() {
-    return new Polygon([
-      new Point(this.origin.x, this.origin.y),
-      new Point(this.origin.x + this.size.width, this.origin.y),
-      new Point(this.origin.x + this.size.width, this.origin.y + this.size.height),
-      new Point(this.origin.x, this.origin.y + this.size.height)
-    ]);
-  }
-  toString() {
-    return `Rectangle(${this.origin}, ${this.size})`;
-  }
-};
-var Vector = class _Vector {
-  constructor(x, y) {
-    this.x = x;
-    this.y = y;
-  }
-  equals(other) {
-    return this.x === other.x && this.y === other.y;
-  }
-  static equals(a, b) {
-    return a.x === b.x && a.y === b.y;
-  }
-  add(other) {
-    return new _Vector(this.x + other.x, this.y + other.y);
-  }
-  subtract(other) {
-    return new _Vector(this.x - other.x, this.y - other.y);
-  }
-  scale(factor) {
-    return new _Vector(this.x * factor, this.y * factor);
-  }
-  length() {
-    return Math.hypot(this.x, this.y);
-  }
-  normalize() {
-    const len = this.length();
-    return len === 0 ? new _Vector(0, 0) : new _Vector(this.x / len, this.y / len);
-  }
-  clone() {
-    return new _Vector(this.x, this.y);
-  }
-  toString() {
-    return `Vector(${this.x}, ${this.y})`;
-  }
-};
-var Polygon = class {
-  constructor(points) {
-    this.points = points;
-  }
-  equals(other) {
-    if (this.points.length !== other.points.length) return false;
-    for (let i = 0; i < this.points.length; i++) {
-      if (!this.points[i].equals(other.points[i])) return false;
-    }
-    return true;
-  }
-  static equals(a, b) {
-    return a.equals(b);
-  }
-  containsPoint(pt) {
-    let vs = this.points;
-    let inside = false;
-    for (let i = 0, j = vs.length - 1; i < vs.length; j = i++) {
-      const xi = vs[i].x, yi = vs[i].y;
-      const xj = vs[j].x, yj = vs[j].y;
-      const intersect = yi > pt.y !== yj > pt.y && pt.x < (xj - xi) * (pt.y - yi) / (yj - yi) + xi;
-      if (intersect) inside = !inside;
-    }
-    return inside;
-  }
-  containsRect(rect) {
-    return this.containsPoint(rect.origin) && this.containsPoint(
-      new Point(rect.origin.x + rect.size.width, rect.origin.y + rect.size.height)
-    ) && this.containsPoint(
-      new Point(rect.origin.x + rect.size.width, rect.origin.y)
-    ) && this.containsPoint(
-      new Point(rect.origin.x, rect.origin.y + rect.size.height)
-    );
-  }
-  toString() {
-    return `Polygon(${this.points.join(",")})`;
-  }
-};
-
-// src/index.ts
+var import_dytools_geometry = require("dytools-geometry");
 var CapturePublicEventType = {
   // These are events based on the state of the zone that is handled by the zone itself.
   ZonePositionChanged: "zone:position_changed",
@@ -804,7 +599,7 @@ var AnchorChildZone = class extends SimpleZone {
   toExternalChild(docWidth, docHeight, parentAnchor) {
     let external = this.toExternal(docWidth, docHeight);
     external.Type = "TemplateAnchorZoneChild";
-    const parentAnchorPercent = new Point(parentAnchor.x / docWidth, parentAnchor.y / docHeight);
+    const parentAnchorPercent = new import_dytools_geometry.Point(parentAnchor.x / docWidth, parentAnchor.y / docHeight);
     external.X = this.rect.origin.x / docWidth - parentAnchorPercent.x;
     external.Y = this.rect.origin.y / docHeight - parentAnchorPercent.y;
     external.XAbsolute = this.rect.origin.x;
@@ -959,7 +754,7 @@ var AnchorZone = class extends CaptureZoneBase {
           } else {
             for (const child of this.children) {
               if (child.hidden == false) {
-                let vector = this.currentAnchorPoint ? match.anchorPointAbsolute.getDeltaFromPoint(this.currentAnchorPoint) : new Vector(0, 0);
+                let vector = this.currentAnchorPoint ? match.anchorPointAbsolute.getDeltaFromPoint(this.currentAnchorPoint) : new import_dytools_geometry.Vector(0, 0);
                 let color = "rgba(" + cycle + ", 128, 255, 0.5)";
                 const polygon = child.rect.move(vector).toPolygon().points;
                 this.ocrOverlayIds.push(this.canvasManager?.addPolygon(polygon, color, false));
@@ -1041,7 +836,7 @@ var AnchorZone = class extends CaptureZoneBase {
         if (!isFirstMatch) {
           for (const child of this.children) {
             if (child.hidden == false) {
-              let vector = this.currentAnchorPoint ? match.anchorPointAbsolute.getDeltaFromPoint(this.currentAnchorPoint) : new Vector(0, 0);
+              let vector = this.currentAnchorPoint ? match.anchorPointAbsolute.getDeltaFromPoint(this.currentAnchorPoint) : new import_dytools_geometry.Vector(0, 0);
               let color = "rgba(128, 128, 255, 0.5)";
               const polygon = child.rect.move(vector).toPolygon().points;
               this.ocrOverlayIds.push(canvas.addPolygon(polygon, color, false));
@@ -1561,7 +1356,7 @@ var CaptureEngine = class {
   }
   // --- in CaptureEngine.ts (or a new file) ---
   rectFromExternal(z, docW, docH) {
-    return new Rectangle(
+    return new import_dytools_geometry.Rectangle(
       z.X * docW,
       z.Y * docH,
       z.Width * docW,
@@ -1595,7 +1390,7 @@ var CaptureEngine = class {
     if (parentAnchorAbs) {
       const absX = parentAnchorAbs.x / docW + z.X;
       const absY = parentAnchorAbs.y / docH + z.Y;
-      const childRect = new Rectangle(
+      const childRect = new import_dytools_geometry.Rectangle(
         absX * docW,
         absY * docH,
         z.Width * docW,
@@ -1742,10 +1537,10 @@ var CaptureEngine = class {
     }
     if (patch.rect) {
       const b = patch.rect;
-      if (b instanceof Rectangle) {
+      if (b instanceof import_dytools_geometry.Rectangle) {
         zone.rect = b.clone();
       } else if (b.origin && b.size) {
-        zone.rect = new Rectangle(
+        zone.rect = new import_dytools_geometry.Rectangle(
           b.origin.x,
           b.origin.y,
           b.size.width,
@@ -1908,7 +1703,7 @@ var CaptureEngine = class {
         (p) => (
           //(typeof (p as any).clone === 'function')
           //? (p as any).clone() :
-          new Point(p.x * this.width, p.y * this.height)
+          new import_dytools_geometry.Point(p.x * this.width, p.y * this.height)
         )
       );
       const overlayId = `ocr-${word.ocrTextResultId}`;
@@ -1959,11 +1754,11 @@ var CaptureEngine = class {
       processedText: m.processedText,
       polygonPercent: m.polygonPercent,
       anchorPointPercent: m.anchorPoint,
-      polygonAbsolute: new Polygon(m.polygonPercent.points.map(
-        (p) => new Point(p.x * this.engine.width, p.y * this.engine.height)
+      polygonAbsolute: new import_dytools_geometry.Polygon(m.polygonPercent.points.map(
+        (p) => new import_dytools_geometry.Point(p.x * this.engine.width, p.y * this.engine.height)
         // TODO: This will need to be updated when the background changes.
       )),
-      anchorPointAbsolute: m.anchorPoint ? new Point(m.anchorPoint.x * this.engine.width, m.anchorPoint.y * this.engine.height) : null
+      anchorPointAbsolute: m.anchorPoint ? new import_dytools_geometry.Point(m.anchorPoint.x * this.engine.width, m.anchorPoint.y * this.engine.height) : null
     }));
     this.zoneOcrMatches = absoluteMatches;
     this.allZonesFlattened.forEach((e) => {

package/dist/index.js

@@ -6,212 +6,12 @@ import {
   EngineEventType,
   CircleObject
 } from "dytools-canvas-engine";
-
-// node_modules/dytools-geometry/dist/index.js
-var Point = class _Point {
-  constructor(x, y) {
-    this.x = x;
-    this.y = y;
-  }
-  equals(other) {
-    return this.x === other.x && this.y === other.y;
-  }
-  static equals(a, b) {
-    return a.x === b.x && a.y === b.y;
-  }
-  getDeltaFromPoint(other) {
-    return new Vector(this.x - other.x, this.y - other.y);
-  }
-  getDeltaToPoint(other) {
-    return new Vector(this.x + other.x, this.y + other.y);
-  }
-  add(vector) {
-    return new _Point(this.x + vector.x, this.y + vector.y);
-  }
-  asVector() {
-    return new Vector(this.x, this.y);
-  }
-  subtract(vector) {
-    return new _Point(this.x - vector.x, this.y - vector.y);
-  }
-  isInside(rect) {
-    return rect.contains(this);
-  }
-  clone() {
-    return new _Point(this.x, this.y);
-  }
-  isInPolygon(poly) {
-    return poly.containsPoint(this);
-  }
-  toString() {
-    return `Point(${this.x}, ${this.y})`;
-  }
-};
-var Size = class _Size {
-  constructor(width, height) {
-    this.width = width;
-    this.height = height;
-  }
-  equals(other) {
-    return this.width === other.width && this.height === other.height;
-  }
-  static equals(a, b) {
-    return a.width === b.width && a.height === b.height;
-  }
-  clone() {
-    return new _Size(this.width, this.height);
-  }
-  toString() {
-    return `Size(${this.width}, ${this.height})`;
-  }
-};
-var Rectangle = class _Rectangle {
-  constructor(originOrX, sizeOrY, width, height) {
-    const origin = typeof originOrX === "number" && typeof sizeOrY === "number" ? new Point(originOrX, sizeOrY) : originOrX;
-    const size = typeof sizeOrY === "number" && typeof width === "number" && typeof height === "number" ? new Size(width, height) : sizeOrY;
-    this.origin = origin;
-    this.size = size;
-  }
-  equals(other) {
-    return this.origin.equals(other.origin) && this.size.equals(other.size);
-  }
-  static equals(a, b) {
-    return a.origin.equals(b.origin) && a.size.equals(b.size);
-  }
-  contains(point) {
-    return point.x >= this.origin.x && point.x <= this.origin.x + this.size.width && point.y >= this.origin.y && point.y <= this.origin.y + this.size.height;
-  }
-  clone() {
-    return new _Rectangle(new Point(this.origin.x, this.origin.y), new Size(this.size.width, this.size.height));
-  }
-  center() {
-    return new Point(
-      this.origin.x + this.size.width / 2,
-      this.origin.y + this.size.height / 2
-    );
-  }
-  normalized() {
-    if (this.isNormalized()) {
-      return this;
-    }
-    const normalized = this.clone();
-    normalized.normalize();
-    return normalized;
-  }
-  isNormalized() {
-    return this.size.width >= 0 && this.size.height >= 0;
-  }
-  normalize() {
-    if (this.size.width < 0) {
-      this.origin.x += this.size.width;
-      this.size.width = -this.size.width;
-    }
-    if (this.size.height < 0) {
-      this.origin.y += this.size.height;
-      this.size.height = -this.size.height;
-    }
-  }
-  expand(rect) {
-    const newOrigin = new Point(
-      Math.min(this.origin.x, rect.origin.x),
-      Math.min(this.origin.y, rect.origin.y)
-    );
-    const newWidth = Math.max(this.origin.x + this.size.width, rect.origin.x + rect.size.width) - newOrigin.x;
-    const newHeight = Math.max(this.origin.y + this.size.height, rect.origin.y + rect.size.height) - newOrigin.y;
-    return new _Rectangle(newOrigin, new Size(newWidth, newHeight));
-  }
-  move(vector) {
-    return new _Rectangle(
-      new Point(this.origin.x + vector.x, this.origin.y + vector.y),
-      new Size(this.size.width, this.size.height)
-    );
-  }
-  toPolygon() {
-    return new Polygon([
-      new Point(this.origin.x, this.origin.y),
-      new Point(this.origin.x + this.size.width, this.origin.y),
-      new Point(this.origin.x + this.size.width, this.origin.y + this.size.height),
-      new Point(this.origin.x, this.origin.y + this.size.height)
-    ]);
-  }
-  toString() {
-    return `Rectangle(${this.origin}, ${this.size})`;
-  }
-};
-var Vector = class _Vector {
-  constructor(x, y) {
-    this.x = x;
-    this.y = y;
-  }
-  equals(other) {
-    return this.x === other.x && this.y === other.y;
-  }
-  static equals(a, b) {
-    return a.x === b.x && a.y === b.y;
-  }
-  add(other) {
-    return new _Vector(this.x + other.x, this.y + other.y);
-  }
-  subtract(other) {
-    return new _Vector(this.x - other.x, this.y - other.y);
-  }
-  scale(factor) {
-    return new _Vector(this.x * factor, this.y * factor);
-  }
-  length() {
-    return Math.hypot(this.x, this.y);
-  }
-  normalize() {
-    const len = this.length();
-    return len === 0 ? new _Vector(0, 0) : new _Vector(this.x / len, this.y / len);
-  }
-  clone() {
-    return new _Vector(this.x, this.y);
-  }
-  toString() {
-    return `Vector(${this.x}, ${this.y})`;
-  }
-};
-var Polygon = class {
-  constructor(points) {
-    this.points = points;
-  }
-  equals(other) {
-    if (this.points.length !== other.points.length) return false;
-    for (let i = 0; i < this.points.length; i++) {
-      if (!this.points[i].equals(other.points[i])) return false;
-    }
-    return true;
-  }
-  static equals(a, b) {
-    return a.equals(b);
-  }
-  containsPoint(pt) {
-    let vs = this.points;
-    let inside = false;
-    for (let i = 0, j = vs.length - 1; i < vs.length; j = i++) {
-      const xi = vs[i].x, yi = vs[i].y;
-      const xj = vs[j].x, yj = vs[j].y;
-      const intersect = yi > pt.y !== yj > pt.y && pt.x < (xj - xi) * (pt.y - yi) / (yj - yi) + xi;
-      if (intersect) inside = !inside;
-    }
-    return inside;
-  }
-  containsRect(rect) {
-    return this.containsPoint(rect.origin) && this.containsPoint(
-      new Point(rect.origin.x + rect.size.width, rect.origin.y + rect.size.height)
-    ) && this.containsPoint(
-      new Point(rect.origin.x + rect.size.width, rect.origin.y)
-    ) && this.containsPoint(
-      new Point(rect.origin.x, rect.origin.y + rect.size.height)
-    );
-  }
-  toString() {
-    return `Polygon(${this.points.join(",")})`;
-  }
-};
-
-// src/index.ts
+import {
+  Rectangle,
+  Polygon,
+  Point,
+  Vector
+} from "dytools-geometry";
 var CapturePublicEventType = {
   // These are events based on the state of the zone that is handled by the zone itself.
   ZonePositionChanged: "zone:position_changed",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dytools-capture-engine",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "An editor allowing the creation of templates for ocr capture.",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -25,6 +25,7 @@
   },
   "dependencies": {
     "dytools-canvas-engine": "^1.1.1",
+    "dytools-geometry": "^1.0.0",
     "dytools-result": "^1.0.1"
   }
 }