summaryrefslogtreecommitdiffstats
path: root/scilab
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2010-05-17 14:05:32 +0200
committerBruno JOFRET <bruno.jofret@scilab.org>2010-05-25 10:55:16 +0200
commit341e54c660b1ec504b2dacc9e4e337a179f1a2e2 (patch)
tree025a2ca84fd84fd597d092860d5d4ab0853679ff /scilab
parent5db8ccac140c300a0944e47dab49e1ab27785e04 (diff)
downloadscilab-341e54c660b1ec504b2dacc9e4e337a179f1a2e2.zip
scilab-341e54c660b1ec504b2dacc9e4e337a179f1a2e2.tar.gz
Xcos: Scicos decoding improvement
Allocate and decode ports before decoding the block parameters Change-Id: Ic31f48d0100c8758d84f94aee612f5bf97e8e805
Diffstat (limited to 'scilab')
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockElement.java30
1 files changed, 15 insertions, 15 deletions
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockElement.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockElement.java
index 285f293..903fecb 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockElement.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockElement.java
@@ -117,21 +117,6 @@ public class BlockElement extends AbstractElement<BasicBlock> {
117 } 117 }
118 118
119 /* 119 /*
120 * Fill block with the data structure
121 */
122 int field = 1;
123 graphicElement.decode(data.get(field), block);
124
125 field++;
126 modelElement.decode(data.get(field), block);
127
128 field++;
129 block.setInterfaceFunctionName(interfunction);
130
131 field++;
132 fillDocStructure(data.get(field), block);
133
134 /*
135 * Allocate and setup ports 120 * Allocate and setup ports
136 */ 121 */
137 InputPortElement inElement = new InputPortElement(data); 122 InputPortElement inElement = new InputPortElement(data);
@@ -147,6 +132,21 @@ public class BlockElement extends AbstractElement<BasicBlock> {
147 } 132 }
148 133
149 /* 134 /*
135 * Fill block with the data structure
136 */
137 int field = 1;
138 graphicElement.decode(data.get(field), block);
139
140 field++;
141 modelElement.decode(data.get(field), block);
142
143 field++;
144 block.setInterfaceFunctionName(interfunction);
145
146 field++;
147 fillDocStructure(data.get(field), block);
148
149 /*
150 * Set state dependent informations. 150 * Set state dependent informations.
151 */ 151 */
152 block.setOrdering(ordering); 152 block.setOrdering(ordering);