Merge branch 'hotfix/labels'

app.json

@@ -7,7 +7,7 @@
     /**
      * The version of the application.
      */
-    "version": "3.0.11",
+    "version": "3.0.12",
 
     /**
      * The relative path to the application's markup file (html, jsp, asp, etc.).

app/view/form/label/labelController.js

@@ -18,8 +18,15 @@ Ext.define('metExploreViz.view.form.label.LabelController', {
 		view.lookupReference('selectLabel').on({
 			beforerender: function(c) {
 				var session = _metExploreViz.getSessionById('viz');
-				var metabKeys=Object.keys(session.getD3Data().getNodes().filter(n => n.getBiologicalType() === "metabolite")[0]);
+				var metabKeys;
 
+				metabKeys = Object.keys(session.getD3Data().getNodes().filter(n => n.getBiologicalType() === view.aStyleFormParent.biologicalType)[0]);
+
+				metabKeys = metabKeys.filter(function(key){
+					return key!=="isSideCompound" && key!=="reactionReversibility" && key!=="reactionReversibility" && key!=="selected" && key!=="duplicated" && key!=="labelVisible" &&
+						key!=="svg" && key!=="svgWidth" && key!=="svgHeight" && key!=="pathways" && key!=="compartment" && key!=="mappingDatas" &&
+						key!=="locked" && key!=="label" && key!=="labelFont" && key!=="index" && key!=="vy" && key!=="vx" && key!=="y" && key!=="x" && key!=="y";
+				});
 				view.lookupReference('selectLabel').setStore(metabKeys);
 
 				if(metabKeys.length>0) {

resources/lib/functions/D3Extention.js

@@ -244,6 +244,8 @@ d3.selection.prototype.setLabelNodeText = function(style, label) {
 
 			name = name.split(' ');
 			el.text('');
+
+			if(label!=="hidden"){
 				for (var i = 0; i < name.length; i++) {
 					var nameDOMFormat = $("<div/>").html(name[i]).text();
 					var tspan = el.append('tspan').text(nameDOMFormat);
@@ -264,6 +266,7 @@ d3.selection.prototype.setLabelNodeText = function(style, label) {
 						tspan.attr('dy', style.getFontSize());
 					}
 				}
+			}
 		})
 
 };

resources/lib/functions/GraphPanel.js

@@ -682,7 +682,22 @@ metExploreD3.GraphPanel = {
 				var reactionStyle;
 				if(jsonParsed.reactionStyle)
 				{
-					var reactionStyle = new ReactionStyle(jsonParsed.reactionStyle.backgroundColor,jsonParsed.reactionStyle.height, jsonParsed.reactionStyle.width, jsonParsed.reactionStyle.rx, jsonParsed.reactionStyle.ry, jsonParsed.reactionStyle.opacity, jsonParsed.reactionStyle.strokeColor, jsonParsed.reactionStyle.strokeWidth, jsonParsed.reactionStyle.fontColor, jsonParsed.reactionStyle.fontSize, jsonParsed.reactionStyle.labelOpacity, jsonParsed.reactionStyle.label,  jsonParsed.reactionStyle.useAlias);
+					var reactionStyle = new ReactionStyle(
+						jsonParsed.reactionStyle.backgroundColor,
+						jsonParsed.reactionStyle.height,
+						jsonParsed.reactionStyle.width,
+						jsonParsed.reactionStyle.rx,
+						jsonParsed.reactionStyle.ry,
+						jsonParsed.reactionStyle.opacity,
+						jsonParsed.reactionStyle.strokeColor,
+						jsonParsed.reactionStyle.strokeWidth,
+						jsonParsed.reactionStyle.fontColor,
+						jsonParsed.reactionStyle.fontSize,
+						jsonParsed.reactionStyle.fontWeight,
+						jsonParsed.reactionStyle.labelOpacity,
+						jsonParsed.reactionStyle.label,
+						jsonParsed.reactionStyle.useAlias);
+					
 					metExploreD3.setReactionStyle(reactionStyle);
 				}
 

resources/lib/functions/GraphStyleEdition.js

@@ -573,7 +573,7 @@ metExploreD3.GraphStyleEdition = {
 
             if(biologicalType==="link")
                 selection = d3.select("#viz").select("#D3viz").selectAll(".linkGroup");
-            console.log(selection);
+
             selection
                 .selectAll(target+":not(.bypassed"+attrType+attrName+biologicalType+")"+":not(.mapped"+attrType+attrName+biologicalType+")")
                 .setLabelNodeText(styleToUse, value);

resources/lib/model/ReactionStyle.js

@@ -5,7 +5,21 @@
 /**
  * draw a Reaction
  */
-var ReactionStyle = function(backgroundColor, height, width, rx, ry, opacity, strokeColor, strokeWidth, fontColor, fontSize, fontWeight, labelOpacity, displayNodeName, useAlias){
+var ReactionStyle = function(
+    backgroundColor,
+    height,
+    width,
+    rx,
+    ry,
+    opacity,
+    strokeColor,
+    strokeWidth,
+    fontColor,
+    fontSize,
+    fontWeight,
+    labelOpacity,
+    displayNodeName,
+    useAlias){
 
     if(backgroundColor)
         this.backgroundColor = backgroundColor;