diff options
| -rw-r--r-- | data_structures_correct/IN_f.js | 6 | ||||
| -rw-r--r-- | data_structures_correct/OUT_f.js | 2 | ||||
| -rwxr-xr-x | index.html | 8 | ||||
| -rw-r--r-- | styles/Xcos-style.xml | 4 |
4 files changed, 14 insertions, 6 deletions
diff --git a/data_structures_correct/IN_f.js b/data_structures_correct/IN_f.js index 7527ab6..1a2545a 100644 --- a/data_structures_correct/IN_f.js +++ b/data_structures_correct/IN_f.js @@ -15,7 +15,7 @@ function IN_f () { var exprs = new ScilabString([sci2exp(this.prt)]); var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]); - var block=new standard_define(new ScilabDouble([1,1]),model,exprs,gr_i); + var block = new standard_define(new ScilabDouble([1,1]),model,exprs,gr_i); block.graphics.style = new ScilabString(["IN_f"]); // changed block.graphics.out_implicit = new ScilabString(["E"]); block.graphics.out_style = new ScilabString(["ExplicitOutputPort;align=right;verticalAlign=middle;spacing=10.0;rotation=0"]); @@ -31,14 +31,14 @@ function IN_f () { model.out = new ScilabDouble([-1]); model.out2 = new ScilabDouble([-2]); model.outtyp = new ScilabDouble([-1]); - model.ipar=new ScilabDouble([this.prt]); + model.ipar = new ScilabDouble([this.prt]); model.blocktype = new ScilabString(["c"]); model.dep_ut = new ScilabBoolean([false,false]); var exprs = new ScilabString([sci2exp(this.prt)]); var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]); - this.x=new standard_define(new ScilabDouble([1,1]),model,exprs,gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),model,exprs,gr_i); return new ExplicitInBlock(this.x); } diff --git a/data_structures_correct/OUT_f.js b/data_structures_correct/OUT_f.js index 6b65d13..277148c 100644 --- a/data_structures_correct/OUT_f.js +++ b/data_structures_correct/OUT_f.js @@ -9,7 +9,7 @@ function OUT_f () { model.in = new ScilabDouble([-1]); model.in2 = new ScilabDouble([-2]); model.intyp = new ScilabDouble([-1]); - model.ipar=new ScilabDouble([this.prt]); + model.ipar = new ScilabDouble([this.prt]); model.blocktype = new ScilabString(["c"]); model.dep_ut = new ScilabBoolean([false,false]); var exprs = new ScilabString([sci2exp(this.prt)]); @@ -752,8 +752,12 @@ if (mxUtils.isNode(cell.value)) { var stylesheet = graph.getStylesheet(); - var style = stylesheet.styles[cell.value.getAttribute('style')]; - var displayedLabel = style['displayedLabel']; + var attribute = cell.value.getAttribute('style'); + if(attribute == null){ + attribute = cell.value.getAttribute('interfaceFunctionName'); + } + var style = stylesheet.styles[attribute]; + var displayedLabel = style['displayedLabel']; if (displayedLabel != null) { var displayParameter = cell.blockInstance.instance.displayParameter; for (i in displayParameter) { diff --git a/styles/Xcos-style.xml b/styles/Xcos-style.xml index b3c8583..ac64f8a 100644 --- a/styles/Xcos-style.xml +++ b/styles/Xcos-style.xml @@ -159,6 +159,7 @@ <add as="shape" value="hexagon"/> <add as="rounded" value="1"/> <add as="fillColor" value="white"/> + <add as="displayedLabel" value="%s"/> </add> <add as="READAU_f" extend="blockWithLabel"> <add as="displayedLabel" value="Read from .au<BR> sound file"/> @@ -185,6 +186,7 @@ <add as="shape" value="hexagon"/> <add as="rounded" value="1"/> <add as="fillColor" value="white"/> + <add as="displayedLabel" value="%s"/> </add> <add as="READC_f" extend="blockWithLabel"> <add as="displayedLabel" value="Read from<BR> C binary file"/> @@ -415,6 +417,7 @@ <add as="OUTIMPL_f" extend="blockWithLabel"> <add as="shape" value="hexagon"/> <add as="fillColor" value="white"/> + <add as="displayedLabel" value="%s"/> </add> <!-- INTEGER --> <add as="BITCLEAR" extend="blockWithLabel"> @@ -739,6 +742,7 @@ <add as="shape" value="hexagon"/> <add as="rounded" value="1"/> <add as="fillColor" value="white"/> + <add as="displayedLabel" value="%s"/> </add> <add as="RELATIONALOP" extend="blockWithLabel"> <add as="displayedLabel" value="Relational<BR> op : &<"/> |