jsxgraph 1.3.0 → 1.4.1

package/src/base/chart.js

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

package/src/base/circle.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -141,6 +141,8 @@ define([
          */
         this.circle = null;
 
+        this.points = [];
+
         if (method === 'twoPoints') {
             this.point2 = board.select(par2);
             this.radius = this.Radius();
@@ -344,6 +346,8 @@ define([
          * Uses the boards renderer to update the circle.
          */
         update: function () {
+            var x, y, z, r, c, i;
+
             if (this.needsUpdate) {
                 if (Type.evaluate(this.visProp.trace)) {
                     this.cloneToBackground(true);
@@ -359,6 +363,24 @@ define([
 
                 this.updateStdform();
                 this.updateQuadraticform();
+
+                // Approximate the circle by 4 Bezier segments
+                // This will be used for intersections of type curve / circle.
+                // See https://spencermortensen.com/articles/bezier-circle/
+                z = this.center.coords.usrCoords[0];
+                x = this.center.coords.usrCoords[1] / z;
+                y = this.center.coords.usrCoords[2] / z;
+                z /= z;
+                r = this.Radius();
+                c = 0.551915024494;
+
+                this.numberPoints = 13;
+                this.dataX = [x + r, x + r, x + r * c, x, x - r * c, x - r, x - r, x - r, x - r * c, x, x + r * c, x + r, x + r];
+                this.dataY = [y, y + r * c, y + r, y + r, y + r, y + r * c, y, y - r * c, y - r, y - r, y - r, y - r * c, y];
+                this.bezierDegree = 3;
+                for (i = 0; i < this.numberPoints; i++) {
+                    this.points[i] = new Coords(Const.COORDS_BY_USER, [this.dataX[i], this.dataY[i]], this.board);
+                }
             }
 
             return this;

package/src/base/composition.js

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

package/src/base/constants.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -41,8 +41,8 @@ define(['jxg'], function (JXG) {
     'use strict';
 
     var major = 1,
-        minor = 3,
-        patch = 0,
+        minor = 4,
+        patch = 1,
         add = '', //'dev'
         version = major + '.' + minor + '.' + patch + (add ? '-' + add : ''),
         constants;
@@ -52,7 +52,7 @@ define(['jxg'], function (JXG) {
          * Constant: the currently used JSXGraph version.
          *
          * @name JXG.version
-         * @type {String}
+         * @type String
          */
         version: version,
 
@@ -61,21 +61,21 @@ define(['jxg'], function (JXG) {
          * showCopyright is not set to false on board creation).
          *
          * @name JXG.licenseText
-         * @type {String}
+         * @type String
          */
         licenseText: 'JSXGraph v' + version + ' Copyright (C) see https://jsxgraph.org',
 
         /**
          *  Constant: user coordinates relative to the coordinates system defined by the bounding box.
          *  @name JXG.COORDS_BY_USER
-         *  @type {Number}
+         *  @type Number
          */
         COORDS_BY_USER: 0x0001,
 
         /**
          *  Constant: screen coordinates in pixel relative to the upper left corner of the div element.
          *  @name JXG.COORDS_BY_SCREEN
-         *  @type {Number}
+         *  @type Number
          */
         COORDS_BY_SCREEN: 0x0002,
 
@@ -110,6 +110,7 @@ define(['jxg'], function (JXG) {
         OBJECT_TYPE_INPUT: 28,
         OBJECT_TYPE_BUTTON: 29,
         OBJECT_TYPE_TRANSFORMATION: 30,
+        OBJECT_TYPE_FOREIGNOBJECT: 31,
 
         // IMPORTANT:
         // ----------
@@ -130,8 +131,19 @@ define(['jxg'], function (JXG) {
         GENTYPE_ABC: 1, // unused
         GENTYPE_AXIS: 2,
         GENTYPE_MID: 3,
-        /** @deprecated, now use {@link JXG.GENTYPE_REFLECTION_ON_LINE} */  GENTYPE_REFLECTION: 4,
-        /** @deprecated, now use {@link JXG.GENTYPE_REFLECTION_ON_POINT} */ GENTYPE_MIRRORELEMENT: 5,
+
+        /**
+         * @ignore
+         * @deprecated, now use {@link JXG.GENTYPE_REFLECTION_ON_LINE}
+         *
+         */
+        GENTYPE_REFLECTION: 4,
+        /**
+         * @ignore
+         * @deprecated, now use {@link JXG.GENTYPE_REFLECTION_ON_POINT}
+         */
+        GENTYPE_MIRRORELEMENT: 5,
+
         GENTYPE_REFLECTION_ON_LINE: 4,
         GENTYPE_REFLECTION_ON_POINT: 5,
         GENTYPE_TANGENT: 6,
@@ -144,7 +156,11 @@ define(['jxg'], function (JXG) {
         GENTYPE_GLIDER: 13,
         GENTYPE_INTERSECTION: 14,
         GENTYPE_CIRCLE: 15,
-        /** @deprecated NOT USED ANY MORE SINCE SKETCHOMETRY 2.0 (only for old constructions needed) */ GENTYPE_CIRCLE2POINTS: 16,
+        /**
+         * @ignore @deprecated NOT USED ANY MORE SINCE SKETCHOMETRY 2.0 (only for old constructions needed)
+         */
+        GENTYPE_CIRCLE2POINTS: 16,
+
         GENTYPE_LINE: 17,
         GENTYPE_TRIANGLE: 18,
         GENTYPE_QUADRILATERAL: 19,
@@ -176,7 +192,12 @@ define(['jxg'], function (JXG) {
         GENTYPE_ABLATION: 45,
         GENTYPE_MIGRATE: 46,
         GENTYPE_VECTORCOPY: 47,
-        GENTYPE_POLYGONCOPY: 48,
+        GENTYPE_POLYGONCOPY: 48,    /**
+        * Constants
+        * @name Constants
+        * @namespace
+        */
+
         //        GENTYPE_TRANSFORM: 48, // unused
         // 49 ... 50 // unused ...
 

package/src/base/coords.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -90,7 +90,7 @@ define([
         /**
          * If true, this coordinates object will emit update events every time
          * the coordinates are set.
-         * @type {boolean}
+         * @type boolean
          * @default true
          */
         this.emitter = !Type.exists(emitter) || emitter;
@@ -234,11 +234,11 @@ define([
         },
 
         /**
-        * Copy array, either srcCoords or usrCoords
+        * Copy array, either scrCoords or usrCoords
         * Uses slice() in case of standard arrays and set() in case of
         * typed arrays.
         * @private
-        * @param {String} obj Either 'srcCoords' or 'usrCoords'
+        * @param {String} obj Either 'scrCoords' or 'usrCoords'
         * @param {Number} offset Offset, defaults to 0 if not given
         * @returns {Array} Returns copy of the coords array either as standard array or as
         *   typed array.

package/src/base/coordselement.js

@@ -1,5 +1,5 @@
 /*
-    Copyright 2008-2021
+    Copyright 2008-2022
         Matthias Ehmann,
         Michael Gerhaeuser,
         Carsten Miller,
@@ -94,6 +94,17 @@ define([
          */
         this.position = null;
 
+        /**
+         * True if there the method this.updateConstraint() has been set. It is
+         * probably different from the prototype function() {return this;}.
+         * Used in updateCoords fo glider elements.
+         *
+         * @see JXG.CoordsElement#updateCoords
+         * @type Boolean
+         * @private
+         */
+        this.isConstrained = false;
+
         /**
          * Determines whether the element slides on a polygon if point is a glider.
          * @type Boolean
@@ -125,18 +136,10 @@ define([
          * To prevent double updates, {@link JXG.CoordsElement#needsUpdateFromParent}
          * is set to false in updateGlider() and reset to true in the following call to
          * {@link JXG.CoordsElement#updateGliderFromParent}
-         * @type {Boolean}
+         * @type Boolean
          */
         this.needsUpdateFromParent = true;
 
-        /**
-         * Dummy function for unconstrained points or gliders.
-         * @private
-         */
-        this.updateConstraint = function () {
-            return this;
-        };
-
         /**
          * Stores the groups of this element in an array of Group.
          * @type Array
@@ -182,11 +185,21 @@ define([
     };
 
     JXG.extend(JXG.CoordsElement.prototype, /** @lends JXG.CoordsElement.prototype */ {
+        /**
+         * Dummy function for unconstrained points or gliders.
+         * @private
+         */
+        updateConstraint: function () {
+            return this;
+        },
+
         /**
          * Updates the coordinates of the element.
          * @private
          */
         updateCoords: function (fromParent) {
+            var i;
+
             if (!this.needsUpdate) {
                 return this;
             }
@@ -195,6 +208,10 @@ define([
                 fromParent = false;
             }
 
+            if (!Type.evaluate(this.visProp.frozen)) {
+                this.updateConstraint();
+            }
+
             /*
              * We need to calculate the new coordinates no matter of the elements visibility because
              * a child could be visible and depend on the coordinates of the element/point (e.g. perpendicular).
@@ -204,6 +221,10 @@ define([
              * the defining elements of the line or circle have been changed.
              */
             if (this.type === Const.OBJECT_TYPE_GLIDER) {
+                if (this.isConstrained) {
+                    fromParent = false;
+                }
+
                 if (fromParent) {
                     this.updateGliderFromParent();
                 } else {
@@ -211,9 +232,6 @@ define([
                 }
             }
 
-            if (!Type.evaluate(this.visProp.frozen)) {
-                this.updateConstraint();
-            }
             this.updateTransform(fromParent);
 
             return this;
@@ -242,7 +260,7 @@ define([
                 ev_sw,
                 slide = this.slideObject,
                 res, cu,
-                slides = [], 
+                slides = [],
                 isTransformed;
 
             this.needsUpdateFromParent = false;
@@ -575,7 +593,7 @@ define([
                 this.updateConstraint();
                 c  = Geometry.projectPointToTurtle(this, slide, this.board)[0].usrCoords;
             } else if (slide.elementClass === Const.OBJECT_CLASS_CURVE) {
-                // Handle the case if the curve comes from a transformation of a continous curve.
+                // Handle the case if the curve comes from a transformation of a continuous curve.
                 isTransformed = false;
                 res = slide.getTransformationSource();
                 if (res[0]) {
@@ -591,12 +609,12 @@ define([
                 if (isTransformed) {
                     this.coords.setCoordinates(Const.COORDS_BY_USER, [
                         slides[slides.length - 1].Z(this.position),
-                        slides[slides.length - 1].X(this.position), 
+                        slides[slides.length - 1].X(this.position),
                         slides[slides.length - 1].Y(this.position)]);
                 } else {
                     this.coords.setCoordinates(Const.COORDS_BY_USER, [
-                        slide.Z(this.position), 
-                        slide.X(this.position), 
+                        slide.Z(this.position),
+                        slide.X(this.position),
                         slide.Y(this.position)]);
                 }
 
@@ -787,7 +805,7 @@ define([
         /**
          * Alias for {@link JXG.Element#handleSnapToGrid}
          * @param {Boolean} force force snapping independent from what the snaptogrid attribute says
-         * @returns {JXG.Point} Reference to this element
+         * @returns {JXG.CoordsElement} Reference to this element
          */
         snapToGrid: function (force) {
             return this.handleSnapToGrid(force);
@@ -1080,8 +1098,8 @@ define([
                         slide = slideobj.borders[i];
                     }
                 }
-            	slideobj = this.board.select(slide);
-            	onPolygon = true;
+                slideobj = this.board.select(slide);
+                onPolygon = true;
             }
 
             /* Gliders on Ticks are forbidden */
@@ -1137,6 +1155,8 @@ define([
                         this.elType = 'text';
                     } else if (this.type === Const.OBJECT_TYPE_IMAGE) {
                         this.elType = 'image';
+                    } else if (this.type === Const.OBJECT_TYPE_FOREIGNOBJECT) {
+                        this.elType = 'foreignobject';
                     }
 
                     this.slideObject = null;
@@ -1159,9 +1179,11 @@ define([
                 // remove all transformations
                 this.transformations.length = 0;
 
-                this.updateConstraint = function () {
-                    return this;
-                };
+                delete this.updateConstraint;
+                this.isConstrained = false;
+                // this.updateConstraint = function () {
+                //     return this;
+                // };
 
                 if (!this.isDraggable) {
                     this.isDraggable = true;
@@ -1301,6 +1323,7 @@ define([
                     } else {
                         this.coords = c;
                     }
+                    return this;
                 };
             // Euclidean coordinates
             } else if (terms.length === 2) {
@@ -1311,6 +1334,7 @@ define([
 
                 this.updateConstraint = function () {
                     this.coords.setCoordinates(Const.COORDS_BY_USER, [this.XEval(), this.YEval()]);
+                    return this;
                 };
             // Homogeneous coordinates
             } else {
@@ -1322,8 +1346,10 @@ define([
 
                 this.updateConstraint = function () {
                     this.coords.setCoordinates(Const.COORDS_BY_USER, [this.ZEval(), this.XEval(), this.YEval()]);
+                    return this;
                 };
             }
+            this.isConstrained = true;
 
             /**
             * We have to do an update. Otherwise, elements relying on this point will receive NaN.
@@ -1399,6 +1425,7 @@ define([
             this.updateConstraint = function () {
                 this.coords.setCoordinates(Const.COORDS_BY_USER, [this.ZEval(), this.XEval(), this.YEval()]);
             };
+            this.isConstrained = true;
 
             this.updateConstraint();
             //this.coords = new Coords(Const.COORDS_BY_SCREEN, [0, 0], this.board);