Backup_Repos/jsketcher
1
0
Fork 0
mirror of https://github.com/xibyte/jsketcher synced 2025-12-24 01:15:25 +01:00
Code Issues Projects Releases Wiki Activity

support of constructive elements

Browse source
This commit is contained in:
Val Erastov 2014-11-04 00:39:15 -08:00
parent 996023c3b5
commit d4c813f992
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web/app/constr/solver.js
View file

@ -205,9 +205,9 @@ TCAD.parametric.lock2Equals2 = function(constrs, locked) {
return _locked;
};
TCAD.parametric.prepare = function(constrs, locked, alg) {
TCAD.parametric.prepare = function(constrs, locked, aux, alg) {
// this.lock1(constrs, locked);
this.lock1(constrs, aux);
var lockingConstrs = this.lock2Equals2(constrs, locked);
// Array.prototype.push.apply( constrs, lockingConstrs );

6
web/app/parametric.js
View file

@ -308,6 +308,7 @@ TCAD.TWO.ParametricManager.prototype.prepare = function(locked, alg) {
var ei;
var ii = 0;
var aux = [];
for (i = 0; i < this.system.length; ++i) {
if (eqcElimination[ii] === i) {
@ -321,6 +322,9 @@ TCAD.TWO.ParametricManager.prototype.prepare = function(locked, alg) {
for (p = 0; p < sdata[1].length; ++p) {
_p = getParam(sdata[1][p]);
params.push(_p);
if (_p._backingParam.obj !== undefined && !!_p._backingParam.obj.aux) {
aux.push(_p);
}
}
var _constr = TCAD.constraints.create(sdata[0], params, sdata[2]);
@ -340,7 +344,7 @@ TCAD.TWO.ParametricManager.prototype.prepare = function(locked, alg) {
}
var lockedValues = [];
var solver = TCAD.parametric.prepare(_constrs, _locked, alg);
var solver = TCAD.parametric.prepare(_constrs, _locked, aux, alg);
function solve(fineLevel) {
if (_locked.length != 0) {
for (p = 0; p < locked.length; ++p) {