Integration for fill elements

Benjamin Renard
1 parent d7f73bcb
Showing 6 changed files with 202 additions and 5 deletions Show diff stats
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotElementNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotFillNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotFillSerieConstantNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotFillSerieSerieNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotFillsNodeClass.php
@@ -314,6 +314,10 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		if ($plotNode->getAdditionalObjects() != NULL)
 			$this->unmarshallAdditionalObjects($panelData, $plotNode->getAdditionalObjects(), $isTimePlot);
  
+		//Fills
+		if ($plotNode->getFills() != NULL)
+			$this->unmarshallFills($panelData, $plotNode->getFills());
+		
 		return $panelNode;
 	}
  
@@ -914,6 +918,39 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		$this->unmarshallCurve($curveData, "curve-line", $curveNode);
 	}
  
+	protected function unmarshallFills($panelData, $fillsNode)
+	{
+		foreach ($panelData->{'fills'} as $fillData)
+		{
+			//Serie / Constant
+			if ($fillData->{'fill-type'} == 'serie-constant')
+			{
+				$fillNode = $fillsNode->addFill(RequestOutputPlotFillTypeEnum::SERIECONSTANT);
+				$fillNode->setSerieId($fillData->{'fill-firstserie-id'});
+				$fillNode->setConstantId($fillData->{'fill-constant-id'});
+				if ($fillData->{'fill-greater-color'} != 'none')
+					$fillNode->setGreaterColor($this->hexColor2KernelColor($fillData->{'fill-greater-color'}));
+				if ($fillData->{'fill-less-color'} != 'none')
+					$fillNode->setLessColor($this->hexColor2KernelColor($fillData->{'fill-less-color'}));
+			}
+		}
+		
+		foreach ($panelData->{'fills'} as $fillData)
+		{
+			//Serie / Serie
+			if ($fillData->{'fill-type'} == 'serie-serie')
+			{
+				$fillNode = $fillsNode->addFill(RequestOutputPlotFillTypeEnum::SERIESERIE);
+				$fillNode->setFirstSerieId($fillData->{'fill-firstserie-id'});
+				$fillNode->setSecondSerieId($fillData->{'fill-secondserie-id'});
+				if ($fillData->{'fill-greater-color'} != 'none')
+					$fillNode->setGreaterColor($this->hexColor2KernelColor($fillData->{'fill-greater-color'}));
+				if ($fillData->{'fill-less-color'} != 'none')
+					$fillNode->setLessColor($this->hexColor2KernelColor($fillData->{'fill-less-color'}));
+			}
+		}		
+	}
+	
 	protected function unmarshallTitle($inputData, $keyPrefix, $titleNode)
 	{
 		if ($inputData->{$keyPrefix.'-text'} != '')
@@ -44,12 +44,12 @@ class RequestOutputPlotElementNodeClass extends NodeClass
 			$this->addChild($node);
 		}
  
-		//ToDo fills
-		/*if ($defineFills)
+		//fills
+		if ($defineFills)
 		 {
-		$node = new RequestOutputPlotFillsNodeClass();
-		$this->addChild($node);
-		}*/
+			$node = new RequestOutputPlotFillsNodeClass();
+			$this->addChild($node);
+		}
 	}
  
 	public function getLegends()
@@ -0,0 +1,39 @@
+<?php
+
+define ("REQUESTOUTPUTPLOTFILL_GREATERCOLOR", "colorGreater");
+define ("REQUESTOUTPUTPLOTFILL_LESSCOLOR", "colorLess");
+
+/**
+ * @class RequestOutputPlotFillNodeClass
+ * @brief Definition of fill for a plot
+ * @details
+ */
+class RequestOutputPlotFillNodeClass extends NodeClass
+{
+	public function __construct($name)
+	{
+		parent::__construct($name);
+	}
+	
+	public function setGreaterColor($color)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTFILL_GREATERCOLOR, $color);
+	}
+	
+	public function getGreaterColor()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTFILL_GREATERCOLOR);
+	}
+	
+	public function setLessColor($color)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTFILL_LESSCOLOR, $color);
+	}
+	
+	public function getLessColor()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTFILL_LESSCOLOR);
+	}
+}
+
+?>
 \ No newline at end of file
@@ -0,0 +1,40 @@
+<?php
+
+define ("REQUESTOUTPUTPLOTFILLSERIECONSTANT_NAME", "fillSerieConstant");
+define ("REQUESTOUTPUTPLOTFILLSERIECONSTANT_SERIEID", "serieId");
+define ("REQUESTOUTPUTPLOTFILLSERIECONSTANT_CONSTANTID", "constantId");
+
+/**
+ * @class RequestOutputPlotFillSerieConstantNodeClass
+ * @brief Definition of fill serie/constant for a plot
+ * @details
+ */
+class RequestOutputPlotFillSerieConstantNodeClass extends RequestOutputPlotFillNodeClass
+{
+	public function __construct()
+	{
+		parent::__construct(REQUESTOUTPUTPLOTFILLSERIECONSTANT_NAME);
+	}
+	
+	public function setSerieId($id)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTFILLSERIECONSTANT_SERIEID, $id);
+	}
+	
+	public function getSerieId()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTFILLSERIECONSTANT_SERIEID);
+	}
+	
+	public function setConstantId($id)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTFILLSERIECONSTANT_CONSTANTID, $id);
+	}
+	
+	public function getConstantId()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTFILLSERIECONSTANT_CONSTANTID);
+	}
+}
+
+?>
 \ No newline at end of file
@@ -0,0 +1,40 @@
+<?php
+
+define ("REQUESTOUTPUTPLOTFILLSERIESERIE_NAME", "fillSerieSerie");
+define ("REQUESTOUTPUTPLOTFILLSERIESERIE_FIRSTSERIEID", "firstSerieId");
+define ("REQUESTOUTPUTPLOTFILLSERIESERIE_SECONDSERIEID", "secondSerieId");
+
+/**
+ * @class RequestOutputPlotFillSerieSerieNodeClass
+ * @brief Definition of fill serie/serie for a plot
+ * @details
+ */
+class RequestOutputPlotFillSerieSerieNodeClass extends RequestOutputPlotFillNodeClass
+{
+	public function __construct()
+	{
+		parent::__construct(REQUESTOUTPUTPLOTFILLSERIESERIE_NAME);
+	}
+	
+	public function setFirstSerieId($id)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTFILLSERIESERIE_FIRSTSERIEID, $id);
+	}
+	
+	public function getFirstSerieId()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTFILLSERIESERIE_FIRSTSERIEID);
+	}
+	
+	public function setSecondSerieId($id)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTFILLSERIESERIE_SECONDSERIEID, $id);
+	}
+	
+	public function getSecondSerieId()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTFILLSERIESERIE_SECONDSERIEID);
+	}
+}
+
+?>
 \ No newline at end of file
@@ -0,0 +1,41 @@
+<?php
+
+define ("REQUESTOUTPUTPLOTFILLS_NAME", "fills");
+
+abstract class RequestOutputPlotFillTypeEnum
+{
+	const SERIESERIE    = "serie-serie";
+	const SERIECONSTANT = "serie-constant";
+}
+
+/**
+ * @class RequestOutputPlotFillsNodeClass
+ * @brief Definition of fills for a plot
+ * @details
+ */
+class RequestOutputPlotFillsNodeClass extends NodeClass
+{
+	public function __construct()
+	{
+		parent::__construct(REQUESTOUTPUTPLOTFILLS_NAME);
+	}
+	
+	public function addFill($type)
+	{
+		switch ($type)
+		{
+			case RequestOutputPlotFillTypeEnum::SERIECONSTANT :
+				$node = new RequestOutputPlotFillSerieConstantNodeClass();
+				break;
+			case RequestOutputPlotFillTypeEnum::SERIESERIE :
+			default :
+				$node = new RequestOutputPlotFillSerieSerieNodeClass();
+				break;
+		}
+		
+		$this->addChild($node);
+		return $node;
+	}
+}
+
+?>
 \ No newline at end of file