diff --git a/web/app/sketcher/constr/constraints.js b/web/app/sketcher/constr/constraints.js index 791a9db6..aa7343c9 100644 --- a/web/app/sketcher/constr/constraints.js +++ b/web/app/sketcher/constr/constraints.js @@ -37,6 +37,7 @@ TCAD.constraints.Equal = function(params) { }; +/** @constructor */ TCAD.constraints.ConstantWrapper = function(constr, mask) { this.params = []; @@ -65,6 +66,7 @@ TCAD.constraints.ConstantWrapper = function(constr, mask) { } }; +/** @constructor */ TCAD.constraints.Weighted = function(constr, weight) { this.params = constr.params; diff --git a/web/app/sketcher/constr/solver.js b/web/app/sketcher/constr/solver.js index 4a163da3..7c6ff674 100644 --- a/web/app/sketcher/constr/solver.js +++ b/web/app/sketcher/constr/solver.js @@ -224,8 +224,8 @@ TCAD.parametric.diagnose = function(sys) { TCAD.parametric.prepare = function(constrs, locked, aux, alg) { - this.lock1(constrs, aux); - var lockingConstrs = this.lock2Equals2(constrs, locked); + TCAD.parametric.lock1(constrs, aux); + var lockingConstrs = TCAD.parametric.lock2Equals2(constrs, locked); Array.prototype.push.apply( constrs, lockingConstrs ); var sys = new TCAD.parametric.System(constrs); diff --git a/web/app/sketcher/helpers.js b/web/app/sketcher/helpers.js index c80c372b..94d74c95 100644 --- a/web/app/sketcher/helpers.js +++ b/web/app/sketcher/helpers.js @@ -5,7 +5,6 @@ TCAD.TWO.FilletTool = function(viewer) { TCAD.TWO.FilletTool.prototype.makeFillet = function(point1, point2) { function shrink(point1) { - point1.parent.a; if (point1.id === point1.parent.a.id) { var a = point1.parent.b; var b = point1.parent.a; diff --git a/web/app/sketcher/io.js b/web/app/sketcher/io.js index ce24f23b..d953bc46 100644 --- a/web/app/sketcher/io.js +++ b/web/app/sketcher/io.js @@ -336,7 +336,7 @@ TCAD.io.BBox = function() { this.checkCircBounds(obj.c.x, obj.c.y, obj.r.get()); } else if (obj._class === T.CIRCLE) { this.checkCircBounds(obj.c.x, obj.c.y, obj.r.get()); - } else if (obj._class === T.DIM || obj._class === T.HDIM || obj._class === T.VDIM) { +// } else if (obj._class === T.DIM || obj._class === T.HDIM || obj._class === T.VDIM) { } } @@ -410,7 +410,7 @@ TCAD.IO.prototype.svgExport = function () { out.fline('', [obj.a.x, obj.a.y, r, r, dir, 1, obj.b.x, obj.b.y]); } else if (obj._class === T.CIRCLE) { out.fline('', [obj.c.x, obj.c.y, obj.r.get()]); - } else if (obj._class === T.DIM || obj._class === T.HDIM || obj._class === T.VDIM) { +// } else if (obj._class === T.DIM || obj._class === T.HDIM || obj._class === T.VDIM) { } } out.line(''); @@ -555,7 +555,7 @@ TCAD.IO.prototype.dxfExport = function () { out.line("0"); out.line("40"); out.numberln(obj.r.get()); - } else if (obj._class === T.DIM || obj._class === T.HDIM || obj._class === T.VDIM) { +// } else if (obj._class === T.DIM || obj._class === T.HDIM || obj._class === T.VDIM) { } } }