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

elena
2 parents 10ac375f df008372
Showing 9 changed files with 158 additions and 11 deletions Show diff stats
js/app/models/PlotObjects/PlotBaseSerieObject.js
js/app/models/PlotObjects/PlotSerieObject.js
js/app/models/PlotObjects/PlotSpectroObject.js
js/app/views/PlotComponents/PlotBaseSerieForm.js
js/app/views/PlotComponents/PlotContextManager.js
js/app/views/PlotComponents/PlotSerieForm.js
js/app/views/PlotComponents/PlotSpectroForm.js
js/app/views/PlotTabResultUI.js
php/downloadPlot.php
@@ -31,6 +31,8 @@ Ext.define(&#39;amdaPlotObj.PlotBaseSerieObject&#39;, {
 	          {name: 'serie-symbols-size', type: 'float'},
 	          {name: 'serie-symbols-color', type: 'string'},
 	          {name: 'serie-colored-param', type: 'string'},
+	          {name: 'serie-value-min', type: 'float', useNull:true},
+	          {name: 'serie-value-max', type: 'float', useNull:true},
  
 	          //Time tick
 	          {name: 'serie-timetick-activated', type: 'boolean'},
@@ -139,6 +141,8 @@ Ext.define(&#39;amdaPlotObj.PlotBaseSerieObject&#39;, {
     	serieValues['serie-symbols-size'] = this.get('serie-symbols-size');
     	serieValues['serie-symbols-color'] = this.get('serie-symbols-color');
     	serieValues['serie-colored-param'] = this.get('serie-colored-param');
+    	serieValues['serie-value-min'] = this.get('serie-value-min');
+    	serieValues['serie-value-max'] = this.get('serie-value-max');
  
     	serieValues['serie-timetick-activated'] = this.get('serie-timetick-activated');
     	serieValues['serie-timetick-type'] = this.get('serie-timetick-type');
@@ -19,6 +19,8 @@ Ext.define(&#39;amdaPlotObj.PlotSerieObject&#39;, {
 	fields : [
 	          //Only used for xyPlot
 	          {name: 'serie-xaxis-param', type: 'string'},
+	          {name: 'serie-xvalue-min', type: 'float', useNull:true},
+	          {name: 'serie-xvalue-max', type: 'float', useNull:true},
 	          {name: 'serie-resampling-mode', type: 'string'},
  
 			  //Only used for timePlot
@@ -59,6 +61,8 @@ Ext.define(&#39;amdaPlotObj.PlotSerieObject&#39;, {
     	var serieValues  = this.callParent(arguments);
  
     	serieValues['serie-xaxis-param'] = this.get('serie-xaxis-param');
+    	serieValues['serie-xvalue-min'] = this.get('serie-xvalue-min');
+    	serieValues['serie-xvalue-max'] = this.get('serie-xvalue-max');
     	serieValues['serie-resampling-mode'] = this.get('serie-resampling-mode');
  
     	serieValues['serie-errorbar-activated'] = this.get('serie-errorbar-activated');
@@ -21,7 +21,9 @@ Ext.define(&#39;amdaPlotObj.PlotSpectroObject&#39;, {
 	],
  
 	fields : [
-	          {name: 'spectro-yaxis', type: 'string'}
+	          {name: 'spectro-yaxis', type: 'string'},
+	          {name: 'spectro-value-min', type: 'float', useNull:true},
+	          {name: 'spectro-value-max', type: 'float', useNull:true}
     ],
  
     constructor: function(){
@@ -48,6 +50,8 @@ Ext.define(&#39;amdaPlotObj.PlotSpectroObject&#39;, {
     	var spectroValues  = new Object();
  
     	spectroValues['spectro-yaxis'] = this.get('spectro-yaxis');
+    	spectroValues['spectro-value-min'] = this.get('spectro-value-min');
+    	spectroValues['spectro-value-max'] = this.get('spectro-value-max');
  
     	return spectroValues;
     }
@@ -75,6 +75,13 @@ Ext.define(&#39;amdaPlotComp.PlotBaseSerieForm&#39;, {
 		];
 	},
  
+	getValuesRangeItems: function() {
+		return [
+		        this.addStandardFloat('serie-value-min', 'Min value', -Number.MAX_VALUE, Number.MAX_VALUE, true),
+		        this.addStandardFloat('serie-value-max', 'Max value', -Number.MAX_VALUE, Number.MAX_VALUE, true)
+		];
+	},
+	
 	getFormItems: function() {
 		var me = this;
  
@@ -83,6 +90,7 @@ Ext.define(&#39;amdaPlotComp.PlotBaseSerieForm&#39;, {
 		    	me.object.set('serie-yaxis', value);
 		    	me.crtTree.refresh();
 		    }),
+		    this.addStandardFieldSet('Y Values range', '', this.getValuesRangeItems()),
 		    this.addStandardParamDropTarget('serie-colored-param', 'Colored Parameter'),
 		    this.addStandardFieldSet('Lines', 'serie-lines-activated', this.addStandardLineItems('serie-lines')),
 		    this.addStandardFieldSet('Symbols', 'serie-symbols-activated', this.addStandardSymbolsItems('serie-symbols')),
@@ -82,6 +82,12 @@ Ext.define(&#39;amdaPlotComp.PlotContextManager&#39;, {
 		if (pixelMax == pixelMin)
 			return NaN;
  
+		if (axisContext.logarithmic)
+		{
+			var value = axisContext.min + (pixelValue - pixelMin)/(pixelMax - pixelMin)*(axisContext.max-axisContext.min);
+			return Math.pow(10,value);
+		}
+		
 		return axisContext.min + (pixelValue - pixelMin)/(pixelMax - pixelMin)*(axisContext.max-axisContext.min);
 	}
 });
 \ No newline at end of file
@@ -15,9 +15,12 @@ Ext.define(&#39;amdaPlotComp.PlotSerieForm&#39;, {
 		var isScatter = (plotType == 'xyPlot');
  
 		var xParamField = this.getForm().findField('serie-xaxis-param');
+		var xValueMinField = this.getForm().findField('serie-xvalue-min');
+		var xValueFieldSet = xValueMinField.findParentByType('fieldset');
 		var resamplingModeField = this.getForm().findField('serie-resampling-mode');
  
 		xParamField.setVisible(isScatter);
+		xValueFieldSet.setVisible(isScatter);
 		resamplingModeField.setVisible(isScatter);
  
 		var errorBarTypeField = this.getForm().findField('serie-errorbar-type');
@@ -53,6 +56,13 @@ Ext.define(&#39;amdaPlotComp.PlotSerieForm&#39;, {
 		];
 	},
  
+	getXValuesRangeItems: function() {
+		return [
+		        this.addStandardFloat('serie-xvalue-min', 'Min value', -Number.MAX_VALUE, Number.MAX_VALUE, true),
+		        this.addStandardFloat('serie-xvalue-max', 'Max value', -Number.MAX_VALUE, Number.MAX_VALUE, true)
+		];
+	},
+	
 	getFormItems: function() {
 		var me = this;
  
@@ -63,6 +73,7 @@ Ext.define(&#39;amdaPlotComp.PlotSerieForm&#39;, {
 				me.object.set('serie-xaxis-param', value);
         		me.crtTree.refresh();
 			}),
+			this.addStandardFieldSet('X Values range', '', this.getXValuesRangeItems()),
 			this.addStandardCombo('serie-resampling-mode', 'Reference parameter for resampling', amdaPlotObj.PlotObjectConfig.availableResamplingModes)
 		];
  
@@ -16,13 +16,21 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, {
 		this.loadRecord(this.object);
 	},
  
+	getValuesRangeItems: function() {
+		return [
+		        this.addStandardFloat('spectro-value-min', 'Min value', -Number.MAX_VALUE, Number.MAX_VALUE, true),
+		        this.addStandardFloat('spectro-value-max', 'Max value', -Number.MAX_VALUE, Number.MAX_VALUE, true)
+		];
+	},
+	
 	getFormItems: function() {
 		var me = this;
 		return [
 		    this.addStandardCombo('spectro-yaxis', 'Y axis', amdaPlotObj.PlotObjectConfig.availableYAxes, function(name, value, oldValue) {
 		    	me.object.set('spectro-yaxis', value);
         		me.crtTree.refresh();
-		    })
+		    }),
+		    this.addStandardFieldSet('Values range', '', this.getValuesRangeItems())
 		];
 	}
 });
 \ No newline at end of file
@@ -31,6 +31,8 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
     isTTNavBar : false,
     crtTTFileIndex : 0,
  
+    hiddenForm: null,
+    
     constructor: function(config) {
         this.addEvents({'pagesize':true});
  
@@ -285,15 +287,48 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 				if (me.contextualMenu.items.getCount() > 0)
 					me.contextualMenu.add('-');
  
-				me.contextualMenu.add({
-					text:'Extend/Shift Time request',
-					handler : function ()
-					{
-						var extendShiftPlugin = this.getPlugin('plot-extendshift-plugin-id');
-						extendShiftPlugin.show(me.tabId);
-					},
-					scope: me
-				});
+				me.contextualMenu.add([
+				                       {
+				                    	   text:'Extend/Shift Time request',
+				                    	   handler : function ()
+				                    	   {
+				                    		   var extendShiftPlugin = this.getPlugin('plot-extendshift-plugin-id');
+				                    		   extendShiftPlugin.show(me.tabId);
+				                    	   },
+				                    	   scope: me
+				                       },
+				                       '-',
+				                       {
+				                    	   text: 'Save Plot',
+				                    	   handler : function ()
+				                    	   {
+				                    		   if (me.hiddenForm == null)
+				                    			   me.hiddenForm = Ext.create('Ext.form.Panel', {
+				                    				   title:'hiddenForm',
+				                    				   renderTo: Ext.getBody(),
+				                    				   standardSubmit: true,
+				                    				   url: 'php/downloadPlot.php',
+				                    				   timeout: 120000,
+				                    				   height:100,
+				                    				   width: 100,
+				                    				   hidden:true,
+				                    				   items:[
+				                    				   ]
+				                    			   });
+
+				                    		   me.hiddenForm.getForm().submit({
+				                    			   params: {
+				                    				   sessionId: sessionID,
+				                    				   tabId : me.tabId
+				                    			   },
+				                                   success: function(form, action) {
+				                                   },
+				                                   failure: function(form, action) {
+				                                   }
+				                    		   });
+				                    	   }
+				                       }
+				]);
  
 				me.contextualMenu.showAt(absoluteX, absoluteY);
 			}
@@ -0,0 +1,67 @@
+<?php
+
+require_once 'config.php';
+
+if (!isset($_POST['sessionId']))
+{
+	header("HTTP/1.0 400 Bad Request");
+	echo json_encode(array("success" => false, "error" => "Unknown session Id"));
+	exit;
+}
+$sessionId = $_POST['sessionId'];
+
+if (!isset($_POST['tabId']))
+{
+	header("HTTP/1.0 400 Bad Request");
+	echo json_encode(array("success" => false, "error" => "Unknown tab Id"));
+	exit;
+}
+$tabId     = $_POST['tabId'];
+
+download_plot($sessionId, $tabId);
+
+function download_plot($sessionId, $tabId)
+{
+	// Must be fresh start
+	if( headers_sent() )
+	{
+		header("HTTP/1.0 400 Bad Request");
+		echo json_encode(array("success" => false, "error" => "Headers Sent"));
+		return;
+	}
+
+	// Required for some browsers
+	if(ini_get('zlib.output_compression'))
+		ini_set('zlib.output_compression', 'Off');
+
+	//Build file path
+	$fullPath = USERPATH."/".$sessionId."/RES/Plot_/".$tabId.".png";
+	// File Exists?
+	if( file_exists($fullPath) ){
+
+		// Parse Info / Get Extension
+		$fsize = filesize($fullPath);
+		$path_parts = pathinfo($fullPath);
+		$ctype="image/png";
+		
+		header("Pragma: public"); // required
+		header("Expires: 0");
+		header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+		header("Cache-Control: private",false); // required for certain browsers
+		header("Content-Type: $ctype");
+		header("Content-Disposition: attachment; filename=\"".basename($fullPath)."\";" );
+		header("Content-Transfer-Encoding: binary");
+		header("Content-Length: ".$fsize);
+		ob_clean();
+		flush();
+		readfile( $fullPath );
+
+	} else
+	{
+		header("HTTP/1.0 400 Bad Request");
+		echo json_encode(array("success" => false, "error" => "No existing plot"));
+		return;
+	}
+}
+
+?>
 \ No newline at end of file