summaryrefslogtreecommitdiffstats
path: root/scilab/modules/scicos_blocks
diff options
context:
space:
mode:
Diffstat (limited to 'scilab/modules/scicos_blocks')
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in2
-rw-r--r--scilab/modules/scicos_blocks/macros/Electrical/OpAmp.sci1
-rw-r--r--scilab/modules/scicos_blocks/macros/NonLinear/EXPRESSION.sci (renamed from scilab/modules/scicos_blocks/macros/Misc/EXPRESSION.sci)0
-rw-r--r--scilab/modules/scicos_blocks/macros/NonLinear/MAXMIN.sci6
4 files changed, 6 insertions, 3 deletions
diff --git a/scilab/modules/scicos_blocks/Makefile.in b/scilab/modules/scicos_blocks/Makefile.in
index 6bb8a70..34abd84 100644
--- a/scilab/modules/scicos_blocks/Makefile.in
+++ b/scilab/modules/scicos_blocks/Makefile.in
@@ -1152,9 +1152,11 @@ NMEDIT = @NMEDIT@
1152OBJDUMP = @OBJDUMP@ 1152OBJDUMP = @OBJDUMP@
1153OBJEXT = @OBJEXT@ 1153OBJEXT = @OBJEXT@
1154OCAMLC = @OCAMLC@ 1154OCAMLC = @OCAMLC@
1155OCAMLCFLAGS = @OCAMLCFLAGS@
1155OCAMLDEP = @OCAMLDEP@ 1156OCAMLDEP = @OCAMLDEP@
1156OCAMLLEX = @OCAMLLEX@ 1157OCAMLLEX = @OCAMLLEX@
1157OCAMLOPT = @OCAMLOPT@ 1158OCAMLOPT = @OCAMLOPT@
1159OCAMLOPTFLAGS = @OCAMLOPTFLAGS@
1158OCAMLYACC = @OCAMLYACC@ 1160OCAMLYACC = @OCAMLYACC@
1159OPENMPI_CC = @OPENMPI_CC@ 1161OPENMPI_CC = @OPENMPI_CC@
1160OPENMPI_CFLAGS = @OPENMPI_CFLAGS@ 1162OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
diff --git a/scilab/modules/scicos_blocks/macros/Electrical/OpAmp.sci b/scilab/modules/scicos_blocks/macros/Electrical/OpAmp.sci
index 2aa902c..d11b21d 100644
--- a/scilab/modules/scicos_blocks/macros/Electrical/OpAmp.sci
+++ b/scilab/modules/scicos_blocks/macros/Electrical/OpAmp.sci
@@ -71,6 +71,7 @@ function [x,y,typ]=OpAmp(job,arg1,arg2)
71 x=standard_define([3 5],model,exprs,gr_i) 71 x=standard_define([3 5],model,exprs,gr_i)
72 x.graphics.in_implicit=["I";"I"] 72 x.graphics.in_implicit=["I";"I"]
73 x.graphics.out_implicit=["I"] 73 x.graphics.out_implicit=["I"]
74 x.graphics.sz = [2.5 3]
74 end 75 end
75endfunction 76endfunction
76// OpAmp 77// OpAmp
diff --git a/scilab/modules/scicos_blocks/macros/Misc/EXPRESSION.sci b/scilab/modules/scicos_blocks/macros/NonLinear/EXPRESSION.sci
index 6f85459..6f85459 100644
--- a/scilab/modules/scicos_blocks/macros/Misc/EXPRESSION.sci
+++ b/scilab/modules/scicos_blocks/macros/NonLinear/EXPRESSION.sci
diff --git a/scilab/modules/scicos_blocks/macros/NonLinear/MAXMIN.sci b/scilab/modules/scicos_blocks/macros/NonLinear/MAXMIN.sci
index 2627c1c..906770d 100644
--- a/scilab/modules/scicos_blocks/macros/NonLinear/MAXMIN.sci
+++ b/scilab/modules/scicos_blocks/macros/NonLinear/MAXMIN.sci
@@ -79,19 +79,19 @@ function [x,y,typ]=MAXMIN(job,arg1,arg2)
79 break 79 break
80 end 80 end
81 end 81 end
82
82 case "define" then 83 case "define" then
83 model=scicos_model() 84 model=scicos_model()
84 model.sim=list("minmax",4) 85 model.sim=list("minmax",4)
85 model.out=1 86 model.out=1
86 model.in=-1 87 model.in=[-1 -1]
87 model.blocktype="c" 88 model.blocktype="c"
88 model.dep_ut=[%t %f] 89 model.dep_ut=[%t %f]
89 model.ipar=0; 90 model.ipar=0;
90 exprs=[string([2,1,1]')] 91 exprs=[string([2,2,1]')]
91 gr_i=[] 92 gr_i=[]
92 93
93 x=standard_define([2 2],model,exprs,gr_i) 94 x=standard_define([2 2],model,exprs,gr_i)
94 x.graphics.style = "MAXMIN;displayedLabel=MAX" 95 x.graphics.style = "MAXMIN;displayedLabel=MAX"
95 end 96 end
96endfunction 97endfunction
97