Skip to content

GitLab

Commit 30fdeb89 authored by Jean-Clement Gallardo's avatar Jean-Clement Gallardo
Browse files

add href to doc + style/mapping/flux manage

parent 81a1a749
Hide whitespace changes
Inline Side-by-side
app.json
View file @ 30fdeb89
......@@ -7,7 +7,7 @@
/**
* The version of the application.
*/
"version": "3.1.1",
"version": "3.1.2",
/**
* The relative path to the application's markup file (html, jsp, asp, etc.).
......
app/view/button/buttonImportFlux/ButtonImportFluxController.js
View file @ 30fdeb89
......@@ -64,7 +64,9 @@ Ext.define('metExploreViz.view.button.buttonImportFlux.ButtonImportFluxControlle
}
else {
// Warning for bad syntax file
metExploreD3.displayWarning("Syntaxe error", 'File have bad syntax.');
metExploreD3.displayWarning("Syntaxe error",
'File have bad syntax. See <a target="_blank" href="http://metexplore.toulouse.inra.fr/metexploreViz/doc/documentation.php#fluxImport">MetExploreViz documentation</a>.'
);
}
}
......
app/view/form/fluxMappingForm/FluxMappingForm.js
View file @ 30fdeb89
......@@ -32,7 +32,8 @@ Ext.define('metExploreViz.view.form.fluxMappingForm.FluxMappingForm', {
items: [
{
xtype: 'label',
html: 'Select file or mapping :',
html: 'Select file or mapping'+
'<a target="_blank" href="http://metexplore.toulouse.inra.fr/metexploreViz/doc/documentation.php#flux"><sup>?</sup></a> :',
margin: '15 15 5 15'
},
......@@ -208,7 +209,8 @@ Ext.define('metExploreViz.view.form.fluxMappingForm.FluxMappingForm', {
{
xtype: 'label',
html: 'Scale selector :',
html: 'Scale selector'+
'<a target="_blank" href="http://metexplore.toulouse.inra.fr/metexploreViz/doc/documentation.php#fluxScaleSelector"><sup>?</sup></a> :',
margin: '15 15 5 15'
},
......@@ -305,7 +307,8 @@ Ext.define('metExploreViz.view.form.fluxMappingForm.FluxMappingForm', {
{
xtype: 'checkboxfield',
boxLabel: 'Distribution graph : only display data',
boxLabel: 'Distribution graph : only displayed data' +
'<a target="_blank" href="http://metexplore.toulouse.inra.fr/metexploreViz/doc/documentation.php#fluxDistribGraph"><sup>?</sup></a>',
reference: 'displayGraphDistrib',
margin: '5 5 5 5'
},
......
resources/lib/functions/GraphFlux.js
View file @ 30fdeb89
......@@ -557,6 +557,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false)
.classed("vertical", false)
.classed(axe, true)
.classed("fluxstylelink", true)
.style("opacity", 0.6)
.style("stroke-width",1)
.style("stroke","blue")
......@@ -580,6 +581,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false)
.classed("vertical", false)
.classed(axe, true)
.classed("fluxstylelink", true)
.style("opacity", 0.6)
.style("stroke-width",1)
.style("stroke","blue")
......@@ -604,6 +606,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false)
.classed("vertical", false)
.classed(axe, true)
.classed("fluxstylelink", true)
.style("opacity", 1)
.style("stroke", node.color1)
.style("stroke-width",node.fluxDirection1);
......@@ -628,6 +631,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false)
.classed("vertical", false)
.classed(axe, true)
.classed("fluxstylelink", true)
.style("opacity", 1)
.style("stroke-linejoin", "miter")
.style("stroke", node.color1)
......@@ -653,6 +657,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false)
.classed("vertical", false)
.classed(axe, true)
.classed("fluxstylelink", true)
.style("opacity", 1)
.style("stroke-linejoin", "miter")
.style("stroke", node.color1)
......@@ -676,6 +681,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false)
.classed("vertical", false)
.classed(axe, true)
.classed("fluxstylelink", true)
.style("opacity", 1)
.style("stroke", node.color1)
.style("stroke-width",node.fluxDirection1*(-1));
......@@ -808,6 +814,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false)
.classed("vertical", false)
.classed(axe, true)
.classed("fluxstylelink", true)
.style("opacity", 0.6)
.style("stroke-width",1)
.style("stroke", node.color1)
......@@ -832,6 +839,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false)
.classed("vertical", false)
.classed(axe, true)
.classed("fluxstylelink", true)
.style("opacity", 0.6)
.style("stroke-width",1)
.style("stroke", node.color1)
......@@ -859,6 +867,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false)
.classed("vertical", false)
.classed(axe, true)
.classed("fluxstylelink", true)
.classed("reaction",false)
.style("opacity", 0.6)
.style("stroke-width",1)
......@@ -886,6 +895,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false)
.classed("vertical", false)
.classed(axe, true)
.classed("fluxstylelink", true)
.style("opacity", 0.6)
.style("stroke-width",1)
.style("stroke", node.color2)
......@@ -911,6 +921,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false)
.classed("vertical", false)
.classed(axe, true)
.classed("fluxstylelink", true)
.style("opacity", 1)
.style("stroke", node.color1)
.style("stroke-width",node.fluxDirection1);
......@@ -935,6 +946,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false)
.classed("vertical", false)
.classed(axe, true)
.classed("fluxstylelink", true)
.style("opacity", 1)
.style("stroke-linejoin", "miter")
.style("stroke", node.color1)
......@@ -962,6 +974,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false)
.classed("vertical", false)
.classed(axe, true)
.classed("fluxstylelink", true)
.classed("reaction",false)
.style("opacity", 1)
.style("stroke-dasharray", null)
......@@ -990,6 +1003,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false)
.classed("vertical", false)
.classed(axe, true)
.classed("fluxstylelink", true)
.style("stroke-linejoin", "miter")
.style("opacity", 1)
.style("stroke-dasharray", null)
......@@ -1016,6 +1030,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false)
.classed("vertical", false)
.classed(axe, true)
.classed("fluxstylelink", true)
.style("opacity", 1)
.style("stroke-linejoin", "miter")
.style("stroke", node.color1)
......@@ -1040,6 +1055,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false)
.classed("vertical", false)
.classed(axe, true)
.classed("fluxstylelink", true)
.style("opacity", 1)
.style("stroke", node.color1)
.style("stroke-width",node.fluxDirection1*(-1));
......@@ -1066,6 +1082,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false)
.classed("vertical", false)
.classed(axe, true)
.classed("fluxstylelink", true)
.classed("reaction",false)
.style("stroke-linejoin", "miter")
.style("opacity", 1)
......@@ -1094,6 +1111,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false)
.classed("vertical", false)
.classed(axe, true)
.classed("fluxstylelink", true)
.style("stroke-dasharray", null)
.style("opacity", 1)
.style("stroke", node.color2)
......@@ -1551,6 +1569,7 @@ metExploreD3.GraphFlux = {
else
return linkStyle.getMarkerInColor();
})
.classed("fluxstylelink", false)
.style("stroke", linkStyle.getStrokeColor())
.style("stroke-width", linkStyle.getLineWidth())
.style("opacity", linkStyle.getOpacity())
......@@ -1559,6 +1578,9 @@ metExploreD3.GraphFlux = {
if (metExploreD3.GraphStyleEdition.curvedPath === true){
metExploreD3.GraphLink.bundleLinks("viz");
}
if(_metExploreViz.getMappingsLength()>0){
metExploreD3.GraphLink.majMapping(Ext.ComponentQuery.query('aStyleForm'));
}
},
/**
......
resources/lib/functions/GraphLink.js
View file @ 30fdeb89
......@@ -1355,7 +1355,6 @@ metExploreD3.GraphLink = {
var mappingName = condition.split(" / ")[0];
var conditionName = condition.split(" / ")[1];
if(dataType==="Discrete"){
console.log("ko");
var value = view.getController().getValueMappingsSet("Discrete");
value.forEach(function(valMapping){
metExploreD3.GraphStyleEdition.setCollectionStyleDiscreteMapping(view.target, view.attrType, view.attrName, view.biologicalType, conditionName, mappingName, valMapping.getName(), valMapping.getValue())
......@@ -1372,7 +1371,6 @@ metExploreD3.GraphLink = {
metExploreD3.GraphStyleEdition.setCollectionStyleAsSelectionMapping(view.target, view.attrType, view.attrName, view.biologicalType, conditionName, mappingName, "Identified", value);
}
if(dataType==="Continuous"){
console.log("ok");
rangeCaption = view.scaleRange
.map(function (sr, i) {
return sr.styleValue;
......
resources/lib/functions/GraphStyleEdition.js
View file @ 30fdeb89
......@@ -577,7 +577,11 @@ metExploreD3.GraphStyleEdition = {
if(biologicalType==="link")
selection = d3.select("#viz").select("#D3viz").selectAll(".linkGroup");
selection.selectAll(target+":not(.bypassed"+attrType+attrName+biologicalType+")"+":not(.mapped"+attrType+attrName+biologicalType+")")[attrType](attrName, value);
selection.selectAll(target
+":not(.bypassed"+attrType+attrName+biologicalType+")"
+":not(.mapped"+attrType+attrName+biologicalType+")"
+":not(.fluxstylelink)"
)[attrType](attrName, value);
});
},
......@@ -877,9 +881,10 @@ metExploreD3.GraphStyleEdition = {
var targetSelection = selection.selectAll(target);
targetSelection.classed("mapped"+attrType+attrName+biologicalType, true);
targetSelection = selection.selectAll(target+":not(.fluxstylelink)");
targetSelection[attrType](attrName, valueStyle);
targetSelection.classed("mapped"+attrType+attrName+biologicalType, true);
});
}
},
......@@ -922,9 +927,10 @@ metExploreD3.GraphStyleEdition = {
});
var targetSelection = selection.selectAll(target);
targetSelection.classed("mapped"+attrType+attrName+biologicalType, true);
targetSelection = selection.selectAll(target+":not(.fluxstylelink)");
targetSelection[attrType](attrName, valueStyle);
targetSelection.classed("mapped"+attrType+attrName+biologicalType, true);
});
}
},
......@@ -969,14 +975,13 @@ metExploreD3.GraphStyleEdition = {
});
var targetSelection = selection.selectAll(target);
targetSelection.classed("mapped"+attrType+attrName+biologicalType, true);
function test(d){
var map = d.getMappingDataByNameAndCond(mappingName, conditionName);
return linearScale(map.getMapValue());
}
targetSelection = selection.selectAll(target+":not(.fluxstylelink)");
targetSelection[attrType](attrName, test);
targetSelection.classed("mapped"+attrType+attrName+biologicalType, true);
});
}
},
......
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