Second try about: * Bug #12520 fixed - Improve the description of the size in...

Change-Id: Id97c4834fd59a3c9821a4f0fb7f788c3b72dee98

diff --git a/scilab/modules/ui_data/src/cpp/UpdateBrowseVar.cpp b/scilab/modules/ui_data/src/cpp/UpdateBrowseVar.cpp
index 8edcb13..ea117df 100644 (file)
--- a/scilab/modules/ui_data/src/cpp/UpdateBrowseVar.cpp
+++ b/scilab/modules/ui_data/src/cpp/UpdateBrowseVar.cpp
@@ -150,8 +150,8 @@ void UpdateBrowseVar(BOOL update)
     {
         // name
         pstAllVariableNames[i] = getGlobalNamefromId(j);
-        // Bytes used
-        piAllVariableBytes[i] = getGlobalSizefromId(j);
+        // Bytes used - 8 is the number of bytes in a word
+        piAllVariableBytes[i] = getGlobalSizefromId(j) * 8;
         // type
         // Calling "API Scilab": not yet implemented for global variable
         //getNamedVarType(pvApiCtx, pstAllVariableNames[i], &piAllVariableTypes[i]);

diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/SwingScilabVariableBrowser.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/SwingScilabVariableBrowser.java
index 4847932..4579434 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/SwingScilabVariableBrowser.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/SwingScilabVariableBrowser.java
@@ -166,7 +166,7 @@ public final class SwingScilabVariableBrowser extends SwingScilabTab implements
                             /* Use the getModel() method because the
                              * column 5 has been removed from display
                              * but still exist in the model */
-                            tip = Messages.gettext("Words:") + " " + model.getValueAt(rowIndex, BrowseVar.BYTES_COLUMN_INDEX).toString();
+                            tip = Messages.gettext("Bytes:") + " " + model.getValueAt(rowIndex, BrowseVar.BYTES_COLUMN_INDEX).toString();
                         }
                     }
                 }