Merge branch master in rm_5357

Benjamin Renard
2 parents 5020b4e1 c05ca21a
Showing 6 changed files with 56 additions and 33 deletions Show diff stats
js/app/controllers/DownloadModule.js
js/app/models/Download.js
js/app/models/InteractiveNode.js
js/app/models/PlotObjects/PlotParamObject.js
js/app/views/DownloadUI.js
js/app/views/PlotComponents/PlotPanelForm.js
@@ -30,7 +30,7 @@ Ext.define(&#39;amdaDesktop.DownloadModule&#39;, {
      * @required
      */
     width: 600, 
-    height: 590,
+    height: 600,
     uiType : 'panelDownload',
     helpTitle : 'Help on Download Module',
     helpFile : 'downloadHelp',
@@ -22,6 +22,7 @@ Ext.define(&#39;amdaModel.Download&#39;, {
 		{name: 'refparamSampling', type: 'boolean', defaultValue: false},
                 {name: 'separateInfoFile', type: 'boolean', defaultValue: false},
 		{name: 'sampling', type: 'int', defaultValue: '600'},
+		{name: 'scientificformat', type: 'boolean', defaultValue: false},
 		{name: 'fileprefix', type: 'string'},
 		{name: 'fileformat', type: 'string'},
 		{name: 'fileformatTT', type: 'string'},
@@ -29,7 +30,7 @@ Ext.define(&#39;amdaModel.Download&#39;, {
 		{name: 'compressionTT', type: 'string'}
 	],
  
-	propertiesToCopy : 'id,name,downloadSrc,refparamSampling,separateInfoFile,sampling,list,timeformat,timeformatTT,structure,fileprefix,fileformat,fileformatTT,compression,compressionTT',
+	propertiesToCopy : 'id,name,downloadSrc,refparamSampling,separateInfoFile,sampling,scientificformat,list,timeformat,timeformatTT,structure,fileprefix,fileformat,fileformatTT,compression,compressionTT',
  
 	getJsonValues : function(){
  
@@ -42,6 +43,7 @@ Ext.define(&#39;amdaModel.Download&#39;, {
 			myValues.structure = this.get('structure');
 			myValues.refparamSampling = this.get('refparamSampling');
                         myValues.separateInfoFile = this.get('separateInfoFile');
+			myValues.scientificformat = this.get('scientificformat');
 			myValues.sampling = this.get('sampling');
 			myValues.fileprefix = this.get('fileprefix');
  
@@ -487,16 +487,16 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 						else 
 							paramName = node.get('id');
 				}				
-// 				var component_info = node.get('component_info');
-// 				if (component_info && component_info.parentId) {
-// 					//It's a component
-// 					paramName = component_info.parentId;
-// 					components = [];
-// 					if (component_info.index1)
-// 						components['index1'] = component_info.index1;
-// 					if (component_info.index2)
-// 						components['index2'] = component_info.index2;
-// 				}		
+ 				var component_info = node.get('component_info');
+ 				if (component_info && component_info.parentId) {
+ 					//It's a component
+ 					paramName = component_info.parentId;
+ 					components = [];
+ 					if (component_info.index1)
+ 						components['index1'] = component_info.index1;
+ 					if (component_info.index2)
+ 						components['index2'] = component_info.index2;
+ 				}		
 				module.addParam(paramName,true,node.get('needsArgs'),components);  
 		}); 
 	},
@@ -97,7 +97,7 @@ Ext.define(&#39;amdaPlotObj.PlotParamObject&#39;, {
     	if (this.get('param-drawing-object') != null)
     	{
     		this.get('param-drawing-object').setDefaultValues();
-    		if (this.get('param-drawing-object').loadFromData && drawData)
+    		if (this.get('param-drawing-object').loadFromData && drawData && (type == drawData.type))
     			this.get('param-drawing-object').loadFromData(drawData);
     	}
     },
@@ -204,4 +204,4 @@ Ext.define(&#39;amdaPlotObj.PlotParamObject&#39;, {
  
     	return paramValues;
     }
-});
 \ No newline at end of file
+});
@@ -7,8 +7,7 @@
  * @author 	 Myriam
  * @version $Id: DownloadUI.js 2622 2014-11-07 14:50:09Z elena $  
  */
- 
- 
+
 Ext.define('amdaUI.DownloadUI', {
 	extend: 'Ext.container.Container',
 	alias: 'widget.panelDownload',
@@ -18,12 +17,14 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
 		'amdaUI.ParamArgumentsPlug',
 		'amdaUI.SendToSampButtonUI',
 		'amdaModel.DownloadParam'
-	],   
-	
+	],
+
 	//Old kernel time formats
 	//timeformatData    : [['Y-m-dTH:i:s', 'YYYY-MM-DDThh:mm:ss'], ['Y m d H i s', 'YYYY MM DD hh mm ss'], ['d m Y H i s', 'DD MM YYYY hh mm ss'], ['Y z H i s', 'YYYY DDD hh mm ss']],
 	//New kernel time formats
-	timeformatData    : [['Y-m-dTH:i:s', 'YYYY-MM-DDThh:mm:ss'], ['DD Time', 'DD Time'], ['Timestamp', 'Timestamp']],
+	timeformatData    : [['YYYY-MM-DDThh:mm:ss', 'YYYY-MM-DDThh:mm:ss.ms', 'ISO format with msecs'], 
+								['DD Time',  'YYYYDOYhhmmssms',  'Day-Of-Year, 1 Jan : DOY = 0'], 
+								['Timestamp', 'Seconds from 1970', 'Total of seconds from the Unix Epoch on January 1st, 1970 at UTC.']],
 	timeformatTTData    : [['Y-m-dTH:i:s', 'YYYY-MM-DDThh:mm:ss']],
 	fileformatData    : [['ASCII', 'ASCII'],['vot', 'VOTable'],['cdf', 'CDF'],['json', 'JSON']],
 	fileformatTTData  : [['text', 'plain text'], ['vot','VOTable']],
@@ -121,8 +122,9 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
 		var pos = this.paramGrid.store.getCount();
 		this.paramGrid.store.insert(pos,r); 
 		this.paramGrid.getView().refresh();
-		//if (!isLeaf || needArgs)
-			//this.editParameterArgs(r);
+
+		if (needArgs)
+			this.editParameterArgs(r);
 	},
  
 	addParams: function(arrayParams) 
@@ -199,8 +201,8 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
  
 		// data download
 		if (downloadSrc === 0) 
-		{            
-			var timeformat =  basicForm.findField('timeformat').getRawValue();         
+		{             
+			var timeformat = values.timeformat;
 			var timeSource = this.timeSelector.getActiveTimeSource();     
 			var structure = values.filestructure;
 			var sampling = values.sampling ? values.sampling : 600;
@@ -455,7 +457,7 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
 									var component_info = data.records[0].get('component_info');
 									if (component_info && component_info.parentId) 
 									{													
-										if ( component_info.index1 && component_info.index2 )
+										if ( component_info.index1 || component_info.index2 )
 										{															 
 											idToSent = component_info.parentId;
 											components = [];												
@@ -552,7 +554,12 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
 		});
  
 		this.TTGrid.on('cellclick', this.actionItem, this);
-						
+		
+		var store =  new Ext.data.ArrayStore({
+							fields: ['id', 'name', 'qtip'],
+							data: this.timeformatData
+						});
+		
 		this.paramPanel = { 		 
 			xtype: 'container',	  
 			title: 'Parameters',		   
@@ -596,12 +603,22 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
 					type: 'vbox',
 					align: 'stretch'
 				},
-				items: [				
-					{				    				  
-						fieldLabel: 'Time Format',				  
-						name: 'timeformat',				   
-						store: this.timeformatData,
-						value: this.timeformatData[0]					     
+				items: [
+					{ 
+						fieldLabel: 'Time Format',  
+						name: 'timeformat',
+						valueField: 'id',
+						displayField: 'name',
+						queryMode: 'local',
+						store: store,
+						listConfig: {
+							tpl: [
+									'<tpl for=".">',
+										'<li class="x-boundlist-item" data-qtip="{qtip}">{name}</li>',
+									'</tpl>'
+							]
+						},
+					   value: store.first()
 					},
 					{				    
 						fieldLabel: 'File Structure',
@@ -635,6 +652,11 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
 						disabled: true
 					},
 					{
+						xtype : 'checkbox', boxLabel: 'Scientific floating-point formatting',
+						boxLabelAlign: 'before',
+						name: 'scientificformat', checked: false
+					},
+					{
 						xtype: 'textfield', name: 'fileprefix',
 						fieldLabel: 'File Prefix',				    
 						disabled: false,  editable: true
@@ -49,7 +49,6 @@ Ext.define(&#39;amdaPlotComp.PlotPanelForm&#39;, {
  
 		//Instant time visibility
 		var instantTimeField = this.getForm().findField('panel-instant-time');
-		console.log(this.up().up().up().up());
 		instantTimeField.setVisible(plotType == 'instantPlot');
  
 		//Options in relation with the layout
@@ -152,4 +151,4 @@ Ext.define(&#39;amdaPlotComp.PlotPanelForm&#39;, {
 		        this.addStandardFieldSet('Ticks Bars', '', tickItems)
 		];
 	}
-});
 \ No newline at end of file
+});