Add integration for time tick defintion

Benjamin Renard
1 parent b4ee5e62
Showing 4 changed files with 197 additions and 22 deletions Show diff stats
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotAxisElementNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotYSerieNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotYSerieTimeTicksNodeClass.php
@@ -142,7 +142,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			}
  
 			if ($tab->{'page-font-activated'})
-				$this->unmarshallFont($tab, 'page', $pageNode->getFont());
+				$this->unmarshallFont($tab, 'page-font', $pageNode->getFont());
  
 			//Superpose mode
 			$pageNode->setSuperposeMode($tab->{'page-superpose-mode'} ? "true": "false");
@@ -261,7 +261,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			$panelNode->setBackgroundColor($this->hexColor2KernelColor($panelData->{'panel-background-color'}));
  
 		//Panel font
-		$this->unmarshallFont($panelData, 'panel', $panelNode->getFont());
+		$this->unmarshallFont($panelData, 'panel-font', $panelNode->getFont());
  
 		//Panel title
 		$this->unmarshallTitle($panelData, 'panel-title', $panelNode->getTitle());
@@ -438,6 +438,12 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			$axisNode->getLegend()->setText($axisData->{'axis-legend-text'});
 		$axisNode->getLegend()->setColor($this->hexColor2KernelColor($axisData->{'axis-legend-color'}));
 		$this->unmarshallLabel($axisData, "axis-legend", $axisNode->getLegend());
+		
+		//Show legend
+		$axisNode->setShowLegend($axisData->{'axis-legend-activated'} ? "true" : "false");
+		
+		//Show tick marks
+		$axisNode->setShowTickMarks($axisData->{'axis-tick-showmarks'} ? "true" : "false");
 	}
  
 	protected function unmarshallParams($paramsData, $requestParamsNode, $plotNode, $panelNode, $statusPlotNode, $tickPlotNode)
@@ -585,10 +591,48 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			//Line
 			$this->unmarshallLine($paramDrawingData, 'serie', $serieNode->getLine());
 			//Symbol
-			$this->unmarshallSymbol($paramDrawingData, 'serie', $serieNode->getSymbol());		
+			if (!$paramDrawingData->{"serie-symbols-activated"})
+				$serieNode->getSymbol()->setType(RequestOutputPlotSymbolTypeEnum::NO);
+			else
+				$this->unmarshallSymbol($paramDrawingData, 'serie-symbols', $serieNode->getSymbol());
+			//Time tick
+			if (isset($paramDrawingData->{'serie-timetick'}))
+				$this->unmarshallTimeTick($paramDrawingData->{'serie-timetick'}, $serieNode->getTimeTicks());
 		}
 	}
  
+	protected function unmarshallTimeTick($timeTickData, $timeTickNode)
+	{
+		//Font
+		if ($timeTickData->{'serie-timetick-font-activated'})
+			$this->unmarshallFont($timeTickData, 'serie-timetick-font', $timeTickNode->getFont());
+		//First Symbol
+		if ($timeTickData->{'serie-timetick-firstsymbols-activated'})
+			$this->unmarshallSymbol($timeTickData, 'serie-timetick-firstsymbols', $timeTickNode->getFirstSymbol());
+		//Symbol
+		$this->unmarshallSymbol($timeTickData, 'serie-timetick-symbols', $timeTickNode->getSymbol());
+		//Set options by type
+		switch ($timeTickData->{'serie-timetick-type'})
+		{
+			case 'time-step' :
+				$timeTickNode->setStep(CommonClass::timeStampToDDTime($timeTickData->{'serie-timetick-step'}));
+				$timeTickNode->setNumber(0);
+				break;
+			case 'nb-major' :
+				$timeTickNode->setStep(0);
+				$timeTickNode->setNumber($timeTickData->{'serie-timetick-nbmajor'});
+				break;
+			case 'auto' :
+			default :
+				$timeTickNode->setStep('auto');
+				$timeTickNode->setNumber(0);
+		}
+		//Minor
+		$timeTickNode->setMinor($timeTickData->{'serie-timetick-nbminor'});
+		//Color
+		$timeTickNode->setColor($this->hexColor2KernelColor($timeTickData->{'serie-timetick-color'}));
+	}
+	
 	protected function unmarshallInstantSerie($paramDrawingData, $plotNode, $paramNode)
 	{
 		$iserieNode = $paramNode->addInstantSerie(REQUESTOUTPUTPLOTELEMENTXY_XAXISID, 'y-left');
@@ -600,7 +644,10 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		$this->unmarshallLine($paramDrawingData, 'iserie', $iserieNode->getLine());
  
 		//Symbol
-		$this->unmarshallSymbol($paramDrawingData, 'iserie', $iserieNode->getSymbol());
+		if (!$paramDrawingData->{"iserie-symbols-activated"})
+			$iserieNode->getSymbol()->setType(RequestOutputPlotSymbolTypeEnum::NO);
+		else
+			$this->unmarshallSymbol($paramDrawingData, 'iserie-symbols', $iserieNode->getSymbol());
 	}
  
 	protected function unmarshallSpectro($paramDrawingData, $plotNode, $paramNode, $indexes)
@@ -703,17 +750,17 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
  
 	protected function unmarshallFont($inputData, $keyPrefix, $fontNode)
 	{
-		if ($inputData->{$keyPrefix.'-font-activated'})
+		if ($inputData->{$keyPrefix.'-activated'})
 		{
-			$fontNode->setFontName($inputData->{$keyPrefix.'-font-name'});
-			$fontNode->setSize($inputData->{$keyPrefix.'-font-size'});
+			$fontNode->setFontName($inputData->{$keyPrefix.'-name'});
+			$fontNode->setSize($inputData->{$keyPrefix.'-size'});
  
-			if ($inputData->{$keyPrefix.'-font-italic'})
+			if ($inputData->{$keyPrefix.'-italic'})
 				$fontNode->setStyle(RequestOutputPlotFontStyle::ITALIC);
 			else
 				$fontNode->setStyle(RequestOutputPlotFontStyle::UPRIGHT);
  
-			if ($inputData->{$keyPrefix.'-font-bold'})
+			if ($inputData->{$keyPrefix.'-bold'})
 				$fontNode->setWeight(RequestOutputPlotFontWeight::BOLD);
 			else
 				$fontNode->setWeight(RequestOutputPlotFontWeight::MEDIUM);
@@ -759,13 +806,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
  
 	protected function unmarshallSymbol($inputData, $keyPrefix, $symbolNode)
 	{
-		if (!$inputData->{$keyPrefix."-symbols-activated"})
-		{
-			$symbolNode->setType(RequestOutputPlotSymbolTypeEnum::NO);
-			return;
-		}
-		
-		switch ($inputData->{$keyPrefix.'-symbols-type'})
+		switch ($inputData->{$keyPrefix.'-type'})
 		{
 			case 'dot' :
 				$symbolNode->setType(RequestOutputPlotSymbolTypeEnum::DOT);
@@ -816,10 +857,10 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 				throw new Exception('Symbol type not implemented.');
 		}
  
-		$symbolNode->setSize($inputData->{$keyPrefix.'-symbols-size'});
+		$symbolNode->setSize($inputData->{$keyPrefix.'-size'});
  
-		if ($inputData->{$keyPrefix.'-symbols-color'} != 'auto')
-			$symbolNode->setColor($this->hexColor2KernelColor($inputData->{$keyPrefix.'-symbols-color'}));
+		if ($inputData->{$keyPrefix.'-color'} != 'auto')
+			$symbolNode->setColor($this->hexColor2KernelColor($inputData->{$keyPrefix.'-color'}));
 	}
  
 	/*
@@ -6,6 +6,8 @@ define (&quot;REQUESTOUTPUTPLOTAXISELEMENT_VISIBLE&quot;, &quot;visible&quot;);
 define ("REQUESTOUTPUTPLOTAXISELEMENT_SCALE", "scale");
 define ("REQUESTOUTPUTPLOTAXISELEMENT_COLOR", "color");
 define ("REQUESTOUTPUTPLOTAXISELEMENT_THICKNESS", "thickness");
+define ("REQUESTOUTPUTPLOTAXISELEMENT_SHOWLEGEND", "showLegend");
+define ("REQUESTOUTPUTPLOTAXISELEMENT_TICKMARKS", "showTickMark");
  
 define ("REQUESTOUTPUTPLOTAXISELEMENTRANGE_NAME", "range");
 define ("REQUESTOUTPUTPLOTAXISELEMENTRANGE_MIN", "min");
@@ -250,9 +252,25 @@ class RequestOutputPlotAxisElementNodeClass extends NodeClass
 		return $this->getAttribute(REQUESTOUTPUTPLOTAXISELEMENT_SCALE);
 	}
  
-	/* ToDo showLegend */
-
-	/* ToDo showTickMark */
+	public function setShowLegend($show)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTAXISELEMENT_SHOWLEGEND, $show);
+	}
+	
+	public function getShowLegend()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTAXISELEMENT_SHOWLEGEND);
+	}
+	
+	public function setShowTickMarks($show)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTAXISELEMENT_TICKMARKS, $show);
+	}
+	
+	public function getShowTickMarks()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTAXISELEMENT_TICKMARKS);
+	}
 }
  
 ?>
 \ No newline at end of file
@@ -10,6 +10,7 @@ define (&quot;REQUESTOUTPUTPLOTYSERIE_COLORSERIEID&quot;, &quot;colorSerieId&quot;);
 define ("REQUESTOUTPUTPLOTYSERIE_RESAMPLING", "resampling");
 define ("REQUESTOUTPUTPLOTYSERIE_LINE", "line");
 define ("REQUESTOUTPUTPLOTYSERIE_SYMBOL", "symbol");
+define ("REQUESTOUTPUTPLOTYSERIE_TIMETICKS", "timeTick");
  
 /**
  * @class RequestOutputPlotYSerieNodeClass
@@ -101,6 +102,19 @@ class RequestOutputPlotYSerieNodeClass extends NodeClass
  
 		return $node;
 	}
+	
+	public function getTimeTicks()
+	{
+		$node = $this->getFirstChildByName(REQUESTOUTPUTPLOTYSERIE_TIMETICKS);
+	
+		if (!isset($node))
+		{
+			$node = new RequestOutputPlotYSerieTimeTicksNodeClass(REQUESTOUTPUTPLOTYSERIE_TIMETICKS);
+			$this->addChild($node);
+		}
+	
+		return $node;
+	}
 }
  
 ?>
 \ No newline at end of file
@@ -0,0 +1,102 @@
+<?php
+
+define ("REQUESTOUTPUTPLOTYSERIETIMETICKS_STEP", "step");
+define ("REQUESTOUTPUTPLOTYSERIETIMETICKS_NUMBER", "number");
+define ("REQUESTOUTPUTPLOTYSERIETIMETICKS_MINOR", "minor");
+define ("REQUESTOUTPUTPLOTYSERIETIMETICKS_COLOR", "color");
+define ("REQUESTOUTPUTPLOTYSERIETIMETICKS_SYMBOL", "symbol");
+define ("REQUESTOUTPUTPLOTYSERIETIMETICKS_FIRSTSYMBOL", "firstSymbol");
+
+/**
+ * @class RequestOutputPlotYSerieTimeTicksNodeClass
+ * @brief Definition of time ticks element for a yserie of a plot
+ * @details
+ */
+class RequestOutputPlotYSerieTimeTicksNodeClass extends NodeClass
+{
+	public function __construct($name)
+	{
+		parent::__construct($name);
+	}
+
+	public function getSymbol()
+	{
+		$node = $this->getFirstChildByName(REQUESTOUTPUTPLOTYSERIETIMETICKS_SYMBOL);
+	
+		if (!isset($node))
+		{
+			$node = new RequestOutputPlotSymbolNodeClass(REQUESTOUTPUTPLOTYSERIETIMETICKS_SYMBOL);
+			$this->addChild($node);
+		}
+	
+		return $node;
+	}
+	
+	public function getFirstSymbol()
+	{
+		$node = $this->getFirstChildByName(REQUESTOUTPUTPLOTYSERIETIMETICKS_FIRSTSYMBOL);
+	
+		if (!isset($node))
+		{
+			$node = new RequestOutputPlotSymbolNodeClass(REQUESTOUTPUTPLOTYSERIETIMETICKS_FIRSTSYMBOL);
+			$this->addChild($node);
+		}
+	
+		return $node;
+	}
+	
+	public function getFont()
+	{
+		$node = $this->getFirstChildByName(REQUESTOUTPUTPLOTFONT_NODENAME);
+	
+		if (!isset($node))
+		{
+			$node = new RequestOutputPlotFontNodeClass();
+			$this->addChild($node);
+		}
+	
+		return $node;
+	}
+	
+	public function setStep($step)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTYSERIETIMETICKS_STEP, $step);
+	}
+	
+	public function getStep()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTYSERIETIMETICKS_STEP);
+	}
+	
+	public function setNumber($number)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTYSERIETIMETICKS_NUMBER, $number);
+	}
+	
+	public function getNumber()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTYSERIETIMETICKS_NUMBER);
+	}
+	
+	public function setMinor($minor)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTYSERIETIMETICKS_MINOR, $minor);
+	}
+	
+	public function getMinor()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTYSERIETIMETICKS_MINOR);
+	}
+	
+	public function setColor($color)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTYSERIETIMETICKS_COLOR, $color);
+	}
+	
+	public function getColor()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTYSERIETIMETICKS_COLOR);
+	}
+}
+
+?>
 \ No newline at end of file