diff options
Diffstat (limited to 'js/Sources')
-rw-r--r-- | js/Sources/CLKINV_f.js | 6 | ||||
-rw-r--r-- | js/Sources/CLKIN_f.js | 6 | ||||
-rw-r--r-- | js/Sources/CLOCK_c.js | 8 | ||||
-rw-r--r-- | js/Sources/CLOCK_f.js | 8 | ||||
-rw-r--r-- | js/Sources/CONST.js | 6 | ||||
-rw-r--r-- | js/Sources/CONST_f.js | 6 | ||||
-rw-r--r-- | js/Sources/CONST_m.js | 6 | ||||
-rw-r--r-- | js/Sources/CURVE_c.js | 14 | ||||
-rw-r--r-- | js/Sources/Counter.js | 10 | ||||
-rw-r--r-- | js/Sources/FROMWS_c.js | 12 | ||||
-rw-r--r-- | js/Sources/GENSIN_f.js | 10 | ||||
-rw-r--r-- | js/Sources/GENSQR_f.js | 6 | ||||
-rw-r--r-- | js/Sources/GEN_SQR.js | 12 | ||||
-rw-r--r-- | js/Sources/INIMPL_f.js | 6 | ||||
-rw-r--r-- | js/Sources/Modulo_Count.js | 8 | ||||
-rw-r--r-- | js/Sources/PULSE_SC.js | 12 | ||||
-rw-r--r-- | js/Sources/RAMP.js | 10 | ||||
-rw-r--r-- | js/Sources/RAND_f.js | 12 | ||||
-rw-r--r-- | js/Sources/RAND_m.js | 14 | ||||
-rw-r--r-- | js/Sources/READAU_f.js | 10 | ||||
-rw-r--r-- | js/Sources/READC_f.js | 20 | ||||
-rw-r--r-- | js/Sources/RFILE_f.js | 14 | ||||
-rw-r--r-- | js/Sources/STEP.js | 10 | ||||
-rw-r--r-- | js/Sources/SampleCLK.js | 8 | ||||
-rw-r--r-- | js/Sources/TKSCALE.js | 10 |
25 files changed, 122 insertions, 122 deletions
diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js index 140623c7..c694928c 100644 --- a/js/Sources/CLKINV_f.js +++ b/js/Sources/CLKINV_f.js @@ -23,12 +23,12 @@ function CLKINV_f() { return options; } CLKINV_f.prototype.set = function CLKINV_f() { - this.prt = parseFloat(arguments[0]["prt"]) - this.exprs = parseFloat(arguments[0]["exprs"]) this.exprs = this.graphics.exprs; this.exprs = this.exprs[1-1]; while (true) { - [ok,this.prt,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CLKINV_f")],[" "],["Event input port"],[" "]],"Port Number",list("vec",1),this.exprs); + var ok = true; + this.prt = parseFloat(arguments[0]["prt"]); + this.exprs = parseFloat(arguments[0]["exprs"]); this.prt = int(this.prt); if (!ok) { break; diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js index 73cd143c..96057474 100644 --- a/js/Sources/CLKIN_f.js +++ b/js/Sources/CLKIN_f.js @@ -22,12 +22,12 @@ function CLKIN_f() { return options; } CLKIN_f.prototype.set = function CLKIN_f() { - this.prt = parseFloat(arguments[0]["prt"]) - this.exprs = parseFloat(arguments[0]["exprs"]) this.exprs = this.graphics.exprs; this.exprs = this.exprs[1-1]; while (true) { - [ok,this.prt,this.exprs] = scicos_getvalue("Set Event Input block parameters","Port number",list("vec",1),this.exprs); + var ok = true; + this.prt = parseFloat(arguments[0]["prt"]); + this.exprs = parseFloat(arguments[0]["exprs"]); this.prt = int(this.prt); if (!ok) { break; diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js index a967cc83..1b458be2 100644 --- a/js/Sources/CLOCK_c.js +++ b/js/Sources/CLOCK_c.js @@ -53,9 +53,6 @@ function CLOCK_c() { return options; } CLOCK_c.prototype.set = function CLOCK_c() { - this.dt = arguments[0]["dt"] - this.t0 = arguments[0]["t0"] - this.exprs0 = arguments[0]["exprs0"] if (typeof(o)=="Block"&&o.gui=="EVTDLY_c") { var path = i; break; @@ -68,7 +65,10 @@ function CLOCK_c() { var dt_old = this.model.rpar[1-1]; var model_n = this.model; while (true) { - [ok,this.dt,this.t0,this.exprs0] = scicos_getvalue([[msprintf("Set %s block parameters","CLOCK_c")],[" "],["Event clock generator"],[" "],[" Do not start if \'Initialisation Time\' is negative"],[" "]],["Period","Initialisation Time"],list("vec",1,"vec",1),this.exprs); + var ok = true; + this.dt = arguments[0]["dt"]; + this.t0 = arguments[0]["t0"]; + this.exprs0 = arguments[0]["exprs0"]; if (!ok) { break; } diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js index 3fb2bb94..3ebc7d0c 100644 --- a/js/Sources/CLOCK_f.js +++ b/js/Sources/CLOCK_f.js @@ -53,9 +53,6 @@ function CLOCK_f() { return options; } CLOCK_f.prototype.set = function CLOCK_f() { - this.dt = arguments[0]["dt"] - this.t0 = arguments[0]["t0"] - this.exprs0 = arguments[0]["exprs0"] if (typeof(o)=="Block"&&o.gui=="EVTDLY_f") { var path = i; break; @@ -68,7 +65,10 @@ function CLOCK_f() { var dt_old = this.model.rpar; var model_n = this.model; while (true) { - [ok,this.dt,this.t0,this.exprs0] = scicos_getvalue("Set Clock block parameters",["Period","Init time"],list("vec",1,"vec",1),this.exprs); + var ok = true; + this.dt = arguments[0]["dt"]; + this.t0 = arguments[0]["t0"]; + this.exprs0 = arguments[0]["exprs0"]; if (!ok) { break; } diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js index c48814a6..76661388 100644 --- a/js/Sources/CONST.js +++ b/js/Sources/CONST.js @@ -23,11 +23,11 @@ function CONST() { return options; } CONST.prototype.set = function CONST() { - this.C = parseFloat(arguments[0]["C"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; while (true) { - [ok,this.C,this.exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),this.exprs); + var ok = true; + this.C = parseFloat(arguments[0]["C"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js index 22b503c3..c866e463 100644 --- a/js/Sources/CONST_f.js +++ b/js/Sources/CONST_f.js @@ -23,11 +23,11 @@ function CONST_f() { return options; } CONST_f.prototype.set = function CONST_f() { - this.C = parseFloat(arguments[0]["C"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; while (true) { - [ok,this.C,this.exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),this.exprs); + var ok = true; + this.C = parseFloat(arguments[0]["C"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js index 7996dfc3..55c8e3a6 100644 --- a/js/Sources/CONST_m.js +++ b/js/Sources/CONST_m.js @@ -26,11 +26,11 @@ function CONST_m() { return options; } CONST_m.prototype.set = function CONST_m() { - this.C = inverse(arguments[0]["C"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; while (true) { - [ok,this.C,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONST_m")],[" "],["Constant value generator"],[" "]],"Constant Value",list("vec",-1),this.exprs); + var ok = true; + this.C = inverse(arguments[0]["C"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js index 4e040c1c..c80502c7 100644 --- a/js/Sources/CURVE_c.js +++ b/js/Sources/CURVE_c.js @@ -37,18 +37,18 @@ function CURVE_c() { return options; } CURVE_c.prototype.set = function CURVE_c() { - this.Method = parseFloat(arguments[0]["Method"]) - this.xx = inverse(arguments[0]["xx"]) - this.yy = inverse(arguments[0]["yy"]) - this.PeriodicOption = arguments[0]["PeriodicOption"] - this.graf = arguments[0]["graf"] - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; var ok = false; var SaveExit = false; while (true) { var Ask_again = false; - [ok,this.Method,this.xx,this.yy,this.PeriodicOption,this.graf,this.exprs] = scicos_getvalue("Spline data",["Spline Method (0..7)","x","y","Periodic signal(y/n)?","Launch graphic window(y/n)?"],list("vec",1,"vec",-1,"vec",-1,"str",1,"str",1),this.exprs); + var ok = true; + this.Method = parseFloat(arguments[0]["Method"]); + this.xx = inverse(arguments[0]["xx"]); + this.yy = inverse(arguments[0]["yy"]); + this.PeriodicOption = arguments[0]["PeriodicOption"]; + this.graf = arguments[0]["graf"]; + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js index 79fbc87a..3c58ad05 100644 --- a/js/Sources/Counter.js +++ b/js/Sources/Counter.js @@ -30,13 +30,13 @@ function Counter() { return options; } Counter.prototype.set = function Counter() { - this.minim = parseFloat(arguments[0]["minim"]) - this.maxim = parseFloat(arguments[0]["maxim"]) - this.rule = parseFloat(arguments[0]["rule"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; while (true) { - [ok,this.minim,this.maxim,this.rule,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Counter")],[" "],["Integer counter generator"],[" "]],["Minimum","Maximum","Rule (1:Increment, 2:Decrement)"],list("vec",1,"vec",1,"vec",1),this.exprs); + var ok = true; + this.minim = parseFloat(arguments[0]["minim"]); + this.maxim = parseFloat(arguments[0]["maxim"]); + this.rule = parseFloat(arguments[0]["rule"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js index 714ff8fe..4adfef56 100644 --- a/js/Sources/FROMWS_c.js +++ b/js/Sources/FROMWS_c.js @@ -34,14 +34,14 @@ function FROMWS_c() { return options; } FROMWS_c.prototype.set = function FROMWS_c() { - this.varnam = arguments[0]["varnam"] - this.Method = parseFloat(arguments[0]["Method"]) - this.ZC = parseFloat(arguments[0]["ZC"]) - this.OutEnd = parseFloat(arguments[0]["OutEnd"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; while (true) { - [ok,this.varnam,this.Method,this.ZC,this.OutEnd,this.exprs] = scicos_getvalue("Set From_Workspace block parameters",["Variable name","Interpolation Method","Enable zero crossing(0:No, 1:Yes)?","Output at end(0:Zero, 1:Hold, 2:Repeat)"],list("str",1,"vec",1,"vec",1,"vec",1),this.exprs); + var ok = true; + this.varnam = arguments[0]["varnam"]; + this.Method = parseFloat(arguments[0]["Method"]); + this.ZC = parseFloat(arguments[0]["ZC"]); + this.OutEnd = parseFloat(arguments[0]["OutEnd"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js index b141b1a7..6d3b1e7c 100644 --- a/js/Sources/GENSIN_f.js +++ b/js/Sources/GENSIN_f.js @@ -28,13 +28,13 @@ function GENSIN_f() { return options; } GENSIN_f.prototype.set = function GENSIN_f() { - this.M = arguments[0]["M"] - this.F = arguments[0]["F"] - this.P = arguments[0]["P"] - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; while (true) { - [ok,this.M,this.F,this.P,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","GENSIN_f")],[" "],["Sine wave generator"],[" "]],["Magnitude","Frequency (rad/s)","Phase (rad)"],list("vec",1,"vec",1,"vec",1),this.exprs); + var ok = true; + this.M = arguments[0]["M"]; + this.F = arguments[0]["F"]; + this.P = arguments[0]["P"]; + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js index 7c09ea48..874e820d 100644 --- a/js/Sources/GENSQR_f.js +++ b/js/Sources/GENSQR_f.js @@ -26,14 +26,14 @@ function GENSQR_f() { return options; } GENSQR_f.prototype.set = function GENSQR_f() { - this.Amplitude = parseFloat(arguments[0]["Amplitude"]) - this.exprs = parseFloat(arguments[0]["exprs"]) this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[2-1]; } while (true) { - [ok,this.Amplitude,this.exprs] = scicos_getvalue(["Set Square generator block parameters"],["Amplitude"],list("vec",1),this.exprs); + var ok = true; + this.Amplitude = parseFloat(arguments[0]["Amplitude"]); + this.exprs = parseFloat(arguments[0]["exprs"]); if (!ok) { break; } diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js index acd68578..03aac3aa 100644 --- a/js/Sources/GEN_SQR.js +++ b/js/Sources/GEN_SQR.js @@ -59,11 +59,6 @@ function GEN_SQR() { return options; } GEN_SQR.prototype.set = function GEN_SQR() { - scicos_context.Amin = arguments[0]["scicos_context.Amin"] - scicos_context.Amax = arguments[0]["scicos_context.Amax"] - scicos_context.rule = arguments[0]["scicos_context.rule"] - scicos_context.F = arguments[0]["scicos_context.F"] - this.exprs = arguments[0]["exprs"] var y = this.needcompile; var typ = list(); this.exprs = this.graphics.exprs; @@ -74,7 +69,12 @@ function GEN_SQR() { var scicos_context = struct(); var ok = false; while (!ok) { - [ok,scicos_context.Amin,scicos_context.Amax,scicos_context.rule,scicos_context.F,this.exprs] = scicos_getvalue(Btitre,Bitems,Ss,this.exprs); + var ok = true; + scicos_context.Amin = arguments[0]["scicos_context.Amin"]; + scicos_context.Amax = arguments[0]["scicos_context.Amax"]; + scicos_context.rule = arguments[0]["scicos_context.rule"]; + scicos_context.F = arguments[0]["scicos_context.F"]; + this.exprs = arguments[0]["exprs"]; if (!ok) { return; } diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js index 91304a4c..548f42d6 100644 --- a/js/Sources/INIMPL_f.js +++ b/js/Sources/INIMPL_f.js @@ -28,14 +28,14 @@ function INIMPL_f() { return options; } INIMPL_f.prototype.set = function INIMPL_f() { - this.prt = parseFloat(arguments[0]["prt"]) - this.exprs = parseFloat(arguments[0]["exprs"]) this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[1-1]; } while (true) { - [ok,this.prt,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","INIMPL_f")],[" "],["Implicit input port"],[" "]],"Port Number",list("vec",1),this.exprs); + var ok = true; + this.prt = parseFloat(arguments[0]["prt"]); + this.exprs = parseFloat(arguments[0]["exprs"]); if (!ok) { break; } diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js index d3d8fc63..3e7bc4db 100644 --- a/js/Sources/Modulo_Count.js +++ b/js/Sources/Modulo_Count.js @@ -27,12 +27,12 @@ function Modulo_Count() { return options; } Modulo_Count.prototype.set = function Modulo_Count() { - this.ini_c = parseFloat(arguments[0]["ini_c"]) - this.base = parseFloat(arguments[0]["base"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; while (true) { - [ok,this.ini_c,this.base,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Modulo_Count")],[" "],["Modulo counter (0 to N counter)"],[" "]],["Initial State (zero or positive number)","Upper Limit (positive number)"],list("vec",1,"vec",1),this.exprs); + var ok = true; + this.ini_c = parseFloat(arguments[0]["ini_c"]); + this.base = parseFloat(arguments[0]["base"]); + this.exprs = arguments[0]["exprs"]; this.ini_c = int(this.ini_c); this.base = int(this.base); if (!ok) { diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js index 6ec87ef7..6b91077a 100644 --- a/js/Sources/PULSE_SC.js +++ b/js/Sources/PULSE_SC.js @@ -54,11 +54,6 @@ function PULSE_SC() { return options; } PULSE_SC.prototype.set = function PULSE_SC() { - scicos_context.E = arguments[0]["scicos_context.E"] - scicos_context.W = arguments[0]["scicos_context.W"] - scicos_context.F = arguments[0]["scicos_context.F"] - scicos_context.A = arguments[0]["scicos_context.A"] - this.exprs = arguments[0]["exprs"] var y = this.needcompile; var typ = list(); this.exprs = this.graphics.exprs; @@ -69,7 +64,12 @@ function PULSE_SC() { var scicos_context = struct(); var ok = false; while (!ok) { - [ok,scicos_context.E,scicos_context.W,scicos_context.F,scicos_context.A,this.exprs] = scicos_getvalue(Btitre,Bitems,Ss,this.exprs); + var ok = true; + scicos_context.E = arguments[0]["scicos_context.E"]; + scicos_context.W = arguments[0]["scicos_context.W"]; + scicos_context.F = arguments[0]["scicos_context.F"]; + scicos_context.A = arguments[0]["scicos_context.A"]; + this.exprs = arguments[0]["exprs"]; if (!ok) { return; } diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js index 4e351fee..a18024eb 100644 --- a/js/Sources/RAMP.js +++ b/js/Sources/RAMP.js @@ -31,13 +31,13 @@ function RAMP() { return options; } RAMP.prototype.set = function RAMP() { - this.slope = parseFloat(arguments[0]["slope"]) - this.stt = parseFloat(arguments[0]["stt"]) - this.iout = parseFloat(arguments[0]["iout"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; while (true) { - [ok,this.slope,this.stt,this.iout,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RAMP")],[" "],["Ramp function"],[" "]],["Slope","Start Time","Initial Value"],list("vec",1,"vec",1,"vec",1),this.exprs); + var ok = true; + this.slope = parseFloat(arguments[0]["slope"]); + this.stt = parseFloat(arguments[0]["stt"]); + this.iout = parseFloat(arguments[0]["iout"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js index 0cdd5b9c..d38311f7 100644 --- a/js/Sources/RAND_f.js +++ b/js/Sources/RAND_f.js @@ -33,11 +33,6 @@ function RAND_f() { return options; } RAND_f.prototype.set = function RAND_f() { - this.flag = parseFloat(arguments[0]["flag"]) - this.a = parseFloat(arguments[0]["a"]) - this.b = parseFloat(arguments[0]["b"]) - this.seed_c = arguments[0]["seed_c"] - this.exprs = inverse(arguments[0]["exprs"]) this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==5) { this.exprs = this.exprs.slice(1-1,3); @@ -46,7 +41,12 @@ function RAND_f() { this.exprs = [[this.exprs],[string(this.model.dstate[1-1])]]; } while (true) { - [ok,this.flag,this.a,this.b,this.seed_c,this.exprs] = scicos_getvalue([["Set Random generator block parameters"],["flag = 0 : Uniform distribution A is min and A+B max"],["flag = 1 : Normal distribution A is mean and B deviation"],[" "],["A and B must be vector with equal sizes"],["seed is the seed of random number generator (integer<2**31)"]],["flag","A","B","seed"],list("vec",1,"vec",-1,"vec","size(%2,\'*\')","vec",1),this.exprs); + var ok = true; + this.flag = parseFloat(arguments[0]["flag"]); + this.a = parseFloat(arguments[0]["a"]); + this.b = parseFloat(arguments[0]["b"]); + this.seed_c = arguments[0]["seed_c"]; + this.exprs = inverse(arguments[0]["exprs"]); if (!ok) { break; } diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js index f5753151..0e1fdf00 100644 --- a/js/Sources/RAND_m.js +++ b/js/Sources/RAND_m.js @@ -43,18 +43,18 @@ function RAND_m() { return options; } RAND_m.prototype.set = function RAND_m() { - this.typ = inverse(arguments[0]["typ"]) - this.flag = parseFloat(arguments[0]["flag"]) - this.a = parseFloat(arguments[0]["a"]) - this.b = parseFloat(arguments[0]["b"]) - this.seed_c = arguments[0]["seed_c"] - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==14) { this.exprs[9-1] = []; } while (true) { - [ok,this.typ,this.flag,this.a,this.b,this.seed_c,this.exprs] = scicos_getvalue([["Set Random generator block parameters"],["flag = 0 : Uniform distribution A is min and A+B max"],["flag = 1 : Normal distribution A is mean and B deviation"],[" "],["A and B must be matrix with equal sizes"]],["Datatype(1=real double 2=complex)","flag","A","B","SEED"],list("vec",1,"vec",1,"mat",[-1,-2],"mat","[-1 -2]","mat",[1,2]),this.exprs); + var ok = true; + this.typ = inverse(arguments[0]["typ"]); + this.flag = parseFloat(arguments[0]["flag"]); + this.a = parseFloat(arguments[0]["a"]); + this.b = parseFloat(arguments[0]["b"]); + this.seed_c = arguments[0]["seed_c"]; + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js index 1d6748b9..0fafedda 100644 --- a/js/Sources/READAU_f.js +++ b/js/Sources/READAU_f.js @@ -37,10 +37,6 @@ function READAU_f() { return options; } READAU_f.prototype.set = function READAU_f() { - this.fname1 = parseFloat(arguments[0]["fname1"]) - this.N = parseFloat(arguments[0]["N"]) - this.swap = parseFloat(arguments[0]["swap"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; var out = this.model.out; var dstate = this.model.dstate; @@ -50,7 +46,11 @@ function READAU_f() { var lunit = dstate[3-1]; var fname = this.exprs[1-1]; while (true) { - [ok,this.fname1,this.N,this.swap,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","READAU_f")],[" "],["(Read Audio File)"],[" "],["Read is done on a binary \'.au\' file"]],["Input File Name","Buffer size","Swap Mode (0:No, 1:Yes)"],list("str",1,"vec",1,"vec",1),this.exprs); + var ok = true; + this.fname1 = parseFloat(arguments[0]["fname1"]); + this.N = parseFloat(arguments[0]["N"]); + this.swap = parseFloat(arguments[0]["swap"]); + this.exprs = arguments[0]["exprs"]; var tmask1 = []; var outmask = 1; var frmt1 = "uc"; diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js index a52a4711..7077cef6 100644 --- a/js/Sources/READC_f.js +++ b/js/Sources/READC_f.js @@ -46,15 +46,6 @@ function READC_f() { return options; } READC_f.prototype.set = function READC_f() { - this.tmask1 = parseFloat(arguments[0]["tmask1"]) - this.outmask = parseFloat(arguments[0]["outmask"]) - this.fname1 = parseFloat(arguments[0]["fname1"]) - this.frmt1 = arguments[0]["frmt1"] - this.M = parseFloat(arguments[0]["M"]) - this.N = parseFloat(arguments[0]["N"]) - this.offset = parseFloat(arguments[0]["offset"]) - this.swap = parseFloat(arguments[0]["swap"]) - this.exprs = arguments[0]["exprs"] this.model = this.x.model; this.exprs = this.graphics.exprs; var out = this.model.out; @@ -66,7 +57,16 @@ function READC_f() { var fname = this.exprs[3-1]; var frmt = this.exprs[4-1]; while (true) { - [ok,this.tmask1,this.outmask,this.fname1,this.frmt1,this.M,this.N,this.offset,this.swap,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","READC_f")],[" "],["Read from C binary file"]],["Time Record Selection","Outputs Record Selection","Input File Name","Input Format","Record Size","Buffer Size","Initial Record Index","Swap Mode (0:No, 1:Yes)"],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); + var ok = true; + this.tmask1 = parseFloat(arguments[0]["tmask1"]); + this.outmask = parseFloat(arguments[0]["outmask"]); + this.fname1 = parseFloat(arguments[0]["fname1"]); + this.frmt1 = arguments[0]["frmt1"]; + this.M = parseFloat(arguments[0]["M"]); + this.N = parseFloat(arguments[0]["N"]); + this.offset = parseFloat(arguments[0]["offset"]); + this.swap = parseFloat(arguments[0]["swap"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js index a05b52ed..f2c02647 100644 --- a/js/Sources/RFILE_f.js +++ b/js/Sources/RFILE_f.js @@ -39,12 +39,6 @@ function RFILE_f() { return options; } RFILE_f.prototype.set = function RFILE_f() { - this.tmask1 = parseFloat(arguments[0]["tmask1"]) - this.outmask = parseFloat(arguments[0]["outmask"]) - this.fname1 = parseFloat(arguments[0]["fname1"]) - this.frmt1 = parseFloat(arguments[0]["frmt1"]) - this.N = parseFloat(arguments[0]["N"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; var dstate = this.model.dstate; var ipar = this.model.ipar; @@ -59,7 +53,13 @@ function RFILE_f() { this.exprs[6-1] = []; } while (true) { - [ok,this.tmask1,this.outmask,this.fname1,this.frmt1,this.N,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RFILE_f")],[" "],["Read from an input file"],[" "],["Read is done on:"],[" - A binary file if no format given"],[" - A formatted text file if a format (fortran type) is given"]],["Time Record Selection","Outputs Record Selection","Input File Name","Input Format","Buffer Size"],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1),this.exprs); + var ok = true; + this.tmask1 = parseFloat(arguments[0]["tmask1"]); + this.outmask = parseFloat(arguments[0]["outmask"]); + this.fname1 = parseFloat(arguments[0]["fname1"]); + this.frmt1 = parseFloat(arguments[0]["frmt1"]); + this.N = parseFloat(arguments[0]["N"]); + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js index a5779be2..b743301e 100644 --- a/js/Sources/STEP.js +++ b/js/Sources/STEP.js @@ -30,13 +30,13 @@ function STEP() { return options; } STEP.prototype.set = function STEP() { - this.temps = arguments[0]["temps"] - this.in1 = arguments[0]["in1"] - this.fi = arguments[0]["fi"] - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; while (true) { - [ok,this.temps,this.in1,this.fi,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","STEP_FUNCTION")],[" "],["Step Function"],[" "]],["Step Time","Initial Value","Final Value"],list("vec",1,"vec",-1,"vec",-1),this.exprs); + var ok = true; + this.temps = arguments[0]["temps"]; + this.in1 = arguments[0]["in1"]; + this.fi = arguments[0]["fi"]; + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js index 55e4663a..eb2a7a81 100644 --- a/js/Sources/SampleCLK.js +++ b/js/Sources/SampleCLK.js @@ -23,12 +23,12 @@ function SampleCLK() { return options; } SampleCLK.prototype.set = function SampleCLK() { - this.frequ = arguments[0]["frequ"] - this.offset = arguments[0]["offset"] - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; while (true) { - [ok,this.frequ,this.offset,this.exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",1,"vec",1),this.exprs); + var ok = true; + this.frequ = arguments[0]["frequ"]; + this.offset = arguments[0]["offset"]; + this.exprs = arguments[0]["exprs"]; if (!ok) { break; } diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js index a487f386..d98b2531 100644 --- a/js/Sources/TKSCALE.js +++ b/js/Sources/TKSCALE.js @@ -28,12 +28,12 @@ function TKSCALE() { return options; } TKSCALE.prototype.set = function TKSCALE() { - this.a = parseFloat(arguments[0]["a"]) - this.b = parseFloat(arguments[0]["b"]) - this.f = parseFloat(arguments[0]["f"]) - this.exprs = arguments[0]["exprs"] this.exprs = this.graphics.exprs; - [ok,this.a,this.b,this.f,this.exprs] = scicos_getvalue("Set scale block parameters",["Min value","Max value","Normalization"],list("vec",1,"vec",1,"vec",1),this.exprs); + var ok = true; + this.a = parseFloat(arguments[0]["a"]); + this.b = parseFloat(arguments[0]["b"]); + this.f = parseFloat(arguments[0]["f"]); + this.exprs = arguments[0]["exprs"]; if (ok) { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.a],[this.b],[this.f]); |