summaryrefslogtreecommitdiff
path: root/js/Sources/CURVE_c.js
diff options
context:
space:
mode:
authorSunil Shetye2018-07-11 17:51:05 +0530
committerSunil Shetye2018-07-12 23:01:50 +0530
commit44a3807a94783e831070f0e003340af58dc64d16 (patch)
treecce50388afa463583d7a7aead34d40f5b02281f7 /js/Sources/CURVE_c.js
parent0047c3bea1d86b12a08544f6f0833c63e77f6eac (diff)
downloadsci2js-44a3807a94783e831070f0e003340af58dc64d16.tar.gz
sci2js-44a3807a94783e831070f0e003340af58dc64d16.tar.bz2
sci2js-44a3807a94783e831070f0e003340af58dc64d16.zip
change graphics to object
Diffstat (limited to 'js/Sources/CURVE_c.js')
-rw-r--r--js/Sources/CURVE_c.js30
1 files changed, 15 insertions, 15 deletions
diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js
index 7b67863e..a165bcb8 100644
--- a/js/Sources/CURVE_c.js
+++ b/js/Sources/CURVE_c.js
@@ -44,8 +44,8 @@ function CURVE_c() {
this.graf = arguments[0]["graf"]
this.x = arg1;
this.model = arg1.model;
- var graphics = arg1.graphics;
- var exprs = graphics.exprs;
+ this.graphics = arg1.graphics;
+ var exprs = this.graphics.exprs;
var ok = false;
var SaveExit = false;
while (true) {
@@ -71,11 +71,11 @@ function CURVE_c() {
if (!Ask_again) {
this.xx = this.xx.slice();
this.yy = this.yy.slice();
- var tmpvar0 = size(this.xx)
- var nx = tmpvar0[0]
+ var tmpvar0 = size(this.xx);
+ var nx = tmpvar0[0];
var mx = tmpvar0[1];
- var tmpvar1 = size(this.yy)
- var ny = tmpvar1[0]
+ var tmpvar1 = size(this.yy);
+ var ny = tmpvar1[0];
var my = tmpvar1[1];
if (!((nx==ny)&&(mx==my))) {
messagebox("Incompatible size of [x] and [y]","modal","error");
@@ -84,7 +84,7 @@ function CURVE_c() {
}
if (!Ask_again) {
this.xy = [this.xx,this.yy];
- var tmpvar2 = cleandata(this.xy)
+ var tmpvar2 = cleandata(this.xy);
this.xy = tmpvar2[0];
var N = size(this.xy,"r");
exprs[5-1] = "n";
@@ -96,9 +96,9 @@ function CURVE_c() {
} else {
this.curwin = max(winsid())+1;
}
- var tmpvar3 = poke_point(this.xy,ipar,rpar)
- var orpar = tmpvar3[0]
- var oipar = tmpvar3[1]
+ var tmpvar3 = poke_point(this.xy,ipar,rpar);
+ var orpar = tmpvar3[0];
+ var oipar = tmpvar3[1];
var ok = tmpvar3[2];
if (!ok) {
break;
@@ -130,9 +130,9 @@ function CURVE_c() {
exprs[4-1] = perop;
var SaveExit = true;
} else {
- var tmpvar4 = Do_Spline(N,mtd,this.xy.slice()[1-1],this.xy.slice()[2-1])
- var Xdummy = tmpvar4[0]
- var Ydummy = tmpvar4[1]
+ var tmpvar4 = Do_Spline(N,mtd,this.xy.slice()[1-1],this.xy.slice()[2-1]);
+ var Xdummy = tmpvar4[0];
+ var Ydummy = tmpvar4[1];
var orpar = tmpvar4[2];
if ((METHOD=="periodic")) {
this.xy[N-1][2-1] = this.xy[1-1][2-1];
@@ -158,9 +158,9 @@ function CURVE_c() {
}
this.model.rpar = new ScilabDouble(orpar);
this.model.ipar = new ScilabDouble(oipar);
- graphics.exprs = exprs;
+ this.graphics.exprs = new ScilabDouble([exprs]);
this.x.model = this.model;
- this.x.graphics = graphics;
+ this.x.graphics = this.graphics;
break;
}
}