#10584 - Done

Erdogan Furkan
1 parent 1fc076b5
Showing 2 changed files with 64 additions and 12 deletions Show diff stats
js/app/views/CatalogVisuHistogram.js
js/app/views/CatalogVisuScatter.js
@@ -60,7 +60,7 @@ 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 binSize = (maxValue-minValue) / (nbBinsValue);
     var x=[];
     catalogStore.each(function (item) {
@@ -77,8 +77,12 @@ Ext.define(&#39;amdaUI.CatalogVisuHistogram&#39;, {
     var data = [trace];
     var layout = {
       margin: {l: 60,r: 40, b: 40,t: 40,pad: 5},
-      yaxis: {title: Ext.getCmp('normalizedCheckbox').getValue() ? 'Frequency': 'Events',},
-      xaxis: {title: paramOpt.title }, };
+      yaxis: {
+        title: Ext.getCmp('normalizedCheckbox').getValue() ? 'Frequency': 'Events',
+        type: isLogScale ? 'log' : null
+      },
+      xaxis: {title: paramOpt.title},
+    };
  
       var result =  {data:data,layout:layout}
     return result;
@@ -101,7 +105,25 @@ Ext.define(&#39;amdaUI.CatalogVisuHistogram&#39;, {
         scope: this
       }
     };
-    var checkbox={
+    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',
             defaultType: 'checkboxfield',
@@ -170,7 +192,8 @@ Ext.define(&#39;amdaUI.CatalogVisuHistogram&#39;, {
       items : [
         paramComboConfig,
         sliderConfig,
-        checkbox,
+        normalizedbox,
+        logbox,
         {
           xtype: 'textfield',
           fieldLabel: 'Title',
@@ -55,8 +55,14 @@ Ext.define(&#39;amdaUI.CatalogVisuScatter&#39;, {
  
 	var layout = {
 		margin: {l: 50,r: 40, b: 40,t: 40,pad: 5},
-		xaxis: {title: xAxisOpt.title, range: !xAxisOpt.range ? null : [xAxisOpt.range.min,xAxisOpt.range.max]},
-		yaxis: {title: yAxisOpt.title, range: !yAxisOpt.range ? null : [yAxisOpt.range.min,yAxisOpt.range.max]},
+		xaxis: {
+			title: xAxisOpt.title, range: !xAxisOpt.range ? null : [xAxisOpt.range.min,xAxisOpt.range.max],
+			type: xAxisOpt.logscale ? 'log' : null
+		},
+		yaxis: {
+			title: yAxisOpt.title, range: !yAxisOpt.range ? null : [yAxisOpt.range.min,yAxisOpt.range.max],
+			type: yAxisOpt.logscale ? 'log' : null
+		},
 		hovermode: "closest",
 		hoverlabel :{ font:{size:10}}	
 	};
@@ -98,6 +104,9 @@ Ext.define(&#39;amdaUI.CatalogVisuScatter&#39;, {
         'max' : axisRangeMax
       };
     }
+
+	opt.logscale = Ext.getCmp('visu-scatter-' + axisName + '-logbox').getValue();
+
     return opt;
   },
  
@@ -144,6 +153,25 @@ Ext.define(&#39;amdaUI.CatalogVisuScatter&#39;, {
 			}
 		};
  
+		var logbox={
+				xtype: 'fieldcontainer',
+				fieldLabel: 'Log Scale',
+				defaultType: 'checkboxfield',
+				items: [
+					{
+						name      : 'logscale',
+						inputValue: false,
+						id        : 'visu-scatter-' + axisName + '-logbox',
+						listeners:{
+						change:function(){
+							this.visuUI.plotChart();
+						},
+						scope: this
+						}
+					}
+				],
+		  };
+
 		var axisRangeConfig = {
 			xtype : 'fieldcontainer',
 			layout: 'hbox',
@@ -186,9 +214,9 @@ Ext.define(&#39;amdaUI.CatalogVisuScatter&#39;, {
 								},
 								scope: this
 							}
-						}
+						},
 					]
-				}
+				},
 			]
 		};
  
@@ -198,6 +226,7 @@ Ext.define(&#39;amdaUI.CatalogVisuScatter&#39;, {
 			items : [
 				paramComboConfig,
 				axisRangeConfig,
+				logbox,
 				{
 					xtype: 'textfield',
 					fieldLabel: axisName + ' title',
@@ -207,7 +236,7 @@ Ext.define(&#39;amdaUI.CatalogVisuScatter&#39;, {
 							this.visuUI.plotChart();
 						},
 						scope: this
-					}
+					},
 				}
 			]
 		};
@@ -222,7 +251,7 @@ Ext.define(&#39;amdaUI.CatalogVisuScatter&#39;, {
 			queryMode: 'local',
 			valueField: 'type',
 			value: 'scatter',
-      id: 'visu-scatter-type',
+      		id: 'visu-scatter-type',
 			listeners : {
 				scope : this,
 				change : function(combo, newValue, oldValue) {
@@ -240,7 +269,7 @@ Ext.define(&#39;amdaUI.CatalogVisuScatter&#39;, {
 			queryMode: 'local',
 			valueField: 'type',
 			value: 'Blue',
-      id: 'visu-scatter-color',
+      		id: 'visu-scatter-color',
 			listeners : {
 				scope : this,
 				change : function(combo, newValue, oldValue) {