From eb7c8e0cd42d4afe02be3adda2e94b6b0dfdaa00 Mon Sep 17 00:00:00 2001
From: Sunil Shetye
Date: Tue, 26 Jun 2018 14:59:47 +0530
Subject: add return value from scicos_getvalue to global vars
---
js/Sinks/CSCOPXY.js | 60 ++++++++++++++++++++++++++---------------------------
1 file changed, 30 insertions(+), 30 deletions(-)
(limited to 'js/Sinks/CSCOPXY.js')
diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js
index 769fe395..0b2e9b80 100644
--- a/js/Sinks/CSCOPXY.js
+++ b/js/Sinks/CSCOPXY.js
@@ -1,28 +1,28 @@
/* autogenerated from "macros/Sinks/CSCOPXY.sci" */
function CSCOPXY() {
CSCOPXY.prototype.define = function CSCOPXY() {
- win = -1;
- clrs = 4;
- siz = 1;
- wdim = [[600],[400]];
- wpos = [[-1],[-1]];
- N = 2;
- xmin = -15;
- xmax = 15;
- ymin = -15;
- ymax = +15;
- nbr_curves = 1;
+ this.win = -1;
+ this.clrs = 4;
+ this.siz = 1;
+ this.wdim = [[600],[400]];
+ this.wpos = [[-1],[-1]];
+ this.N = 2;
+ this.xmin = -15;
+ this.xmax = 15;
+ this.ymin = -15;
+ this.ymax = +15;
+ this.nbr_curves = 1;
model = scicos_model();
model.sim = list("cscopxy",4);
model.in1 = [[1],[1]];
model.in2 = [[1],[1]];
model.intyp = [[1],[1]];
model.evtin = 1;
- model.rpar = [[xmin],[xmax],[ymin],[ymax]];
- model.ipar = [[win],[1],[N],[clrs],[siz],[1],[wpos.slice()],[wdim.slice()],[nbr_curves]];
+ model.rpar = [[this.xmin],[this.xmax],[this.ymin],[this.ymax]];
+ model.ipar = [[this.win],[1],[this.N],[this.clrs],[this.siz],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]];
model.blocktype = "d";
model.dep_ut = [false,false];
- exprs = [[string(nbr_curves)],[sci2exp(clrs)],[sci2exp(siz)],[string(win)],[sci2exp([])],[sci2exp(wdim)],[string(xmin)],[string(xmax)],[string(ymin)],[string(ymax)],[string(N)]];
+ exprs = [[string(this.nbr_curves)],[sci2exp(this.clrs)],[sci2exp(this.siz)],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]];
gr_i = [];
this.x = standard_define([2,2],model,exprs,gr_i);
return new BasicBlock(this.x);
@@ -38,57 +38,57 @@ function CSCOPXY() {
exprs = graphics.exprs;
model = arg1.model;
while (true) {
- [ok,nbr_curves,clrs,siz,win,wpos,wdim,xmin,xmax,ymin,ymax,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);
+ [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);
if (!ok) {
break;
}
mess = [];
- if (size(wpos,"*")!=0&&size(wpos,"*")!=2) {
+ if (size(this.wpos,"*")!=0&&size(this.wpos,"*")!=2) {
mess = [[mess],["Window position must be [] or a 2 vector"],[" "]];
ok = false;
}
- if (size(wdim,"*")!=0&&size(wdim,"*")!=2) {
+ if (size(this.wdim,"*")!=0&&size(this.wdim,"*")!=2) {
mess = [[mess],["Window dim must be [] or a 2 vector"],[" "]];
ok = false;
}
- if (nbr_curves<=0) {
+ if (this.nbr_curves<=0) {
mess = [[mess],["Number of Curves cannot be negative or null"],[" "]];
ok = false;
}
- if (win<-1) {
+ if (this.win<-1) {
mess = [[mess],["Window number cannot be inferior than -1"],[" "]];
ok = false;
}
- if (N<1) {
+ if (this.N<1) {
mess = [[mess],["Buffer size must be at least 1"],[" "]];
ok = false;
}
- if (N==1&&clrs>0) {
+ if (this.N==1&&this.clrs>0) {
mess = [[mess],["Buffer size must be at least 2"],[" "]];
ok = false;
}
- if (ymin>=ymax) {
+ if (this.ymin>=this.ymax) {
mess = [[mess],["Ymax must be greater than Ymin"],[" "]];
ok = false;
}
- if (xmin>=xmax) {
+ if (this.xmin>=this.xmax) {
mess = [[mess],["Xmax must be greater than Xmin"],[" "]];
ok = false;
}
if (!ok) {
message(mess);
} else {
- in1 = nbr_curves*ones(2,1);
+ in1 = this.nbr_curves*ones(2,1);
in2 = ones(2,1);
[model,graphics,ok] = set_io(model,graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]);
- if (wpos==[]) {
- wpos = [[-1],[-1]];
+ if (this.wpos==[]) {
+ this.wpos = [[-1],[-1]];
}
- if (wdim==[]) {
- wdim = [[-1],[-1]];
+ if (this.wdim==[]) {
+ this.wdim = [[-1],[-1]];
}
- rpar = [[xmin],[xmax],[ymin],[ymax]];
- ipar = [[win],[1],[N],[clrs],[siz],[1],[wpos.slice()],[wdim.slice()],[nbr_curves]];
+ rpar = [[this.xmin],[this.xmax],[this.ymin],[this.ymax]];
+ ipar = [[this.win],[1],[this.N],[this.clrs],[this.siz],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]];
model.rpar = rpar;
model.ipar = ipar;
graphics.exprs = exprs;
--
cgit