Merge branch 'MAZ_FIX_9016' into amdadev

Benjamin Renard
2 parents 7af10470 8ba66fe1
Showing 1 changed file with 9 additions and 6 deletions Show diff stats
js/app/views/PlotComponents/plotFunction/FunctionType.js
@@ -26,7 +26,7 @@ Ext.define(&#39;amdaPlotComp.plotFunction.FunctionType&#39;, {
         },
         scale: {
             name: "scale_abscisse",
-            field: "Scale Abscisse",
+            field: "X-Axis Scale",
             values: {
                 log: "logarithmic",
                 linear: "linear",
@@ -43,7 +43,7 @@ Ext.define(&#39;amdaPlotComp.plotFunction.FunctionType&#39;, {
         },
         scale_ordonnee: {
             name: "scale_ordonnee",
-            field: "Scale Ordonnée"
+            field: "Y-Axis Scale"
         }
     },
@@ -60,7 +60,9 @@ Ext.define(&#39;amdaPlotComp.plotFunction.FunctionType&#39;, {
         item_type = {};
         item_type[key_] = this.plotFunctionItems.type.values.dft;
         item_type[name_] = this.plotFunctionItems.type.labels.dft;
-        data_function_type.push(item_type);
+        // Disbale DFT momentarily
+        //data_function_type.push(item_type);
+
         item_type = {};
         item_type[key_] = this.plotFunctionItems.type.values.sum;
         item_type[name_] = this.plotFunctionItems.type.labels.sum;
@@ -80,7 +82,8 @@ Ext.define(&#39;amdaPlotComp.plotFunction.FunctionType&#39;, {
         const item_inherits = {};
         item_inherits[key_] = this.plotFunctionItems.scale.values.inherits;
         item_inherits[name_] = this.plotFunctionItems.scale.values.inherits;
-        data_.push(item_inherits);
+        // Disbale inherits momentarily
+        //data_.push(item_inherits);
         const item_log = {};
         item_log[key_] = this.plotFunctionItems.scale.values.log;
@@ -154,7 +157,7 @@ Ext.define(&#39;amdaPlotComp.plotFunction.FunctionType&#39;, {
                     displayField: name_,
                     valueField: key_,
                     editable: false,
-                    value: this.plotFunctionItems.scale.values.inherits,
+                    value: this.plotFunctionItems.scale.values.log,
                     name: this.plotFunctionItems.scale.name
                 },
                 {
@@ -177,7 +180,7 @@ Ext.define(&#39;amdaPlotComp.plotFunction.FunctionType&#39;, {
                     displayField: name_,
                     valueField: key_,
                     editable: false,
-                    value: this.plotFunctionItems.scale.values.inherits,
+                    value: this.plotFunctionItems.scale.values.log,
                     name: this.plotFunctionItems.scale_ordonnee.name
                 }
             ]