summaryrefslogtreecommitdiff
path: root/js/Sinks/CSCOPXY.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/Sinks/CSCOPXY.js
parent0047c3bea1d86b12a08544f6f0833c63e77f6eac (diff)
downloadsci2js-44a3807a94783e831070f0e003340af58dc64d16.tar.gz
sci2js-44a3807a94783e831070f0e003340af58dc64d16.tar.bz2
sci2js-44a3807a94783e831070f0e003340af58dc64d16.zip
change graphics to object
Diffstat (limited to 'js/Sinks/CSCOPXY.js')
-rw-r--r--js/Sinks/CSCOPXY.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js
index 1f2e5dc0..62151c21 100644
--- a/js/Sinks/CSCOPXY.js
+++ b/js/Sinks/CSCOPXY.js
@@ -59,8 +59,8 @@ function CSCOPXY() {
this.ymax = parseFloat(arguments[0]["ymax"])
this.N = parseFloat(arguments[0]["N"])
this.x = arg1;
- var graphics = arg1.graphics;
- var exprs = graphics.exprs;
+ this.graphics = arg1.graphics;
+ var exprs = this.graphics.exprs;
this.model = arg1.model;
while (true) {
[ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.xmin,this.xmax,this.ymin,this.ymax,this.N,exprs] = scicos_getvalue("Set Scope parameters",["Number of Curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin","Xmax","Ymin","Ymax","Buffer size"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs);
@@ -105,9 +105,9 @@ function CSCOPXY() {
} else {
var in1 = this.nbr_curves*ones(2,1);
var in2 = ones(2,1);
- var tmpvar0 = set_io(this.model,graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[])
- this.model = tmpvar0[0]
- var graphics = tmpvar0[1]
+ var tmpvar0 = set_io(this.model,this.graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]);
+ this.model = tmpvar0[0];
+ this.graphics = tmpvar0[1];
var ok = tmpvar0[2];
if (this.wpos==[]) {
this.wpos = [[-1],[-1]];
@@ -119,8 +119,8 @@ function CSCOPXY() {
var ipar = [[this.win],[1],[this.N],[this.clrs],[this.siz],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]];
this.model.rpar = new ScilabDouble(rpar);
this.model.ipar = new ScilabDouble(ipar);
- graphics.exprs = exprs;
- this.x.graphics = graphics;
+ this.graphics.exprs = new ScilabDouble([exprs]);
+ this.x.graphics = this.graphics;
this.x.model = this.model;
break;
}