Commit 15f8d25d authored by PkSM3's avatar PkSM3

multiple bugfix

parent 3ad22b68
...@@ -12,14 +12,15 @@ function changeType() { ...@@ -12,14 +12,15 @@ function changeType() {
pushSWClick("semantic"); pushSWClick("semantic");
RefreshState("B") RefreshState("B")
} else { } else {
//From soc* to SocSem
if(is_empty(selections)) { if(is_empty(selections)) {
//soc to SocSem
changeToMacro("semantic"); changeToMacro("semantic");
pushSWClick("semantic"); pushSWClick("semantic");
RefreshState("B") RefreshState("B")
} else { } else {
//soc* to SocSem
changeToMeso("sociosemantic"); changeToMeso("sociosemantic");
pushSWClick("sociosemantic"); pushSWClick("sociosemantic");
RefreshState("AaBb") RefreshState("AaBb")
...@@ -246,7 +247,7 @@ function EdgeWeightFilter(sliderDivID , type_attrb , type , criteria) { ...@@ -246,7 +247,7 @@ function EdgeWeightFilter(sliderDivID , type_attrb , type , criteria) {
partialGraph.refresh() partialGraph.refresh()
partialGraph.draw() partialGraph.draw()
fa2enabled=true; partialGraph.startForceAtlas2() // fa2enabled=true; partialGraph.startForceAtlas2()
// }); // });
} }
......
...@@ -81,9 +81,6 @@ function sigmaLimits(){ ...@@ -81,9 +81,6 @@ function sigmaLimits(){
function bringTheNoise(pathfile,type){ function bringTheNoise(pathfile,type){
pr("printing the pathfile:")
pr(pathfile)
$("#semLoader").hide(); $("#semLoader").hide();
$('#modalloader').modal('show'); $('#modalloader').modal('show');
// === get width and height === // // === get width and height === //
...@@ -95,11 +92,8 @@ function bringTheNoise(pathfile,type){ ...@@ -95,11 +92,8 @@ function bringTheNoise(pathfile,type){
.graphProperties(sigmaJsGraphProperties) .graphProperties(sigmaJsGraphProperties)
.mouseProperties(sigmaJsMouseProperties); .mouseProperties(sigmaJsMouseProperties);
otherGraph = sigma.init(document.getElementById('sigma-othergraph')) //dummy graph (semantic layouting in background)
// .drawingProperties(sigmaJsDrawingProperties) otherGraph = sigma.init(document.getElementById('sigma-othergraph'));
// .graphProperties(sigmaJsGraphProperties)
// .mouseProperties(sigmaJsMouseProperties);
// === resize topbar and tweakbar === // // === resize topbar and tweakbar === //
var body=document.getElementsByTagName('body')[0]; var body=document.getElementsByTagName('body')[0];
...@@ -284,8 +278,8 @@ function theListeners(){ ...@@ -284,8 +278,8 @@ function theListeners(){
$.ui.autocomplete.prototype._renderItem = function(ul, item) { $.ui.autocomplete.prototype._renderItem = function(ul, item) {
var searchVal = $("#searchinput").val(); var searchVal = $("#searchinput").val();
var desc = extractContext(item.desc, searchVal); var desc = extractContext(item.desc, searchVal);
pr("desc:") // pr("desc:")
pr(desc) // pr(desc)
return $('<li onclick=\'var s = "'+item.label+'"; search(s);$("#searchinput").val(strSearchBar);\'></li>') return $('<li onclick=\'var s = "'+item.label+'"; search(s);$("#searchinput").val(strSearchBar);\'></li>')
.data('item.autocomplete', item) .data('item.autocomplete', item)
.append("<a><span class=\"labelresult\">" + item.label + "</span></a>" ) .append("<a><span class=\"labelresult\">" + item.label + "</span></a>" )
...@@ -456,7 +450,7 @@ function theListeners(){ ...@@ -456,7 +450,7 @@ function theListeners(){
if(is_empty(actualSel) || i==0){ if(is_empty(actualSel) || i==0){
pr("cursor radius ON, mouseDown -> selecciones vacias"); pr("cursor radius ON, mouseDown -> selecciones vacias");
cancelSelection(false); cancelSelection(false);
LevelButtonDisable(true);
// $("#names").html(""); // $("#names").html("");
// $("#opossiteNodes").html(""); // $("#opossiteNodes").html("");
// $("#information").html(""); // $("#information").html("");
......
This diff is collapsed.
...@@ -788,5 +788,4 @@ function extractFromJson(data,seed){ ...@@ -788,5 +788,4 @@ function extractFromJson(data,seed){
//edge.hidden=false/**///should be commented //edge.hidden=false/**///should be commented
} }
} }
//for socialgraph
function showMeSomeLabels(N){ function showMeSomeLabels(N){
/*======= Show some labels at the beginning =======*/ /*======= Show some labels at the beginning =======*/
minIn=50, minIn=50,
...@@ -112,6 +114,7 @@ function exactfind(label) { ...@@ -112,6 +114,7 @@ function exactfind(label) {
return null; return null;
} }
//to general utils (not used btw)
function cloneObject(source) { function cloneObject(source) {
for (i in source) { for (i in source) {
if (typeof source[i] == 'source') { if (typeof source[i] == 'source') {
...@@ -284,7 +287,8 @@ function calculateFull(hex) { ...@@ -284,7 +287,8 @@ function calculateFull(hex) {
return [r,g,b]; return [r,g,b];
} }
// function for calculating 3 letters hex value
// function for calculating 3 letters hex value
function calculatePartial(hex) { function calculatePartial(hex) {
var r = parseInt(hex.substring(0, 1) + hex.substring(0, 1), 16); 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 g = parseInt(hex.substring(1, 2) + hex.substring(1, 2), 16);
......
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