CDPP / AMDA_IHM

Commit 96d948bad55da231dddd5c60aee936db8acefe55

Authored by Benjamin Renard
2 parents 153abcd9 b4553b19
Exists in master and in 9 other branches FER_11242, FER_11500, FER_11537, FER_6265, FER_9629, FER_TFCat, SpeasyGet, amdadev, openam

Merge branch 'master' into amdadev

Showing 2 changed files with 17 additions and 1 deletions   Show diff stats
Inline Side-by-side
js/app/models/PlotObjects/PlotHistogram1DSerieObject.js
  Diff comments   View file @96d948b
... ... @@ -29,6 +29,16 @@ Ext.define('amdaPlotObj.PlotHistogram1DSerieObject', {
29 29  
30 30 constructor: function(){
31 31 var me = this;
  32 + if ((arguments.length > 0) && arguments[0]) {
  33 + if (!arguments[0]['histo1d-yaxis']) {
  34 + // Compatibility mode to support old saved requests
  35 + arguments[0]['histo1d-yaxis'] = amdaDefaultValues.plot.histogram1D.histo1DyAxis;
  36 + }
  37 + if (!arguments['histo1d-style']) {
  38 + // Compatibility mode to support old saved requests
  39 + arguments[0]['histo1d-style'] = amdaDefaultValues.plot.histogram1D.histo1DStyle;
  40 + }
  41 + }
32 42 me.callParent(arguments);
33 43 },
34 44  
... ...
js/app/models/PlotObjects/PlotHistogram2DSerieObject.js
  Diff comments   View file @96d948b
... ... @@ -30,7 +30,13 @@ Ext.define('amdaPlotObj.PlotHistogram2DSerieObject', {
30 30  
31 31 constructor: function(){
32 32 var me = this;
33   - me.callParent(arguments);
  33 + if ((arguments.length > 0) && arguments[0]) {
  34 + if (!arguments[0]['histo2d-yaxis']) {
  35 + // Compatibility mode to support old saved requests
  36 + arguments[0]['histo2d-yaxis'] = amdaDefaultValues.plot.histogram2D.histo2DyAxis;
  37 + }
  38 + }
  39 + me.callParent(arguments);
34 40 },
35 41  
36 42 setDefaultValues: function()
... ...