@teachinglab/omd 0.6.1 → 0.6.3

package/src/omdRationalExpression.js

@@ -1,115 +1,115 @@
-
-import { omdColor } from "./omdColor.js";
-import { omdMetaExpression } from "./omdMetaExpression.js"
-import { omdExpression } from "./omdExpression.js"
-import { omdNumber } from "./omdNumber.js"
-import { omdVariable } from "./omdVariable.js"
-import { omdTerm } from "./omdTerm.js"
-
-export class omdRationalExpression extends omdMetaExpression
-{
-    constructor()
-    {
-        // initialization
-        super();
-
-        this.type = "omdPowerExpression";
-        
-        this.numeratorExpression = null;
-        this.denominatorExpression = null;
-
-        this.numeratorHolder = new jsvgGroup();
-        this.addChild( this.numeratorHolder );
-
-        this.denominatorHolder = new jsvgGroup();
-        this.addChild( this.denominatorHolder );
-
-        this.dividerLine = new jsvgLine();
-        this.setStrokeWidth( 2 );
-        this.setStrokeColor( "black" );
-        this.addChild( this.dividerLine );
-    }
-
-    // make a power expression of (2x+2)^(3x+3)
-
-    loadFromJSON( data )
-    {
-        if ( typeof data.numeratorExpression != "undefined" )
-        {
-            // console.log("A");
-            // console.log( data.baseExpression );
-            if ( data.numeratorExpression.omdType == "expression" )
-                this.numeratorExpression = new omdExpression();
-            if ( data.numeratorExpression.omdType == "number" )
-                this.numeratorExpression = new omdNumber();
-            if ( data.numeratorExpression.omdType == "variable" )
-                this.numeratorExpression = new omdVariable();
-            if ( data.numeratorExpression.omdType == "term" )
-                this.numeratorExpression = new omdTerm();
-            this.numeratorExpression.loadFromJSON(  data.numeratorExpression  );
-            this.numeratorHolder.removeAllChildren();
-            this.numeratorHolder.addChild( this.numeratorExpression );
-        }
-        if ( typeof data.denominatorExpression != "undefined" )
-        {
-            // console.log("B");
-            // console.log( data.exponentExpression );
-            if ( data.denominatorExpression.omdType == "expression" )
-                this.denominatorExpression = new omdExpression();
-            if ( data.denominatorExpression.omdType == "number" )
-                this.denominatorExpression = new omdNumber();
-            if ( data.denominatorExpression.omdType == "variable" )
-                this.denominatorExpression = new omdVariable();
-            if ( data.denominatorExpression.omdType == "term" )
-                this.denominatorExpression = new omdTerm();
-            this.denominatorExpression.loadFromJSON(  data.denominatorExpression  );
-            this.denominatorHolder.removeAllChildren();
-            this.denominatorHolder.addChild( this.denominatorExpression );
-        }
-    
-        this.updateLayout();
-    }
-
-
-    setNumeratorAndDenominator( numerator, denominator )
-    {
-        this.numeratorExpression = numerator;
-        this.numeratorHolder.removeAllChildren();
-        this.numeratorHolder.addChild( numerator );
-
-        this.denominatorExpression = denominator;
-        this.denominatorHolder.removeAllChildren();
-        this.denominatorHolder.addChild( denominator );
-
-        this.numeratorExpression.hideBackgroundByDefault();
-        this.denominatorExpression.hideBackgroundByDefault();
-
-        this.updateLayout();
-    }
-
-    updateLayout()
-    {
-        this.numeratorHolder.setPosition(5, 0);
-        this.denominatorHolder.setPosition( 5, 30 );
-
-        // get max width
-        var W = this.numeratorExpression.width;
-        if ( this.denominatorExpression.width  > W )
-            W = this.denominatorExpression.width;
-
-        // center numerator
-        var pX = W/2 - this.numeratorExpression.width/2 + 5;
-        this.numeratorHolder.setPosition( pX, 0 );
-
-        // center denominator
-        pX = W/2 - this.denominatorExpression.width/2 + 5;
-        this.denominatorHolder.setPosition( pX, 30 );
-
-        // update line width
-        this.dividerLine.setEndpoints( 10-5,30, W+5,30 );
-
-        // update back rect
-        this.backRect.setWidthAndHeight( W+10, 60 );
-        this.setWidthAndHeight( this.backRect.width, this.backRect.height );
-    }
+
+import { omdColor } from "./omdColor.js";
+import { omdMetaExpression } from "./omdMetaExpression.js"
+import { omdExpression } from "./omdExpression.js"
+import { omdNumber } from "./omdNumber.js"
+import { omdVariable } from "./omdVariable.js"
+import { omdTerm } from "./omdTerm.js"
+
+export class omdRationalExpression extends omdMetaExpression
+{
+    constructor()
+    {
+        // initialization
+        super();
+
+        this.type = "omdPowerExpression";
+        
+        this.numeratorExpression = null;
+        this.denominatorExpression = null;
+
+        this.numeratorHolder = new jsvgGroup();
+        this.addChild( this.numeratorHolder );
+
+        this.denominatorHolder = new jsvgGroup();
+        this.addChild( this.denominatorHolder );
+
+        this.dividerLine = new jsvgLine();
+        this.setStrokeWidth( 2 );
+        this.setStrokeColor( "black" );
+        this.addChild( this.dividerLine );
+    }
+
+    // make a power expression of (2x+2)^(3x+3)
+
+    loadFromJSON( data )
+    {
+        if ( typeof data.numeratorExpression != "undefined" )
+        {
+            // console.log("A");
+            // console.log( data.baseExpression );
+            if ( data.numeratorExpression.omdType == "expression" )
+                this.numeratorExpression = new omdExpression();
+            if ( data.numeratorExpression.omdType == "number" )
+                this.numeratorExpression = new omdNumber();
+            if ( data.numeratorExpression.omdType == "variable" )
+                this.numeratorExpression = new omdVariable();
+            if ( data.numeratorExpression.omdType == "term" )
+                this.numeratorExpression = new omdTerm();
+            this.numeratorExpression.loadFromJSON(  data.numeratorExpression  );
+            this.numeratorHolder.removeAllChildren();
+            this.numeratorHolder.addChild( this.numeratorExpression );
+        }
+        if ( typeof data.denominatorExpression != "undefined" )
+        {
+            // console.log("B");
+            // console.log( data.exponentExpression );
+            if ( data.denominatorExpression.omdType == "expression" )
+                this.denominatorExpression = new omdExpression();
+            if ( data.denominatorExpression.omdType == "number" )
+                this.denominatorExpression = new omdNumber();
+            if ( data.denominatorExpression.omdType == "variable" )
+                this.denominatorExpression = new omdVariable();
+            if ( data.denominatorExpression.omdType == "term" )
+                this.denominatorExpression = new omdTerm();
+            this.denominatorExpression.loadFromJSON(  data.denominatorExpression  );
+            this.denominatorHolder.removeAllChildren();
+            this.denominatorHolder.addChild( this.denominatorExpression );
+        }
+    
+        this.updateLayout();
+    }
+
+
+    setNumeratorAndDenominator( numerator, denominator )
+    {
+        this.numeratorExpression = numerator;
+        this.numeratorHolder.removeAllChildren();
+        this.numeratorHolder.addChild( numerator );
+
+        this.denominatorExpression = denominator;
+        this.denominatorHolder.removeAllChildren();
+        this.denominatorHolder.addChild( denominator );
+
+        this.numeratorExpression.hideBackgroundByDefault();
+        this.denominatorExpression.hideBackgroundByDefault();
+
+        this.updateLayout();
+    }
+
+    updateLayout()
+    {
+        this.numeratorHolder.setPosition(5, 0);
+        this.denominatorHolder.setPosition( 5, 30 );
+
+        // get max width
+        var W = this.numeratorExpression.width;
+        if ( this.denominatorExpression.width  > W )
+            W = this.denominatorExpression.width;
+
+        // center numerator
+        var pX = W/2 - this.numeratorExpression.width/2 + 5;
+        this.numeratorHolder.setPosition( pX, 0 );
+
+        // center denominator
+        pX = W/2 - this.denominatorExpression.width/2 + 5;
+        this.denominatorHolder.setPosition( pX, 30 );
+
+        // update line width
+        this.dividerLine.setEndpoints( 10-5,30, W+5,30 );
+
+        // update back rect
+        this.backRect.setWidthAndHeight( W+10, 60 );
+        this.setWidthAndHeight( this.backRect.width, this.backRect.height );
+    }
 }

package/src/omdSampleData.js

@@ -1,215 +1,215 @@
-
-
-let numberSample = 
-{
-    "omdType": "number",
-    "value" : 7
-}
-
-let variableSample = 
-{
-    "omdType": "variable",
-    "name" : "C"
-}
-
-let operatorSample = 
-{
-    "omdType": "operator",
-    "operator" : "+"
-}
-
-let termSample = 
-{
-    "omdType": "term",
-    "coefficient": 3,
-    "variable": "x",
-    "exponent":  1
-}
-
-let expressionSample = 
-{
-    "omdType": "expression",
-    "termsAndOpers":  
-    [ 
-        {
-            "omdType": "term",
-            "coefficient": 3,
-            "variable": '',
-            "exponent":  1
-        },
-        {
-            "omdType": "operator",
-            "operator" : "+"
-        },
-        {
-            "omdType": "term",
-            "coefficient": 5,
-            "variable": 'x',
-            "exponent":  2
-        },
-        {
-            "omdType": "operator",
-            "operator" : "+"
-        },
-        {
-            "omdType": "variable",
-            "name": "x",
-        }
-    ],
-}
-
-
-
-let numberLineSample = 
-{
-    "omdType": "numberLine",
-    "dotValues": [3, 5, 7],
-    "min": 0,
-    "max": 10,
-    "label": "",
-}
-
-let tapeDiagramSample = 
-{
-    "omdType": "tapeDiagram",
-    //"values": ['x','x','x+1'],
-    "values": [1,2,3,4],
-    "showValues": true,
-    "colors": [],
-    "unitWidth": 30,
-    "labelSet": [
-        {
-            "omdType": "omdTapeLabel",
-            "startValue":  0,
-            "endValue":  3,
-            "label":  "3",
-            "showBelow":  false
-        },
-        {
-            "omdType": "omdTapeLabel",
-            "startValue":  1,
-            "endValue":  6,
-            "label":  "5",
-            "showBelow":  true
-        }
-    ]
- }
- 
-let tapeDiagramSample2 = 
-{
-    "omdType": "tapeDiagram",
-    "values": ['2','x','x+1'],
-    "showValues": true,
-    "colors": [],
-    "unitWidth": 30,
-    "labelSet": [
-        {
-            "omdType": "omdTapeLabel",
-            "startIndex":  0,
-            "endIndex":  3,
-            "label":  "9",
-            "showBelow":  false
-        }
-    ]
- }
- 
-let balanceHangerSample = 
-{
-    "leftValues": [1, 2, 3, 4],
-    "rightValues": [1, 2, 3],
-    "tilt": "right"
-}
-
-let balanceHangerSample2 = 
-{
-    "leftValues": [1, 'x', 3],
-    "rightValues": [1, 4, 5],
-    "tilt": "none"
-}
-
-let numberTileSample1 = 
-{
-    "omdType": "numberTile",
-    "value": 3
-}
-
-let numberTileSample2 = 
-{
-    "omdType": "numberTile",
-    "value": 8,
-    "size": "medium"        // small, medium or large
-}
-
-let rightTriangleSample =
-{
-    "omdType": "rightTriangle",
-    "verticalLeg": 6,        // length of vertical leg
-    "horizontalLeg": 3,      // length of horizontal leg
-    "unitScale":10            // unit scale should be 10 unless otherwise specified
-}
-
-let isoscelesTriangleSample =
-{
-    "omdType": "isoscelesTriangle",
-    "base": 4,                  // triangle base
-    "height": 6,                // triangle height
-    "unitScale":10              // unit scale should be 10 unless otherwise specified
-}
-
-let rightTriangleSample2 = 
-{
-    "omdType": "rightTriangle",
-    "angleA": 60,          // angle A
-    "hypotenuse": 50,      // hypotenuse
-    "unitScale":10         // unit scale should be 10 unless otherwise specified
-}
-
-let rectangleSample = 
-{
-    "omdType": "rectangle",
-    "width": 10,          // width
-    "height": 6,            // height
-    "unitScale": 10         // unit scale should be 10 unless otherwise specified
-}
-
-let ellipseSample = 
-{
-    "omdType": "ellipse",
-    "width": 10,           // width
-    "height": 6,           // height  (same as width for circle)
-    "unitScale":10         // unit scale should be 10 unless otherwise specified
-}
-
-let circleSample = 
-{
-    "omdType": "circle",
-    "radius": 3,           // radius
-    "unitScale":10         // unit scale should be 10 unless otherwise specified
-}
-
-let regularPolygonSample = 
-{
-    "omdType": "regularPolygon",
-    "radius": 3,          // radius
-    "numberOfSides": 6,    // number of sides
-    "unitScale":10        // unit scale should be 10 unless otherwise specified
-}
-
-let planeWithShapes = 
-{
-    "omdType": "coordinatePlane",
-    "size": "medium",
-    "shapeSet": [
-        {
-            "omdType": "circle",
-            "radius": 3,
-            "unitScale": 10
-        },
-        {
-            "omdType": "isoscelesTriangle",
-            "base": 2,                  // triangle base
-            "height": 3,                // triangle height
-            "unitScale":10              // unit scale should be 10 unless otherwise specified
-        }
-    ]
-}
+
+
+let numberSample = 
+{
+    "omdType": "number",
+    "value" : 7
+}
+
+let variableSample = 
+{
+    "omdType": "variable",
+    "name" : "C"
+}
+
+let operatorSample = 
+{
+    "omdType": "operator",
+    "operator" : "+"
+}
+
+let termSample = 
+{
+    "omdType": "term",
+    "coefficient": 3,
+    "variable": "x",
+    "exponent":  1
+}
+
+let expressionSample = 
+{
+    "omdType": "expression",
+    "termsAndOpers":  
+    [ 
+        {
+            "omdType": "term",
+            "coefficient": 3,
+            "variable": '',
+            "exponent":  1
+        },
+        {
+            "omdType": "operator",
+            "operator" : "+"
+        },
+        {
+            "omdType": "term",
+            "coefficient": 5,
+            "variable": 'x',
+            "exponent":  2
+        },
+        {
+            "omdType": "operator",
+            "operator" : "+"
+        },
+        {
+            "omdType": "variable",
+            "name": "x",
+        }
+    ],
+}
+
+
+
+let numberLineSample = 
+{
+    "omdType": "numberLine",
+    "dotValues": [3, 5, 7],
+    "min": 0,
+    "max": 10,
+    "label": "",
+}
+
+let tapeDiagramSample = 
+{
+    "omdType": "tapeDiagram",
+    //"values": ['x','x','x+1'],
+    "values": [1,2,3,4],
+    "showValues": true,
+    "colors": [],
+    "unitWidth": 30,
+    "labelSet": [
+        {
+            "omdType": "omdTapeLabel",
+            "startValue":  0,
+            "endValue":  3,
+            "label":  "3",
+            "showBelow":  false
+        },
+        {
+            "omdType": "omdTapeLabel",
+            "startValue":  1,
+            "endValue":  6,
+            "label":  "5",
+            "showBelow":  true
+        }
+    ]
+ }
+ 
+let tapeDiagramSample2 = 
+{
+    "omdType": "tapeDiagram",
+    "values": ['2','x','x+1'],
+    "showValues": true,
+    "colors": [],
+    "unitWidth": 30,
+    "labelSet": [
+        {
+            "omdType": "omdTapeLabel",
+            "startIndex":  0,
+            "endIndex":  3,
+            "label":  "9",
+            "showBelow":  false
+        }
+    ]
+ }
+ 
+let balanceHangerSample = 
+{
+    "leftValues": [1, 2, 3, 4],
+    "rightValues": [1, 2, 3],
+    "tilt": "right"
+}
+
+let balanceHangerSample2 = 
+{
+    "leftValues": [1, 'x', 3],
+    "rightValues": [1, 4, 5],
+    "tilt": "none"
+}
+
+let numberTileSample1 = 
+{
+    "omdType": "numberTile",
+    "value": 3
+}
+
+let numberTileSample2 = 
+{
+    "omdType": "numberTile",
+    "value": 8,
+    "size": "medium"        // small, medium or large
+}
+
+let rightTriangleSample =
+{
+    "omdType": "rightTriangle",
+    "verticalLeg": 6,        // length of vertical leg
+    "horizontalLeg": 3,      // length of horizontal leg
+    "unitScale":10            // unit scale should be 10 unless otherwise specified
+}
+
+let isoscelesTriangleSample =
+{
+    "omdType": "isoscelesTriangle",
+    "base": 4,                  // triangle base
+    "height": 6,                // triangle height
+    "unitScale":10              // unit scale should be 10 unless otherwise specified
+}
+
+let rightTriangleSample2 = 
+{
+    "omdType": "rightTriangle",
+    "angleA": 60,          // angle A
+    "hypotenuse": 50,      // hypotenuse
+    "unitScale":10         // unit scale should be 10 unless otherwise specified
+}
+
+let rectangleSample = 
+{
+    "omdType": "rectangle",
+    "width": 10,          // width
+    "height": 6,            // height
+    "unitScale": 10         // unit scale should be 10 unless otherwise specified
+}
+
+let ellipseSample = 
+{
+    "omdType": "ellipse",
+    "width": 10,           // width
+    "height": 6,           // height  (same as width for circle)
+    "unitScale":10         // unit scale should be 10 unless otherwise specified
+}
+
+let circleSample = 
+{
+    "omdType": "circle",
+    "radius": 3,           // radius
+    "unitScale":10         // unit scale should be 10 unless otherwise specified
+}
+
+let regularPolygonSample = 
+{
+    "omdType": "regularPolygon",
+    "radius": 3,          // radius
+    "numberOfSides": 6,    // number of sides
+    "unitScale":10        // unit scale should be 10 unless otherwise specified
+}
+
+let planeWithShapes = 
+{
+    "omdType": "coordinatePlane",
+    "size": "medium",
+    "shapeSet": [
+        {
+            "omdType": "circle",
+            "radius": 3,
+            "unitScale": 10
+        },
+        {
+            "omdType": "isoscelesTriangle",
+            "base": 2,                  // triangle base
+            "height": 3,                // triangle height
+            "unitScale":10              // unit scale should be 10 unless otherwise specified
+        }
+    ]
+}