Merge branch 'develop' into MAZ_6018

updates from develop

Merge branch 'develop' into MAZ_6018
updates from develop
Menouard AZIB
2 parents 8e9913e3 1277dcb7
Showing 3 changed files with 33 additions and 3 deletions Show diff stats
src/InputOutput/IHMImpl/Tools/CommonClass.php
src/InputOutput/IHMImpl/Tools/IHMParamManagerClass.php
src/InputOutput/IHMImpl/Tools/IHMPlotContextFileClass.php
@@ -39,11 +39,25 @@ class CommonClass
 	public static function isoToTimeStampWithMls($iso)
 	{
 		date_default_timezone_set('UTC');
+		$iso = trim($iso);
+		if (empty($iso)) {
+			return 0.;
+		}
+		else if ($iso[strlen($iso)-1] == 'Z') {
+			$iso = substr($iso, 0, -1);
+		}
 		$date = DateTime::createFromFormat('Y-m-d\TH:i:s.v', $iso);
 		if ($date !== FALSE) {
 			return round(floatval($date->format('v'))/1000. + $date->getTimestamp(),3);
 		}
 		$date = DateTime::createFromFormat('Y-m-d\TH:i:s', $iso);
+		if ($date !== FALSE) {
+			return round(floatval($date->getTimestamp()),3);
+		}
+		$date = DateTime::createFromFormat('Y-m-d\TH:i', $iso);
+		if ($date === FALSE) {
+			return 0.;
+		}
 		return round(floatval($date->getTimestamp()),3);
 	}
@@ -345,12 +345,17 @@ class IHMParamManagerClass
 			$res_split = $this->splitParamComponents($reference_param);
 			$reference_param = $res_split['param'];
 		}
-		
+
+		// On plot, no need to plot "ws_" on derived parameter legend.
+		$newParamName="";
+		if(strpos($paramId, "ws_") === 0){
+			$newParamName=substr($paramId,3);
+		}
 		//create a process param for the derived parameter
 		$this->addProcessParam($paramId, $expressionInfo["expression"], $res["param"]["expression"],
 				$expressionInfo['params'], $res["param"]["info"]["sampling_mode"], $res["param"]["info"]["timestep"], $reference_param,
 				0,$res["param"]["dateModif"],!empty($res["param"]["info"]["units"]) ? $res["param"]["info"]["units"] : "",
-				!empty($res["param"]["info"]["yTitle"]) ? $res["param"]["info"]["yTitle"] : "", $paramsData);
+				!empty($res["param"]["info"]["yTitle"]) ? $res["param"]["info"]["yTitle"] : $newParamName, $paramsData);
 		return array("id" => $paramId, "indexes" => $indexes, "calib_infos" => array());
 	}
@@ -136,7 +136,18 @@ class IHMPlotContextFileClass
 			$pageContext['panels'][] = $panelContext;
 		}
-
+		$instantTimeNavNodes = $pageNode->getElementsByTagName('instantTimeNav');
+		foreach($instantTimeNavNodes as $instantTimeNavNode){
+			if ($instantTimeNavNode != "")
+			{
+				$instantTimeNavContext = array(
+					'prevTime' => $instantTimeNavNode->getAttribute('prevTime'),
+					'nextTime' => $instantTimeNavNode->getAttribute('nextTime'),
+				);
+				$pageContext['instantTimeNav']= $instantTimeNavContext;
+			}
+			
+		}
 		return array("success" => true, "page" => $pageContext);
 	}
 }