Commit 158b344e authored by Jean-Clement Gallardo's avatar Jean-Clement Gallardo
Browse files

add distrib graph on display, fix some bug and change caption label

parent 812e3ffa
......@@ -134,10 +134,22 @@ Ext.define('metExploreViz.view.form.fluxMappingForm.FluxMappingForm', {
{
xtype: 'button',
html: 'RUN',
html: 'Display',
width: '100%',
margin: '15 5 5 5',
reference: 'runFluxVizu'
},
{
xtype: 'panel',
layout: 'vbox',
margin: "15 5 5 5",
items: [
{
flex: 1,
html: "<div id='graphDistrib' height='100%' width='100%'></div>"
}
]
}
]
});
......@@ -68,7 +68,7 @@ Ext.define('metExploreViz.view.form.fluxMappingForm.FluxMappingFormController',
me.computeFlux(selectedFile, nbColSelect, condSelect);
metExploreD3.GraphStyleEdition.fluxPath = true;
view.lookupReference('runFluxVizu').setText("STOP");
view.lookupReference('runFluxVizu').setText("Remove display");
}
else{
......@@ -76,8 +76,9 @@ Ext.define('metExploreViz.view.form.fluxMappingForm.FluxMappingFormController',
metExploreD3.GraphLink.tick('viz');
metExploreD3.GraphCaption.drawCaption();
metExploreD3.GraphFlux.restoreStyles(_metExploreViz.linkStyle);
metExploreD3.GraphFlux.removeGraphDistrib();
view.lookupReference('runFluxVizu').setText("RUN");
view.lookupReference('runFluxVizu').setText("Display");
}
}
......@@ -181,6 +182,7 @@ Ext.define('metExploreViz.view.form.fluxMappingForm.FluxMappingFormController',
}
}
metExploreD3.GraphFlux.displayChoice(conData, targetLabel, nbCol);
metExploreD3.GraphFlux.graphDistrib(conData);
}
});
......@@ -490,8 +490,6 @@ metExploreD3.GraphCaption = {
// This part create the legend of the representation and
// add a mention to Metexplore in the right bottom
// corner
// Issue to be solved: when the window size change we
// loose the MetExplore text.
var sx = 15/2 - reactionStyle.getWidth()*xRea/2;
var sy = 15;
var linkStyle = metExploreD3.getLinkStyle();
......@@ -502,7 +500,6 @@ metExploreD3.GraphCaption = {
var path3 = "M"+(50 + 15/2 - reactionStyle.getWidth()*xRea/2)+","+sy+
"L"+(sx+80)+","+sy+"L"+(sx+80)+","+(sy-5)+"L"+(sx+90)+","+sy+"L"+
(sx+80)+","+(sy+5)+"L"+(sx+80)+","+sy;
var path4 = "M"+(50 + 15/2 - reactionStyle.getWidth()*xRea/2 - reactionStyle.getWidth()*xRea)+","+sy+
"L"+(sx+10)+","+sy+
"L"+(sx+10)+","+(sy-5)+
......@@ -699,7 +696,7 @@ metExploreD3.GraphCaption = {
d3.select("#viz").select("#D3viz")
.append("svg:text")
.attr('class', 'textCaptionRev')
.text('Reaction KO')
.text('Reaction with 0 flux')
.attr('x', 20)
.attr('y', 15)
.attr("transform", "translate(0,200)");
......
This diff is collapsed.
......@@ -410,6 +410,7 @@ metExploreD3.GraphLink = {
if (metExploreD3.GraphStyleEdition.fluxPath === true){
metExploreD3.GraphFlux.curveEdge();
metExploreD3.GraphCaption.drawCaptionFluxMode();
}
if(metExploreD3.getGeneralStyle().isDisplayedPathwaysOnLinks())
......@@ -671,6 +672,7 @@ metExploreD3.GraphLink = {
}
else if (metExploreD3.GraphStyleEdition.fluxPath === true){
metExploreD3.GraphFlux.curveEdge();
metExploreD3.GraphCaption.drawCaptionFluxMode();
}
else {
var scale = metExploreD3.getScaleById("viz");
......
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