Skip to content

GitLab

MetExploreViz
MetExploreViz
Commit 77ea1733 authored by Maxime Chazalviel's avatar Maxime Chazalviel
Browse files
Options

Merge branch 'master' into develop

parents 57bba12c 582658fe
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 63 deletions
app.json
View file @ 77ea1733
......@@ -7,7 +7,7 @@
/**
* The version of the application.
*/
"version": "2.6.4",
"version": "2.6.5",
/**
* The relative path to the application's markup file (html, jsp, asp, etc.).
......@@ -222,8 +222,7 @@
"js": [
{
"path": "app.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "metexploreviz.js"
......@@ -244,143 +243,115 @@
},
{
"path": "resources/lib/metExploreViz.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/model/NetworkVizSession.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/model/LinkData.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/model/NodeData.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/model/NetworkData.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/model/GeneralStyle.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/model/LinkStyle.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/model/MetaboliteStyle.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/model/ReactionStyle.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/model/Pathway.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/model/Compartment.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/model/Mapping.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/model/MappingData.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/model/Scale.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/model/ColorMapping.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/model/ComparedPanel.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/functions/D3Extention.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/functions/GraphLink.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/functions/GraphNode.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/functions/GraphCaption.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/functions/GraphUtils.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/functions/GraphNetwork.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/functions/Features.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/functions/GraphFunction.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/functions/GraphMapping.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/functions/GraphPanel.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/functions/GraphPath.js",
"bundle": true,
"update": "delta"
"bundle": true
},
{
"path": "resources/lib/functions/GraphStyleEdition.js",
"bundle": true,
"update": "delta"
"bundle": true
}
],
......@@ -620,8 +591,7 @@
*/
"cache": {
"enable": false,
"daelts": true
"enable": false
},
......
resources/css/networkViz.css
View file @ 77ea1733
......@@ -46,7 +46,6 @@ text.reaction{
max-width: 200px;
}
.brush{
fill: #99BCE8;
fill-opacity: 0.1;
stroke: #99BCE8;
shape-rendering: crispEdges;
......
resources/lib/functions/GraphNode.js
View file @ 77ea1733
......@@ -1437,9 +1437,24 @@ metExploreD3.GraphNode = {
return d.getBiologicalType() === 'reaction';
})
.addNodeText(reactionStyle);
}
}
metExploreD3.GraphNode.updatedNodes
.each(function (d) {
// set corresponding event handler
var name = reactionStyle.getDisplayLabel(d, reactionStyle.getLabel());
metExploreD3.GraphStyleEdition.changeNodeLabel(d, parent, name);
if (metExploreD3.GraphStyleEdition.editMode == true) {
metExploreD3.GraphStyleEdition.startDragLabel(parent);
}
else {
metExploreD3.GraphStyleEdition.endDragLabel(parent);
metExploreD3.GraphNode.applyEventOnNode(parent);
}
});
metExploreD3.GraphNode.updatedNodes
.filter(function (d) {
......
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