jsxgraph 1.3.1 → 1.4.2

package/src/base/group.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -93,7 +93,7 @@ define([
          * It has to be kept updated in this class "by hand"-
          *
          * @private
-         * @type {Object}
+         * @type Object
          * @see JXG.Group#_updateCoordsCache
          */
         this.coords = {};

package/src/base/image.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -39,7 +39,6 @@
  base/coords
  base/element
  math/math
- math/statistics
  utils/type
  */
 
@@ -55,8 +54,6 @@ define([
 
     /**
      * Construct and handle images
-     * The coordinates can be relative to the coordinates of an element
-     * given in {@link JXG.Options#text.anchor}.
      *
      * The image can be supplied as an URL or an base64 encoded inline image
      * like "data:image/png;base64, /9j/4AAQSkZJRgA..." or a function returning
@@ -66,8 +63,8 @@ define([
      * type {@link Image} instead.
      * @augments JXG.GeometryElement
      * @augments JXG.CoordsElement
-     * @param {string|JXG.Board} board The board the new text is drawn on.
-     * @param {Array} coordinates An array with the user coordinates of the text.
+     * @param {string|JXG.Board} board The board the new image is drawn on.
+     * @param {Array} coordinates An array with the user coordinates of the image.
      * @param {Object} attributes An object containing visual and - optionally - a name and an id.
      * @param {string|function} url An URL string or a function returning an URL string.
      * @param  {Array} size Array containing width and height of the image in user coordinates.
@@ -85,13 +82,13 @@ define([
 
         /**
          * Array of length two containing [width, height] of the image in pixel.
-         * @type {array}
+         * @type array
          */
         this.size = [Math.abs(this.usrSize[0] * board.unitX), Math.abs(this.usrSize[1] * board.unitY)];
 
         /**
          * 'href' of the image. This might be an URL, but also a data-uri is allowed.
-         * @type {string}
+         * @type string
          */
         this.url = url;
 
@@ -269,7 +266,7 @@ define([
             return this;
         },
 
-        // documented in element.js
+        // Documented in element.js
         getParents: function () {
             var p = [this.url, [this.Z(), this.X(), this.Y()], this.usrSize];
 
@@ -291,7 +288,7 @@ define([
          * @returns {JXG.GeometryElement} A reference to the element
          *
          * @example
-         * var im = board.create('image', ['http://jsxgraph.uni-bayreuth.de/distrib/images/uccellino.jpg',
+         * var im = board.create('image', ['https://jsxgraph.org/distrib/images/uccellino.jpg',
          *                                [-3,-2], [3,3]]);
          * im.setSize(4, 4);
          * board.update();
@@ -301,7 +298,7 @@ define([
          *     (function() {
          *         var board = JXG.JSXGraph.initBoard('JXG8411e60c-f009-11e5-b1bf-901b0e1b8723',
          *             {boundingbox: [-8, 8, 8,-8], axis: true, showcopyright: false, shownavigation: false});
-         *     var im = board.create('image', ['http://jsxgraph.uni-bayreuth.de/distrib/images/uccellino.jpg', [-3,-2],    [3,3]]);
+         *     var im = board.create('image', ['https://jsxgraph.org/distrib/images/uccellino.jpg', [-3,-2],    [3,3]]);
          *     //im.setSize(4, 4);
          *     //board.update();
          *
@@ -311,7 +308,7 @@ define([
          *
          * @example
          * var p0 = board.create('point', [-3, -2]),
-         *     im = board.create('image', ['http://jsxgraph.uni-bayreuth.de/distrib/images/uccellino.jpg',
+         *     im = board.create('image', ['https://jsxgraph.org/distrib/images/uccellino.jpg',
          *                     [function(){ return p0.X(); }, function(){ return p0.Y(); }],
          *                     [3,3]]),
          *     p1 = board.create('point', [1, 2]);
@@ -325,7 +322,7 @@ define([
          *         var board = JXG.JSXGraph.initBoard('JXG4ce706c0-f00a-11e5-b1bf-901b0e1b8723',
          *             {boundingbox: [-8, 8, 8,-8], axis: true, showcopyright: false, shownavigation: false});
          *     var p0 = board.create('point', [-3, -2]),
-         *         im = board.create('image', ['http://jsxgraph.uni-bayreuth.de/distrib/images/uccellino.jpg',
+         *         im = board.create('image', ['https://jsxgraph.org/distrib/images/uccellino.jpg',
          *                         [function(){ return p0.X(); }, function(){ return p0.Y(); }],
          *                         [3,3]]),
          *         p1 = board.create('point', [1, 2]);
@@ -382,12 +379,12 @@ define([
      * <p>
      * The array size defines the image's width and height in user coordinates.
      * @example
-     * var im = board.create('image', ['http://jsxgraph.uni-bayreuth.de/jsxgraph/distrib/images/uccellino.jpg', [-3,-2], [3,3]]);
+     * var im = board.create('image', ['https://jsxgraph.org/jsxgraph/distrib/images/uccellino.jpg', [-3,-2], [3,3]]);
      *
      * </pre><div class="jxgbox" id="JXG9850cda0-7ea0-4750-981c-68bacf9cca57" style="width: 400px; height: 400px;"></div>
      * <script type="text/javascript">
      *   var image_board = JXG.JSXGraph.initBoard('JXG9850cda0-7ea0-4750-981c-68bacf9cca57', {boundingbox: [-4, 4, 4, -4], axis: true, showcopyright: false, shownavigation: false});
-     *   var image_im = image_board.create('image', ['http://jsxgraph.uni-bayreuth.de/distrib/images/uccellino.jpg', [-3,-2],[3,3]]);
+     *   var image_im = image_board.create('image', ['https://jsxgraph.org/distrib/images/uccellino.jpg', [-3,-2],[3,3]]);
      * </script><pre>
      */
     JXG.createImage = function (board, parents, attributes) {

package/src/base/line.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,

package/src/base/point.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -87,6 +87,7 @@ define([
         this.board.renderer.drawPoint(this);
         this.board.finalizeAdding(this);
 
+        this.createGradient();
         this.createLabel();
 
     };
@@ -156,7 +157,7 @@ define([
          * @returns {JXG.CoordsElement} Reference to this object.
          */
         updateTransform: function (fromParent) {
-            var c, i, invMat;
+            var c, i;
 
             if (this.transformations.length === 0 || this.baseElement === null) {
                 return this;
@@ -167,17 +168,6 @@ define([
                 c = this.transformations[0].apply(this.baseElement, 'self');
                 this.coords.setCoordinates(Const.COORDS_BY_USER, c);
             } else {
-                // Case of board.create('point',[baseElement, transform]);
-                if (!fromParent) {
-                    // The element has been dragged or it is the initial update,
-                    // now we transform the baseElement
-                    if (this.draggable() && this.baseElement.draggable()) {
-                        this.transformations[0].update();
-                        invMat = Mat.inverse(this.transformations[0].matrix);
-                        c = Mat.matVecMult(invMat, this.coords.usrCoords);
-                        this.baseElement.coords.setCoordinates(Const.COORDS_BY_USER, c);
-                    }
-                }
                 c = this.transformations[0].apply(this.baseElement);
             }
             this.coords.setCoordinates(Const.COORDS_BY_USER, c);
@@ -338,7 +328,7 @@ define([
          *                 'point on curve = ' + point.isOn(curve) + '<br>' +
          *                 'point on polygon = ' + point.isOn(pol) + '<br>';
          * }]);
-         * 
+         *
          * </pre><div id="JXG6c7d7404-758a-44eb-802c-e9644b9fab71" class="jxgbox" style="width: 300px; height: 300px;"></div>
          * <script type="text/javascript">
          *     (function() {
@@ -350,29 +340,28 @@ define([
          *     var po = board.create('point', [-1, 0], {color: 'blue'});
          *     var curve = board.create('functiongraph', ['sin(x)'], {strokeColor: 'blue'});
          *     var pol = board.create('polygon', [[2,2], [4,2], [4,3]], {strokeColor: 'blue'});
-         *     
+         *
          *     var point = board.create('point', [-1, 1], {
-         *     			  attractors: [line, seg, circ, po, curve, pol],
+         *                   attractors: [line, seg, circ, po, curve, pol],
          *                   attractorDistance: 0.2
          *                 });
-         *     
+         *
          *     var txt = board.create('text', [-4, 3, function() {
-         *     		return 'point on line: ' + point.isOn(line) + '<br>' +
+         *             return 'point on line: ' + point.isOn(line) + '<br>' +
          *                     'point on seg: ' + point.isOn(seg) + '<br>' +
          *                     'point on circ = ' + point.isOn(circ) + '<br>' +
          *                     'point on point = ' + point.isOn(po) + '<br>' +
          *                     'point on curve = ' + point.isOn(curve) + '<br>' +
          *                     'point on polygon = ' + point.isOn(pol) + '<br>';
          *     }]);
-         * 
+         *
          *     })();
-         * 
+         *
          * </script><pre>
-         * 
+         *
          */
         isOn: function(el, tol) {
-            var arr, crds,
-                len, i, j, x, y, c;
+            var arr, crds;
 
             tol = tol || Mat.eps;
 
@@ -381,39 +370,29 @@ define([
             } else if (el.elementClass === Const.OBJECT_CLASS_LINE) {
                 if (el.elType === 'segment' && !Type.evaluate(this.visProp.alwaysintersect)) {
                     arr = JXG.Math.Geometry.projectCoordsToSegment(
-            			        this.coords.usrCoords,
+                                this.coords.usrCoords,
                                 el.point1.coords.usrCoords,
                                 el.point2.coords.usrCoords);
                     if (arr[1] >= 0 && arr[1] <= 1 &&
                         Geometry.distPointLine(this.coords.usrCoords, el.stdform) < tol) {
-       				    return true;
+                           return true;
                     } else {
-            		    return false;
+                        return false;
                     }
                 } else {
                     return Geometry.distPointLine(this.coords.usrCoords, el.stdform) < tol;
                 }
             } else if (el.elementClass === Const.OBJECT_CLASS_CIRCLE) {
+                if (Type.evaluate(el.visProp.hasinnerpoints)) {
+                    return this.Dist(el.center) < el.Radius() + tol;
+                }
                 return Math.abs(this.Dist(el.center) - el.Radius()) < tol;
             } else if (el.elementClass === Const.OBJECT_CLASS_CURVE) {
                 crds = Geometry.projectPointToCurve(this, el, this.board)[0];
                 return Geometry.distance(this.coords.usrCoords, crds.usrCoords, 3) < tol;
             } else if (el.type === Const.OBJECT_TYPE_POLYGON) {
                 if (Type.evaluate(el.visProp.hasinnerpoints)) {
-                    len = el.vertices.length;
-                    x = this.coords.usrCoords[1];
-                    y = this.coords.usrCoords[2];
-                    c = false;
-                    // W. Randolf Franklin's pnpoly method.
-                    // See https://wrf.ecse.rpi.edu/Research/Short_Notes/pnpoly.html
-                    for (i = 0, j = len - 2; i < len - 1; j = i++) {
-                        if (((el.vertices[i].coords.usrCoords[2] > y) !== (el.vertices[j].coords.usrCoords[2] > y)) &&
-                                (x < (el.vertices[j].coords.usrCoords[1] - el.vertices[i].coords.usrCoords[1]) * (y - el.vertices[i].coords.usrCoords[2]) /
-                                (el.vertices[j].coords.usrCoords[2] - el.vertices[i].coords.usrCoords[2]) + el.vertices[i].coords.usrCoords[1])) {
-                            c = !c;
-                        }
-                    }
-                    if (c) {
+                    if (el.pnpoly(this.coords.usrCoords[1], this.coords.usrCoords[2], JXG.COORDS_BY_USER)) {
                         return true;
                     }
                 }
@@ -428,7 +407,7 @@ define([
             return false;
         },
 
-        // already documented in GeometryElement
+        // Already documented in GeometryElement
         cloneToBackground: function () {
             var copy = {};
 

package/src/base/polygon.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -163,6 +163,72 @@ define([
     JXG.Polygon.prototype = new GeometryElement();
 
     JXG.extend(JXG.Polygon.prototype, /** @lends JXG.Polygon.prototype */ {
+
+        /**
+         * Decides if a point (x,y) is inside of the polygon.
+         * Implements W. Randolf Franklin's pnpoly method.
+         *
+         * See <a href="https://wrf.ecse.rpi.edu/Research/Short_Notes/pnpoly.html">https://wrf.ecse.rpi.edu/Research/Short_Notes/pnpoly.html</a>.
+         *
+         * @param {Number} x_in x-coordinate (screen or user coordinates)
+         * @param {Number} y_in y-coordinate (screen or user coordinates)
+         * @param {Number} coord_type (Optional) the type of coordinates used here.
+         *   Possible values are <b>JXG.COORDS_BY_USER</b> and <b>JXG.COORDS_BY_SCREEN</b>.
+         *   Default value is JXG.COORDS_BY_SCREEN
+         *
+         * @returns {Boolean} if (x,y) is inside of the polygon.
+         * @example
+         * var pol = board.create('polygon', [[-1,2], [2,2], [-1,4]]);
+         * var p = board.create('point', [4, 3]);
+         * var txt = board.create('text', [-1, 0.5, function() {
+         *   return 'Point A is inside of the polygon = ' +
+         *     pol.pnpoly(p.X(), p.Y(), JXG.COORDS_BY_USER);
+         * }]);
+         *
+         * </pre><div id="JXG7f96aec7-4e3d-4ffc-a3f5-d3f967b6691c" class="jxgbox" style="width: 300px; height: 300px;"></div>
+         * <script type="text/javascript">
+         *     (function() {
+         *         var board = JXG.JSXGraph.initBoard('JXG7f96aec7-4e3d-4ffc-a3f5-d3f967b6691c',
+         *             {boundingbox: [-2, 5, 5,-2], axis: true, showcopyright: false, shownavigation: false});
+         *     var pol = board.create('polygon', [[-1,2], [2,2], [-1,4]]);
+         *     var p = board.create('point', [4, 3]);
+         *     var txt = board.create('text', [-1, 0.5, function() {
+         *     		return 'Point A is inside of the polygon = ' + pol.pnpoly(p.X(), p.Y(), JXG.COORDS_BY_USER);
+         *     }]);
+         *
+         *     })();
+         *
+         * </script><pre>
+         *
+         */
+        pnpoly: function(x_in, y_in, coord_type) {
+            var i, j, len,
+                x, y, crds,
+                v = this.vertices,
+                isIn = false;
+
+            if (coord_type === Const.COORDS_BY_USER) {
+                crds = new Coords(Const.COORDS_BY_USER, [x_in, y_in], this.board);
+                x = crds.scrCoords[1];
+                y = crds.scrCoords[2];
+            } else {
+                x = x_in;
+                y = y_in;
+            }
+
+            len = this.vertices.length;
+            for (i = 0, j = len - 2; i < len - 1; j = i++) {
+                if (((v[i].coords.scrCoords[2] > y) !== (v[j].coords.scrCoords[2] > y)) &&
+                    (x < (v[j].coords.scrCoords[1] - v[i].coords.scrCoords[1]) *
+                    (y - v[i].coords.scrCoords[2]) / (v[j].coords.scrCoords[2] - v[i].coords.scrCoords[2]) + v[i].coords.scrCoords[1])
+                   ) {
+                    isIn = !isIn;
+                }
+            }
+
+            return isIn;
+        },
+
         /**
          * Checks whether (x,y) is near the polygon.
          * @param {Number} x Coordinate in x direction, screen coordinates.
@@ -170,22 +236,11 @@ define([
          * @returns {Boolean} Returns true, if (x,y) is inside or at the boundary the polygon, otherwise false.
          */
         hasPoint: function (x, y) {
-
-            var i, j, len, c = false;
+            var i, len;
 
             if (Type.evaluate(this.visProp.hasinnerpoints)) {
                 // All points of the polygon trigger hasPoint: inner and boundary points
-                len = this.vertices.length;
-                // W. Randolf Franklin's pnpoly method.
-                // See https://wrf.ecse.rpi.edu/Research/Short_Notes/pnpoly.html
-                for (i = 0, j = len - 2; i < len - 1; j = i++) {
-                    if (((this.vertices[i].coords.scrCoords[2] > y) !== (this.vertices[j].coords.scrCoords[2] > y)) &&
-                            (x < (this.vertices[j].coords.scrCoords[1] - this.vertices[i].coords.scrCoords[1]) * (y - this.vertices[i].coords.scrCoords[2]) /
-                            (this.vertices[j].coords.scrCoords[2] - this.vertices[i].coords.scrCoords[2]) + this.vertices[i].coords.scrCoords[1])) {
-                        c = !c;
-                    }
-                }
-                if (c) {
+                if (this.pnpoly(x, y)) {
                     return true;
                 }
             }
@@ -197,12 +252,11 @@ define([
             len = this.borders.length;
             for (i = 0; i < len; i++) {
                 if (this.borders[i].hasPoint(x, y)) {
-                    c = true;
-                    break;
+                    return true;
                 }
             }
 
-            return c;
+            return false;
         },
 
         /**
@@ -461,7 +515,7 @@ define([
             return box;
         },
 
-        // already documented in GeometryElement
+        // Already documented in GeometryElement
         bounds: function () {
             return this.boundingBox();
         },
@@ -469,6 +523,8 @@ define([
         /**
          * This method removes the SVG or VML nodes of the lines and the filled area from the renderer, to remove
          * the object completely you should use {@link JXG.Board#removeObject}.
+         *
+         * @private
          */
         remove: function () {
             var i;
@@ -483,6 +539,7 @@ define([
         /**
          * Finds the index to a given point reference.
          * @param {JXG.Point} p Reference to an element of type {@link JXG.Point}
+         * @returns {Number} Index of the point or -1.
          */
         findPoint: function (p) {
             var i;