From aa539e33aa337681656bbd44adf2e109cca165c3 Mon Sep 17 00:00:00 2001 From: Vladislav TRUBKIN Date: Tue, 15 Apr 2014 14:30:01 +0200 Subject: [PATCH] Xcos: Bug #9995 fixed - The RELATION_OP box drawn. Also the default size of LOGICAL_OP block has been reduced. Change-Id: Iea019e38ea4fa3e2d51840225a260a7db03d8829 --- scilab/CHANGES_5.5.X | 3 ++- scilab/modules/helptools/images/LOGICAL_OP.png | Bin 1047 -> 1074 bytes scilab/modules/helptools/images/RELATIONALOP.png | Bin 1327 -> 913 bytes .../scicos_blocks/macros/Misc/LOGICAL_OP.sci | 2 +- .../scicos_blocks/macros/Misc/RELATIONALOP.sci | 20 ++++++++++++++++++-- scilab/modules/xcos/etc/Xcos-style.xml | 4 ++-- scilab/modules/xcos/images/palettes/LOGICAL_OP.png | Bin 924 -> 1074 bytes .../modules/xcos/images/palettes/RELATIONALOP.png | Bin 1279 -> 913 bytes 8 files changed, 23 insertions(+), 6 deletions(-) diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X index cde43d8..d20f7c1 100644 --- a/scilab/CHANGES_5.5.X +++ b/scilab/CHANGES_5.5.X @@ -16,8 +16,9 @@ Scilab Bug Fixes Xcos Bug Fixes ============== -* Bug #12751 fixed - cdummy_ entry point was not found when using Code Generation. +* Bug #9996 fixed - The RELATION_OP box drawn in the work space is not compliant to the programming. +* Bug #12751 fixed - cdummy_ entry point was not found when using Code Generation. Changes between version 5.4.1 and 5.5.0 diff --git a/scilab/modules/helptools/images/LOGICAL_OP.png b/scilab/modules/helptools/images/LOGICAL_OP.png index e93f6de2d0cb37eb6a45c9e584e5d14802633059..623f0ac0bf74470386f9144c9984297aef7ae8e7 100644 GIT binary patch delta 1018 zcmV%WcNT`cOdMKi3 z)y0~Zpg{DrOAt|)SR;fW@L57+)6iU6mzNix&v$ruSemW?0KHxh zl!acehhezn9LQ#~5Cj3m!Sj5{TpSJ&KtW!b5zshXOaKp-IGtMVw8s{j;58HU;0+f$pa z|EdFKv$?;&|K{eVy}kYD=;%jk*7sb^W^;FU_w(~JilXD=<1h@Xk!yW@{n*%8GMU6M z%;9jTxxT_ClL^Bx9LN9D+`i48AK<#Zy)Dzaf7I2tWQfWm5{VcLhDanL&KL}a-QC^X zP#6VZ7{)Nnx7!{cAFr&el+0DW5Yja5bUJC8&Ml23Nxr?kiJ>sEEX%U&+S;1O<6#&^ ze%ov|J2y9%+m*iODlaX^aq)P3X=&-?lmF}dAtcQ6L{auriw ze}%4uqG;|}rOX@%hr?E@6+sZI)fx_m#m6|E&ePM=tE;Pgt^!@2=Zo(J*VotLS%v5M zGIgaW%4V}c5HvVANKsU-kju-<^Yilsx#ow(^sT0*rg%Kw+uK{t`8AP9BoYa`-7d~t zTwJuYv+}zyO*0!~^CFZNR&%wa~e}W*zmu-{DWVhRs$z)GYkIiO-gs9$0D>SJ8ygmjMV_Trt0f2`f0ar# zG&D?4Pv>?hNgq2qJB#DE@&&)OwKWh33=IwCn?%+5Eu+ymJUm>Q-%_K8k@8#W^)UH< zOTFIkcl)iKot9^GA4a+#YsE(^vtNoFDE$4S_ zj^kcmUv)a2l0+XLALW+6B#=s_L`FtN(&_XcrI1diEf&k=<)suQ$@41!;O_2jbaeFN ouEve~n2*K~!ko?OHuZ^FSEBqzSd)s<_zNp|sRN5jPhV(WOfKS&9gym9&FD zQ$!qM9TWsbTmm8y(M4m1fG!=X&_M^KIu${2h@gnj!KH|iena5M*O-$wicRzxuDo|i zFHhdQcTb)cD;A5u0E(ipEGx^h%jLpx98@Jc-R46VLM=k7s3NrEH#ab8{^%E!9sFVtswRqoZSdeEh>v!>94#;UN$RVAjFZ z)D+M2Msx_H0jJZ6VHmIu91aIT5M}dpI2={G_8_j=Xb7*buU}YLP!y%Ka4iVLEx@0j zpOeX?f7|WWv$YjZ_2cpJv4pM7^7&tVs%$qlHsbMku~@WReSV%#E&P6eHk&;+kMw_D@jr)6e3A76bea_ ze*`Zg91dSyUESQ==y|GC6-D_folwH|Tk+4`Js1{@(5NK;_+uPfN^$BM=IXNLo@~bv& zt+t~mia;l`f(ZmcNG6ksL_!TYjuS<3e|~-*CXiv6fq?;SJ^=vfbUGG`ZEtUz-^}#d z4&^6Qynh}aAE(o4cy2Tr?dj=ZSr&d_ZEfx3Qy zfBuk-{2@^ke}zAEadGi0{GrRs%Rhg}M*fh^d=o=|$ZkHE(ZI{gi{*H}zrUBw)8%sA z-`{&Y9;=Y#d7h?eL%DABz9P%=;^HF5ah4!?dwUy+M9$96%JwzgZg*W>-SqTyp-`xD zd9b^?8;L|DNkY9#BmO@G0NCH(DPLV(bvm7hpTvK>CTW@;8yiC(_76M^qKrM|p?UxS N002ovPDHLkV1lHT)0hAN diff --git a/scilab/modules/helptools/images/RELATIONALOP.png b/scilab/modules/helptools/images/RELATIONALOP.png index 8e3b9bb1564c91592b0ee487f75201878d8b2ef9..07d64fcb1382f15e9ba75d57b4ce55c4915b19b9 100644 GIT binary patch literal 913 zcmV;C18)3@P)6Qw1 z>xW!6)K6C&-NS!4?a(A z=Ct_@p7&*pZSdY_?|nYs*M=|*13nW?)2USI=;%lyku(|&@XbO|v|6o_B&pNsxX!`2 z4y014a5%iRwKXy_0z^@x(eQXYp-^agdiv875U#rJ?CjWVHqnf-s@LlzNnTxD^;TB^ zfKsUh;!3GhVi?wQ23oBaf*?S2wcG8Uy&?#Lq9}k#s7j^s`FtPm1{sq0yq3#lilQba zCVW0040idvvYV%;CyJsbCnv+i&-rmMA3`Vb0Q&XFpn-32U zTCLV*v%%b7F}+@|)oKZX_-D9vP0tX#o}Zudj4rt57LU=P=;r1o5D4__RdA0?Bob?D zYr?K=wOV_7d!19MyH^3FWfQ z<#Mmrn@lGAp9S~#_kY$Z?RFdEuj|)?@Av!1$Hz}jP8Jpx2K!3Q%*>?I>7}Kmf#r37 zf1jplhr_YFynK9oT(8&rUk~W@dcWU~SS%KcMcB2YqoZoI`r{mhk+*a@ozv;;jkjQA7%tv| zmtj8g7QAfuvw7>{;^N2fRwk4AF}#({X8-fnH}DpO48zG=FtXtQ*DgczDwD~El2;+$ zwO?Ld-rn963WbU193kyq2OUq0W{ILA|{Qmy_PeQ!l5m``BFg`y1rO7ihGow%_)M~X9oxQ!iDwXOh znQ(l3oS2xX)oKmasZ=Uo$_kA}g9&J`&WehPQ@N3plw`2Z%F4=Da)VE2NJz-?^0Ho? zU&{?Xodkb>f0o*+s;V=&A*@qZEp)y%95nL!|AqODVs$drR##WQp&)rnOG`}hm6eq@ z+@MV4UH(e(FxxRqXINNRT3T9kbhMTNNnG&&zoqks-%#Kd39xosTU(R(;NT!7CB@FpE+8Oab#;|hNn$fIGcPZ%xw$#=Ck?Z5 zb8|B)D$3T@7CpPQwMBonuCC6(!NJ4B19pY0P1ZLG>tre#gs-o! z$Ts1=LpW+|j~zNJ80xE>xJ#>B)-O-+#`bnfr(zx^+y z5|H_JetwSan@-XJGlovMHUv-$ojjF-ZA$S&7~$_J&=v`fj*fhMd`?bI5P$J6i1+sP za&mH5l`bwWShTTp6&DxNNqc+y?d@$=Wol|F)^=3FnWU$uv+fGE$*h#9^9KsFMaO-8 zeVLh=2rvk_xw#ktZ*T9($w^ivUR+&WUEST?8yXtuB-(^j@+Y0#-QC3sgmnm$1zo25 zjr?sgE3qi*^>%zZ(bkW0gUj3T>1=FlypkJS-cCU0PjZ9H+wtjaYHE5XH@LhVY#gUf z>^JY_2A8+v8&Bx`S#EH7J3gH)EiJ!%HkOu_un%KT8XO!nVzX9OR(idifX-h(8=jt? z3kwTyq(wzVMr;;4xn6I_r?a)S^@akDEH*Y4yKr1w9P9x}Vurx$V}Fl`h=41)(E$ZF z`as9yoda#&7#k_)Lv3wsw-gx}8N?pJ^ui30BxGPsCN2jBx1vGE<5dps2Oj;_s7N^< zg3db%JVorNDl1^eWKZqtiKE9-+Hc+>|T%e=fiH#avM8yf^zknn1zR4TCnK0XgA=R=rIA9z9i z2NOfe`4Dt|uc3 zw!u2#>8`G>{*n(pJw0n{YXbRs8A(n~#yTWX lCx8J=GI>-gmEivm{R8FxXIrB+y6XS{002ovPDHLkV1n^XbM^oL diff --git a/scilab/modules/scicos_blocks/macros/Misc/LOGICAL_OP.sci b/scilab/modules/scicos_blocks/macros/Misc/LOGICAL_OP.sci index c06c633..bc76864 100644 --- a/scilab/modules/scicos_blocks/macros/Misc/LOGICAL_OP.sci +++ b/scilab/modules/scicos_blocks/macros/Misc/LOGICAL_OP.sci @@ -134,6 +134,6 @@ function [x,y,typ]=LOGICAL_OP(job,arg1,arg2) exprs=[string(nin);string(ipar)] gr_i=[] - x=standard_define([3 2],model,exprs,gr_i) + x=standard_define([2 2],model,exprs,gr_i) end endfunction diff --git a/scilab/modules/scicos_blocks/macros/Misc/RELATIONALOP.sci b/scilab/modules/scicos_blocks/macros/Misc/RELATIONALOP.sci index a4db6e5..1dc73fb 100644 --- a/scilab/modules/scicos_blocks/macros/Misc/RELATIONALOP.sci +++ b/scilab/modules/scicos_blocks/macros/Misc/RELATIONALOP.sci @@ -47,6 +47,7 @@ function [x,y,typ] = RELATIONALOP(job,arg1,arg2) end if (rule<0)|(rule>5) then message("Incorrect operator "+string(rule)+" ; must be 0 to 5.") + ok=%f; end if (Datatype==1) then model.sim=list("relational_op",4) @@ -74,7 +75,21 @@ function [x,y,typ] = RELATIONALOP(job,arg1,arg2) [model,graphics,ok]=set_io(model,graphics,list(in,it),list(out,ot),[],[]) end if ok then + if rule == 0 then + label = "=="; + elseif rule == 1 then + label = "~="; + elseif rule == 2 then + label = "<"; + elseif rule == 3 then + label = "<="; + elseif rule == 4 then + label = ">"; + elseif rule == 5 then + label = ">="; + end graphics.exprs=exprs; + graphics.style=["fontSize=13;fontStyle=1;displayedLabel="+label]; model.ipar=[rule], model.nzcross=zcr, model.nmode=zcr, @@ -85,6 +100,7 @@ function [x,y,typ] = RELATIONALOP(job,arg1,arg2) end case "define" then ipar=[2] + label="<"; model=scicos_model() model.sim=list("relationalop",4) model.in=[1;1] @@ -92,9 +108,9 @@ function [x,y,typ] = RELATIONALOP(job,arg1,arg2) model.ipar=ipar model.blocktype="c" model.dep_ut=[%t %f] - exprs=[string(ipar);string(0)] gr_i=[] - x=standard_define([3 2],model,exprs,gr_i) + x=standard_define([2 2],model,exprs,gr_i) + x.graphics.style=["fontSize=13;fontStyle=1;displayedLabel="+label]; end endfunction diff --git a/scilab/modules/xcos/etc/Xcos-style.xml b/scilab/modules/xcos/etc/Xcos-style.xml index c93ca21..0fc668d 100644 --- a/scilab/modules/xcos/etc/Xcos-style.xml +++ b/scilab/modules/xcos/etc/Xcos-style.xml @@ -759,8 +759,8 @@ - - + + diff --git a/scilab/modules/xcos/images/palettes/LOGICAL_OP.png b/scilab/modules/xcos/images/palettes/LOGICAL_OP.png index 42568f0915c0ba7e8311f18c6fc7d1ad711b82aa..623f0ac0bf74470386f9144c9984297aef7ae8e7 100644 GIT binary patch literal 1074 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