NetworkVis: popoto/src/js/popoto.js comparison

comparison popoto/src/js/popoto.js @ 1:db013b2f3e10

added displayAttribute to show on individual nodes. pull all labels and add getLabelFilter to ignore labels (currently with underscore). added ismi-specific app-template and html file.

author	Robert Casties <casties@mpiwg-berlin.mpg.de>
date	Tue, 01 Sep 2015 16:56:31 +0200
parents	3b8b5aa8ab65
children	aea1b2097f4f

comparison

equal deleted inserted replaced

-:3b8b5aa8ab65
+:db013b2f3e10
 var nx = clickedNode.x + (100 * Math.cos((angleDeg * (Math.PI / 180)) - parentAngle)),
 ny = clickedNode.y + (100 * Math.sin((angleDeg * (Math.PI / 180)) - parentAngle));
 var isGroupNode = popoto.provider.getIsGroup(d);
+// filter multiple labels
+var nodeLabel = popoto.provider.getLabelFilter(d.label);
 var node = {
 "id": "" + (++popoto.graph.node.idgen),
 "parent": clickedNode,
 "type": (isGroupNode) ? popoto.graph.node.NodeTypes.GROUP : popoto.graph.node.NodeTypes.CHOOSE,
-"label": d.label,
+"label": nodeLabel,
 "fixed": false,
-"internalLabel": popoto.graph.node.generateInternalLabel(d.label),
+"internalLabel": popoto.graph.node.generateInternalLabel(nodeLabel),
 "x": nx,
 "y": ny
 };
 popoto.graph.force.nodes().push(node);
 matchElements.push("(" + targetNode.internalLabel + ":`" + targetNode.label + "`)-[r]" + rel + "(x)");
 returnElements.push("type(r) AS relationship");
 if (popoto.query.USE_PARENT_RELATION) {
 returnElements.push("head(labels(x)) AS label");
 } else {
-returnElements.push("last(labels(x)) AS label");
+//returnElements.push("last(labels(x)) AS label");
+returnElements.push("labels(x) AS label");
 }
 returnElements.push("count(r) AS count");
 endElements.push("ORDER BY count(r) DESC");
 return "MATCH " + matchElements.join(", ") + ((whereElements.length > 0) ? " WHERE " + whereElements.join(" AND ") : "") + " RETURN " + returnElements.join(", ") + " " + endElements.join(" ");
 popoto.provider.getDisplayResultFunction = function (label) {
 return popoto.provider.getProperty(label, "displayResults");
 };
 /**
+* Select the label if there is more than one.
+*
+* Discards the label with an underscore.
+*/
+popoto.provider.getLabelFilter = function (nodeLabel) {
+if (Array.isArray(nodeLabel)) {
+// use last label
+var label = nodeLabel[nodeLabel.length - 1];
+if (label.indexOf('_') == -1 && nodeLabel.length > 1) {
+// skip if wrong label
+label = nodeLabel[nodeLabel.length - 2];
+}
+// replace array with string
+nodeLabel = label;
+}
+return nodeLabel;
+}
+/**
 * Label provider used by default if none have been defined for a label.
 * This provider can be changed if needed to customize default behavior.
 * If some properties are not found in user customized providers, default values will be extracted from this provider.
 */
 popoto.provider.DEFAULT_PROVIDER = Object.freeze(
 * This id is used by default because it is a convenient way to identify a node when nothing is known about its attributes.
 * But you should really consider using your application attributes instead, it is a bad practice to rely on this attribute.
 */
 "constraintAttribute": popoto.query.NEO4J_INTERNAL_ID,
+/**
+* Defines the attribute of the node to display as a text identifying the node.
+*
+* The default value is the Neo4j internal id.
+*/
+"displayAttribute": popoto.query.NEO4J_INTERNAL_ID,
 /**
 * Return the list of predefined constraints to add for the given label.
 * These constraints will be added in every generated Cypher query.
 *
 * For example if the returned list contain ["$identifier.born > 1976"] for "Person" nodes everywhere in popoto.js the generated Cypher query will add the constraint
 * @param node the node to represent as text.
 * @returns {string} the text representation of the node.
 */
 "getTextValue": function (node) {
 var text;
-var constraintAttr = popoto.provider.getProperty(node.label, "constraintAttribute");
+var textAttr = popoto.provider.getProperty(node.label, "displayAttribute");
 if (node.type === popoto.graph.node.NodeTypes.VALUE) {
-if (constraintAttr === popoto.query.NEO4J_INTERNAL_ID) {
+if (textAttr === popoto.query.NEO4J_INTERNAL_ID) {
 text = "" + node.internalID;
 } else {
-text = "" + node.attributes[constraintAttr];
+text = "" + node.attributes[textAttr];
 }
 } else {
 if (node.value === undefined) {
 text = node.label;
 } else {
-if (constraintAttr === popoto.query.NEO4J_INTERNAL_ID) {
+if (textAttr === popoto.query.NEO4J_INTERNAL_ID) {
 text = "" + node.value.internalID;
 } else {
-text = "" + node.value.attributes[constraintAttr];
+text = "" + node.value.attributes[textAttr];
 }
 }
 }
 // Text is truncated to fill the ellipse
 return text.substring(0, popoto.graph.node.NODE_MAX_CHARS);
 * @param node the node to represent as text.
 * @returns {string} the text semantic representation of the node.
 */
 "getSemanticValue": function (node) {
 var text;
-var constraintAttr = popoto.provider.getProperty(node.label, "constraintAttribute");
+var textAttr = popoto.provider.getProperty(node.label, "displayAttribute");
 if (node.type === popoto.graph.node.NodeTypes.VALUE) {
-if (constraintAttr === popoto.query.NEO4J_INTERNAL_ID) {
+if (textAttr === popoto.query.NEO4J_INTERNAL_ID) {
 text = "" + node.internalID;
 } else {
-text = "" + node.attributes[constraintAttr];
+text = "" + node.attributes[textAttr];
 }
 } else {
 if (node.value === undefined) {
 text = node.label;
 } else {
-if (constraintAttr === popoto.query.NEO4J_INTERNAL_ID) {
+if (textAttr === popoto.query.NEO4J_INTERNAL_ID) {
 text = "" + node.value.internalID;
 } else {
-text = "" + node.value.attributes[constraintAttr];
+text = "" + node.value.attributes[textAttr];
 }
 }
 }
 return text;
 },