#10702/10701 - Log Scale on X axis for histogram plot

Erdogan Furkan
1 parent 77d927cd
Showing 1 changed file with 27 additions and 22 deletions Show diff stats
js/app/views/CatalogVisuHistogram.js
@@ -60,7 +60,8 @@ Ext.define(&#39;amdaUI.CatalogVisuHistogram&#39;, {
       myDesktopApp.errorMsg('Not enough data or constant data');
       return null;
     }
-    var isLogScale = Ext.getCmp('visu-scatter-logbox').getValue();
+    var isLogScaleX = Ext.getCmp('visu-histo-logbox-X').getValue();
+    var isLogScaleY = Ext.getCmp('visu-histo-logbox-Y').getValue();
 		var binSize = (maxValue-minValue) / (nbBinsValue);
     var x=[];
     catalogStore.each(function (item) {
@@ -79,15 +80,36 @@ Ext.define(&#39;amdaUI.CatalogVisuHistogram&#39;, {
       margin: {l: 60,r: 40, b: 40,t: 40,pad: 5},
       yaxis: {
         title: Ext.getCmp('normalizedCheckbox').getValue() ? 'Frequency': 'Events',
-        type: isLogScale ? 'log' : null
+        type: isLogScaleY ? 'log' : null
       },
-      xaxis: {title: paramOpt.title},
+      xaxis: {
+        title: paramOpt.title,
+        type: isLogScaleX ? 'log' : null},
     };
       var result =  {data:data,layout:layout}
     return result;
   },
+  generateLogBox: function(axis){
+    return {xtype: 'fieldcontainer',
+    fieldLabel: axis+' Log Scale',
+    defaultType: 'checkboxfield',
+    items: [
+      {
+        name      : 'logscale'+axis,
+        inputValue: false,
+        id        : 'visu-histo-logbox-'+axis,
+        listeners:{
+        change:function(){
+          this.visuUI.plotChart();
+        },
+        scope: this
+        }
+      }
+    ],}
+  },
+
   getHistoConfig: function(parametersStore) {
     var paramComboConfig = {
       xtype: 'combo',
@@ -105,24 +127,6 @@ Ext.define(&#39;amdaUI.CatalogVisuHistogram&#39;, {
         scope: this
       }
     };
-    var logbox={
-      xtype: 'fieldcontainer',
-      fieldLabel: 'Log Scale',
-      defaultType: 'checkboxfield',
-      items: [
-        {
-          name      : 'logscale',
-          inputValue: false,
-          id        : 'visu-scatter-logbox',
-          listeners:{
-          change:function(){
-            this.visuUI.plotChart();
-          },
-          scope: this
-          }
-        }
-      ],
-    };
     var normalizedbox={
       xtype: 'fieldcontainer',
             fieldLabel: 'Normalized',
@@ -193,7 +197,8 @@ Ext.define(&#39;amdaUI.CatalogVisuHistogram&#39;, {
         paramComboConfig,
         sliderConfig,
         normalizedbox,
-        logbox,
+        this.generateLogBox('X'),
+        this.generateLogBox('Y'),
         {
           xtype: 'textfield',
           fieldLabel: 'Title',