Commit 3fd92115 authored by Fintan Mc Gee's avatar Fintan Mc Gee

added chart on right click for BIo DataItems

Fixed issue with QBE sor some reousce documents ( use cypher row insead of cypher)
add QBE to DH1 view
parent c06de8b6
......@@ -38,7 +38,7 @@ angular.module('blizaarModule.services')
});
},
addChart:function(chartTargetHTMLTag,nodeUid, layer){
addChart:function(chartTargetHTMLTag,nodeUid, layer,index){
var chartData= [];
var nodeType = multiLayerGraphService.getNodePropertyValue(nodeUid,"type", layer);
......@@ -46,8 +46,14 @@ angular.module('blizaarModule.services')
var chartTitle = "";
if(this.fieldChartsByType[nodeType] && this.fieldChartsByType[nodeType].length ) {
// for now only darw the first chart unless asked to draw all
attribNames = this.fieldChartsByType[nodeType][0].attribs;
chartTitle = this.fieldChartsByType[nodeType][0].chartName;
if(index < this.fieldChartsByType[nodeType].length) {
attribNames = this.fieldChartsByType[nodeType][index].attribs;
chartTitle = this.fieldChartsByType[nodeType][index].chartName;
} else {
return;
}
} else {
return;
}
......
......@@ -95,7 +95,8 @@ angular.module('blizaarModule.services')
// nodeInfoText += '<div id="' + chartID + '"></div>';
// }
// tooltipText = " (" + d3.event.pageX+ "," + d3.event.pageY+ ")<br>"; // DEBUG text
nodeInfoText += '<div id="' + chartID + '"></div>';
nodeInfoText += '<div id="' + chartID + '0"></div>';
nodeInfoText += '<div id="' + chartID + '1"></div>';
for(var i=0;i<this.nodesAttributes.length;i++){
if(typeof(node[this.nodesAttributes[i]]) !== 'undefined')
if(this.nodeImages.indexOf(this.nodesAttributes[i]) > -1){
......@@ -165,7 +166,8 @@ angular.module('blizaarModule.services')
}
// console.log("TooltipDrawn");
nodeChartService.addChart(chartID, node.uid, layerName);
nodeChartService.addChart(chartID + "0", node.uid, layerName,0);
nodeChartService.addChart(chartID + "1", node.uid, layerName,1);
},
......
......@@ -20,8 +20,8 @@ module.exports = {
views: {
admin: ["loadData", "svgView","nodeLink", "canvas2dView", "sigmaView","webglView","aspectCombination","hiveplotList","Multiple_Edges", "hiveplot", "setGraphQBE", "list","nodeLinkList","nodeLinkAttribute","DHList", "bioList","smallMultiples","layerComparison","admin"],
//cvce: ["DHList","nodeLink","setGraphQBE", "svgView","aspectCombination", "hiveplot","hiveplotList","nodeLinkList","smallMultiples","layerComparison"],
cvce: ["DHList","nodeLink","aspectCombination", "hiveplotList","smallMultiples","layerComparison"],
biology:[ "setGraphQBE","bioList","nodeLink","aspectCombination","svgView", "hiveplot","hiveplotList", "nodeLinkList","nodeLinkAttribute","smallMultiples","layerComparison"],
cvce: ["DHList","nodeLink","aspectCombination", "hiveplotList","smallMultiples","layerComparison","setGraphQBE"],
biology:[ "bioList","nodeLink","aspectCombination","setGraphQBE", "hiveplotList", "nodeLinkList","nodeLinkAttribute","smallMultiples","layerComparison"],
//default: ["loadData", "svgView", "Multiple_Edges", "hiveplot", "setGraphQBE", "list","DHList","bioList","nodeLinkList","smallMultiples"]
default: []
}
......
......@@ -105,8 +105,11 @@ module.exports = {
"intersections", "type", "weight"]
} ,
nodeChartFormats: {
Bio: [{chartName: "Metab1", nodeType: "Metabolite", attribs: ["mt_H9A", "mt_H9B", "mt_H9C", "mt_H9D"]},
{chartName: "Metab2", nodeType: "Metabolite", attribs: ["mt_H9A", "mt_H9B", "mt_H9C", "mt_H9D"]}],
Bio: [{chartName: "Evolution:in_time", nodeType: "Metabolite", attribs:["mt_H6_AVG", "mt_H9_AVG", "mt_H15_AVG", "mt_H20_AVG"] },
{chartName: "Nine_day_replicates", nodeType: "Metabolite", attribs: ["mt_H9A", "mt_H9B", "mt_H9C", "mt_H9D"]}
//{chartName: "Metab3", nodeType: "Metabolite", attribs: ["mt_H9A", "mt_H9B", "mt_H9C", "mt_H9D"]}
],
histograph:[]
}
};
......
......@@ -1891,7 +1891,7 @@ function getAnEasyQuery(user,entity,res) {
}
else {query += "match p=()-[n0:"+entity.label+"]->() return count (distinct n0)"}
}
cypher(query, params, cb,["row", "graph"]);
cypherRow(query, params, cb,["row", "graph"]);
};
/**************************************
......
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