- Create segment with optional second point omitted (issue #84)

- Release patch v1.2.23
alexbol99 · May 16, 2021 · d286ed5 · d286ed5
1 parent bf7a901
commit d286ed5
Show file tree

Hide file tree

Showing 58 changed files with 4,126 additions and 3,923 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/dist/main.cjs.js b/dist/main.cjs.js
@@ -4503,6 +4503,12 @@ class Segment {
             return;
         }
 
+        // second point omitted issue #84
+        if (args.length === 1 && args[0] instanceof Flatten.Point) {
+            this.ps = args[0].clone();
+            return;
+        }
+
         if (args.length === 2 && args[0] instanceof Flatten.Point && args[1] instanceof Flatten.Point) {
             this.ps = args[0].clone();
             this.pe = args[1].clone();
@@ -5796,10 +5802,22 @@ class Arc {
         return this.transform(m);
     }
 
+    /**
+     * Return new arc scaled by scaleX, scaleY.
+     * @param {number} scaleX - scale value by X
+     * @param {number} scaleY - scale value by Y
+     * @returns {Arc}
+     */
+    scale(scaleX = 1, scaleY = 1) {
+        let m = new Flatten.Matrix();
+        m = m.scale(scaleX, scaleY);
+        return this.transform(m);
+    }
+
     /**
      * Return new arc transformed using affine transformation matrix <br/>
-     * Note 1. Non-equal scaling by x and y (matrix[0] != matrix[3]) produce illegal result because
-     * it should create elliptic arc but library does not support ellipses
+     * Note 1. Non-equal scaling by x and y (abs(matrix[0]) != abs(matrix[3])) produce illegal result because
+     * it should create elliptic arc but this package does not support ellipses
      * Note 2. Mirror transformation (matrix[0] * matrix[3] < 0) change direction of the arc to the opposite
      * TODO: support non-equal scaling arc to ellipse or throw exception ?
      * @param {Matrix} matrix - affine transformation matrix

diff --git a/dist/main.esm.js b/dist/main.esm.js
@@ -4499,6 +4499,12 @@ class Segment {
             return;
         }
 
+        // second point omitted issue #84
+        if (args.length === 1 && args[0] instanceof Flatten.Point) {
+            this.ps = args[0].clone();
+            return;
+        }
+
         if (args.length === 2 && args[0] instanceof Flatten.Point && args[1] instanceof Flatten.Point) {
             this.ps = args[0].clone();
             this.pe = args[1].clone();
@@ -5792,10 +5798,22 @@ class Arc {
         return this.transform(m);
     }
 
+    /**
+     * Return new arc scaled by scaleX, scaleY.
+     * @param {number} scaleX - scale value by X
+     * @param {number} scaleY - scale value by Y
+     * @returns {Arc}
+     */
+    scale(scaleX = 1, scaleY = 1) {
+        let m = new Flatten.Matrix();
+        m = m.scale(scaleX, scaleY);
+        return this.transform(m);
+    }
+
     /**
      * Return new arc transformed using affine transformation matrix <br/>
-     * Note 1. Non-equal scaling by x and y (matrix[0] != matrix[3]) produce illegal result because
-     * it should create elliptic arc but library does not support ellipses
+     * Note 1. Non-equal scaling by x and y (abs(matrix[0]) != abs(matrix[3])) produce illegal result because
+     * it should create elliptic arc but this package does not support ellipses
      * Note 2. Mirror transformation (matrix[0] * matrix[3] < 0) change direction of the arc to the opposite
      * TODO: support non-equal scaling arc to ellipse or throw exception ?
      * @param {Matrix} matrix - affine transformation matrix

diff --git a/dist/main.umd.js b/dist/main.umd.js
@@ -4505,6 +4505,12 @@
                 return;
             }
 
+            // second point omitted issue #84
+            if (args.length === 1 && args[0] instanceof Flatten.Point) {
+                this.ps = args[0].clone();
+                return;
+            }
+
             if (args.length === 2 && args[0] instanceof Flatten.Point && args[1] instanceof Flatten.Point) {
                 this.ps = args[0].clone();
                 this.pe = args[1].clone();
@@ -5798,10 +5804,22 @@
             return this.transform(m);
         }
 
+        /**
+         * Return new arc scaled by scaleX, scaleY.
+         * @param {number} scaleX - scale value by X
+         * @param {number} scaleY - scale value by Y
+         * @returns {Arc}
+         */
+        scale(scaleX = 1, scaleY = 1) {
+            let m = new Flatten.Matrix();
+            m = m.scale(scaleX, scaleY);
+            return this.transform(m);
+        }
+
         /**
          * Return new arc transformed using affine transformation matrix <br/>
-         * Note 1. Non-equal scaling by x and y (matrix[0] != matrix[3]) produce illegal result because
-         * it should create elliptic arc but library does not support ellipses
+         * Note 1. Non-equal scaling by x and y (abs(matrix[0]) != abs(matrix[3])) produce illegal result because
+         * it should create elliptic arc but this package does not support ellipses
          * Note 2. Mirror transformation (matrix[0] * matrix[3] < 0) change direction of the arc to the opposite
          * TODO: support non-equal scaling arc to ellipse or throw exception ?
          * @param {Matrix} matrix - affine transformation matrix

diff --git a/docs/Arc.html b/docs/Arc.html
diff --git a/docs/Box.html b/docs/Box.html
diff --git a/docs/Circle.html b/docs/Circle.html
diff --git a/docs/CircularLinkedList.html b/docs/CircularLinkedList.html
diff --git a/docs/DE9IM.html b/docs/DE9IM.html
diff --git a/docs/Edge.html b/docs/Edge.html
diff --git a/docs/Errors.html b/docs/Errors.html
diff --git a/docs/Face.html b/docs/Face.html
diff --git a/docs/Line.html b/docs/Line.html
diff --git a/docs/LinkedList.html b/docs/LinkedList.html
diff --git a/docs/Matrix.html b/docs/Matrix.html
diff --git a/docs/Multiline.html b/docs/Multiline.html
diff --git a/docs/PlanarSet.html b/docs/PlanarSet.html
diff --git a/docs/Point.html b/docs/Point.html
diff --git a/docs/Polygon.html b/docs/Polygon.html
diff --git a/docs/Ray.html b/docs/Ray.html
diff --git a/docs/Segment.html b/docs/Segment.html
diff --git a/docs/Vector.html b/docs/Vector.html
diff --git a/docs/algorithms_boolean_op.js.html b/docs/algorithms_boolean_op.js.html
diff --git a/docs/algorithms_distance.js.html b/docs/algorithms_distance.js.html
diff --git a/docs/algorithms_inversion.js.html b/docs/algorithms_inversion.js.html
diff --git a/docs/algorithms_ray_shooting.js.html b/docs/algorithms_ray_shooting.js.html
diff --git a/docs/algorithms_relation.js.html b/docs/algorithms_relation.js.html
diff --git a/docs/classes_arc.js.html b/docs/classes_arc.js.html
diff --git a/docs/classes_box.js.html b/docs/classes_box.js.html
diff --git a/docs/classes_circle.js.html b/docs/classes_circle.js.html
diff --git a/docs/classes_edge.js.html b/docs/classes_edge.js.html
diff --git a/docs/classes_face.js.html b/docs/classes_face.js.html
diff --git a/docs/classes_line.js.html b/docs/classes_line.js.html
diff --git a/docs/classes_matrix.js.html b/docs/classes_matrix.js.html
diff --git a/docs/classes_multiline.js.html b/docs/classes_multiline.js.html
diff --git a/docs/classes_point.js.html b/docs/classes_point.js.html
diff --git a/docs/classes_polygon.js.html b/docs/classes_polygon.js.html
diff --git a/docs/classes_ray.js.html b/docs/classes_ray.js.html
diff --git a/docs/classes_segment.js.html b/docs/classes_segment.js.html
diff --git a/docs/classes_vector.js.html b/docs/classes_vector.js.html
diff --git a/docs/data_structures_circular_linked_list.js.html b/docs/data_structures_circular_linked_list.js.html
diff --git a/docs/data_structures_de9im.js.html b/docs/data_structures_de9im.js.html
diff --git a/docs/data_structures_linked_list.js.html b/docs/data_structures_linked_list.js.html
diff --git a/docs/data_structures_planar_set.js.html b/docs/data_structures_planar_set.js.html
diff --git a/docs/global.html b/docs/global.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/module-BooleanOperations.html b/docs/module-BooleanOperations.html
diff --git a/docs/module-RayShoot.html b/docs/module-RayShoot.html
diff --git a/docs/module-Relation.html b/docs/module-Relation.html
diff --git a/docs/utils_constants.js.html b/docs/utils_constants.js.html
diff --git a/docs/utils_errors.js.html b/docs/utils_errors.js.html
diff --git a/docs/utils_utils.js.html b/docs/utils_utils.js.html
diff --git a/index.d.ts b/index.d.ts
@@ -147,6 +147,7 @@ declare namespace Flatten {
         translate(vec: Vector): Arc;
         translate(x:number, y:number): Arc;
         rotate(angle: number, center: Point): Arc;
+        scale(scaleX: number, scaleY: number) : Arc;
         transform(matrix?: Matrix): Arc;
         sortPoints(pts: Array<Point>): Array<Point>;
         toJSON() : Object;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@flatten-js/core",
-  "version": "1.2.22",
+  "version": "1.2.23",
   "description": "Javascript library for 2d geometry",
   "main": "dist/main.cjs.js",
   "umd:main": "dist/main.umd.js",

diff --git a/src/classes/arc.js b/src/classes/arc.js
@@ -403,10 +403,22 @@ export class Arc {
         return this.transform(m);
     }
 
+    /**
+     * Return new arc scaled by scaleX, scaleY.
+     * @param {number} scaleX - scale value by X
+     * @param {number} scaleY - scale value by Y
+     * @returns {Arc}
+     */
+    scale(scaleX = 1, scaleY = 1) {
+        let m = new Flatten.Matrix();
+        m = m.scale(scaleX, scaleY);
+        return this.transform(m);
+    }
+
     /**
      * Return new arc transformed using affine transformation matrix <br/>
-     * Note 1. Non-equal scaling by x and y (matrix[0] != matrix[3]) produce illegal result because
-     * it should create elliptic arc but library does not support ellipses
+     * Note 1. Non-equal scaling by x and y (abs(matrix[0]) != abs(matrix[3])) produce illegal result because
+     * it should create elliptic arc but this package does not support ellipses
      * Note 2. Mirror transformation (matrix[0] * matrix[3] < 0) change direction of the arc to the opposite
      * TODO: support non-equal scaling arc to ellipse or throw exception ?
      * @param {Matrix} matrix - affine transformation matrix

diff --git a/src/classes/segment.js b/src/classes/segment.js
@@ -47,6 +47,12 @@ export class Segment {
             return;
         }
 
+        // second point omitted issue #84
+        if (args.length === 1 && args[0] instanceof Flatten.Point) {
+            this.ps = args[0].clone();
+            return;
+        }
+
         if (args.length === 2 && args[0] instanceof Flatten.Point && args[1] instanceof Flatten.Point) {
             this.ps = args[0].clone();
             this.pe = args[1].clone();

diff --git a/test/classes/arc.js b/test/classes/arc.js
@@ -4,7 +4,7 @@ import { expect } from 'chai';
 import Flatten from '../../index';
 
 import {Point, Vector, Circle, Line, Segment, Arc, Box, Polygon, Edge, Face, Ray} from '../../index';
-import {point, vector, circle, line, segment, arc, ray} from '../../index';
+import {point, vector, circle, line, segment, arc, matrix, ray} from '../../index';
 
 describe('#Flatten.Arc', function() {
     it('May create new instance of Arc', function () {
@@ -319,6 +319,18 @@ describe('#Flatten.Arc', function() {
         expect(reversed_arc.counterClockwise).to.equal(Flatten.CW);
         expect(Flatten.Utils.EQ(arc.sweep,reversed_arc.sweep)).to.be.true;
     })
+    it('Can mirror arc by Y axis using transformation matrix', () => {
+        let a1 = arc(point(0, 10), 20, -Math.PI / 4, Math.PI / 4, true);
+        let m = matrix().scale(-1, 1);
+        let a2 = a1.transform(m);
+        expect(a2.start.x).to.be.closeTo(-a1.start.x, Flatten.DP_TOL);
+        expect(a2.start.y).to.be.closeTo(a1.start.y, Flatten.DP_TOL);
+        expect(a2.end.x).to.be.closeTo(-a1.end.x, Flatten.DP_TOL);
+        expect(a2.end.y).to.be.closeTo(a1.end.y, Flatten.DP_TOL);
+        expect(a2.center.x).to.be.closeTo(-a1.center.x, Flatten.DP_TOL);
+        expect(a2.center.y).to.be.closeTo(a1.center.y, Flatten.DP_TOL);
+        expect(a2.counterClockwise).to.be.equal(!a1.counterClockwise);
+    });
     it('Method svg() without parameters creates svg string with default attributes', function() {
         let arc = new Arc(point(), 5, Math.PI/4, 3*Math.PI/4, Flatten.CCW);
         let svg = arc.svg();

diff --git a/test/classes/segment.js b/test/classes/segment.js
@@ -21,6 +21,12 @@ describe('#Flatten.Segment', function() {
         expect(segment.start).to.deep.equal({x:1, y:1});
         expect(segment.end).to.deep.equal({x:2, y:3});
     });
+    it('May construct segment when second point is omitted', function () {
+        let ps = new Point(10,10);
+        let segment = new Segment(ps);
+        expect(segment.start).to.deep.equal({x:10, y:10});
+        expect(segment.end).to.deep.equal({x:0, y:0});
+    });
     it('May constructor by array [4] ', function () {
         let ps = new Point(1,1);
         let pe = new Point(2,3);