better management of gridbad layout

Change-Id: I02adfbb284a63ea57234789236302fdd70cf17a4

diff --git a/scilab/modules/graphic_objects/src/cpp/webutils.cpp b/scilab/modules/graphic_objects/src/cpp/webutils.cpp
index 6cc419c..8ccf36c 100644 (file)
--- a/scilab/modules/graphic_objects/src/cpp/webutils.cpp
+++ b/scilab/modules/graphic_objects/src/cpp/webutils.cpp
@@ -939,7 +939,7 @@ void WebUtils::setUIGridBag(int uid, std::string& str, bool append)
     td = "var __td__ = " + createElement("TD");
 
     std::string name("_" + std::to_string(grid[0]) + "_" + std::to_string(grid[1]));
-    td += "__td__.id = " + getIdString(uid, name) + ";";
+    td += "__td__.id = " + getIdString(parent, name) + ";";
 
     if (grid[2] != 1)
     {
@@ -951,24 +951,30 @@ void WebUtils::setUIGridBag(int uid, std::string& str, bool append)
         td += "__td__.rowSpan = '" + std::to_string(grid[3]) + "';";
     }
 
-    //td += "__td__.style.width = '100%';";
     td += "__td__.appendChild(__child__);";
 
     //build or get tr
     name = "_" + std::to_string(grid[1]);
     std::string tr;
     tr = "var __tr__ = " + getElementById(parent, name);
+    tr += "var __table__ = " + getElementById(parent, "_table");
     tr += "if(__tr__ == null){";
-    tr += "";
     tr += "__tr__ = " + createElement("TR");
     tr += "__tr__.id = " + getIdString(parent, name) + ";";
-    tr += "var __table__ = " + getElementById(parent, "_table");
-    tr += "__table__.appendChild(__tr__);";
+    tr += "gridbagHelperTR(__table__, __tr__, " + std::to_string(grid[1]) + ");";
     tr += "}";
-    tr += "__tr__.appendChild(__td__);";
+    tr += "gridbagHelperTD(__tr__,__td__, " + std::to_string(grid[0]) + ");";
+
+    //to force refresh of table, move it to another component and restore it
+    std::string tricktoforcerefresh("\nvar __scilab__ = document.getElementById('scilab');\n");
+    tricktoforcerefresh += "__scilab__.appendChild(__table__);\n";
+    tricktoforcerefresh += "var __parent__ = " + getElementById(parent) + "\n";
+    tricktoforcerefresh += "__parent__.appendChild(__table__);";
+
 
     str += td;
     str += tr;
+    str += tricktoforcerefresh;
 }
 
 bool WebUtils::hasCallback(int uid)
@@ -1299,78 +1305,61 @@ bool WebUtils::updateDefaultProperties(int uid, std::string& update)
 
     //visible
     setVisible(uid, str);
-    update += str;
 
     //backgoundcolor
-    setUIBackgroundColor(uid, str);
-    update += str;
+    setUIBackgroundColor(uid, str, true);
 
     //enable
-    setUIEnable(uid, str);
-    update += str;
+    setUIEnable(uid, str, true);
 
     //fontangle
-    setUIFontAngle(uid, str);
-    update += str;
+    setUIFontAngle(uid, str, true);
 
     //fontname
-    setUIFontName(uid, str);
-    update += str;
+    setUIFontName(uid, str, true);
 
     //fontsize & fontunits
-    setUIFontSize(uid, str);
-    update += str;
+    setUIFontSize(uid, str, true);
 
     //fontweight
-    setUIFontWeight(uid, str);
-    update += str;
+    setUIFontWeight(uid, str, true);
 
     //foregroundcolor
-    setUIForegroundColor(uid, str);
-    update += str;
+    setUIForegroundColor(uid, str, true);
 
     //horizontalalignment
-    setUIHorizontalAlignment(uid, str);
-    update += str;
+    setUIHorizontalAlignment(uid, str, true);
 
     //relief ?
-    setUIRelief(uid, str);
-    update += str;
+    setUIRelief(uid, str, true);
 
     //string
-    setUIString(uid, str);
-    update += str;
+    setUIString(uid, str, true);
 
     //verticalalignment
-    setUIVerticalAlignment(uid, str);
-    update += str;
+    setUIVerticalAlignment(uid, str, true);
 
     //position
-    setUIPosition(uid, str);
-    update += str;
+    setUIPosition(uid, str, true);
 
     //layout ?
-    setUILayout(uid, str);
-    update += str;
+    setUILayout(uid, str, true);
 
     //min
-    setUIMin(uid, str);
-    update += str;
+    setUIMin(uid, str, true);
 
     //max
-    setUIMax(uid, str);
-    update += str;
+    setUIMax(uid, str, true);
 
     //step
-    setUIStep(uid, str);
-    update += str;
+    setUIStep(uid, str, true);
 
     //vaue
-    setUIValue(uid, str);
-    update += str;
+    setUIValue(uid, str, true);
 
     //set callback uses to update values from web view
-    setCallback(uid, str);
+    setCallback(uid, str, true);
+
     update += str;
 
     return true;

diff --git a/scilab/node/favicon.ico b/scilab/node/favicon.ico
new file mode 100644 (file)
index 0000000..074812b
Binary files /dev/null and b/scilab/node/favicon.ico differ

diff --git a/scilab/node/html/index.html b/scilab/node/html/index.html
index 6b174d5..fa5ff0f 100644 (file)
--- a/scilab/node/html/index.html
+++ b/scilab/node/html/index.html
@@ -256,7 +256,7 @@ body {
                 <td bgcolor="blue" colspan="2"></td>
             </tr>
         </table>
-        <br>
+        <br!-->
         <table width=200 height=100>
             <tr>
                 <td bgcolor="red"></td>
@@ -270,7 +270,7 @@ body {
             <tr>
                 <td bgcolor="blue" colspan="2"></td>
             </tr>
-        </table!-->
+        </table>
         
         <div id='infobar'></div>
         <h3>Logger:</h3>
@@ -380,6 +380,44 @@ body {
                 //setLogger('<font color="orange">' +  msg.data + '</font>');
                 eval(msg);
             });
+
+            //helper call by scilab to insert gridbad child in good order.
+            function gridbagHelperTD(parent, child, pos) {
+                console.log(parent);
+                console.log(child);
+                console.log(pos);
+                
+                console.log("cells: " + parent.cells.length);
+                for(var i = 0 ; i < parent.cells.length ; ++i){
+                    var __tr__ = parent.cells[i];
+                    var idxstr = __tr__.id.indexOf('_');
+                    var idx = parseInt(__tr__.id.substring(idxstr+1));
+                    if(idx > pos) {
+                        parent.insertBefore(child, __tr__);
+                        return;
+                    }
+                }
+                
+                //not found, insert @last pos
+                parent.insertBefore(child, null);
+               
+            }
+            
+            function gridbagHelperTR(parent, child, pos) {
+                for(var i = 0 ; i < parent.rows.length ; ++i){
+                    var __tr__ = parent.rows[i];
+                    var idxstr = __tr__.id.indexOf('_');
+                    var idx = parseInt(__tr__.id.substring(idxstr+1));
+                    if(idx > pos) {
+                        parent.insertBefore(child, __tr__);
+                        return;
+                    }
+                }
+                
+                //not found, insert @last pos
+                parent.insertBefore(child, null);
+            }
+            
         </script>
     </body>
 </html>

diff --git a/scilab/node/loader.sce b/scilab/node/loader.sce
index 97a9119..5983ffb 100644 (file)
--- a/scilab/node/loader.sce
+++ b/scilab/node/loader.sce
@@ -183,6 +183,18 @@ if 1 then
     magf_grid   = [3, 1, 1, 1];
     cyanf_grid  = [3, 2, 1, 2];
 
+    c.grid = bluef_grid;
+    u_grid3 = uicontrol(f , ...
+        "style"               , "frame", ...
+        "backgroundcolor"     , [0 0 1], ...
+        "constraints"         , c);
+
+        c.grid = cyanf_grid;
+    u_grid1 = uicontrol(f , ...
+        "style"               , "frame", ...
+        "backgroundcolor"     , [0 1 1], ...
+        "constraints"         , c);
+
     c.grid = redf_grid;
     u_grid1 = uicontrol(f , ...
         "style"               , "frame" , ...
@@ -195,12 +207,6 @@ if 1 then
         "backgroundcolor"     , [0 1 0], ...
         "constraints"         , c);
 
-    c.grid = bluef_grid;
-    u_grid3 = uicontrol(f , ...
-        "style"               , "frame", ...
-        "backgroundcolor"     , [0 0 1], ...
-        "constraints"         , c);
-
     c.grid = yelf_grid;
     u_grid4 = uicontrol(f , ...
         "style"               , "frame", ...
@@ -212,10 +218,4 @@ if 1 then
         "style"               , "frame", ...
         "backgroundcolor"     , [1 0 1], ...
         "constraints"         , c);
-       
-    c.grid = cyanf_grid;
-    u_grid1 = uicontrol(f , ...
-        "style"               , "frame", ...
-        "backgroundcolor"     , [0 1 1], ...
-        "constraints"         , c);
 end

diff --git a/scilab/node/scilab_server.js b/scilab/node/scilab_server.js
index 800b825..5882ab1 100644 (file)
--- a/scilab/node/scilab_server.js
+++ b/scilab/node/scilab_server.js
@@ -1,6 +1,7 @@
 var L = console.log;
 
-var app = require('express')();
+var express = require('express');
+var app = express();
 var server = require('http').Server(app);
 var io = require('socket.io')(server);
 
@@ -13,6 +14,10 @@ server.listen(1337);
 
 var script = '/loader';
 
+app.use('/favicon.ico', express.static('./favicon.ico'));
+app.get("/favicon.ico", function(req, res) {
+});
+
 app.get("*", function(req, res) {
     res.sendFile(__dirname + '/html/index.html');
     if(req.url != "/") {