CDPP / AMDA_IHM

Commit 73c866c9f3275077c1c6f27927483fa11f64df5a

Authored by Benjamin Renard
2 parents 7af10470 8ba66fe1
Exists in master and in 29 other branches FER_10435, FER_10828_2, FER_10829, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_6265, FER_6951, FER_7618, FER_7862, FER_9629, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_11362, MAZ_11427, MAZ_FIX_9016, SpeasyGet, amdadev, amdadev_test, develop, openam

Merge branch 'MAZ_FIX_9016' into amdadev

Showing 1 changed file with 9 additions and 6 deletions   Show diff stats
Inline Side-by-side
js/app/views/PlotComponents/plotFunction/FunctionType.js
  Diff comments   View file @73c866c
... ... @@ -26,7 +26,7 @@ Ext.define('amdaPlotComp.plotFunction.FunctionType', {
26 26 },
27 27 scale: {
28 28 name: "scale_abscisse",
29   - field: "Scale Abscisse",
  29 + field: "X-Axis Scale",
30 30 values: {
31 31 log: "logarithmic",
32 32 linear: "linear",
... ... @@ -43,7 +43,7 @@ Ext.define('amdaPlotComp.plotFunction.FunctionType', {
43 43 },
44 44 scale_ordonnee: {
45 45 name: "scale_ordonnee",
46   - field: "Scale Ordonnée"
  46 + field: "Y-Axis Scale"
47 47 }
48 48 },
49 49  
... ... @@ -60,7 +60,9 @@ Ext.define('amdaPlotComp.plotFunction.FunctionType', {
60 60 item_type = {};
61 61 item_type[key_] = this.plotFunctionItems.type.values.dft;
62 62 item_type[name_] = this.plotFunctionItems.type.labels.dft;
63   - data_function_type.push(item_type);
  63 + // Disbale DFT momentarily
  64 + //data_function_type.push(item_type);
  65 +
64 66 item_type = {};
65 67 item_type[key_] = this.plotFunctionItems.type.values.sum;
66 68 item_type[name_] = this.plotFunctionItems.type.labels.sum;
... ... @@ -80,7 +82,8 @@ Ext.define('amdaPlotComp.plotFunction.FunctionType', {
80 82 const item_inherits = {};
81 83 item_inherits[key_] = this.plotFunctionItems.scale.values.inherits;
82 84 item_inherits[name_] = this.plotFunctionItems.scale.values.inherits;
83   - data_.push(item_inherits);
  85 + // Disbale inherits momentarily
  86 + //data_.push(item_inherits);
84 87  
85 88 const item_log = {};
86 89 item_log[key_] = this.plotFunctionItems.scale.values.log;
... ... @@ -154,7 +157,7 @@ Ext.define('amdaPlotComp.plotFunction.FunctionType', {
154 157 displayField: name_,
155 158 valueField: key_,
156 159 editable: false,
157   - value: this.plotFunctionItems.scale.values.inherits,
  160 + value: this.plotFunctionItems.scale.values.log,
158 161 name: this.plotFunctionItems.scale.name
159 162 },
160 163 {
... ... @@ -177,7 +180,7 @@ Ext.define('amdaPlotComp.plotFunction.FunctionType', {
177 180 displayField: name_,
178 181 valueField: key_,
179 182 editable: false,
180   - value: this.plotFunctionItems.scale.values.inherits,
  183 + value: this.plotFunctionItems.scale.values.log,
181 184 name: this.plotFunctionItems.scale_ordonnee.name
182 185 }
183 186 ]
... ...