summaryrefslogtreecommitdiff
path: root/js/MatrixOp/EXTRACT.js
diff options
context:
space:
mode:
authorSunil Shetye2018-06-18 23:41:23 +0530
committerSunil Shetye2018-06-19 10:31:46 +0530
commit1170404c7650cb531534b308f103c9b6abd50d14 (patch)
treea6a61ae2a9a3592440483906ce6c7254b3243553 /js/MatrixOp/EXTRACT.js
parentcd5b0819762aa4a1cb72d29ab7b8c3ac65bbad76 (diff)
downloadsci2js-1170404c7650cb531534b308f103c9b6abd50d14.tar.gz
sci2js-1170404c7650cb531534b308f103c9b6abd50d14.tar.bz2
sci2js-1170404c7650cb531534b308f103c9b6abd50d14.zip
handle multiple rows
Diffstat (limited to 'js/MatrixOp/EXTRACT.js')
-rw-r--r--js/MatrixOp/EXTRACT.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js
index 9cfd2064..b3fbbbc0 100644
--- a/js/MatrixOp/EXTRACT.js
+++ b/js/MatrixOp/EXTRACT.js
@@ -20,7 +20,7 @@ model.ipar=[1,1,1,1];
model.blocktype="c";
model.firing=[];
model.dep_ut=[true,false];
-label=[sci2exp(1),sci2exp([1]),sci2exp([1])];
+label=[[sci2exp(1)],[sci2exp([1])],[sci2exp([1])]];
gr_i=[];
x=standard_define([3,2],model,label,gr_i);
}
@@ -37,7 +37,7 @@ if (size(label,"*")==14) {
label[9-1]=[];
}
while (true) {
-[ok,typ,a,b,exprs]=scicos_getvalue("Set EXTRACT Block",["Datatype (1=real double 2=Complex)","Lines to extract","Columns to extract"],list("vec",1,"mat",[1,-1],"mat",[1,-1]),label);
+[ok,typ,a,b,exprs]=scicos_getvalue("Set EXTRACT Block",[["Datatype (1=real double 2=Complex)"],["Lines to extract"],["Columns to extract"]],list("vec",1,"mat",[1,-1],"mat",[1,-1]),label);
a=a.slice();
b=b.slice();
if (!ok) {
@@ -73,7 +73,7 @@ message("invalid index");
ok=false;
}
}
-model.ipar=[a,b,ma,mb];
+model.ipar=[[a],[b],[ma],[mb]];
in1=[model.in1,model.in2];
out=[ma,mb];
funtyp=4;