Integration for curve definition

Benjamin Renard
1 parent ab13f26c
Showing 5 changed files with 169 additions and 12 deletions Show diff stats
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotAdditionalObjectsNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotConstantNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotCurveObjectNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotYSerieNodeClass.php
@@ -524,11 +524,11 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			{
 				case 'serie' :
 					$paramNode = $plotNode->getParams()->getParamById($paramInfo['id']);
-					$this->unmarshallYSerie($paramData->{'param-drawing-object'}, $plotNode, $paramNode, $paramInfo['indexes'], $isScatter && ($paramData->{'param-drawing-object'}->{'serie-xaxis-param'} != ''), $colorSerieId);
+					$this->unmarshallYSerie($paramData, $plotNode, $paramNode, $paramInfo['indexes'], $isScatter && ($paramData->{'param-drawing-object'}->{'serie-xaxis-param'} != ''), $colorSerieId);
 					break;
 				case 'spectro' :
 					$paramNode = $plotNode->getParams()->getParamById($paramInfo['id']);
-					$this->unmarshallSpectro($paramData->{'param-drawing-object'}, $plotNode, $paramNode, $paramInfo['indexes']);
+					$this->unmarshallSpectro($paramData, $plotNode, $paramNode, $paramInfo['indexes']);
 					break;
 				case 'status-bar' :
 					if (($plotNode->getName() == REQUESTOUTPUTPLOTELEMENTSTATUS_NAME) && !isset($statusPlotNode))
@@ -592,21 +592,30 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		}
 	}
  
-	protected function unmarshallYSerie($paramDrawingData, $plotNode, $paramNode, $indexes, $useXAxis, $colorSerieId)
+	protected function unmarshallYSerie($paramData, $plotNode, $paramNode, $indexes, $useXAxis, $colorSerieId)
 	{
 		$serieNodes = array();
  
 		if (count($indexes) == 0)
-			$serieNodes[] = $paramNode->addYSerie($paramDrawingData->{'serie-yaxis'}, -1, $useXAxis ? REQUESTOUTPUTPLOTELEMENTXY_XAXISID : '', $colorSerieId);
+		{
+			$serieNode = $paramNode->addYSerie($paramData->{'param-drawing-object'}->{'serie-yaxis'}, -1, $useXAxis ? REQUESTOUTPUTPLOTELEMENTXY_XAXISID : '', $colorSerieId);
+			$serieNode->setId($paramData->{'id'});
+			$serieNodes[] = $serieNode;
+		}
 		foreach ($indexes as $index)
-			$serieNodes[] = $paramNode->addYSerie($paramDrawingData->{'serie-yaxis'}, $index, $useXAxis ? REQUESTOUTPUTPLOTELEMENTXY_XAXISID : '', $colorSerieId);
-		
+		{
+			$serieNode = $paramNode->addYSerie($paramData->{'param-drawing-object'}->{'serie-yaxis'}, $index, $useXAxis ? REQUESTOUTPUTPLOTELEMENTXY_XAXISID : '', $colorSerieId);
+			if (count($indexes) == 1)
+				$serieNode->setId($paramData->{'id'});
+			$serieNodes[] = $serieNode;
+		}
+			
 		foreach ($serieNodes as $serieNode)
 		{
 			//Resampling
 			if ($plotNode->getName() == REQUESTOUTPUTPLOTELEMENTXY_NAME)
 			{
-				switch ($paramDrawingData->{'serie-resampling-mode'})
+				switch ($paramData->{'param-drawing-object'}->{'serie-resampling-mode'})
 				{
 					case 'yparam' :
 						$serieNode->getResampling()->setType(RequestOutputPlotResamplingTypeEnum::YPARAM);
@@ -617,15 +626,15 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 				}
 			}
 			//Line
-			$this->unmarshallLine($paramDrawingData, 'serie', $serieNode->getLine(), $paramDrawingData->{"serie-lines-activated"} ? RequestOutputPlotLineTypeEnum::LINE : RequestOutputPlotLineTypeEnum::NO);
+			$this->unmarshallLine($paramData->{'param-drawing-object'}, 'serie', $serieNode->getLine(), $paramData->{'param-drawing-object'}->{"serie-lines-activated"} ? RequestOutputPlotLineTypeEnum::LINE : RequestOutputPlotLineTypeEnum::NO);
 			//Symbol
-			if (!$paramDrawingData->{"serie-symbols-activated"})
+			if (!$paramData->{'param-drawing-object'}->{"serie-symbols-activated"})
 				$serieNode->getSymbol()->setType(RequestOutputPlotSymbolTypeEnum::NO);
 			else
-				$this->unmarshallSymbol($paramDrawingData, 'serie-symbols', $serieNode->getSymbol());
+				$this->unmarshallSymbol($paramData->{'param-drawing-object'}, 'serie-symbols', $serieNode->getSymbol());
 			//Time tick
-			if (isset($paramDrawingData->{'serie-timetick'}))
-				$this->unmarshallTimeTick($paramDrawingData->{'serie-timetick'}, $serieNode->getTimeTicks());
+			if (isset($paramData->{'param-drawing-object'}->{'serie-timetick'}))
+				$this->unmarshallTimeTick($paramData->{'param-drawing-object'}->{'serie-timetick'}, $serieNode->getTimeTicks());
 		}
 	}
  
@@ -805,6 +814,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 	protected function unmarshallConstant($constantData,$axisNode)
 	{
 		$constantNode = $axisNode->addConstant();
+		$constantNode->setId($constantData->{'id'});
  
 		//Constant value
 		switch ($axisNode->getName())
@@ -827,6 +837,8 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 	{
 		foreach ($panelData->{'textObjs'} as $textData)
 			$this->unmarshallTextObject($textData, $addObjectsNode, $isTimePlot);
+		foreach ($panelData->{'curves'} as $curveData)
+			$this->unmarshallCurveObject($curveData, $addObjectsNode);
 	}
  
 	protected function unmarshallTextObject($textData, $addObjectsNode, $isTimePlot)
@@ -884,6 +896,24 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			$this->unmarshallFont($textData, 'text-font', $textNode->getFont());
 	}
  
+	protected function unmarshallCurveObject($curveData, $addObjectsNode)
+	{
+		if (($curveData->{'curve-name'} == '') || !isset($curveData->{'curve-serie-id'}))
+			return;
+		
+		$curveNode = $addObjectsNode->addCurveObject();
+		
+		$curveNode->setSerieId($curveData->{'curve-serie-id'});
+		
+		$curveNode->getFunction()->setFunctionName($curveData->{'curve-name'});
+		
+		foreach ($curveData->{'params'} as $paramData)
+			$curveNode->getFunction()->addAttribute($paramData->{'curve-param-name'}, $paramData->{'curve-param-value'});
+		
+		//Curve options
+		$this->unmarshallCurve($curveData, "curve-line", $curveNode);
+	}
+	
 	protected function unmarshallTitle($inputData, $keyPrefix, $titleNode)
 	{
 		if ($inputData->{$keyPrefix.'-text'} != '')
@@ -20,6 +20,13 @@ class RequestOutputPlotAdditionalObjectsNodeClass extends NodeClass
 		$this->addChild($node);
 		return $node;
 	}
+	
+	public function addCurveObject()
+	{
+		$node = new RequestOutputPlotCurveObjectNodeClass();
+		$this->addChild($node);
+		return $node;
+	}
 }
  
 ?>
 \ No newline at end of file
@@ -2,6 +2,7 @@
  
 define ("REQUESTOUTPUTPLOTCONSTANT_NAME", "constantLine");
 define ("REQUESTOUTPUTPLOTCONSTANT_VALUE", "value");
+define ("REQUESTOUTPUTPLOTCONSTANT_ID", "id");
  
 /**
  * @class RequestOutputPlotConstantNodeClass
@@ -24,6 +25,16 @@ class RequestOutputPlotConstantNodeClass extends RequestOutputPlotCurveNodeClass
 	{
 		return $this->getAttribute(REQUESTOUTPUTPLOTCONSTANT_VALUE);
 	}
+	
+	public function setId($id)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTCONSTANT_ID, $id);
+	}
+	
+	public function getId()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTCONSTANT_ID);
+	}
 }
  
 ?>
 \ No newline at end of file
@@ -0,0 +1,98 @@
+<?php
+
+define ("REQUESTOUTPUTPLOTCURVEOBJECT_NAME", "curvePlot");
+define ("REQUESTOUTPUTPLOTCURVEOBJECT_SERIEID", "serieId");
+
+define ("REQUESTOUTPUTPLOTCURVEOBJECTFUNCTION_NAME", "function");
+define ("REQUESTOUTPUTPLOTCURVEOBJECTFUNCTION_FUNCTIONNAME", "name");
+define ("REQUESTOUTPUTPLOTCURVEOBJECTFUNCTION_ATTRIBUTES", "attributes");
+define ("REQUESTOUTPUTPLOTCURVEOBJECTFUNCTION_ATTRIBUTE", "attribute");
+define ("REQUESTOUTPUTPLOTCURVEOBJECTFUNCTION_ATTRIBUTENAME", "name");
+define ("REQUESTOUTPUTPLOTCURVEOBJECTFUNCTION_ATTRIBUTEVALUE", "value");
+
+/**
+ * @class RequestOutputPlotCurveObjectFunctionNodeClass
+ * @brief Definition of a function for a curve object element of a plot
+ * @details
+ */
+class RequestOutputPlotCurveObjectFunctionNodeClass extends NodeClass
+{
+	public function __construct()
+	{
+		parent::__construct(REQUESTOUTPUTPLOTCURVEOBJECTFUNCTION_NAME);
+	}
+	
+	public function setFunctionName($name)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTCURVEOBJECTFUNCTION_FUNCTIONNAME, $name);
+	}
+	
+	public function getFunctionName()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTCURVEOBJECTFUNCTION_FUNCTIONNAME);
+	}
+	
+	public function getAttributes()
+	{
+		$node = $this->getFirstChildByName(REQUESTOUTPUTPLOTCURVEOBJECTFUNCTION_ATTRIBUTES);
+	
+		if (!isset($node))
+		{
+			$node = new NodeClass(REQUESTOUTPUTPLOTCURVEOBJECTFUNCTION_ATTRIBUTES);
+			$this->addChild($node);
+		}
+	
+		return $node;
+	}
+	
+	public function addAttribute($name, $value)
+	{
+		$attributesNode = $this->getAttributes();
+		
+		$node = new NodeClass(REQUESTOUTPUTPLOTCURVEOBJECTFUNCTION_ATTRIBUTE);
+		
+		$node->setAttribute(REQUESTOUTPUTPLOTCURVEOBJECTFUNCTION_ATTRIBUTENAME, $name);
+		$node->setAttribute(REQUESTOUTPUTPLOTCURVEOBJECTFUNCTION_ATTRIBUTEVALUE, $value);
+		
+		$attributesNode->addChild($node);
+		return $node;
+	}
+}
+
+/**
+ * @class RequestOutputPlotCurveObjectNodeClass
+ * @brief Definition of a curve object element for a plot
+ * @details
+ */
+class RequestOutputPlotCurveObjectNodeClass extends RequestOutputPlotCurveNodeClass
+{
+	public function __construct()
+	{
+		parent::__construct(REQUESTOUTPUTPLOTCURVEOBJECT_NAME);
+	}
+	
+	public function setSerieId($serieId)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTCURVEOBJECT_SERIEID, $serieId);
+	}
+	
+	public function getSerieId()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTCURVEOBJECT_SERIEID);
+	}
+	
+	public function getFunction()
+	{
+		$node = $this->getFirstChildByName(REQUESTOUTPUTPLOTCURVEOBJECTFUNCTION_NAME);
+	
+		if (!isset($node))
+		{
+			$node = new RequestOutputPlotCurveObjectFunctionNodeClass();
+			$this->addChild($node);
+		}
+	
+		return $node;
+	}
+}
+
+?>
 \ No newline at end of file
@@ -11,6 +11,7 @@ define (&quot;REQUESTOUTPUTPLOTYSERIE_RESAMPLING&quot;, &quot;resampling&quot;);
 define ("REQUESTOUTPUTPLOTYSERIE_LINE", "line");
 define ("REQUESTOUTPUTPLOTYSERIE_SYMBOL", "symbol");
 define ("REQUESTOUTPUTPLOTYSERIE_TIMETICKS", "timeTick");
+define ("REQUESTOUTPUTPLOTYSERIE_ID", "id");
  
 /**
  * @class RequestOutputPlotYSerieNodeClass
@@ -115,6 +116,16 @@ class RequestOutputPlotYSerieNodeClass extends NodeClass
  
 		return $node;
 	}
+	
+	public function setId($id)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTYSERIE_ID, $id);
+	}
+	
+	public function getId()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTYSERIE_ID);
+	}
 }
  
 ?>
 \ No newline at end of file