Merge branch 'amdadev'

Benjamin Renard
2 parents ac42dad1 f27db60a
Showing 8 changed files with 259 additions and 16 deletions Show diff stats
config/kernel/plotConfig.xml
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
src/InputOutput/IHMImpl/Tools/IHMParamManagerClass.php
src/InputOutput/IHMImpl/Tools/IHMPlotContextFileClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotElementHistoNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotHistogram1DSerieNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotPanelNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotParamsNodeClass.php
@@ -34,6 +34,8 @@
 					<symbol type="circle" size="5" color="[120,120,0]" />
 				</timeTick>
 			</xyPlot>
+			<histoPlot zAxis="colorAxis">
+			</histoPlot>
 			<instantPlot zAxis="colorAxis">
 				<line type="no" style="plain" color="[255,0,0]" width="1" />
 				<symbol type="dot" size="4" color="[0,0,255]" />
@@ -315,7 +315,6 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		//Plot type
 		$this->isInstantPlot = false;
 		$plotNode = $this->unmarshallPlotType($panelData, $panelNode);
-
 		$isTimePlot = ($plotNode->getName() == REQUESTOUTPUTPLOTELEMENTTIME_NAME);
  
 		//Tick plot
@@ -373,6 +372,9 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 				$plotNode = $panelNode->addPlotElement(RequestOutputPlotElementTypeEnum::XYPLOT);
 				$plotNode->setIsIsotropic($panelData->{'panel-scatter-isotropic'});
 				break;
+			case 'histoPlot':
+				$plotNode = $panelNode->addPlotElement(RequestOutputPlotElementTypeEnum::HISTOPLOT);
+				break;
 			case 'statusPlot':
 				$plotNode = $panelNode->addPlotElement(RequestOutputPlotElementTypeEnum::STATUSPLOT);
 				switch ($panelData->{'panel-status-position'}) {
@@ -517,12 +519,30 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			if (isset($axisData->{'axis-grid-major-number'}) && $axisData->{'axis-grid-major-number'} != 0)
 				$axisNode->getTick()->setMajorGridNumber($axisData->{'axis-grid-major-number'});
 		} elseif ($axisData->{'axis-grid-specify-ticks-spacing'}) {
+			$timeMultiplier = 1;
+			if(isset($axisData->{'axis-tick-time-unit'}) && ($axisData->{'axis-type'} == "time" || $axisData->{'axis-type'} == "epoch" )){
+				switch ($axisData->{'axis-tick-time-unit'}) {
+					case 'default':
+						$timeMultiplier = 1;
+						break;
+					case 'min':
+						$timeMultiplier = 60;
+						break;
+					case "hour":
+						$timeMultiplier = 3600;
+						break;
+					case "day":
+						$timeMultiplier = 86400;
+						break;
+				}	
+			}
  
 			if (isset($axisData->{'axis-grid-major-space'}) && $axisData->{'axis-grid-major-space'} != 0)
-				$axisNode->getTick()->setMajorGridSpace($axisData->{'axis-grid-major-space'});
+				$axisNode->getTick()->setMajorGridSpace($axisData->{'axis-grid-major-space'}*$timeMultiplier);
  
 			if (isset($axisData->{'axis-grid-minor-space'}) && $axisData->{'axis-grid-minor-space'} != 0)
-				$axisNode->getTick()->setMinorGridSpace($axisData->{'axis-grid-minor-space'});
+				$axisNode->getTick()->setMinorGridSpace($axisData->{'axis-grid-minor-space'}*$timeMultiplier);
+			
 		}
  
  
@@ -553,8 +573,9 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 	{
 		//X parameters
 		$isScatter = ($plotNode->getName() == REQUESTOUTPUTPLOTELEMENTXY_NAME);
+		$isHisto = ($plotNode->getName() == REQUESTOUTPUTPLOTELEMENTHISTO_NAME);	
 		$xIds = array();
-		if ($isScatter) {
+		if ($isScatter || $isHisto) {
 			$crtXId = 0;
 			foreach ($paramsData as $paramData) {
 				if ($paramData->{'param-drawing-object'}->{'serie-xaxis-param'} == '')
@@ -614,7 +635,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			if (!empty($paramData->{'param-drawing-object'}->{'serie-colored-param'}))
 				$colorSerieId = $drawingEltIndex;
  
-			$xId = ($isScatter && !empty($paramData->{'param-drawing-object'}->{'serie-xaxis-param'})) ? $xIds[$paramData->{'param-drawing-object'}->{'serie-xaxis-param'}] : -1;
+			$xId = (($isScatter || $isHisto) && !empty($paramData->{'param-drawing-object'}->{'serie-xaxis-param'})) ? $xIds[$paramData->{'param-drawing-object'}->{'serie-xaxis-param'}] : -1;
  
 			switch ($paramData->{'param-drawing-type'}) {
 				case 'serie':
@@ -629,6 +650,10 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 						$paramZInfo = NULL;
 					$this->unmarshallHistogram2D($paramData, $requestParamsNode, $plotNode, $paramNode, $paramInfo['indexes'], $xId, $paramZInfo,$axesData);
 					break;	
+				case 'histogram1d':
+					$paramNode = $plotNode->getParams()->getParamById($paramInfo['id']);
+					$this->unmarshallHistogram1D($paramData, $requestParamsNode, $plotNode, $paramNode, $paramInfo['indexes']);
+					break;
 				case 'orbit-serie':
 					$paramNode = $plotNode->getParams()->getParamById($paramInfo['id']);
 					$this->unmarshallSerie($paramData, $requestParamsNode, $plotNode, $paramNode, -1, $xId, $colorSerieId, true);
@@ -766,6 +791,42 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		}
 	}
  
+	protected function unmarshallHistogram1D($paramData, $requestParamsNode, $plotNode, $paramNode, $indexes)
+	{
+		$histogram1DNodes = array();
+		if ($paramData->{'param-drawing-object'}->{'histo1d-color'} == "none") {
+			$color = NULL;
+		} else {
+			$color = $this->hexColor2KernelColor($paramData->{'param-drawing-object'}->{'histo1d-color'});
+		}
+		
+		if (count($indexes) == 0) {
+			$histogram1DNode = $paramNode->addHistogram1DSerie($paramData->{'param-drawing-object'}->{'serie-yaxis'}, -1, $color);
+			if (isset($histogram1DNode)) {
+				$histogram1DNode->setId($paramData->{'id'});
+				$histogram1DNodes[] = $histogram1DNode;
+			}
+		}
+		foreach ($indexes as $index) {
+			$histogram1DNode = $paramNode->addHistogram1DSerie($paramData->{'param-drawing-object'}->{'serie-yaxis'}, $index, $color);
+			if (isset($histogram1DNode)) {
+				if (count($indexes) == 1)
+					$histogram1DNode->setId($paramData->{'id'});
+				$histogram1DNodes[] = $histogram1DNode;
+			}
+		}
+
+		foreach ($histogram1DNodes as $histogram1DNode) {
+
+			// xBinNumber 
+			$histogram1DNode->getBins()->addManual1DBins($paramData->{'param-drawing-object'}->{'histo1d-xbinnumber'});
+
+			// histotype, function
+			$histogram1DNode->getHistotype()->set1DFunction($paramData->{'param-drawing-object'}->{'histo1d-function'});
+
+		}
+	}
+
 	protected function unmarshallSerie($paramData, $requestParamsNode, $plotNode, $paramNode, $indexes, $xId, $colorSerieId, $isOrbitSerie)
 	{
 		$serieNodes = array();
@@ -340,16 +340,7 @@ class IHMParamManagerClass
 				}
 			}
  
-			if ($this->templateParamsManager->isTemplatedParam($linkedParamId)) {
-				$linkedParamPath = $this->templateParamsManager->generateTemplatedParamFile($linkedParamId, $tempArgs);
-				$real_linked_param_id = $this->templateParamsManager->getTemplatedParamId($linkedParamId, $tempArgs);
-			}
-			else {
-				$real_linked_param_id = $linkedParamId;
-				$linkedParamPath = IHMConfigClass::getLocalParamDBPath().$real_linked_param_id.".xml";
-			}
-			$paramsData->addParamToCopy($real_linked_param_id,$linkedParamPath);
-			$this->addLinkedLocalParams($linkedParamId, $paramsData);
+			$this->addExistingParam($linkedParamId, $paramsData);
 		}
 	}
  
@@ -113,6 +113,8 @@ class IHMPlotContextFileClass
 					$panelContext['plotArea']['y']      = $pageContext['height'] - intval($plotAreaNode->getAttribute('y')) - $panelContext['plotArea']['height'];
 					$panelContext['plotArea']['width']  = intval($plotAreaNode->getAttribute('width'));
 				}
+				//BG COLOR
+				$panelContext['plotArea']['plotAreaBackgroundColor'] = ($plotAreaNode->getAttribute('plotAreaBackgroundColor'));
  
 				//hasSpectro
 				$panelContext['plotArea']['hasSpectro']  = ($plotAreaNode->getAttribute('hasSpectro') == "true");
@@ -127,7 +129,8 @@ class IHMPlotContextFileClass
 						'id' => $axisNode->getAttribute('id'),
 						'logarithmic' => ($axisNode->getAttribute('logarithmic') == "true"),
 						'min' => floatval($axisNode->getAttribute('min')),
-						'max' => floatval($axisNode->getAttribute('max'))
+						'max' => floatval($axisNode->getAttribute('max')),
+						'colorsList' => $axisNode->getAttribute('colorsList')
 					);
  
 					$panelContext['plotArea']['axes'][] = $axisContext;
@@ -0,0 +1,50 @@
+<?php
+
+require_once("RequestOutputPlotElementNodeClass.php");
+
+define ("REQUESTOUTPUTPLOTELEMENTHISTO_NAME", "histoPlot");
+define ("REQUESTOUTPUTPLOTELEMENTHISTO_XAXISID", "xaxis_id");
+
+/**
+ * @class RequestOutputPlotElementXYNodeClass
+ * @brief Definition of a histogram plot element for a panel of a plot request
+ * @details
+*/
+class RequestOutputPlotElementHistoNodeClass extends RequestOutputPlotElementNodeClass
+{
+	public function __construct()
+	{
+		parent::__construct(REQUESTOUTPUTPLOTELEMENTHISTO_NAME,true,false,false,false,false,false);
+		//create x axis
+		$this->getAxes()->addDigitalAxis(RequestOutputPlotAxisTypeEnum::XAXIS,REQUESTOUTPUTPLOTELEMENTHISTO_XAXISID);
+		//force color axis creation
+		$this->getAxes()->getColorAxis();
+	}
+
+	public function getXAxis()
+	{
+		return $this->getAxes()->getDigitalAxis(RequestOutputPlotAxisTypeEnum::XAXIS,REQUESTOUTPUTPLOTELEMENTHISTO_XAXISID);
+	}
+
+	public function addYAxis($id)
+	{
+		return $this->getAxes()->addDigitalAxis(RequestOutputPlotAxisTypeEnum::YAXIS,$id);
+	}
+
+	public function getYAxis($id)
+	{
+		return $this->getAxes()->getDigitalAxis(RequestOutputPlotAxisTypeEnum::YAXIS,$id);
+	}
+
+	public function getZAxis()
+	{
+		return $this->getAxes()->getColorAxis();
+	}
+	
+	public function loadFromNode($xmlNode)
+	{
+		parent::loadFromNode($xmlNode);
+	}
+}
+
+?>
 \ No newline at end of file
@@ -0,0 +1,120 @@
+<?php
+
+require_once "RequestOutputPlotResamplingNodeClass.php";
+require_once "RequestOutputPlotYSerieErrorBarNodeClass.php";
+
+define ("REQUESTOUTPUTPLOTHISTOGRAM1DSERIE_NAME", "histogram1d");
+define ("REQUESTOUTPUTPLOTHISTOGRAM1DSERIE_INDEX", "index");
+define ("REQUESTOUTPUTPLOTHISTOGRAM1DSERIE_COLOR", "color");
+
+define ("REQUESTOUTPUTPLOTBINS_NAME", "bins");
+define ("REQUESTOUTPUTPLOTBINS_MANUAL", "manual");
+define ("REQUESTOUTPUTPLOTBINS_XBINNUMBER", "xbinnumber");
+
+define ("REQUESTOUTPUTPLOTHISTOTYPE_NAME", "histotype");
+define ("REQUESTOUTPUTPLOTHISTOTYPE_FUNCTION", "type");
+/**
+ * @class RequestOutputPlotHistogram1DSerieNodeClass
+ * @brief Definition of a histogram1D for a plot of a plot request
+ * @details
+*/
+
+class RequestOutputPlotBins1DNodeClass extends NodeClass
+{
+	public function __construct($name)
+	{
+		parent::__construct($name);
+	}
+
+	public function addManual1DBins($xBinNumber)
+	{
+		$node = $this->getFirstChildByName(REQUESTOUTPUTPLOTBINS_MANUAL);
+		
+		if (!isset($node))
+		{
+			$node = new NodeClass(REQUESTOUTPUTPLOTBINS_MANUAL);
+			$this->addChild($node);
+		}
+		
+		$node->setAttribute(REQUESTOUTPUTPLOTBINS_XBINNUMBER, $xBinNumber);
+		return $node;
+	}
+
+}
+
+class RequestOutputPlotHistotype1DNodeClass extends NodeClass
+{
+	public function __construct($name)
+	{
+		parent::__construct($name);
+	}
+
+	public function set1DFunction($type){
+		$this->setAttribute(REQUESTOUTPUTPLOTHISTOTYPE_FUNCTION, $type);
+	}
+	public function get1DFunction(){
+		return $this->getAttribute(REQUESTOUTPUTPLOTHISTOTYPE_FUNCTION);
+	}
+}
+
+class RequestOutputPlotHistogram1DSerieNodeClass extends RequestOutputPlotBaseSerieNodeClass
+{
+	public function __construct($name)
+	{
+		parent::__construct($name);
+	}
+
+	public function getBins()
+	{
+		$node = $this->getFirstChildByName(REQUESTOUTPUTPLOTBINS_NAME);
+		
+		if (!isset($node))
+		{
+			$node = new RequestOutputPlotBins1DNodeClass(REQUESTOUTPUTPLOTBINS_NAME);
+			$this->addChild($node);
+		}
+		
+		return $node;
+	}
+
+	public function getHistotype()
+	{
+		$node = $this->getFirstChildByName(REQUESTOUTPUTPLOTHISTOTYPE_NAME);
+		
+		if (!isset($node))
+		{
+			$node = new RequestOutputPlotHistotype1DNodeClass(REQUESTOUTPUTPLOTHISTOTYPE_NAME);
+			$this->addChild($node);
+		}
+		
+		return $node;
+	}
+
+	public function setColor($color)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTHISTOGRAM1DSERIE_COLOR, $color);
+	}
+	
+	public function getColor()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTHISTOGRAM1DSERIE_COLOR);
+	}
+
+	public function setIndex($index)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTHISTOGRAM1DSERIE_INDEX, $index);
+	}
+	
+	public function getIndex()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTHISTOGRAM1DSERIE_INDEX);
+	}	
+	
+	public function loadFromNode($xmlNode)
+	{
+		$this->setIndex($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTHISTOGRAM1DSERIE_INDEX));
+		parent::loadFromNode($xmlNode);
+	}
+}
+
+?>
@@ -23,6 +23,7 @@ abstract class RequestOutputPlotElementTypeEnum
 {
 	const TIMEPLOT    = "TimePlot";
 	const XYPLOT      = "XYPlot";
+	const HISTOPLOT   = "HistoPlot";
 	const STATUSPLOT  = "StatusPlot";
 	const TICKPLOT    = "TickPlot";
 	const EPOCHPLOT   = "EpochPlot";
@@ -107,6 +108,9 @@ class RequestOutputPlotPanelNodeClass extends NodeClass
 			case RequestOutputPlotElementTypeEnum::XYPLOT:
 				$node = new RequestOutputPlotElementXYNodeClass();
 				break;
+			case RequestOutputPlotElementTypeEnum::HISTOPLOT:
+				$node = new RequestOutputPlotElementHistoNodeClass();
+				break;
 			case RequestOutputPlotElementTypeEnum::STATUSPLOT:
 				$node = new RequestOutputPlotElementStatusNodeClass($noAxes);
 				break;
@@ -115,6 +115,18 @@ class RequestOutputPlotParamNodeClass extends NodeClass
 		return $histogram2dNode;
 	}
  
+	public function addHistogram1DSerie($yAxis, $index, $color)
+	{
+		$histogram1dNode = new RequestOutputPlotHistogram1DSerieNodeClass(REQUESTOUTPUTPLOTHISTOGRAM1DSERIE_NAME);
+		$histogram1dNode->setColor($color);
+		$histogram1dNode->setXAxisId(REQUESTOUTPUTPLOTELEMENTXY_XAXISID);
+		$histogram1dNode->setYAxisId($yAxis);
+		if ($index >= 0)
+			$histogram1dNode->setIndex($index);
+		$this->addChild($histogram1dNode);
+		return $histogram1dNode;
+	}
+
 	public function addOrbitSerie($yAxis, $colorSerieId = -1)
 	{
 		$orbitSerieNode = new RequestOutputPlotOrbitSerieNodeClass();