diff options
Diffstat (limited to 'js/IntegerOp')
-rw-r--r-- | js/IntegerOp/BITCLEAR.js | 4 | ||||
-rw-r--r-- | js/IntegerOp/BITSET.js | 4 | ||||
-rw-r--r-- | js/IntegerOp/CONVERT.js | 4 | ||||
-rw-r--r-- | js/IntegerOp/EXTRACTBITS.js | 4 | ||||
-rw-r--r-- | js/IntegerOp/INTMUL.js | 4 | ||||
-rw-r--r-- | js/IntegerOp/JKFLIPFLOP.js | 6 | ||||
-rw-r--r-- | js/IntegerOp/LOGIC.js | 4 | ||||
-rw-r--r-- | js/IntegerOp/SHIFT.js | 4 | ||||
-rw-r--r-- | js/IntegerOp/SRFLIPFLOP.js | 6 |
9 files changed, 20 insertions, 20 deletions
diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js index 8190422e..ebaf6b25 100644 --- a/js/IntegerOp/BITCLEAR.js +++ b/js/IntegerOp/BITCLEAR.js @@ -28,7 +28,7 @@ model=arg1.model; while (true) { [ok,Datatype,bit,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"BITCLEAR")," ",gettext("Clear a bit")," "],[msprintf(gettext("Data Type %s"),"(3:int32, 4:int16, 5:int8, ...)"),gettext("Index of Bit (0 is least significant)")],list("vec",1,"vec",1),exprs); if (!ok) { -break +break; } in1=[model.in1,model.in2]; if (floor(bit)!=bit) { @@ -79,7 +79,7 @@ graphics.exprs=exprs; model.opar=list(n); x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js index 58e2ad4d..cb6ef8ff 100644 --- a/js/IntegerOp/BITSET.js +++ b/js/IntegerOp/BITSET.js @@ -28,7 +28,7 @@ model=arg1.model; while (true) { [ok,Datatype,bit,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"BITSET")," ",gettext("Set a bit")," "],[msprintf(gettext("Data Type %s"),"(3:int32, 4:int16, 5:int8, ...)"),gettext("Index of Bit (0 is least significant)")],list("vec",1,"vec",1),exprs); if (!ok) { -break +break; } in1=[model.in1,model.in2]; if (floor(bit)!=bit) { @@ -77,7 +77,7 @@ graphics.exprs=exprs; model.opar=list(n); x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js index 9faa0876..faee9fa1 100644 --- a/js/IntegerOp/CONVERT.js +++ b/js/IntegerOp/CONVERT.js @@ -30,7 +30,7 @@ exprs=graphics.exprs; while (true) { [ok,it,ot,np,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"CONVERT")," ",gettext("Type conversion")," "],[gettext("Input Type (1:double, 3:int32, 4:int16, 5:int8, ...)"),gettext("Output Type (1:double, 3:int32, 4:int16, 5:int8, ...)"),gettext("Do on Overflow (0:Nothing, 1:Saturate, 2:Error)")],list("vec",1,"vec",1,"vec",1),exprs); if (!ok) { -break +break; } if (it==2) { it=1; @@ -363,7 +363,7 @@ if (ok) { graphics.exprs=exprs; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js index 54ed45e7..64fabaf8 100644 --- a/js/IntegerOp/EXTRACTBITS.js +++ b/js/IntegerOp/EXTRACTBITS.js @@ -29,7 +29,7 @@ model=arg1.model; while (true) { [ok,Datatype,rule,bit,scal,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"EXTRACTBITS")," ",gettext("Bits Extraction")," ",gettext(" - Bits to Extract:"),gettext(" 1 Upper Half"),gettext(" 2 Lower Half"),gettext(" 3 Range from MSB"),gettext(" 4 Range to LSB"),gettext(" 5 Range of Bits"),gettext(" - Number of Bits or Index of bit : Index 0 is LSB"),gettext(" If \'Bits to Extract\' is set to \'Range of bits\': [Start, End]")," "],[msprintf(gettext("Data Type %s"),"(3:int32, 4:int16, 5:int8, ...)"),gettext("Bits to extract"),gettext("Number of Bits or Index of Bit"),gettext("Treat Bit Field as an Integer (0:No, 1:Yes)")],list("vec",1,"vec",1,"vec",-1,"vec",1),exprs); if (!ok) { -break +break; } bitstr=strcat(string(bit.slice())," "); if ((rule<1)||(rule>5)) { @@ -222,7 +222,7 @@ graphics.exprs=exprs; model.ipar=[int(bit.slice()),int(numb.slice())]; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index cf1c0b4b..8a8a079c 100644 --- a/js/IntegerOp/INTMUL.js +++ b/js/IntegerOp/INTMUL.js @@ -30,7 +30,7 @@ exprs=graphics.exprs; while (true) { [ok,Datatype,np,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"INTMUL")," ",gettext("Integer matrix multiplication")," "],[msprintf(gettext("Data Type %s"),"(3:int32, 4:int16, 5:int8, ...)"),gettext("Do on Overflow (0:Nothing, 1:Saturate, 2:Error)")],list("vec",1,"vec",1),exprs); if (!ok) { -break +break; } it=Datatype*ones(1,2); ot=Datatype; @@ -99,7 +99,7 @@ model.ipar=np; graphics.exprs=exprs; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index 6e27be91..d06ebfd8 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -56,7 +56,7 @@ for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { o=arg1.model.rpar.objs(i); if (typeof(o)=="Block"&&o.gui=="DOLLAR_m") { path=i; -break +break; } } newpar=list(); @@ -67,7 +67,7 @@ init_old=model.odstate(1); while (true) { [ok,init,exprs0]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"JKFLIPFLOP")," ",gettext("JK flip-flop")," ",gettext("The \'Initial Value\' must be 0 or 1 of type int8"),gettext(" - Negative values are considered as int8(0)"),gettext(" - Positive values are considered as int8(1)")," "],gettext("Initial Value"),list("vec",1),exprs); if (!ok) { -break +break; } if (init<=0) { init=int8(0); @@ -79,7 +79,7 @@ xx.graphics.exprs[1-1]=exprs0; model.odstate[1-1]=init; xx.model=model; arg1.model.rpar.objs[path-1]=xx; -break +break; } } needcompile=0; diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index a94c7b2a..6032df73 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -31,7 +31,7 @@ model=arg1.model; while (true) { [ok,mat,herit,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"LOGIC")," ",gettext("Combinatorial logic")," ",gettext(" Rows of the matrix are the output values"),gettext(" Number of rows must be a power of two."),gettext(" Number of columns gives the number of outputs.")," "],[gettext("Truth Table (matrix of outputs)"),gettext("Accepts Inherited Events (0:No, 1:Yes)")],list("mat",[-1,-2],"vec",1),exprs); if (!ok) { -break +break; } nout=size(mat,2); nin=(log(size(mat,1))/log(2)); @@ -59,7 +59,7 @@ mat=int8(mat); model.opar=list(mat); x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js index 48bc9d66..97684526 100644 --- a/js/IntegerOp/SHIFT.js +++ b/js/IntegerOp/SHIFT.js @@ -31,7 +31,7 @@ exprs=graphics.exprs; while (true) { [ok,Datatype,nb,np,exprs]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"SHIFT")," ",gettext("Shift/Rotates bits")],[msprintf(gettext("Data Type %s"),"(3:int32, 4:int16, 5:int8, ...)"),gettext("Number of Bits to Shift Left (Negative number to shift right)"),gettext("Shift Type (0:Arithmetic, 1:Circular)")],list("vec",1,"vec",1,"vec",1),exprs); if (!ok) { -break +break; } if ((np!=0&&np!=1)) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Shift Type"),np),msprintf(gettext("Must be in the interval %s."),"[0, 1]")); @@ -114,7 +114,7 @@ model.ipar=nb; graphics.exprs=exprs; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index 0fd8afb0..c2800c1b 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -40,7 +40,7 @@ for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { o=arg1.model.rpar.objs(i); if (typeof(o)=="Block"&&o.gui=="DOLLAR_m") { path=i; -break +break; } } newpar=list(); @@ -51,7 +51,7 @@ init_old=model.odstate(1); while (true) { [ok,init,exprs0]=scicos_getvalue([msprintf(gettext("Set %s block parameters"),"SRFLIPFLOP")," ",gettext("SR flip-flop")," ",gettext("The \'Initial Value\' must be 0 or 1 of type int8"),gettext(" - Negative values are considered as int8(0)"),gettext(" - Positive values are considered as int8(1)")," "],gettext("Initial Value"),list("vec",1),exprs); if (!ok) { -break +break; } if (init<=0) { init=int8(0); @@ -63,7 +63,7 @@ xx.graphics.exprs[1-1]=exprs0; model.odstate[1-1]=init; xx.model=model; arg1.model.rpar.objs[path-1]=xx; -break +break; } } needcompile=0; |