Skip to content

C
clinicaltrials
Commit 2bdcb035 authored by PkSM3's avatar PkSM3
Browse files
Options

addEdge bugfix (rga<=>hex)

parent 15f8d25d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1352 additions and 105 deletions
css2/custom.css
View file @ 2bdcb035
......@@ -8,7 +8,6 @@
.navbar {
margin-bottom:1px;
}
......
explorerjs.html
View file @ 2bdcb035
......@@ -14,7 +14,7 @@
<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="css2/token-input.css" type="text/css">
<link rel="stylesheet" href="libs/bootstrap-select.min.css" media="screen">
</head>
......@@ -69,19 +69,31 @@
<div class="navbar-collapse collapse navbar-responsive-collapse">
<div id="left" style="margin:0em 2em;">
<ul class="nav navbar-nav">
<!--
<li>
<a>
<select id="aselector" onchange="console.log('salut monde')" class="selectpicker" data-style="btn btn-success btn-sm" data-width="auto">
<option value="Document" selected>Scholars</option>
<option value="NGram">Keywords</option>
</select>
</a>
</li> -->
<li>
<a>
<button type="button" id="changetype" class="btn btn-primary btn-sm">Change Type</button>
<button type="button" id="changetype" class="btn btn-success btn-sm">Change Type</button>
</a>
</li>
<li>
<a>
<button type="button" id="changelevel" class="btn btn-info btn-sm" disabled>Change Level</button>
</a>
</li>
<li>
<a>
<div style="margin:0em 2em;" id="unranged-value"></div>
......@@ -356,6 +368,7 @@
<script src="bootswatch/js/bootswatch.js"></script>
<script src="libs/bootstrap/js/bootstrap-modal.js" type="text/javascript"></script>
<script src="libs/bootstrap/js/bootstrap-hover-dropdown.min.js" type="text/javascript"></script>
<!--<script src="libs/bootstrap-select.min.js" type="text/javascript"></script>-->
<script src="geomap2/js/raphael/raphael-min.js" charset="utf-8" ></script>
......
libs/bootstrap-select.min.css 0 → 100644
View file @ 2bdcb035
/*!
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
*/.bootstrap-select{width:220px \0}.bootstrap-select>.btn{width:100%;padding-right:25px}.error .bootstrap-select .btn{border:1px solid #b94a48}.control-group.error .bootstrap-select .dropdown-toggle{border-color:#b94a48}.bootstrap-select.fit-width{width:auto!important}.bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn){width:220px}.bootstrap-select .btn:focus{outline:thin dotted #333!important;outline:5px auto -webkit-focus-ring-color!important;outline-offset:-2px}.bootstrap-select.form-control{margin-bottom:0;padding:0;border:none}.bootstrap-select.form-control:not([class*=col-]){width:100%}.bootstrap-select.btn-group:not(.input-group-btn),.bootstrap-select.btn-group[class*=col-]{float:none;display:inline-block;margin-left:0}.bootstrap-select.btn-group.dropdown-menu-right,.bootstrap-select.btn-group[class*=col-].dropdown-menu-right,.row-fluid .bootstrap-select.btn-group[class*=col-].dropdown-menu-right{float:right}.form-search .bootstrap-select.btn-group,.form-inline .bootstrap-select.btn-group,.form-horizontal .bootstrap-select.btn-group,.form-group .bootstrap-select.btn-group{margin-bottom:0}.form-group-lg .bootstrap-select.btn-group.form-control,.form-group-sm .bootstrap-select.btn-group.form-control{padding:0}.form-inline .bootstrap-select.btn-group .form-control{width:100%}.input-append .bootstrap-select.btn-group{margin-left:-1px}.input-prepend .bootstrap-select.btn-group{margin-right:-1px}.bootstrap-select.btn-group>.disabled{cursor:not-allowed}.bootstrap-select.btn-group>.disabled:focus{outline:0!important}.bootstrap-select.btn-group .btn .filter-option{display:inline-block;overflow:hidden;width:100%;text-align:left}.bootstrap-select.btn-group .btn .caret{position:absolute;top:50%;right:12px;margin-top:-2px;vertical-align:middle}.bootstrap-select.btn-group[class*=col-] .btn{width:100%}.bootstrap-select.btn-group .dropdown-menu{min-width:100%;z-index:1035;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-select.btn-group .dropdown-menu.inner{position:static;border:0;padding:0;margin:0;border-radius:0;-webkit-box-shadow:none;box-shadow:none}.bootstrap-select.btn-group .dropdown-menu li{position:relative}.bootstrap-select.btn-group .dropdown-menu li:not(.disabled) a:hover small,.bootstrap-select.btn-group .dropdown-menu li:not(.disabled) a:focus small,.bootstrap-select.btn-group .dropdown-menu li.active:not(.disabled) a small{color:#64b1d8;color:rgba(100,177,216,.4)}.bootstrap-select.btn-group .dropdown-menu li.disabled a{cursor:not-allowed}.bootstrap-select.btn-group .dropdown-menu li a{cursor:pointer}.bootstrap-select.btn-group .dropdown-menu li a.opt{position:relative;padding-left:2.25em}.bootstrap-select.btn-group .dropdown-menu li a span.check-mark{display:none}.bootstrap-select.btn-group .dropdown-menu li a span.text{display:inline-block}.bootstrap-select.btn-group .dropdown-menu li small{padding-left:.5em}.bootstrap-select.btn-group .dropdown-menu .notify{position:absolute;bottom:5px;width:96%;margin:0 2%;min-height:26px;padding:3px 5px;background:#f5f5f5;border:1px solid #e3e3e3;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05);pointer-events:none;opacity:.9;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-select.btn-group .no-results{padding:3px;background:#f5f5f5;margin:0 5px}.bootstrap-select.btn-group.fit-width .btn .filter-option{position:static}.bootstrap-select.btn-group.fit-width .btn .caret{position:static;top:auto;margin-top:-1px}.bootstrap-select.btn-group.show-tick .dropdown-menu li.selected a span.check-mark{position:absolute;display:inline-block;right:15px;margin-top:5px}.bootstrap-select.btn-group.show-tick .dropdown-menu li a span.text{margin-right:34px}.bootstrap-select.show-menu-arrow.open>.btn{z-index:1035+1}.bootstrap-select.show-menu-arrow .dropdown-toggle:before{content:'';border-left:7px solid transparent;border-right:7px solid transparent;border-bottom-width:7px;border-bottom-style:solid;border-bottom-color:#ccc;border-bottom-color:rgba(204,204,204,.2);position:absolute;bottom:-4px;left:9px;display:none}.bootstrap-select.show-menu-arrow .dropdown-toggle:after{content:'';border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;bottom:-4px;left:10px;display:none}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:before{bottom:auto;top:-3px;border-bottom:0;border-top-width:7px;border-top-style:solid;border-top-color:#ccc;border-top-color:rgba(204,204,204,.2)}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle:after{bottom:auto;top:-3px;border-top:6px solid #fff;border-bottom:0}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:before{right:12px;left:auto}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle:after{right:13px;left:auto}.bootstrap-select.show-menu-arrow.open>.dropdown-toggle:before,.bootstrap-select.show-menu-arrow.open>.dropdown-toggle:after{display:block}.bs-searchbox,.bs-actionsbox{padding:4px 8px}.bs-actionsbox{float:left;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bs-actionsbox .btn-group button{width:50%}.bs-searchbox+.bs-actionsbox{padding:0 8px 4px}.bs-searchbox input.form-control{margin-bottom:0;width:100%}.mobile-device{position:absolute;top:0;left:0;display:block!important;width:100%;height:100%!important;opacity:0}
\ No newline at end of file
libs/bootstrap-select.min.js 0 → 100644
View file @ 2bdcb035
This diff is collapsed.
libs/bootstrap/js/bootstrap-select.js 0 → 100644
View file @ 2bdcb035
This diff is collapsed.
libs/sizeof.compressed.js deleted 100644 → 0
View file @ 15f8d25d
/*
sizeof.js
A function to calculate the approximate memory usage of objects
Created by Stephen Morley - http://code.stephenmorley.org/ - and released under
the terms of the CC0 1.0 Universal legal code:
http://creativecommons.org/publicdomain/zero/1.0/legalcode
*/
function sizeof(_1){
var _2=[_1];
var _3=0;
for(var _4=0;_4<_2.length;_4++){
switch(typeof _2[_4]){
case "boolean":
_3+=4;
break;
case "number":
_3+=8;
break;
case "string":
_3+=2*_2[_4].length;
break;
case "object":
if(Object.prototype.toString.call(_2[_4])!="[object Array]"){
for(var _5 in _2[_4]){
_3+=2*_5.length;
}
}
for(var _5 in _2[_4]){
var _6=false;
for(var _7=0;_7<_2.length;_7++){
if(_2[_7]===_2[_4][_5]){
_6=true;
break;
}
}
if(!_6){
_2.push(_2[_4][_5]);
}
}
}
}
return _3;
};
php/community.db 100755 → 100644
View file @ 2bdcb035
File mode changed from 100755 to 100644
tinawebJS/js/enviroment.js
View file @ 2bdcb035
......@@ -57,9 +57,16 @@ function changeType() {
pushSWClick("sociosemantic");
RefreshState("AaBb")
} else {
pushSWClick(swclickPrev);
changeToMeso(swclickActual);
RefreshState(PAST)
if(is_empty(selections)) {
changeToMacro(swclickPrev);
pushSWClick(swclickPrev);
RefreshState(PAST.toUpperCase())
} else {
pushSWClick(swclickPrev);
changeToMeso(swclickActual);
RefreshState(PAST)
}
}
// if(swMacro) {
// changeToMacro("semantic");
......@@ -227,7 +234,7 @@ function EdgeWeightFilter(sliderDivID , type_attrb , type , criteria) {
// partialGraph._core.graph.edgesIndex[ID].lock=false;
// partialGraph._core.graph.edgesIndex[ID].hidden=false;
add1Edge(ID)
Edges[ID].lock = false;
// Edges[ID].lock = false;
}
} else {
for(var id in ids) {
......@@ -235,7 +242,7 @@ function EdgeWeightFilter(sliderDivID , type_attrb , type , criteria) {
// partialGraph._core.graph.edgesIndex[ID].lock=true;
// partialGraph._core.graph.edgesIndex[ID].hidden=true;
partialGraph.dropEdge(ID)
Edges[ID].lock = true;
// Edges[ID].lock = true;
}
}
}
......
tinawebJS/js/main.js
View file @ 2bdcb035
......@@ -83,6 +83,11 @@ function bringTheNoise(pathfile,type){
$("#semLoader").hide();
$('#modalloader').modal('show');
// $('.selectpicker').selectpicker();
// === get width and height === //
sigmaLimits();
......
tinawebJS/js/methods.js
View file @ 2bdcb035
......@@ -280,7 +280,7 @@ function pushSWClick(arg){
// it receives entire node
function selection(currentNode){
pr("\t***in selection()");
// pr("\t***in selection()");
if(checkBox==false && cursor_size==0) {
highlightSelectedNodes(false);
opossites = [];
......@@ -415,7 +415,7 @@ function selection(currentNode){
}
function getOpossitesNodes(node_id, entireNode) {
pr("\tin getOpossitesNodes");
// pr("\tin getOpossitesNodes");
node="";
if(entireNode==true) node=node_id;
else node = partialGraph._core.graph.nodesIndex[node_id];
......@@ -1442,24 +1442,26 @@ function changeToMeso(iwannagraph) {
var finalnodes={}
for(var i in selections) {
finalnodes[i]=1
for(var j in nodes1[i].neighbours) {
id=nodes1[i].neighbours[j];
s = i;
t = id;
edg1 = Edges[s+";"+t];
if(edg1){
// pr("\tunhide "+edg1.id)
if(!edg1.lock){
finalnodes[t] = 1;
if(nodes1[i]) {
for(var j in nodes1[i].neighbours) {
id=nodes1[i].neighbours[j];
s = i;
t = id;
edg1 = Edges[s+";"+t];
if(edg1){
// pr("\tunhide "+edg1.id)
if(!edg1.lock){
finalnodes[t] = 1;
}
}
}
edg2 = Edges[t+";"+s];
if(edg2){
// pr("\tunhide "+edg2.id)
if(!edg2.lock){
finalnodes[t] = 1;
edg2 = Edges[t+";"+s];
if(edg2){
// pr("\tunhide "+edg2.id)
if(!edg2.lock){
finalnodes[t] = 1;
}
}
}
}
}
}
......@@ -1480,10 +1482,12 @@ function changeToMeso(iwannagraph) {
else {
// unHide(i);
finalnodes[i]=1;
neigh=nodes1[i].neighbours;
for(var j in neigh) {
// unHide(neigh[j]);
finalnodes[neigh[j]] = 1;
if(nodes1[i]) {
neigh=nodes1[i].neighbours;
for(var j in neigh) {
// unHide(neigh[j]);
finalnodes[neigh[j]] = 1;
}
}
}
}
......@@ -1498,10 +1502,12 @@ function changeToMeso(iwannagraph) {
if(Nodes[i].type==catSoc){
// unHide(i);
finalnodes[i] = 1;
for(var j in nodes1[i].neighbours) {
id=nodes1[i].neighbours[j];
// unHide(id);
finalnodes[id] = 1;
if(nodes1[i]) {
for(var j in nodes1[i].neighbours) {
id=nodes1[i].neighbours[j];
// unHide(id);
finalnodes[id] = 1;
}
}
// createEdgesForExistingNodes(iwannagraph);
}
......@@ -1552,10 +1558,12 @@ function changeToMeso(iwannagraph) {
for(var i in selections) {
// unHide(i);
finalnodes[i] = 1;
neigh=nodes2[i].neighbours;
for(var j in neigh) {
// unHide(neigh[j]);
finalnodes[neigh[j]] = 1;
if(nodes2[i]) {
neigh=nodes2[i].neighbours;
for(var j in neigh) {
// unHide(neigh[j]);
finalnodes[neigh[j]] = 1;
}
}
}
for (var Nk in finalnodes) unHide(Nk);
......@@ -1572,10 +1580,12 @@ function changeToMeso(iwannagraph) {
} else {
// unHide(i);
finalnodes[i] = 1;
neigh=nodes2[i].neighbours;
for(var j in neigh) {
// unHide(neigh[j]);
finalnodes[neigh[j]] = 1;
if(nodes2[i]) {
neigh=nodes2[i].neighbours;
for(var j in neigh) {
// unHide(neigh[j]);
finalnodes[neigh[j]] = 1;
}
}
}
}
......@@ -1594,10 +1604,12 @@ function changeToMeso(iwannagraph) {
if(Nodes[i].type==catSem){
// unHide(i);//sneaky bug!
finalnodes[i] = 1;
for(var j in nodes2[i].neighbours) {
id=nodes2[i].neighbours[j];
// unHide(id);
finalnodes[id] = 1;
if(nodes2[i]) {
for(var j in nodes2[i].neighbours) {
id=nodes2[i].neighbours[j];
// unHide(id);
finalnodes[id] = 1;
}
}
}
}
......@@ -1654,9 +1666,11 @@ function changeToMacro(iwannagraph) {
unHide(n);
}
} // and semantic edges
createEdgesForExistingNodes(iwannagraph);
if(iwannagraph=="social") showMeSomeLabels(6);
swMacro=true;
if (!is_empty(selections))
$.doTimeout(10,function (){
chosenones=(PAST=="a"||PAST=="b")?selections:opossites;
......
tinawebJS/js/sigma.min.js
View file @ 2bdcb035
......@@ -1081,6 +1081,25 @@ sigma.classes.Cascade = function() {
//edge color will be the combination of the 2 node colors
var a = self.nodesIndex[source]['color'];
var b = self.nodesIndex[target]['color'];
if(a.charAt(0)!="#") {
tmp = a.replace("rgba(","").replace(")","").split(",")
a = rgbToHex( parseFloat( tmp[0] ) , parseFloat( tmp[1] ) , parseFloat( tmp[2] ) );
}
if(b.charAt(0)!="#") {
tmp = b.replace("rgba(","").replace(")","").split(",")
b = rgbToHex( parseFloat( tmp[0] ) , parseFloat( tmp[1] ) , parseFloat( tmp[2] ) );
}
pr(source+" : "+a+"\t|\t"+target+" : "+b)
// '#'+sigma.tools.rgbToHex(parseFloat(colorNode.getAttribute('r')),
// parseFloat(colorNode.getAttribute('g')),
// parseFloat(colorNode.getAttribute('b')));
a = hex2rga(a);
b = hex2rga(b);
var r = (a[0] + b[0]) >> 1;
......
tinawebJS/js/sigma.parseCustom.js
View file @ 2bdcb035
......@@ -281,6 +281,7 @@ function onepartiteExtract(){
}
}
$("#closeloader").click();
}
function fullExtract(){
......@@ -448,6 +449,8 @@ function fullExtract(){
if(Nodes[i].type==catSoc) partialGraph.addNode(i,nodeK);
}
//Edges
var edgeId = 0;
var edgesNodes = gexf.getElementsByTagName('edges');
for(i=0; i<edgesNodes.length; i++){
......@@ -462,8 +465,7 @@ function fullExtract(){
target = (Nodes["D::"+target])? ("D::"+target):("N::"+target)
var indice=source+";"+target;
// pr(indice)
var edge = {
id: indice,
......@@ -598,6 +600,7 @@ function fullExtract(){
}
}
$("#closeloader").click();
}
......
tinawebJS/js/sigmaUtils.js
View file @ 2bdcb035
......@@ -175,13 +175,16 @@ function getClientTime(){
function getCountries(){
var nodes = getVisibleNodes();
var countries = {}
pr("in getCountries")
for(var i in nodes) {
theid = nodes[i].id;
// pr(i)
// pr(nodes[i].id+" : "+nodes[i].attr["CC"]+" , "+nodes[i].attr["ACR"])
if (nodes[i].attr["CC"]!="-")
countries[nodes[i].attr["CC"]]=1
// pr(Nodes[theid])
// pr(theid+" : "+Nodes[theid].attr["CC"]+" , "+nodes[i].attr["ACR"])
if (Nodes[theid]["CC"]!="-")
countries[Nodes[theid]["CC"]]=1
// pr("")
}
return Object.keys(countries);
......@@ -193,10 +196,11 @@ function getAcronyms() {
var acrs = {}
pr("in getAcronyms")
for(var i in nodes) {
theid = nodes[i].id;
// pr(i)
// pr(nodes[i].id+" : "+nodes[i].attr["CC"]+" , "+nodes[i].attr["ACR"])
if (nodes[i].attr["ACR"]!="-")
acrs[nodes[i].attr["ACR"]]=1
if (Nodes[theid]["ACR"]!="-")
acrs[Nodes[theid]["ACR"]]=1
// pr("")
}
return ( Object.keys(acrs) );
......@@ -221,7 +225,7 @@ function clustersBy(daclass) {
colorList.sort(function(){ return Math.random()-0.5; });
// pr(colorList);
for(var i in nodes) {
cc = nodes[i].attr["CC"]
cc = Nodes[nodes[i].id]["CC"]
if( !isUndef( cc ) && cc!="-" ) {
nodes[i].color = colorList[ CCxID[cc] ];
}
......@@ -246,7 +250,7 @@ function clustersBy(daclass) {
colorList.sort(function(){ return Math.random()-0.5; });
// pr(colorList);
for(var i in nodes) {
cc = nodes[i].attr["ACR"]
cc = Nodes[nodes[i].id]["ACR"]
if( !isUndef( cc ) && cc!="-" ) {
nodes[i].color = colorList[ CCxID[cc] ];
}
......@@ -294,4 +298,13 @@ function calculatePartial(hex) {
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);
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment