Merge master_vge into master

Benjamin Renard
2 parents fc4e516d e036ece7
Showing 2 changed files with 59 additions and 57 deletions Show diff stats
js/app/views/PlotComponents/PlotStandardForm.js
php/WebServices/xml/AmdaPlots.xml
@@ -326,61 +326,63 @@ Ext.define(&#39;amdaPlotComp.PlotStandardForm&#39;, {
  
 	addStandardParamDropTarget: function (name, label, onChange) {
 		return {
-			xtype: 'erasetrigger',
-			name: name,
-			fieldLabel: label,
-			emptyText: 'Drop a parameter',
-			listeners: {
-				change: function (field, newValue, oldValue, eOpts) {
-					this.object.set(name, newValue);
-					if (onChange != null)
-						onChange(name, newValue, oldValue);
-				},
-				afterrender: function (field, eOpts) {
-					var paramTarget = new Ext.dd.DropTarget(field.el.dom,
-						{
-							ddGroup: 'explorerTree',
-							notifyEnter: function (ddSource, e, data) {
-							},
-							notifyDrop: function (ddSource, e, data) {
-								var selectedRecord = ddSource.dragData.records[0];
-								switch (selectedRecord.$className) {
-									case 'amdaModel.LocalParamNode':
-									case 'amdaModel.RemoteParamNode':
-									case 'amdaModel.RemoteSimuParamNode':
-										if (!selectedRecord.get('isParameter') || selectedRecord.get('disable'))
-											return false;
-										if (selectedRecord.get('alias') != "")
-											field.setValue("#" + selectedRecord.get('alias'));
-										else
-											field.setValue(selectedRecord.get('id'));
-										return true;
-									case 'amdaModel.AliasNode':
-										if (!selectedRecord.isLeaf())
-											return false;
-										field.setValue("#" + selectedRecord.get('text'));
-										return true;
-									case 'amdaModel.DerivedParamNode':
-										if (!selectedRecord.isLeaf())
-											return false;
-										field.setValue("ws_" + selectedRecord.get('text'));
-										return true;
-									case 'amdaModel.MyDataParamNode':
-										if (!selectedRecord.isLeaf())
-											return false;
-										field.setValue("wsd_" + selectedRecord.get('text'));
-										return true;
-									default:
-										return false;
-								}
-								return true;
-							}
-						}
-					);
-				},
-				scope: this
-			}
-		};
+	        xtype: 'erasetrigger',
+	        name: name,
+	        fieldLabel: label,
+	        emptyText: 'Drop a parameter',
+	        listeners: {
+            	change: function(field, newValue, oldValue, eOpts) {
+            		this.object.set(name, newValue);
+            		if (onChange != null)
+            			onChange(name, newValue, oldValue);
+            	},
+            	afterrender: function(field, eOpts ){
+            		var paramTarget = new Ext.dd.DropTarget(field.el.dom, 
+            				{
+            					ddGroup: 'explorerTree',
+            					notifyEnter: function(ddSource, e, data) {
+            					},
+            					notifyDrop: function(ddSource, e, data) {
+            						var selectedRecord = ddSource.dragData.records[0];
+            						switch (selectedRecord.$className)
+            						{
+            						case 'amdaModel.LocalParamNode'   :	  
+            			    	 	                    case 'amdaModel.RemoteParamNode'  :
+            			    	 	                    case 'amdaModel.RemoteSimuParamNode'  : 
+            			    	 		if (!selectedRecord.get('isParameter') || selectedRecord.get('disable'))
+            			    	 			return false;
+            			    	 		if (selectedRecord.get('alias') != "" )
+            			    	 			field.setValue("#"+selectedRecord.get('alias'));
+            			                                                            else
+            			                	                                        field.setValue(selectedRecord.get('id'));
+            			    	 		return true;
+            			    	 	                    case 'amdaModel.AliasNode'        :
+            			    	 		if (!selectedRecord.isLeaf())
+            			    	 			return false;
+            			    	 		field.setValue("#"+selectedRecord.get('text'));
+            			    	 		return true;
+            			    	 	                    case 'amdaModel.DerivedParamNode' :
+								    case 'amdaModel.DerivedParamComponentNode':
+            			    	 		if (!selectedRecord.isLeaf())
+            							    return false;
+            			    	 		field.setValue("ws_"+selectedRecord.get('text'));
+            			    	 		return true;
+            						case 'amdaModel.MyDataParamNode' :
+            							if (!selectedRecord.isLeaf())
+            							    return false;
+            							field.setValue("wsd_"+selectedRecord.get('text'));
+            						    return true;
+            					                         default :
+            						    return false;
+            						}
+            						return true;
+            					}
+            				}
+            		);
+            	},
+            	scope: this
+            }
+	    };
 	},
  
 	addStandardDate: function (name, label, onChange) {
@@ -84,7 +84,7 @@
                 <param name='pas_momgr1_v_rtn_tot'/>
         </mission>
         <mission xml:id='SOLO'>
-                <param name='solo_het_tot_eflux(0)'/>
-                <param name='solo_het_total_hflux(16)'/>
+                <param name='solo_het_omni_eflux(0)'/>
+                <param name='solo_het_omni_hflux(16)'/>
         </mission>
 </missions>