* Bug #12101 fixed - Port ordering was not preserved on parameters change.

Change-Id: I802185bd7ab8cae1bb0eb4c49b571cd26eca007a

diff --git a/scilab/CHANGES_5.4.X b/scilab/CHANGES_5.4.X
index ef8a3de..857b03b 100644 (file)
--- a/scilab/CHANGES_5.4.X
+++ b/scilab/CHANGES_5.4.X
@@ -108,6 +108,8 @@ Xcos
 
 * Bug #11998 fixed - listvar_in_hdf5 did not close the hdf5 file.
 
+* Bug #12101 fixed - Port ordering was not preserved on parameters change.
+
 * Bug #12014 fixed - dep_ut help was wrongly detailed.
 
 * Bug #12031 fixed - Changes in context of superblock did not always have 

diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
index 00f3669..b90c0de 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
@@ -106,6 +106,11 @@ import com.mxgraph.util.mxUtils;
 // CSOFF: ClassFanOutComplexity
 @SuppressWarnings(value = { "serial" })
 public class BasicBlock extends ScilabGraphUniqueObject implements Serializable {
+    /**
+     * Sorted kind of input, useful to sort them by kind
+     */
+    private static final Class<?>[] sortedChildrenClass = {InputPort.class, OutputPort.class, ControlPort.class, CommandPort.class, Object.class};
+
     /*
      * Property names
      */
@@ -222,12 +227,21 @@ public class BasicBlock extends ScilabGraphUniqueObject implements Serializable
         Collections.sort(children, new Comparator<Object>() {
             @Override
             public int compare(Object o1, Object o2) {
-                final int o1Base = calcBaseIncrement(o1);
-                final int o2Base = calcBaseIncrement(o2);
+                // diff is the major sorting by kind
+                int diff = compareByChildClass(o1, o2);
 
-                int diff = o1Base - o2Base;
                 if (o1 instanceof BasicPort && o2 instanceof BasicPort) {
-                    diff = diff + reference.indexOf(o1) - reference.indexOf(o2) + ((BasicPort) o1).getOrdering() - ((BasicPort) o2).getOrdering();
+                    // first sort with the port list index
+                    final int diffIndexOf = Integer.signum(reference.indexOf(o1) - reference.indexOf(o2));
+                    // then sort with the ordering value
+                    final int diffOrdering = Integer.signum(((BasicPort) o1).getOrdering() - ((BasicPort) o2).getOrdering());
+                    // then sort with the port position value
+                    final mxGeometry o1Geom = ((BasicPort) o1).getGeometry();
+                    final mxGeometry o2Geom = ((BasicPort) o2).getGeometry();
+                    final int diffPosition = Integer.signum((int) (o2Geom.getX() - o1Geom.getX() - o2Geom.getY() + o1Geom.getY()));
+
+                    // voting is performed with these equivalent 3 selector
+                    diff = diff + diffIndexOf + diffOrdering + diffPosition;
                 }
 
                 return diff;
@@ -243,22 +257,29 @@ public class BasicBlock extends ScilabGraphUniqueObject implements Serializable
      *            the cell
      * @return the base index
      */
-    private static int calcBaseIncrement(Object cell) {
-        final int base;
-
-        if (cell instanceof InputPort) {
-            base = 1;
-        } else if (cell instanceof OutputPort) {
-            base = 2;
-        } else if (cell instanceof ControlPort) {
-            base = 3;
-        } else if (cell instanceof CommandPort) {
-            base = 4;
-        } else {
-            base = 0;
+    private static final int compareByChildClass(final Object o1, final Object o2) {
+        int o1Index = 0;
+        int o2Index = 0;
+
+        for (int i = 0; i < sortedChildrenClass.length; i++) {
+            final Class<?> klass = sortedChildrenClass[i];
+
+            if (klass.isInstance(o1)) {
+                o1Index = i;
+                break;
+            }
         }
+        for (int i = 0; i < sortedChildrenClass.length; i++) {
+            final Class<?> klass = sortedChildrenClass[i];
 
-        return base * (Integer.MAX_VALUE / 5);
+            if (klass.isInstance(o2)) {
+                o2Index = i;
+                break;
+            }
+        }
+
+        final int base = o1Index - o2Index;
+        return base * (Integer.MAX_VALUE / sortedChildrenClass.length);
     }
 
     /**
@@ -1271,6 +1292,10 @@ public class BasicBlock extends ScilabGraphUniqueObject implements Serializable
             return;
         }
 
+        // sort children according to the ordering parameter (useful on
+        // scilab-5.2.x diagrams)
+        sort(children);
+
         final ScilabDirectHandler handler = ScilabDirectHandler.acquire();
         if (handler == null) {
             return;