Do not call onChange callback during rebuild + Move a specific message for plot in the plot module

Benjamin Renard
1 parent b1a45580
Showing 2 changed files with 25 additions and 32 deletions Show diff stats
js/app/views/ParamArgumentsUI.js
js/app/views/PlotComponents/PlotParamForm.js
@@ -19,7 +19,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
 	onChange: null,
 	onModifyHeight: null,
 	pluginOwner: null,
-	isFirstMsg : true,
+	inRebuild : false,
 	constructor: function(config) {
 		this.init(config);	    
@@ -66,8 +66,8 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
 									paramRequestObject.set('dim2-index', 0);
 								}
 							}
-							paramRequestObject.set('is-init', true);
 						}
+						paramRequestObject.set('is-init', true);
 					}
 					me.rebuildAll(paramInfo, uiScope);
 				}
@@ -153,6 +153,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
 	},
 	rebuildAll: function(paramInfoResult , uiScope) {
+		this.inRebuild = true;
 		//Rebuild arguments selection
 		this.rebuildArguments(paramInfoResult, uiScope);
 		//Add default template args values
@@ -199,6 +200,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
     		}
     		else
     			item.setValue(this.paramRequestObject.get(item.argId));
+		this.inRebuild = false;
     	}, this);
     },
@@ -310,26 +312,10 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
 		    hidden: (relatedTable ? relatedTable.variable : false),
 		    listeners: {
             		change: function(field, newValue, oldValue, eOpts) {
-						if (this.paramRequestObject.get('type') == '2' && this.isFirstMsg) 
-						{
-							if (relatedDim == 'dim2' &&  newValue == '*') { 
-								var previousCombo = field.previousSibling();
-								
-								if (previousCombo instanceof Ext.form.FieldSet)  
-									previousCombo = previousCombo.previousSibling();
-								
-									if (previousCombo instanceof Ext.form.ComboBox && previousCombo.argId == 'dim1' && previousCombo.getValue() == '*' && !previousCombo.isDisabled()) {
-										myDesktopApp.warningMsg('If argument <i>All</i> is set for both dimensions output will be the total sum <b>(not spectra!)</b>');
-										this.isFirstMsg = false;
-									}
-								
-							}
-						}
-						
-            		this.paramRequestObject.set(relatedDim+'-index', newValue); 
-            		if (this.onChange != null)
-            			this.onChange(uiScope, relatedDim, newValue, oldValue, false);
-            	},
+            			this.paramRequestObject.set(relatedDim+'-index', newValue); 
+            			if (!this.inRebuild && (this.onChange != null))
+            				this.onChange(uiScope, relatedDim, newValue, oldValue, false);
+            		},
             	scope: this
             }
@@ -363,7 +349,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
 					field.up().down('[name=value_max_'+relatedDim+']').setVisible(newValue == 1);
 					field.up().down('[name=index_min_'+relatedDim+']').setVisible(newValue == 2);
 					field.up().down('[name=index_max_'+relatedDim+']').setVisible(newValue == 2);
-					if (this.onChange != null)
+					if (!this.inRebuild && (this.onChange != null))
 						this.onChange(uiScope, relatedDim, newValue, oldValue, false);
 				},
 				scope: this
@@ -378,7 +364,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
                 	listeners: {
                 		change: function(field, newValue, oldValue, eOpts) {
                 			this.paramRequestObject.set(relatedDim+'-min-value', newValue);
-    	            			if (this.onChange != null)
+    	            			if (!this.inRebuild && (this.onChange != null))
     	            				this.onChange(uiScope, relatedDim, newValue, oldValue, false);
                 		},
                 		scope: this
@@ -393,7 +379,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
                 	listeners: {
                 		change: function(field, newValue, oldValue, eOpts) {
                 			this.paramRequestObject.set(relatedDim+'-max-value', newValue);
-    	            			if (this.onChange != null)
+    	            			if (!this.inRebuild && (this.onChange != null))
     	            				this.onChange(uiScope, relatedDim, newValue, oldValue, false);
                 		},
                 		scope: this
@@ -410,7 +396,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
                         listeners: {
                                 change: function(field, newValue, oldValue, eOpts) {
                                         this.paramRequestObject.set(relatedDim+'-min-index', newValue);
-                                	if (this.onChange != null)
+                                	if (!this.inRebuild && (this.onChange != null))
                                         	this.onChange(uiScope, relatedDim, newValue, oldValue, false);
                                 },
                                 scope: this
@@ -427,7 +413,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
                         listeners: {
                                 change: function(field, newValue, oldValue, eOpts) {
                                         this.paramRequestObject.set(relatedDim+'-max-index', newValue);
-                                	if (this.onChange != null)
+                                	if (!this.inRebuild && (this.onChange != null))
                                         	this.onChange(uiScope, relatedDim, newValue, oldValue, false);
                                 },
                                 scope: this
@@ -454,7 +440,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
 							}
 							fieldset.down('[name=sum_type_'+relatedDim+']').setValue(this.paramRequestObject.get(relatedDim+'-sum-type'));
 							indexesCombo.setDisabled(true);
-							if (this.onChange != null)
+							if (!this.inRebuild && (this.onChange != null))
 								this.onChange(uiScope, relatedDim, true, false, false);
 							if (this.onModifyHeight)
 								this.onModifyHeight(this.pluginOwner);
@@ -462,7 +448,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
 					collapse: function(fieldset, eOpts) {
 							indexesCombo.setDisabled(false);	
 							this.paramRequestObject.set(relatedDim+'-sum-type', 0);
-							if (this.onChange != null)
+							if (!this.inRebuild && (this.onChange != null))
 								this.onChange(uiScope, relatedDim, false, true, false);
 							if (this.onModifyHeight)
 								this.onModifyHeight(this.pluginOwner);
@@ -493,7 +479,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
     	            			template_args = {};
     						template_args[key] = newValue;
     						me.paramRequestObject.set('template_args', template_args);
-    						if (me.onChange != null)
+    						if (!this.inRebuild && (me.onChange != null))
     							me.onChange(uiScope, key, newValue, oldValue, true);
     					},
     					scope: me
@@ -529,7 +515,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
     	            			template_args = {};
     						template_args[key] = newValue;
     						me.paramRequestObject.set('template_args', template_args);
-    						if (me.onChange != null)
+    						if (!this.inRebuild && (me.onChange != null))
     	            			me.onChange(uiScope, key, newValue, oldValue, true);
     	            	},
     	            	scope: me
@@ -551,7 +537,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
     	            			template_args = {};
     						template_args[key] = newValue;
     						me.paramRequestObject.set('template_args', template_args);
-    						if (me.onChange != null)
+    						if (!this.inRebuild && (me.onChange != null))
     							me.onChange(uiScope, key, newValue, oldValue, true);
     					},
     					scope: me
@@ -27,6 +27,8 @@ Ext.define(&#39;amdaPlotComp.PlotParamForm&#39;, {
 	drawingOptionsFormsManager : new Ext.AbstractManager(),
 	paramArgs : null,
+
+        isFirstMsg: true,
 	destroy: function() {
 		this.drawingOptionsFormsManager.each(function (key, value, length) {
@@ -108,6 +110,11 @@ Ext.define(&#39;amdaPlotComp.PlotParamForm&#39;, {
 	},
 	onChangeParamArgs: function(uiScope, args_key, newValue, oldValue, isTemplateArg) {
+		if ((uiScope.isFirstMsg) && (uiScope.object.get('type') == 2) && (uiScope.object.get('dim1-sum-type') == 0) && (uiScope.object.get('dim2-sum-type') == 0) &&
+			(uiScope.object.get('dim1-index') == '*') && (uiScope.object.get('dim2-index') == '*')) {
+			uiScope.isFirstMsg = false;
+			myDesktopApp.warningMsg('If argument <i>All</i> is set for both dimensions output will be the total sum <b>(not spectra!)</b>');
+		}
 		uiScope.crtTree.refresh();
 	},