Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM

Benjamin Renard
2 parents 66a3a33d 8497e83c
Showing 7 changed files with 51 additions and 40 deletions Show diff stats
help/dataMiningHOWTO
js/app/models/PlotObjects/PlotObjectConfig.js
js/app/models/RemoteSimuParamNode.js
js/app/views/ParameterUI.js
js/app/views/PlotTabResultUI.js
js/app/views/SearchUI.js
js/app/views/TimeTableUI.js
 To construct a condition for data mining <i>drag</i> one of the AMDA parameters
 from the parameter tree and <i>drop</i> onto the panel.
 <li>1. Use <b><i>FLOAT numbers<i></b> in math expressions 
-<li>2. <b>Enclose</b> your expression in<b>brackets</b> - <i>(1./2.*imf(0)) > 0</i>
+<li>2. <b>Enclose</b> your expression in <b>brackets</b> - <i>(1./2.*imf(0)) > 0</i>
 <li>3. Use <b>&</b> as <i>AND</i> and <b>|</b> as <i>OR</i> and <b>enclose</b> every logical block in <b>brackets</b> - <i>(imf(0) > 0) & ((5.*imf(1)) < -5)
  
@@ -23,7 +23,7 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
 			oneFilePerInterval: false
 		},
 		tree : {
-			simplifiedView : false
+			simplifiedView : true
 		},
 		page : {
 			xMargin : 5.,
@@ -66,6 +66,10 @@ Ext.define(&#39;amdaModel.RemoteSimuParamNode&#39;, {
 				text : 'Close All'
 			}, 
 			{
+				fnId : 'miss-collapseAll',
+				text : 'Close All'
+			},
+			{
 				fnId : 'dire-collapseAll',
 				text : 'Close All'
 			},
@@ -102,10 +106,17 @@ Ext.define(&#39;amdaModel.RemoteSimuParamNode&#39;, {
  
 	getAllContextMenuItems: function()
 	{
-		if (this.get('isAddable')) 
+		if (this.get('isAddable')) { 
+			if (this.getNodeKind() == amdaUI.ExplorerUI.ITEM_KIND_MISS )
 						return  Ext.Array.push(this.allMenuItems(),
-															{ fnId : 'dire-addData',
+															{ fnId : 'miss-addData',
 																text : 'Add Run'});
+						
+			else if (this.getNodeKind() == amdaUI.ExplorerUI.ITEM_KIND_DIRE )
+						return  Ext.Array.push(this.allMenuItems(),
+															{ fnId : 'dire-addData',
+																text : 'Add Run'});		
+		}
 		else if (this.get('isDeletable'))                                  
 						return  Ext.Array.push(this.allMenuItems(),
 															{ fnId : 'dire-deleteNode',
@@ -136,6 +147,7 @@ Ext.define(&#39;amdaModel.RemoteSimuParamNode&#39;, {
 				this.deleteData();
 					break;
 				case  'dire-addData':
+				case  'miss-addData':	
 				case  'root-addData':    
 				this.addData();           
 					break;
@@ -299,19 +299,19 @@ Ext.define(&#39;amdaUI.ParameterUI&#39;,
 						notifyEnter : function(ddSource, e, data) {},
 						notifyOver  : function(ddSource, e, data)
 						{
-							if (data.records[0].data.nodeType == 'localParam' && data.records[0].get('notyet')) 
+							if (data.records[0].get('nodeType') == 'localParam' && data.records[0].get('notyet')) 
 							{
 								this.valid = false;
 								return this.dropNotAllowed;   
 							}
  
-							if (((data.records[0].data.nodeType == 'localParam')   ||
-								(data.records[0].data.nodeType == 'remoteParam') ||
-								(data.records[0].data.nodeType == 'remoteSimuParam') ||
-								(data.records[0].data.nodeType == 'derivedParam') ||
-								(data.records[0].data.nodeType == 'myDataParam') ||
-								(data.records[0].data.nodeType == 'alias')) &&
-								//(data.records[0].data.leaf) && 
+							if (((data.records[0].get('nodeType') == 'localParam')   ||
+								(data.records[0].get('nodeType') == 'remoteParam') ||
+								(data.records[0].get('nodeType') == 'remoteSimuParam') ||
+								(data.records[0].get('nodeType') == 'derivedParam') ||
+								(data.records[0].get('nodeType')== 'myDataParam') ||
+								(data.records[0].get('nodeType') == 'alias')) &&
+								(data.records[0].isLeaf() || data.records[0].get('isParameter')) && 
 								!(data.records[0].data.disable))
 							{
 								this.valid = true;
@@ -326,7 +326,7 @@ Ext.define(&#39;amdaUI.ParameterUI&#39;,
 								return false;
 							var nameToSent;
 							var components = null;
-							switch (data.records[0].data.nodeType)
+							switch (data.records[0].get('nodeType'))
 							{
 								case 'localParam' :
 								case 'remoteParam' :
@@ -440,7 +440,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 			this.navToolBar.removeAll(true);
  
 		this.multiPlotCheck = Ext.create('Ext.form.field.Checkbox', {
-			boxLabel : 'Linked to Multi Plot Mode',
+			boxLabel : 'Linked to Multi Plot',
 			scope: this,
 			handler: function(check, checked) {
 				if (!this.disableSynchronize)
@@ -450,11 +450,17 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 		});
  
 		var commonItemsCfg = [
+		'-',
 		{
 			xtype: 'tbspacer',
-			width: 50
-		},
+			width: 20
+		},		
 		this.multiPlotCheck,
+		{
+			xtype: 'tbspacer',
+			width: 2
+		},
+		'-',
 		'->',
 		{
 			text: 'Get HST Data',
@@ -346,24 +346,25 @@ Ext.define(&#39;amdaUI.SearchUI&#39;,
 							notifyEnter : function(ddSource, e, data){ },
 							notifyOver  : function(ddSource, e, data)
 							{ 
-								if (data.records[0].data.nodeType == 'localParam' && data.records[0].get('notyet')) {
+								if (data.records[0].get('nodeType') == 'localParam' && data.records[0].get('notyet')) {
 										this.valid = false;
 										return this.dropNotAllowed;   
 								}
-								if (((data.records[0].data.nodeType == 'localParam')   ||
-											(data.records[0].data.nodeType == 'remoteParam') || 
-											(data.records[0].data.nodeType == 'remoteSimuParam') ||
-											(data.records[0].data.nodeType == 'derivedParam') ||
-											(data.records[0].data.nodeType == 'myDataParam') ||
-											(data.records[0].data.nodeType == 'alias'))&&
-											//(data.records[0].data.leaf) &&
-											!data.records[0].data.disable)
-										{
-											this.valid = true;
-											return this.dropAllowed;
-										}
-										this.valid = false;
-										return this.dropNotAllowed;
+								if (((data.records[0].get('nodeType') == 'localParam')   ||
+										(data.records[0].get('nodeType') == 'remoteParam') || 
+										(data.records[0].get('nodeType') == 'remoteSimuParam') ||
+										(data.records[0].get('nodeType') == 'derivedParam') ||
+										(data.records[0].get('nodeType') == 'myDataParam') ||
+										(data.records[0].get('nodeType') == 'alias')) &&
+										(data.records[0].isLeaf() || data.records[0].get('isParameter'))  &&
+										!data.records[0].data.disable)
+								{
+									this.valid = true;
+									return this.dropAllowed;
+								}
+								
+								this.valid = false;
+								return this.dropNotAllowed;
 							},
 							notifyDrop  : function(ddSource, e, data)
 							{
@@ -737,15 +737,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
 	    					    ttModule.createObject();
 	    					    this.setObject(ttModule.getLinkedNode().get('object'));
                             }
-                        }, 
-                        {
-                            xtype: 'button',
-                            text: 'Share',
-                            scope: this,
-                            width: 65,
-                            disabled: true,
-                            handler: function () {}
-                        }
+                        } 
                     ]
                 },                              
                 {