From: Clément DAVID <clement.david@scilab-enterprises.com>
Date: Thu, 4 Aug 2016 16:11:41 +0000 (+0200)
Subject: Xcos: fix port labeling on invalid rpar
X-Git-Tag: 6.0.0~541
X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=4fda446cc2c05825abb32cb988609c9a1d5d4996

Xcos: fix port labeling on invalid rpar

Change-Id: I0c00735a3db948fbda25786e665bb50f326cb4db
---

diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/custom/ProdPortLabeler.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/custom/ProdPortLabeler.java
index 46bb339..41c0c22 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/custom/ProdPortLabeler.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/custom/ProdPortLabeler.java
@@ -76,16 +76,16 @@ public class ProdPortLabeler {
          * Set the ports labels
          */
         JavaController controller = new JavaController();
-        VectorOfInt ipar = new VectorOfInt(ports.size());
+        VectorOfInt ipar = new VectorOfInt();
         controller.getObjectProperty(source.getUID(), Kind.BLOCK, ObjectProperties.IPAR, ipar);
 
         for (int i = 0; i < ports.size(); i++) {
             final int gain;
 
-            if (ipar.size() < i) {
-                gain = 1;
-            } else {
+            if (i < rpar.size()) {
                 gain = ipar.get(i);
+            } else {
+                gain = 1;
             }
 
             ports.get(i).setValue(getLabel(gain));
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/custom/SumPortLabeler.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/custom/SumPortLabeler.java
index 560bf8d..845feac 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/custom/SumPortLabeler.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/custom/SumPortLabeler.java
@@ -77,16 +77,16 @@ public class SumPortLabeler {
          * Set the ports labels
          */
         JavaController controller = new JavaController();
-        VectorOfDouble rpar = new VectorOfDouble(ports.size());
+        VectorOfDouble rpar = new VectorOfDouble();
         controller.getObjectProperty(source.getUID(), Kind.BLOCK, ObjectProperties.RPAR, rpar);
 
         for (int i = 0; i < ports.size(); i++) {
             final double gain;
 
-            if (rpar.size() < i) {
-                gain = 1;
-            } else {
+            if (i < rpar.size()) {
                 gain = rpar.get(i);
+            } else {
+                gain = 1;
             }
 
             ports.get(i).setValue(getLabel(gain));