Use param indexes for requests

Benjamin Renard
1 parent f28f7c0e
Showing 4 changed files with 59 additions and 5 deletions Show diff stats
src/InputOutput/IHMImpl/Params/DownloadImpl/IHMInputOutputParamsDownloadClass.php
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotParamsNodeClass.php
@@ -74,7 +74,29 @@ class IHMInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClas
 		//add params to output
 		foreach ($input->list as $param)
 		{
-			$paramInfo = $this->paramManager->addExistingParam($param,$this->paramsData);
+			$paramInfo = $this->paramManager->addExistingParam($param->name,$this->paramsData);
+			switch ($param->type) {
+				case 0:
+					//scalar - nothing to do
+					break;
+				case 1:
+					//Tab1D
+					if (isset($param->dim1) && ($param->dim1 != '') && ($param->dim1 != '*')) {
+						$paramInfo['indexes'] = array();
+						$paramInfo['indexes'][] = $param->dim1;
+					}
+					else if (isset($param->dim2) && ($param->dim2 != '') && ($param->dim2 != '*')) {
+						$paramInfo['indexes'] = array();
+						$paramInfo['indexes'][] = $param->dim2;
+					}
+					break;
+				case 2:
+					if (($param->dim1 != '*') || ($param->dim2 != '*')) {
+						$paramInfo['indexes'] = array();
+						$paramInfo['indexes'][] = "[".$param->dim1.",".$param->dim2."]";
+					}
+					break;
+			}
 			$downloadNode->addParam($paramInfo['id'],$paramInfo['indexes'],$paramInfo['calib_infos']);
 			$paramsNode->addParam($paramInfo['id']);
 		}
@@ -647,6 +647,34 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		{
 			//Param
 			$paramInfo = $this->paramManager->addExistingParam($paramData->{'param-id'},$this->paramsData);
+			
+			$paramInfo['indexes'] = array();
+			$dim1 = $paramData->{'param-dim-1'};
+			if ($dim1 == '')
+				$dim1 = '*';
+			$dim2 = $paramData->{'param-dim-2'};
+			if ($dim2 == '')
+				$dim2 = '*';
+			switch ($paramData->{'param-type'}) {
+				case 0:
+					//scalar - nothing to do
+					break;
+				case 1:
+					//Tab1D
+					if (isset($dim1) && ($dim1 != '*')) {
+						$paramInfo['indexes'][] = $dim1;
+					}
+					else if (isset($dim2) && ($dim2 != '*')) {
+						$paramInfo['indexes'][] = $dim2;
+					}
+					break;
+				case 2:
+					if (($dim1 != '*') || ($dim2 != '*')) {
+						$paramInfo['indexes'][] = "[".$dim1.",".$dim2."]";
+					}
+					break;
+			}
+			
 			$requestParamsNode->addParam($paramInfo['id']);
@@ -958,7 +986,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 	protected function unmarshallSpectro($paramDrawingData, $plotNode, $paramNode, $indexes)
 	{
-		$spectroNode = $paramNode->addSpectro($paramDrawingData->{'spectro-yaxis'}, $paramDrawingData->{'spectro-value-min'}, $paramDrawingData->{'spectro-value-max'});
+		$spectroNode = $paramNode->addSpectro($paramDrawingData->{'spectro-yaxis'}, count($indexes) > 0 ? $indexes[0] : NULL, $paramDrawingData->{'spectro-value-min'}, $paramDrawingData->{'spectro-value-max'});
 	}
 	protected function unmarshallStatusBar($paramDrawingData, $paramNode, $indexes)
@@ -276,7 +276,7 @@ class IHMJobsManagerClass {
 					if ($obj->downloadSrc == '2') //fits image
 						$info = $info.' '.$param->url;
 					else
-						$info = $info.' '.$param; //data
+						$info = $info.' '.$param->name; //data
 				}
 				break;
 			case 'request'	 :
@@ -21,6 +21,7 @@ define (&quot;REQUESTOUTPUTPLOTCOLORSERIE_INDEX&quot;, &quot;index&quot;);
 define ("REQUESTOUTPUTPLOTSPECTRO_NAME", "spectro");
 define ("REQUESTOUTPUTPLOTSPECTRO_YAXIS", "yAxis");
+define ("REQUESTOUTPUTPLOTSPECTRO_INDEX", "index");
 define ("REQUESTOUTPUTPLOTSPECTRO_MIN", "min");
 define ("REQUESTOUTPUTPLOTSPECTRO_MAX", "max");
@@ -95,10 +96,12 @@ class RequestOutputPlotParamNodeClass extends NodeClass
 		return $iserieNode;
 	}
-	public function addSpectro($yAxis = "", $min = NULL, $max = NULL)
+	public function addSpectro($yAxis = "", $index = NULL, $min = NULL, $max = NULL)
 	{
 		$spectroNode = new NodeClass(REQUESTOUTPUTPLOTSPECTRO_NAME);
 		$spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_YAXIS, $yAxis);
+		if (isset($index))
+			$spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_INDEX, $index);
 		if (isset($min))
 			$spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_MIN, $min);
 		if (isset($max))
@@ -170,9 +173,10 @@ class RequestOutputPlotParamNodeClass extends NodeClass
 					break;
 				case REQUESTOUTPUTPLOTSPECTRO_NAME :
 					$yAxis = $this->getXmlNodeAttribute($plottypeXmlNode, REQUESTOUTPUTPLOTSPECTRO_YAXIS);
+					$index = $this->getXmlNodeAttribute($plottypeXmlNode, REQUESTOUTPUTPLOTSPECTRO_INDEX);
 					$min = $this->getXmlNodeAttribute($plottypeXmlNode, REQUESTOUTPUTPLOTSPECTRO_MIN);
 					$max = $this->getXmlNodeAttribute($plottypeXmlNode, REQUESTOUTPUTPLOTSPECTRO_MAX);
-					$node = $this->addSpectro($yAxis, $min, $max);
+					$node = $this->addSpectro($yAxis, $index, $min, $max);
 					break;
 				case REQUESTOUTPUTPLOTXSERIE_NAME :
 					$xAxis = $this->getXmlNodeAttribute($plottypeXmlNode, REQUESTOUTPUTPLOTXSERIE_XAXIS);