squashed update 2014-2016

explorerjs.html

@@ -410,9 +410,9 @@
     
     <script src="tinawebJS/sigma.min.js" type="text/javascript" language="javascript"></script>
     <script src="tinawebJS/sigma.forceatlas2.js" type="text/javascript" language="javascript"></script>
-    <script src="settings_explorerjs.js" type="text/javascript" language="javascript"></script>
+    <script src="tinawebJS/settings_explorerjs.js" type="text/javascript" language="javascript"></script>
     <script src="tinawebJS/sigma.parseCustom.js" type="text/javascript" language="javascript"></script>
-    <script src="extras_explorerjs.js" type="text/javascript" language="javascript"></script>
+    <script src="tinawebJS/extras_explorerjs.js" type="text/javascript" language="javascript"></script>
     <script src="tinawebJS/sigmaUtils.js" type="text/javascript" language="javascript"></script>
     <script src="tinawebJS/methods.js" type="text/javascript" language="javascript"></script>
     <script src="tinawebJS/minimap.js" type="text/javascript" language="javascript"></script>

settings_explorerjs.js

-/*
- * Customize as you want ;)
- */
-
-// ============ < DEVELOPER OPTIONS > ============
-var geomap=false;
-var minimap=false;
-var getAdditionalInfo=false;//for topPapers div
-
-
-var mainfile=false;
-// getUrlParam.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"] = external+"php/bridgeClientServer_filter.php";
-bridge["forNormalQuery"] = 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)
-

slidertest.html

-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-    <title>TinawebJS</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta charset="utf-8">
-    
-    <link rel="stylesheet" href="jquery2/jquery-ui.css" media="screen">
-    <link rel="stylesheet" href="css2/bootstrap.css" media="screen">
-    <link rel="stylesheet" href="css2/freshstyle.css" media="screen">
-    <link rel="stylesheet" href="css2/custom.css" media="screen">
-    <link rel="stylesheet" href="css2/sidebar.css" media="screen">
-    <link rel="stylesheet" href="bootswatch/css/bootswatch.css">
-    <link rel="stylesheet" href="css2/font.css" type="text/css">
-    <link rel="stylesheet" href="libs/bootstrap-select.min.css" media="screen">
-
-
-</head>
-  <body>
-
-
-    <!-- this is the tweakbar -->
-    <div id="defaultop" class="navbar navbar-default">
-        <div class="navbar-collapse collapse navbar-responsive-collapse">
-        	<div id="left" style="margin:0em 2em;">
-                  <ul class="nav navbar-nav">
-
-                       <li>
-                         <a>
-                          <div style="margin:0em 2em;" id="unranged-value"></div>
-                          <label style="margin:0em 2em;" for="unranged-value">selector size</label>
-                         </a>
-                       </li>
-
-
-                  </ul>
-                  
-
-                  <ul id="category-B" class="nav navbar-nav navbar-right">
-                        <li>
-                            <ul style="list-style-type: none; margin:0em 1em;">
-                                <li><div id="sliderBEdgeWeight"></div></li>
-                            </ul>
-                        </li>
-                        
-                  </ul>
-
-
-
-          </div>
-            
-        </div><!-- /.nav-collapse -->
-    </div><!-- /.navbar -->
-
-
-    <div id="wrapper"> lalalalalala </div>
-
-
-    <!--<script src="libs/jquery/jquery-1.9.1.js"></script>-->
-    <!--<script src="libs/jquery/jquery-ui.js" type="text/javascript"></script>-->
-    
-    <script src="jquery2/jquery-1.10.2.js" type="text/javascript"></script>
-    <script src="jquery2/jquery-ui.js" type="text/javascript"></script>
-    <script src="libs/jquery/jquery.ba-dotimeout.min.js" type="text/javascript"></script>
-
-    <script type="text/javascript" src="libs/freshslider.1.0.js"></script>
-    <!--source: http://www.jqueryscript.net/slider/Simple-Nice-jQuery-Value-Range-Slider-Plugin-Fresh-Slider.html-->
-    
-    <script src="libs/bootstrap/js/bootstrap.min.js"></script>
-    <script src="bootswatch/js/bootswatch.js"></script>
-    <script src="libs/bootstrap/js/bootstrap-modal.js" type="text/javascript"></script>
-
-    <script src="tinawebJS/js/globalUtils.js" type="text/javascript"></script>
-
-    <script src="slidertest.js" type="text/javascript"></script>
-
-    
-</body>
-</html>

slidertest.js

-
-
-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;
-}
-
-
-var lastFilter = []
-    lastFilter["#sliderBNodeWeight"] = "-"
-    lastFilter["#sliderAEdgeWeight"] = "-"
-    lastFilter["#sliderBEdgeWeight"] = "-"
-
-
-function pushFilterValue(filtername,arg){
-    lastFilter[filtername] = arg;
-}
-
-var finalarray = [];
-    finalarray.push(["D:01","D:02","D:03","D:04","D:05","D:06","D:07","D:08","D:09","D:10"])
-    finalarray.push(["D:11","D:12","D:13","D:14","D:15","D:16","D:17","D:18","D:19","D:20"])
-    finalarray.push(["D:21","D:22","D:23","D:24","D:25","D:26","D:27","D:28","D:29","D:30"])
-    finalarray.push(["D:31","D:32","D:33","D:34","D:35","D:36","D:37","D:38","D:39","D:40"])
-    finalarray.push(["D:41","D:42","D:43","D:44","D:45","D:46","D:47","D:48","D:49","D:50"])
-    finalarray.push(["D:51","D:52","D:53","D:54","D:55","D:56","D:57","D:58","D:59","D:60"])
-    finalarray.push(["D:61","D:62","D:63","D:64","D:65","D:66","D:67","D:68","D:69","D:70"])
-    finalarray.push(["D:71","D:72","D:73","D:74","D:75","D:76","D:77","D:78","D:79","D:80"])
-    finalarray.push(["D:81","D:82","D:83","D:84","D:85","D:86","D:87","D:88","D:89","D:90"])
-    finalarray.push(["D:91","D:92","D:93","D:94","D:95","D:96","D:97","D:98","D:99","D:100"])
-
-var steps = finalarray.length;
-
-var sliderDivID = "#sliderBEdgeWeight";
-
-var lastvalue=("0-"+(steps-1));
-
-pushFilterValue( sliderDivID , "0-"+(steps-1) )
-
-//finished
-$(sliderDivID).freshslider({
-    range: true,
-    step: 1,
-    min:0,
-    bgcolor: "#FFA500" ,
-    max:steps-1,
-    value:[0,steps-1],
-    onchange:function(low, high) {
-
-        var filtervalue = low+"-"+high
-
-        if(filtervalue!=lastFilter[sliderDivID]) {
-
-            $.doTimeout(sliderDivID+"_"+lastFilter[sliderDivID]);
-            
-            $.doTimeout( sliderDivID+"_"+filtervalue,2000,function () {
-
-                pr("\nprevious value "+lastvalue+" | current value "+filtervalue)
-
-                var t0 = lastvalue.split("-")
-                var mint0=parseInt(t0[0]), maxt0=parseInt(t0[1]), mint1=parseInt(low), maxt1=parseInt(high);
-                var addflag = false;
-                var delflag = false;
-
-                var iterarr = []
-
-                if(mint0!=mint1) {
-                    if(mint0<mint1) {
-                        delflag = true;
-                        pr("cotainferior   --||>--------||   a la derecha")
-                    }
-                    if(mint0>mint1) {
-                        addflag = true;
-                        pr("cotainferior   --<||--------||   a la izquierda")
-                    }
-                    iterarr = calc_range(mint0,mint1).sort();
-                }
-
-                if(maxt0!=maxt1) {
-                    if(maxt0<maxt1) {
-                        addflag = true;
-                        pr("cotasuperior   ||--------||>--   a la derecha")
-                    }
-                    if(maxt0>maxt1) {
-                        delflag = true;
-                        pr("cotasuperior   ||--------<||--   a la izquierda")
-                    }
-                    iterarr = calc_range(maxt0,maxt1).sort();
-                }
-
-                for( var c in iterarr ) {
-                    
-                    var i = iterarr[c];
-                    ids = finalarray[i]
-
-                    if(i>=low && i<=high){
-                        if(addflag) {
-                            pr("\tADD pos"+i+": "+ids.join())
-                        }
-
-                    } else {
-                        if(delflag) {
-                            pr("\tDEL pos"+i+": "+ids.join())
-                        }
-                    }
-
-                }
-
-                lastvalue = filtervalue;
-            });  
-
-            pushFilterValue( sliderDivID , filtervalue )
-
-        }
-
-
-
-   }
-
-});
\ No newline at end of file

tinawebJS @ 11e7d77b

-Subproject commit 0f1d9645fc7b35b71bb68ef0bd387215bf91c5a6
+Subproject commit 11e7d77b71ae096b7fad2cfbd716c3c724966ad2