Do not show arguments plugin when it's not necessary + New default config for plot

Benjamin Renard
1 parent 571ea5f8
Showing 6 changed files with 56 additions and 39 deletions Show diff stats
js/app/models/DownloadParam.js
js/app/models/PlotObjects/PlotObjectConfig.js
js/app/views/ParamArgumentsPlug.js
js/app/views/ParamArgumentsUI.js
js/app/views/ParameterUI.js
js/app/views/SearchUI.js
@@ -18,6 +18,7 @@ Ext.define(&#39;amdaModel.DownloadParam&#39;, {
 	extend: 'amdaModel.AmdaObject',
     fields : [
+          {name: 'type', type: 'int'},
 	      {name: 'dim1', type: 'string'},
 	      {name: 'dim2', type: 'string'}
 	]
@@ -38,7 +38,7 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
 			},
 			font : {
 				name : 'sans-serif',
-				size: '12'
+				size: '8'
 			},
 			layout : {
 				type : 'vertical',
@@ -51,13 +51,13 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
 			plotType : 'timePlot',
 			isotropic : false,
 			title : {
-				position: 'bottom',
+				position: 'top',
 				alignment: ' center',
 				color: '#000000'
 			},
 			font : {
 				name : 'sans-serif',
-				size: '12'
+				size: '8'
 			},
 			backgroundColor : 'none',
 			status : {
@@ -74,7 +74,7 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
 				color: '#000000',
 				font : {
 					name : 'sans-serif',
-					size: '12'
+					size: '8'
 				}
 			},
 			timeFormat : 'dd/mm/yy',
@@ -111,7 +111,7 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
 				},
 				font : {
 					name : 'sans-serif',
-					size: '12'
+					size: '8'
 				}
 			},
 			intervaltick : {
@@ -124,7 +124,7 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
 				},
 				font : {
 					name : 'sans-serif',
-					size: '12'
+					size: '8'
 				}
 			},
 			errorbar : {
@@ -155,7 +155,7 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
 				},
 				font : {
 					name : 'sans-serif',
-					size: '12'
+					size: '8'
 				}
 			},
 			text : {
@@ -163,7 +163,7 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
 				color : '#000000',
 				font : {
 					name : 'sans-serif',
-					size: '12'
+					size: '8'
 				}
 			}
 		},
@@ -183,7 +183,7 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
 			color : '#000000',
 			font : {
 				name : 'sans-serif',
-				size: '12'
+				size: '8'
 			}
 		},
 		curves : {
@@ -64,7 +64,8 @@ Ext.define(&#39;amdaUI.ParamArgumentsPlug&#39;, {
     			items: this.getFormConfig(),  
     			listeners: {			                      
     				scope: this,			    			                      
-    				beforeclose: function() {      
+    				beforeclose: function() {
+    					this.hostCmp.setDisabled(false);
     					Ext.PluginManager.unregister(this);                                                                   
     				}     
     			},
@@ -87,6 +88,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsPlug&#39;, {
     	this.paramId = paramId;
     	this.paramArgs.editParameter(paramId, crtArgsValues, this.hostCmp);
+    	this.hostCmp.setDisabled(true);
     	this.win.show();
     },
@@ -128,6 +130,7 @@ Ext.define(&#39;amdaUI.ParamArgumentsPlug&#39;, {
     		        			  if (me.onApply)
     		        				  me.onApply(this.hostCmp, me.paramId, me.paramArgs.getValues());
     		        		  }
+    		        		  me.close();
     		        	  }
     		          },
     		          {
@@ -110,6 +110,10 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
     			++this.paramType;
     		}
     	}
+    	
+    	if (this.paramType <= 0)
+    		//Add no args message
+    		this.resetArguments(false);
     },
     buildDimIndexSelection: function(relatedDim, data, uiScope) {
@@ -34,38 +34,42 @@ Ext.define(&#39;amdaUI.ParameterUI&#39;, {
 	 		paramArgsPlug.onApply = this.onApplyParameterArgs;
     },
+    addParamInEditor : function(param) {
+    	var selection = this.constructionField.getSelection();
+    	this.constructionField.setValue(selection.beforeText + param + selection.afterText);
+    	this.constructionField.focus();
+    	this.constructionField.setCaretPosition(this.constructionField.getValue().length);
+    },
+    
     onApplyParameterArgs : function(uiScope, paramId, values) {
     	var fullParam = paramId;
-  	  	switch (values['type']) {
+    	switch (values['type']) {
   	  		case 0:
   	  			//scalar - nothing to do
   	  			break;
   	  		case 1:
   	  			//Tab1D
-  	  			if ((values['dim_1'] != '') && (values['dim_1'] != '*'))
+  	  			if (values['dim_1'] && (values['dim_1'] != '') && (values['dim_1'] != '*'))
   	  				fullParam += '('+values['dim_1']+')';
-  	  			else if ((values['dim_2'] != '') && (values['dim_2'] != '*'))
+  	  			else if (values['dim_2'] && (values['dim_2'] != '') && (values['dim_2'] != '*'))
   	  				fullParam += '('+values['dim_2']+')';
   	  			break;
   	  		case 2:
   	  			//Tab2D
-  	  			var dim1 = values['dim_1'] != '' ? values['dim_1'] : "*";
-  	  			var dim2 = values['dim_2'] != '' ? values['dim_2'] : "*";
+  	  			var dim1 = (values['dim_1'] && (values['dim_1'] != '')) ? values['dim_1'] : "*";
+  	  			var dim2 = (values['dim_2'] && (values['dim_2'] != '')) ? values['dim_2'] : "*";
   	  			if ((dim1 != '*') || (dim2 != '*'))
   	  				fullParam += '('+dim1+','+dim2+')';
   	  	}
-  	  
-    	var selection = uiScope.constructionField.getSelection();
-    	uiScope.constructionField.setValue(selection.beforeText + fullParam + selection.afterText);
-    	uiScope.constructionField.focus();
-    	uiScope.constructionField.setCaretPosition(uiScope.constructionField.getValue().length);
-    	this.close();
+  	  	
+  	  	uiScope.addParamInEditor(fullParam);
     },
-    addParam : function(newParamName,isLeaf) {
-        if (isLeaf){
+    addParam : function(newParamName, isArgsToDefined) {
+        if (isArgsToDefined)
         	this.editParameterArgs(newParamName);
-        }       
+        else
+        	this.addParamInEditor(newParamName);
     },
     editParameterArgs: function(name) {
@@ -321,8 +325,9 @@ Ext.define(&#39;amdaUI.ParameterUI&#39;, {
 			            	return false;
 			          }
 			          var paramModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.param.id);
-			          if (paramModule)
-			        	  paramModule.addParam(nameToSent,true);
+			          if (paramModule) {
+			        	  paramModule.addParam(nameToSent, !data.records[0].get('leaf') || data.records[0].get('needsArgs'));
+			          }
 				      return true;
 			        }
 			    });
@@ -40,10 +40,18 @@ Ext.define(&#39;amdaUI.SearchUI&#39;, {
             this.timeSelector.setTTTab(TTarray);
         },
-        addParam : function(newParamName, isLeaf) {
-        	if (isLeaf){
+        addParam : function(newParamName, isArgsToDefined) {
+        	if (isArgsToDefined)
             	this.editParameterArgs(newParamName);
-            } 
+            else
+            	this.addParamInEditor(newParamName);
+        },
+        
+        addParamInEditor : function(param) {
+        	var selection = this.constructionField.getSelection();
+        	this.constructionField.setValue(selection.beforeText + param + selection.afterText);
+        	this.constructionField.focus();
+        	this.constructionField.setCaretPosition(this.constructionField.getValue().length);
         },
         onApplyParameterArgs : function(uiScope, paramId, values) {
@@ -54,24 +62,20 @@ Ext.define(&#39;amdaUI.SearchUI&#39;, {
       	  			break;
       	  		case 1:
       	  			//Tab1D
-      	  			if ((values['dim_1'] != '') && (values['dim_1'] != '*'))
+      	  			if (values['dim_1'] && (values['dim_1'] != '') && (values['dim_1'] != '*'))
       	  				fullParam += '('+values['dim_1']+')';
-      	  			else if ((values['dim_2'] != '') && (values['dim_2'] != '*'))
+      	  			else if (values['dim_2'] && (values['dim_2'] != '') && (values['dim_2'] != '*'))
       	  				fullParam += '('+values['dim_2']+')';
       	  			break;
       	  		case 2:
       	  			//Tab2D
-      	  			var dim1 = values['dim_1'] != '' ? values['dim_1'] : "*";
-      	  			var dim2 = values['dim_2'] != '' ? values['dim_2'] : "*";
+      	  			var dim1 = (values['dim_1'] && (values['dim_1'] != '')) ? values['dim_1'] : "*";
+      	  			var dim2 = (values['dim_2'] && (values['dim_2'] != '')) ? values['dim_2'] : "*";
       	  			if ((dim1 != '*') || (dim2 != '*'))
       	  				fullParam += '('+dim1+','+dim2+')';
       	  	}
-        	var selection = uiScope.constructionField.getSelection();
-        	uiScope.constructionField.setValue(selection.beforeText + fullParam + selection.afterText);
-        	uiScope.constructionField.focus();
-        	uiScope.constructionField.setCaretPosition(uiScope.constructionField.getValue().length);
-        	this.close();
+      	  	uiScope.addParamInEditor(fullParam);
         },
         editParameterArgs: function(name) {
@@ -365,7 +369,7 @@ Ext.define(&#39;amdaUI.SearchUI&#39;, {
                                     var searchModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.search.id);
                                     if (searchModule)
-                                    	searchModule.addParam(nameToSent,true);	
+                                    	searchModule.addParam(nameToSent, !data.records[0].get('leaf') || data.records[0].get('needsArgs'));	
                                     return true;
                                 }
                             });