Add indexes support for getPlot API (#9183)

Benjamin Renard
1 parent 0904976e
Showing 2 changed files with 29 additions and 9 deletions Show diff stats
src/InputOutput/IHMImpl/Tools/IHMParamTemplateClass.php
src/InputOutput/WSImpl/Params/PlotImpl/WSInputOutputParamsPlotClass.php
@@ -292,8 +292,14 @@ class IHMParamTemplateClass
 		if (empty($arguments))
 			return;
 		foreach ($arguments as $arg_key => $arg_def) {
-			if (!array_key_exists($arg_key, $template_args))
-				$template_args->{$arg_key} = $arg_def['default'];
+			if (!array_key_exists($arg_key, $template_args)) {
+				if (is_array($template_args)) {
+					$template_args[$arg_key] = $arg_def['default'];
+				}
+				else {
+					$template_args->{$arg_key} = $arg_def['default'];
+				}
+			}
 		}
 	}
  
@@ -130,14 +130,28 @@ class WSInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
  
 		$requestParamsNode->addParam($paramInfo['id']);
 		$paramNode = $plotNode->getParams()->getParamById($paramInfo['id']);
+
+		$activateLegends = FALSE;
+		if (empty($paramInfo['indexes'])) {
+			$paramInfo['indexes'] = array(-1);
+			if ($this->isVector($paramInfo['id'])) {
+				$activateLegends = TRUE;
+			}
+		}
+		else if (count($paramInfo['indexes']) > 1) {
+			$activateLegends = TRUE;
+		}
+
+		$serieId = 1;
+		foreach ($paramInfo['indexes'] as $index) {
+			$serieNode = $paramNode->addYSerie('y-left', $index);
+			$serieNode->setId($serieId);		
+			$lineNode = $serieNode->getLine();
+			$lineNode->setType(RequestOutputPlotLineTypeEnum::LINE);
+			++$serieId;
+		}
  
-		$serieNode = $paramNode->addYSerie('y-left', -1);
-		$serieNode->setId('1');
-		
-		$lineNode = $serieNode->getLine();
-		$lineNode->setType(RequestOutputPlotLineTypeEnum::LINE); 
-		
-		if ($this->isVector($paramInfo['id'])) { // vector - activate legend
+		if ($activateLegends) { // vector - activate legend
 			$paramLegendNode = $plotNode->getLegends()->getParamsLegend();
 			$paramLegendNode->setType(RequestOutputPlotParamsLegendTypeEnum::TEXTONLY);
 			$paramLegendNode->setShowParamInfo("true");