Merge commit 'c6d60bbc' as 'tinawebJS'

tinawebJS/DataScanner.js

+
+function scanDataFolder(){
+        $.ajax({
+            type: 'GET',
+            url: 'php/DirScan_main.php',
+            //data: "type="+type+"&query="+jsonparams,
+            //contentType: "application/json",
+            //dataType: 'json',
+            success : function(data){ 
+                console.log(data);
+                dataFolderTree=data;
+            },
+            error: function(){ 
+                console.log('Page Not found: updateLeftPanel_uni()');
+            }
+        });
+}
+
+function getGexfPath(v){
+	gexfpath=(gexfDictReverse[v])?gexfDictReverse[v]:v;
+        return gexfpath;
+}
+
+function getGexfLegend(gexfPath){
+    legend=(gexfDict[gexfPath])?gexfDict[gexfPath]:gexfPath;
+    return legend;
+}
+
+function jsActionOnGexfSelector(gexfLegend){
+    window.location=window.location.origin+window.location.pathname+"?file="+encodeURIComponent(getGexfPath(gexfLegend));
+}
+
+function listGexfs(){
+    divlen=$("#gexfs").length;
+    if(divlen>0) {
+        param = JSON.stringify(gexfDict);
+        $.ajax({
+            type: 'GET',
+            url: 'php/listFiles.php',
+            //contentType: "application/json",
+            //dataType: 'json',
+            success : function(data){ 
+                html="<select style='width:150px;' ";
+                javs='onchange="'+'jsActionOnGexfSelector(this.value);'+'"';
+                html+=javs;
+                html+=">";
+                html+='<option selected>[More Graphs]</option>';
+                for(var i in data){
+                    //pr("path: "+data[i]);
+                    //pr("legend: "+getGexfLegend(data[i]));
+                    //pr("");
+                    html+="<option>"+getGexfLegend(data[i])+"</option>";
+                }
+                html+="</select>";
+                $("#gexfs").html(html);
+            },
+            error: function(){ 
+                console.log("Page Not found.");
+            }
+        }); 
+    }   
+}

tinawebJS/clean

+#!/bin/bash
+
+#
+ find . -name '*~' -delete

tinawebJS/globalUtils.js

+
+
+function pr(msg) {
+    console.log(msg);
+}
+
+//to general utils
+function getClientTime(){
+    var totalSec = new Date().getTime() / 1000;
+    var d = new Date();
+    var hours = d.getHours();
+    var minutes = parseInt( totalSec / 60 ) % 60;
+    var seconds = (totalSec % 60).toFixed(4);
+    var result = (hours < 10 ? "0" + hours : hours) + ":" + (minutes < 10 ? "0" + minutes : minutes) + ":" + (seconds  < 10 ? "0" + seconds : seconds);
+    return result;
+}
+
+function compareNumbers(a, b) {
+    return a - b;
+}
+
+//python range(a,b) | range(a)
+function calc_range(begin, end) {
+  if (typeof end === "undefined") {
+    end = begin; begin = 0;
+  }
+  var result = [], modifier = end > begin ? 1 : -1;
+  for ( var i = 0; i <= Math.abs(end - begin); i++ ) {
+    result.push(begin + i * modifier);
+  }
+  return result;
+}
+
+
+//to general utils (not used btw)
+function cloneObject(source) {
+    for (i in source) {
+        if (typeof source[i] == 'source') {
+            this[i] = new cloneObject(source[i]);
+        }
+        else{
+            this[i] = source[i];
+  }
+    }
+}
+
+function isUndef(variable){
+    if(typeof(variable)==="undefined") return true;
+    else return false;
+}
+
+
+$.fn.toggleClick = function(){
+        methods = arguments, // store the passed arguments for future reference
+            count = methods.length; // cache the number of methods
+
+        //use return this to maintain jQuery chainability
+        return this.each(function(i, item){
+            // for each element you bind to
+            index = 0; // create a local counter for that element
+            $(item).click(function(){ // bind a click handler to that element
+                return methods[index++ % count].apply(this,arguments); // that when called will apply the 'index'th method to that element
+                // the index % count means that we constrain our iterator between 0 and (count-1)
+            });
+        });
+};
+
+
+ourGetUrlParam = (function () {
+    var get = {
+        push:function (key,value){
+            var cur = this[key];
+            if (cur.isArray){
+                this[key].push(value);
+            }else {
+                this[key] = [];
+                this[key].push(cur);
+                this[key].push(value);
+            }
+        }
+    },
+    decode = function (s, rmSpaceFlag) {
+        s = decodeURIComponent(s.replace(/\+/g, ' '));
+        return rmSpaceFlag ? s.replace(/\s+/g,'') : s;
+    };
+    document.location.search.replace(
+               /\??(?:([^=]+)=(?:%22(.*?)%22|"([^"]*)"|([^&]*))&?)/g,
+            //        ^^^^^^^       ^^^^^   | ^^^^^^^ |^^^^^^^
+            //          key     valUrlquoted|valQuoted|valRaw
+            //  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+            //                       wholeMatch
+
+            function (wholeMatch,key,valUrlquoted,valQuoted,valRaw) {
+
+        // exemple
+        // -------
+        // wholeMatch:      ?type=%22filter%22&
+        // key:             type
+        // valUrlquoted:    filter
+
+        // debug
+        // -----
+        // console.log("getUrlParam re vars wholeMatch  :", wholeMatch)
+        // console.log("getUrlParam re vars key         :", key)
+        // console.log("getUrlParam re vars valUrlquoted:", valUrlquoted)
+        // console.log("getUrlParam re vars valQuoted   :", valQuoted)
+        // console.log("getUrlParam re vars valRaw      :", valRaw)
+
+        var val = ""
+        if (typeof valUrlquoted != "undefined") {
+            val = valUrlquoted
+        }
+        else if (typeof valQuoted != "undefined") {
+            val = valQuoted
+        }
+        else {
+            val = valRaw
+        }
+
+        if (get[decode(key,true)]){
+            get.push(decode(key,true),decode(val));
+        }else {
+            get[decode(key,true)] = decode(val);
+        }
+
+        // debug
+        // -----
+        // console.log("getUrlParam output dict:\n  ", JSON.stringify(get))
+
+    });
+    return get;
+})();
+
+
+
+function ArraySortByValue(array, sortFunc){
+    var tmp = [];
+    oposMAX=0;
+    for (var k in array) {
+        if (array.hasOwnProperty(k)) {
+            tmp.push({
+                key: k,
+                value:  array[k]
+            });
+            if((array[k]) > oposMAX) oposMAX= array[k];
+        }
+    }
+
+    tmp.sort(function(o1, o2) {
+        return sortFunc(o1.value, o2.value);
+    });
+    return tmp;
+}
+
+
+
+function ArraySortByKey(array, sortFunc){
+    var tmp = [];
+    for (var k in array) {
+        if (array.hasOwnProperty(k)) {
+            tmp.push({
+                key: k,
+                value:  array[k]
+            });
+        }
+    }
+
+    tmp.sort(function(o1, o2) {
+        return sortFunc(o1.key, o2.key);
+    });
+    return tmp;
+}
+
+
+function is_empty(obj) {
+    // Assume if it has a length property with a non-zero value
+    // that that property is correct.
+    if (obj.length && obj.length > 0)    return false;
+    if (obj.length && obj.length === 0)  return true;
+
+    for (var key in obj) {
+        if (hasOwnProperty.call(obj, key))    return false;
+    }
+    return true;
+}
+
+
+function getByID(elem) {
+    return document.getElementById(elem);
+}
+
+
+
+function hex2rga(sent_hex) {
+    result = []
+    hex = ( sent_hex.charAt(0) === "#" ? sent_hex.substr(1) : sent_hex );
+    // check if 6 letters are provided
+    if (hex.length === 6) {
+        result = calculateFull(hex);
+        return result;
+    }
+    else if (hex.length === 3) {
+        result = calculatePartial(hex);
+        return result;
+    }
+}
+
+function calculateFull(hex) {
+    var r = parseInt(hex.substring(0, 2), 16);
+    var g = parseInt(hex.substring(2, 4), 16);
+    var b = parseInt(hex.substring(4, 6), 16);
+    return [r,g,b];
+}
+
+
+// function for calculating 3 letters hex value
+function calculatePartial(hex) {
+    var r = parseInt(hex.substring(0, 1) + hex.substring(0, 1), 16);
+    var g = parseInt(hex.substring(1, 2) + hex.substring(1, 2), 16);
+    var b = parseInt(hex.substring(2, 3) + hex.substring(2, 3), 16);
+    return [r,g,b];
+}
+
+function componentToHex(c) {
+    var hex = c.toString(16);
+    return hex.length == 1 ? "0" + hex : hex;
+}
+
+function rgbToHex(r, g, b) {
+    return "#" + componentToHex(r) + componentToHex(g) + componentToHex(b);
+}

tinawebJS/settings_explorerjs.js

+/*
+ * Customize as you want ;)
+ */
+
+// ============ < DEVELOPER OPTIONS > ============
+var geomap=false;
+var minimap=false;
+var getAdditionalInfo=false;//for topPapers div
+
+
+var mainfile=false;
+// ourGetUrlParam.file = "data/testgraph.json";
+
+var dataFolderTree = {};
+var gexfDict={};
+var egonode = {}
+var iwantograph = "";
+
+var bridge={};
+external="";
+//external="http://tina.iscpif.fr/explorerjs/";//Just if you want to use the server-apps from tina.server
+bridge["forFilteredQuery"] = "comexAPI" //external+"php/bridgeClientServer_filter.php";
+bridge["forNormalQuery"] = "comexAPI" //external+"php/bridgeClientServer.php";
+
+
+
+
+ircNick="";
+ircCHN="";
+
+var catSoc = "Document";
+var catSem = "NGram";
+
+var sizeMult = [];
+    sizeMult[catSoc] = 0.0;
+    sizeMult[catSem] = 0.0;
+
+var inactiveColor = '#666';
+var startingNodeId = "1";
+var minLengthAutoComplete = 1;
+var maxSearchResults = 10;
+var strSearchBar = "Search";
+
+var cursor_size_min= 0;
+var cursor_size= 0;
+var cursor_size_max= 100;
+
+var desirableTagCloudFont_MIN=12;
+var desirableTagCloudFont_MAX=20;
+var desirableNodeSizeMIN=1;
+var desirableNodeSizeMAX=12;
+var desirableScholarSize=6; //Remember that all scholars have the same size!
+
+/*
+ *Three states:
+ *  - true: fa2 running at start
+ *  - false: fa2 stopped at start, button exists
+ *  - "off": button doesn't exist, fa2 stopped forever
+ **/ var fa2enabled=false;//"off";
+var stopcriteria = false;
+var iterationsFA2=1000;
+var seed=999999999;//defaultseed
+var semanticConverged=false;
+
+
+var showLabelsIfZoom=2.0;
+var greyColor = "#9b9e9e";
+
+// ============ < SIGMA.JS PROPERTIES > ============
+
+var sigmaJsDrawingProperties = {
+    defaultLabelColor: 'black',
+    defaultLabelSize: 10,//in fact I'm using it as minLabelSize'
+    defaultLabelBGColor: '#fff',
+    defaultLabelHoverColor: '#000',
+    labelThreshold: 6,
+    defaultEdgeType: 'curve',
+
+    borderSize: 2.5,//Something other than 0
+    nodeBorderColor: "default",//exactly like this
+    defaultNodeBorderColor: "black"//,//Any color of your choice
+    //defaultBorderView: "always"
+};
+var sigmaJsGraphProperties = {
+    minEdgeSize: 2,
+    maxEdgeSize: 2
+};
+var sigmaJsMouseProperties = {
+    minRatio:0.1,
+    maxRatio: 15
+};
+// ============ < / SIGMA.JS PROPERTIES > ============
+
+
+// ============ < / DEVELOPER OPTIONS > ============
+
+
+
+// ============ < VARIABLES.JS > ============
+//"http://webchat.freenode.net/?nick=Ademe&channels=#anoe"
+var ircUrl="http://webchat.freenode.net/?nick="+ircNick+"&channels="+ircCHN;
+var twjs="tinawebJS/";
+var categories = {};
+var categoriesIndex = [];
+
+var gexf;
+//var zoom=0;
+
+var checkBox=false;
+var overNodes=false;
+var shift_key=false;
+
+var NOW="A";
+var PAST="--";
+
+var swclickActual="";
+var swclickPrev="";
+var swMacro=true;
+
+var socsemFlag=false;
+var constantNGramFilter;
+
+// var nodeFilterA_past = ""
+// var nodeFilterA_now = ""
+
+// var nodeFilterB_past = ""
+// var nodeFilterB_now = ""
+
+var lastFilter = []
+    lastFilter["#sliderBNodeWeight"] = "-"
+    lastFilter["#sliderAEdgeWeight"] = "-"
+    lastFilter["#sliderBEdgeWeight"] = "-"
+
+// var edgeFilterB_past = ""
+// var edgeFilterB_now = ""
+
+
+
+var overviewWidth = 200;
+var overviewHeight = 175;
+var overviewScale = 0.25;
+var overviewHover=false;
+var moveDelay = 80, zoomDelay = 2;
+//var Vecindad;
+var partialGraph;
+var otherGraph;
+var Nodes = [];
+var Edges = [];
+
+var nodeslength=0;
+
+var labels = [];
+
+var numberOfDocs=0;
+var numberOfNGrams=0;
+
+var selections = [];
+var deselections={};
+var opossites = {};
+var opos=[];
+var oposMAX;
+
+var matches = [];
+
+var nodes1 = [];
+var nodes2 = [];
+var bipartiteD2N = [];
+var bipartiteN2D = [];
+
+var flag=0;
+var firstime=0;
+var leftright=true;
+var edgesTF=false;
+
+//This variables will be updated in sigma.parseCustom.js
+var minNodeSize=1.00;
+var maxNodeSize=5.00;
+var minEdgeWeight=5.0;
+var maxEdgeWeight=0.0;
+//---------------------------------------------------
+
+var bipartite=false;
+var gexfDictReverse={}
+for (var i in gexfDict){
+    gexfDictReverse[gexfDict[i]]=i;
+}
+
+var colorList = ["#000000", "#FFFF00", "#1CE6FF", "#FF34FF", "#FF4A46", "#008941", "#006FA6", "#A30059", "#FFDBE5", "#7A4900", "#0000A6", "#63FFAC", "#B79762", "#004D43", "#8FB0FF", "#997D87", "#5A0007", "#809693", "#FEFFE6", "#1B4400", "#4FC601", "#3B5DFF", "#4A3B53", "#FF2F80", "#61615A", "#BA0900", "#6B7900", "#00C2A0", "#FFAA92", "#FF90C9", "#B903AA", "#D16100", "#DDEFFF", "#000035", "#7B4F4B", "#A1C299", "#300018", "#0AA6D8", "#013349", "#00846F", "#372101", "#FFB500", "#C2FFED", "#A079BF", "#CC0744", "#C0B9B2", "#C2FF99", "#001E09", "#00489C", "#6F0062", "#0CBD66", "#EEC3FF", "#456D75", "#B77B68", "#7A87A1", "#788D66", "#885578", "#FAD09F", "#FF8A9A", "#D157A0", "#BEC459", "#456648", "#0086ED", "#886F4C","#34362D", "#B4A8BD", "#00A6AA", "#452C2C", "#636375", "#A3C8C9", "#FF913F", "#938A81", "#575329", "#00FECF", "#B05B6F", "#8CD0FF", "#3B9700", "#04F757", "#C8A1A1", "#1E6E00", "#7900D7", "#A77500", "#6367A9", "#A05837", "#6B002C", "#772600", "#D790FF", "#9B9700", "#549E79", "#FFF69F", "#201625", "#72418F", "#BC23FF", "#99ADC0", "#3A2465", "#922329", "#5B4534", "#FDE8DC", "#404E55", "#0089A3", "#CB7E98", "#A4E804", "#324E72", "#6A3A4C", "#83AB58", "#001C1E", "#D1F7CE", "#004B28", "#C8D0F6", "#A3A489", "#806C66", "#222800", "#BF5650", "#E83000", "#66796D", "#DA007C", "#FF1A59", "#8ADBB4", "#1E0200", "#5B4E51", "#C895C5", "#320033", "#FF6832", "#66E1D3", "#CFCDAC", "#D0AC94", "#7ED379", "#012C58"];
+
+var RVUniformC = function(seed){
+    this.a=16807;
+    this.b=0;
+    this.m=2147483647;
+    this.u;
+    this.seed=seed;
+    this.x = this.seed;
+    //    this.generar = function(n){
+    //        uniforme = [];
+    //        x = 0.0;
+    //        x = this.seed;
+    //        for(i = 1; i < n ; i++){
+    //            x = ((x*this.a)+this.b)%this.m;
+    //            uniforme[i] = x/this.m;
+    //        }
+    //        return uniforme;
+    //    };
+    this.getRandom = function(){
+        x = ((this.x*this.a)+this.b)%this.m;
+        this.x = x;
+        this.u = this.x/this.m;
+        return this.u;
+    };
+}
+//unifCont = new RVUniformC(100000000)