Commit 3c58eef8 authored by Jean-Clement Gallardo's avatar Jean-Clement Gallardo
Browse files

Finish hotfix/3.1.2

parents 81a1a749 68628e1b
......@@ -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.).
......
......@@ -61,10 +61,13 @@ Ext.define('metExploreViz.view.button.buttonImportFlux.ButtonImportFluxControlle
_metExploreViz.addFlux(flux);
metExploreD3.fireEvent("fluxMapping","fileParse");
metExploreD3.fireEvent("fluxMapping","fileLoad");
metExploreD3.fireEvent("comparisonSidePanel","newFlux");
}
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>.'
);
}
}
......
......@@ -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'
},
......
......@@ -12,6 +12,9 @@ Ext.define('metExploreViz.view.panel.comparisonSidePanel.ComparisonSidePanelCont
view.on({
newMapping : me.drawCaption,
newFlux: function(){
view.setCollapsed(false);
},
scope:me
});
......
This diff is collapsed.
......@@ -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;
......
......@@ -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