Use units and yTitle definition for a derived parameter (#5672)

Benjamin Renard
1 parent 97a69b20
Showing 4 changed files with 35 additions and 8 deletions Show diff stats
src/InputOutput/IHMImpl/Params/DataMiningImpl/IHMInputOutputParamsDataMiningClass.php
src/InputOutput/IHMImpl/Tools/IHMParamManagerClass.php
src/InputOutput/IHMImpl/Tools/IHMUserParamLoaderClass.php
src/Request/ParamsRequestImpl/ParamsRequestDataClass.php
@@ -38,7 +38,7 @@ class IHMInputOutputParamsDataMiningClass extends IHMInputOutputParamsAbstractCl
 		//create a derived param for the expression
 		$this->paramManager->addProcessParam($paramId, $expressionInfo["expression"], $input->expression,
 				$expressionInfo['params'], $input->sampling,
-				$input->gap,time(),$this->paramsData);
+				$input->gap,time(),"","",$this->paramsData);
  
 		//add derived param to output
 		$paramsNode->addParam($paramId);
@@ -39,9 +39,9 @@ class IHMParamManagerClass
 	/*
 	 * @brief Add a process parameter
 	*/
-	public function addProcessParam($paramId,$expression,$expression_info,$params,$sampling,$gap,$dateModif,$paramsData)
-	{	 
-		$paramsData->addProcessParamToCreate($paramId, $expression, $expression_info, $params, $sampling, $gap,$dateModif); 
+	public function addProcessParam($paramId,$expression,$expression_info,$params,$sampling,$gap,$dateModif,$units,$ytitle,$paramsData)
+	{
+		$paramsData->addProcessParamToCreate($paramId, $expression, $expression_info, $params, $sampling, $gap,$dateModif, $units, $ytitle); 
  
 		foreach ($params as $param) {
 			$template_args = NULL; 
@@ -202,7 +202,8 @@ class IHMParamManagerClass
 		//create a process param for the derived parameter
 		$this->addProcessParam($paramId, $expressionInfo["expression"], $res["param"]["expression"],
 				$expressionInfo['params'], $res["param"]["timestep"],
-				0,$res["param"]["dateModif"],$paramsData);
+				0,$res["param"]["dateModif"],!empty($res["param"]["info"]["units"]) ? $res["param"]["info"]["units"] : "",
+				!empty($res["param"]["info"]["yTitle"]) ? $res["param"]["info"]["yTitle"] : "", $paramsData);
  
 		return array("id" => $paramId, "indexes" => array(), "calib_infos" => array());
 	}
@@ -19,7 +19,10 @@ class IHMUserParamLoaderClass
  
 	//additional info for derived parameter
 	private static $infoDerivedUnitsNode       = 'units';
+	private static $infoDerivedYTitleNode      = 'ytitle';
 	private static $infoDerivedDescriptionNode = 'description';
+
+	private static $infoDerivedUndefined       = 'undefined';
  
 	//uploaded parameters in manager file
 	private static $mgrUploadedNode           = 'mydataList';
@@ -255,6 +258,7 @@ class IHMUserParamLoaderClass
  
 		$result = array(
 				"units"       => "",
+				"yTitle"      => "",
 				"description" => ""
 		);
  
@@ -268,8 +272,21 @@ class IHMUserParamLoaderClass
  
 		//get parameter units
 		$unitsNodes = $dom->getElementsByTagName(self::$infoDerivedUnitsNode);
-		if (count($unitsNodes) > 0)
+		if (count($unitsNodes) > 0) {
 			$result["units"] = $unitsNodes->item(0)->nodeValue;
+			if ($result["units"] == self::$infoDerivedUndefined) {
+				$result["units"] = "";
+			}
+		}
+
+		//get parameter y title
+		$yTitleNodes = $dom->getElementsByTagName(self::$infoDerivedYTitleNode);
+		if (count($yTitleNodes) > 0) {
+			$result["yTitle"] = $yTitleNodes->item(0)->nodeValue;
+			if ($result["yTitle"] == self::$infoDerivedUndefined) {
+				$result["yTitle"] = "";
+			}
+		}
  
 		//get parameter description
 		$descNodes = $dom->getElementsByTagName(self::$infoDerivedDescriptionNode);
@@ -361,4 +378,4 @@ class IHMUserParamLoaderClass
  
 		return $result;
 	}
-}
 \ No newline at end of file
+}
@@ -117,10 +117,19 @@ class ParamsRequestDataClass extends ProcessRequestDataClass
 		return $this->processParamsToCreate;
 	}
  
-	public function addProcessParamToCreate($paramId, $expression, $expression_info, $getParams, $sampling, $gap, $dateModif)
+	public function addProcessParamToCreate($paramId, $expression, $expression_info, $getParams, $sampling, $gap, $dateModif, $units, $ytitle)
 	{
 		$newParam = new ParamNodeClass();
 		$newParam->setId($paramId);
+		if (!empty($units)) {
+			$newParam->getInfo()->setUnits($units);
+		}
+		if (!empty($ytitle)) {
+			$newParam->getInfo()->setShortName($ytitle);
+		}
+		else {
+			$newParam->getInfo()->setShortName($paramId);
+		}
 		$newParam->setSampling($sampling);
 		if (isset($gap) && ($gap > 0))
 			$newParam->setGap($gap);