Merge branch 'density_maps' into amdadev

Benjamin Renard
2 parents aba3bf57 2c99863f
Showing 4 changed files with 272 additions and 4 deletions Show diff stats
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
src/InputOutput/WSImpl/Params/PlotImpl/WSInputOutputParamsPlotClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotHistogram2DSerieNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotParamsNodeClass.php
@@ -350,7 +350,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			$this->unmarshallAxis($axisData, $panelData->{'constants'}, $plotNode);
 		//Params
-		$this->unmarshallParams($panelData->{'params'}, $paramsNode, $plotNode, $panelNode, $statusPlotNode, $tickPlotNode);
+		$this->unmarshallParams($panelData->{'params'}, $paramsNode, $plotNode, $panelNode, $statusPlotNode, $tickPlotNode, $panelData->{'axes'});
 		//Additional objects
 		if ($plotNode->getAdditionalObjects() != NULL)
@@ -549,7 +549,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		}
 	}
-	protected function unmarshallParams($paramsData, $requestParamsNode, $plotNode, $panelNode, $statusPlotNode, $tickPlotNode)
+	protected function unmarshallParams($paramsData, $requestParamsNode, $plotNode, $panelNode, $statusPlotNode, $tickPlotNode, $axesData)
 	{
 		//X parameters
 		$isScatter = ($plotNode->getName() == REQUESTOUTPUTPLOTELEMENTXY_NAME);
@@ -570,6 +570,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 				$requestParamsNode->addParam($paramXInfo['id']);
 				$xParamNode = $plotNode->getParams()->getParamById($paramXInfo['id']);
 				switch ($paramData->{'param-drawing-type'}) {
+					case 'histogram2d':
 					case 'serie':
 						//Unmarshall x serie
 						if (count($paramXInfo['indexes']) == 0)
@@ -620,6 +621,14 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 					$paramNode = $plotNode->getParams()->getParamById($paramInfo['id']);
 					$this->unmarshallSerie($paramData, $requestParamsNode, $plotNode, $paramNode, $paramInfo['indexes'], $xId, $colorSerieId, false);
 					break;
+				case 'histogram2d':
+					$paramNode = $plotNode->getParams()->getParamById($paramInfo['id']);
+					if(!empty($paramData->{'param-drawing-object'}->{'histotype-param'}))
+						$paramZInfo = $this->paramManager->addExistingParam($paramData->{'param-drawing-object'}->{'histotype-param'}, $this->paramsData);
+					else
+						$paramZInfo = NULL;
+					$this->unmarshallHistogram2D($paramData, $requestParamsNode, $plotNode, $paramNode, $paramInfo['indexes'], $xId, $paramZInfo,$axesData);
+					break;	
 				case 'orbit-serie':
 					$paramNode = $plotNode->getParams()->getParamById($paramInfo['id']);
 					$this->unmarshallSerie($paramData, $requestParamsNode, $plotNode, $paramNode, -1, $xId, $colorSerieId, true);
@@ -699,6 +708,79 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		}
 	}
+	protected function unmarshallHistogram2D($paramData, $requestParamsNode, $plotNode, $paramNode, $indexes, $xId, $paramZInfo,$axesData)
+	{
+		$histogram2DNodes = array();
+		if (count($indexes) == 0) {
+			$histogram2DNode = $paramNode->addHistogram2DSerie($paramData->{'param-drawing-object'}->{'serie-yaxis'}, -1, $xId);
+			$histogram2DNode->setId($paramData->{'id'});
+			$histogram2DNodes[] = $histogram2DNode;
+		}
+		foreach ($indexes as $index) {
+			$histogram2DNode = $paramNode->addHistogram2DSerie($paramData->{'param-drawing-object'}->{'serie-yaxis'}, $index, $xId);
+			if (count($indexes) == 1)
+				$histogram2DNode->setId($paramData->{'id'});
+			$histogram2DNodes[] = $histogram2DNode;
+		}
+
+		// ranges 
+		foreach($axesData as $axisData){
+			if ($axisData->{'axis-type'} == "x"){
+				$axisNode = $plotNode->getXAxis();
+				$rangeNode = $axisNode->getRange();
+				if($paramData->{'param-drawing-object'}->{'histo2d-xmin'} !== null 
+								&& $paramData->{'param-drawing-object'}->{'histo2d-xmax'} !== null)
+				{
+					$rangeNode->setMinMax($paramData->{'param-drawing-object'}->{'histo2d-xmin'},
+														 $paramData->{'param-drawing-object'}->{'histo2d-xmax'});
+				}
+			}
+			else if ($axisData->{'axis-type'} == "y-left"){
+				$axisNode = $plotNode->getYAxis('y-left');
+				$rangeNode = $axisNode->getRange();
+				if($paramData->{'param-drawing-object'}->{'histo2d-ymin'} !== null 
+								&& $paramData->{'param-drawing-object'}->{'histo2d-ymax'} !== null)
+				{
+					$rangeNode->setMinMax($paramData->{'param-drawing-object'}->{'histo2d-ymin'}, 
+														$paramData->{'param-drawing-object'}->{'histo2d-ymax'});
+				}
+			}
+		}
+		foreach ($histogram2DNodes as $histogram2DNode) {
+			// resampling
+			
+			switch ($paramData->{'param-drawing-object'}->{'serie-resampling-mode'}) {
+				case 'yparam':
+					$histogram2DNode->getResampling()->setType(RequestOutputPlotResamplingTypeEnum::YPARAM);
+					break;
+				case 'xparam':
+				default:
+					$histogram2DNode->getResampling()->setType(RequestOutputPlotResamplingTypeEnum::XPARAM);
+			}
+			// xBinNumber & yBinNumber
+			$histogram2DNode->getBins()->addManualBins($paramData->{'param-drawing-object'}->{'histo2d-xbinnumber'},$paramData->{'param-drawing-object'}->{'histo2d-ybinnumber'});
+
+			// histotype, function
+			$histogram2DNode->getHistotype()->setFunction($paramData->{'param-drawing-object'}->{'histo2d-function'});
+			//smoothfactor
+			$histogram2DNode->getHistotype()->setSmoothFactor($paramData->{'param-drawing-object'}->{'histo2d-smoothfactor'});
+
+			if($paramData->{'param-drawing-object'}->{'histo2d-function'} != "density"){
+				// paramId
+				$requestParamsNode->addParam($paramZInfo['id']);
+				$histogram2DNode->getHistotype()->setParamId($paramZInfo['id']);
+
+				// index
+				if (count($paramZInfo['indexes']) == 0)
+					$histogram2DNode->getHistotype()->setIndex(-1);
+				else if (count($paramZInfo['indexes']) == 1)
+					$histogram2DNode->getHistotype()->setIndex($paramZInfo['indexes'][0]);
+				else
+					throw new Exception('Z parameter for serie must be a component.');
+			}
+		}
+	}
+
 	protected function unmarshallSerie($paramData, $requestParamsNode, $plotNode, $paramNode, $indexes, $xId, $colorSerieId, $isOrbitSerie)
 	{
 		$serieNodes = array();
@@ -101,7 +101,7 @@ class WSInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			$yAxisNode = $plotNode->addYAxis('y-left'); 
 			//Params
-			$this->unmarshallParams($param, $paramsNode, $plotNode, $panelNode);
+			$this->unmarshallParams($param, $paramsNode, $plotNode, $panelNode, NULL);
 			$panelN++;
 		}
@@ -123,7 +123,7 @@ class WSInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 	}
-	protected function unmarshallParams($paramData, $requestParamsNode, $plotNode, $panelNode)
+	protected function unmarshallParams($paramData, $requestParamsNode, $plotNode, $panelNode, $axes)
 	{
 		//Main drawing element parameter
 		$paramInfo = $this->paramManager->addExistingParam($paramData->{'paramid'}, $this->paramsData, NULL);
@@ -0,0 +1,171 @@
+<?php
+
+require_once "RequestOutputPlotResamplingNodeClass.php";
+require_once "RequestOutputPlotYSerieErrorBarNodeClass.php";
+
+define ("REQUESTOUTPUTPLOTHISTOGRAM2DSERIE_NAME", "histogram2d");
+define ("REQUESTOUTPUTPLOTHISTOGRAM2DSERIE_XID", "xId");
+define ("REQUESTOUTPUTPLOTHISTOGRAM2DSERIE_INDEX", "index");
+define ("REQUESTOUTPUTPLOTHISTOGRAM2DSERIE_RESAMPLING", "resampling");
+
+define ("REQUESTOUTPUTPLOTBINS_NAME", "bins");
+define ("REQUESTOUTPUTPLOTBINS_MANUAL", "manual");
+define ("REQUESTOUTPUTPLOTBINS_XBINNUMBER", "xbinnumber");
+define ("REQUESTOUTPUTPLOTBINS_YBINNUMBER", "ybinnumber");
+
+define ("REQUESTOUTPUTPLOTHISTOTYPE_NAME", "histotype");
+define ("REQUESTOUTPUTPLOTHISTOTYPE_FUNCTION", "type");
+define ("REQUESTOUTPUTPLOTHISTOTYPE_SMOOTHFACTOR", "smoothfactor");
+define ("REQUESTOUTPUTPLOTHISTOTYPE_PARAMID", "paramId");
+define ("REQUESTOUTPUTPLOTHISTOTYPE_INDEX", "index");
+/**
+ * @class RequestOutputPlotHistogram2DSerieNodeClass
+ * @brief Definition of a histogram2d for a plot of a plot request
+ * @details
+*/
+
+class RequestOutputPlotBinsNodeClass extends NodeClass
+{
+	public function __construct($name)
+	{
+		parent::__construct($name);
+	}
+
+	public function addManualBins($xBinNumber, $yBinNumber)
+	{
+		$node = $this->getFirstChildByName(REQUESTOUTPUTPLOTBINS_MANUAL);
+		
+		if (!isset($node))
+		{
+			$node = new NodeClass(REQUESTOUTPUTPLOTBINS_MANUAL);
+			$this->addChild($node);
+		}
+		
+		$node->setAttribute(REQUESTOUTPUTPLOTBINS_XBINNUMBER, $xBinNumber);
+		$node->setAttribute(REQUESTOUTPUTPLOTBINS_YBINNUMBER, $yBinNumber);
+		return $node;
+	}
+
+}
+
+class RequestOutputPlotHistotypeNodeClass extends NodeClass
+{
+	public function __construct($name)
+	{
+		parent::__construct($name);
+	}
+
+	public function setFunction($type){
+		$this->setAttribute(REQUESTOUTPUTPLOTHISTOTYPE_FUNCTION, $type);
+	}
+	public function getFunction(){
+		return $this->getAttribute(REQUESTOUTPUTPLOTHISTOTYPE_FUNCTION);
+	}
+
+	public function setSmoothFactor($smoothFactor){
+		$this->setAttribute(REQUESTOUTPUTPLOTHISTOTYPE_SMOOTHFACTOR, $smoothFactor);
+	}
+	public function getSmoothFactor(){
+		return $this->getAttribute(REQUESTOUTPUTPLOTHISTOTYPE_SMOOTHFACTOR);
+	}
+
+	public function setParamId($paramId){
+		$this->setAttribute(REQUESTOUTPUTPLOTHISTOTYPE_PARAMID, $paramId);
+	}
+	public function getParamId(){
+		return $this->getAttribute(REQUESTOUTPUTPLOTHISTOTYPE_PARAMID);
+	}
+
+	public function setIndex($index){
+		$this->setAttribute(REQUESTOUTPUTPLOTHISTOTYPE_INDEX, $index);
+	}
+	public function getIndex(){
+		return $this->getAttribute(REQUESTOUTPUTPLOTHISTOTYPE_INDEX);
+	}
+
+}
+
+class RequestOutputPlotHistogram2DSerieNodeClass extends RequestOutputPlotBaseSerieNodeClass
+{
+	public function __construct($name)
+	{
+		parent::__construct($name);
+	}
+
+	public function getBins()
+	{
+		$node = $this->getFirstChildByName(REQUESTOUTPUTPLOTBINS_NAME);
+		
+		if (!isset($node))
+		{
+			$node = new RequestOutputPlotBinsNodeClass(REQUESTOUTPUTPLOTBINS_NAME);
+			$this->addChild($node);
+		}
+		
+		return $node;
+	}
+
+	public function getHistotype()
+	{
+		$node = $this->getFirstChildByName(REQUESTOUTPUTPLOTHISTOTYPE_NAME);
+		
+		if (!isset($node))
+		{
+			$node = new RequestOutputPlotHistotypeNodeClass(REQUESTOUTPUTPLOTHISTOTYPE_NAME);
+			$this->addChild($node);
+		}
+		
+		return $node;
+	}
+	public function setIndex($index)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTHISTOGRAM2DSERIE_INDEX, $index);
+	}
+	
+	public function getIndex()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTHISTOGRAM2DSERIE_INDEX);
+	}
+
+	public function setXId($xId)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTHISTOGRAM2DSERIE_XID, $xId);
+	}
+
+	public function getXId()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTHISTOGRAM2DSERIE_XID);
+	}
+	
+	public function getResampling()
+	{
+		$node = $this->getFirstChildByName(REQUESTOUTPUTPLOTHISTOGRAM2DSERIE_RESAMPLING);
+		
+		if (!isset($node))
+		{
+			$node = new RequestOutputPlotResamplingNodeClass(REQUESTOUTPUTPLOTHISTOGRAM2DSERIE_RESAMPLING);
+			$this->addChild($node);
+		}
+		
+		return $node;
+	}
+	
+	
+	public function loadFromNode($xmlNode)
+	{
+		$this->setIndex($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTHISTOGRAM2DSERIE_INDEX));
+
+		$xId = $this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTHISTOGRAM2DSERIE_XID);
+		if (!empty($xId))
+			$this->setXId($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTHISTOGRAM2DSERIE_XID));
+		
+		$resamplingXmlNode = $this->getXmlNodeChildByTagName($xmlNode, REQUESTOUTPUTPLOTHISTOGRAM2DSERIE_RESAMPLING);
+		if (isset($resamplingXmlNode))
+			$this->getResampling()->loadFromNode($resamplingXmlNode);
+		
+		
+		parent::loadFromNode($xmlNode);
+	}
+}
+
+?>
 <?php
 require_once("RequestOutputPlotYSerieNodeClass.php");
+require_once("RequestOutputPlotHistogram2DSerieNodeClass.php");
 require_once "RequestOutputPlotOrbitSerieNodeClass.php";
 require_once "RequestOutputPlotInstantSerieNodeClass.php";
@@ -99,6 +100,20 @@ class RequestOutputPlotParamNodeClass extends NodeClass
 		return $ySerieNode;
 	}
+	public function addHistogram2DSerie($yAxis, $index, $xId = -1)
+	{
+		if ($xId != -1) {
+			$histogram2dNode = new RequestOutputPlotHistogram2DSerieNodeClass(REQUESTOUTPUTPLOTHISTOGRAM2DSERIE_NAME);
+			$histogram2dNode->setXId($xId);
+			$histogram2dNode->setXAxisId(REQUESTOUTPUTPLOTELEMENTXY_XAXISID);
+		} 
+		$histogram2dNode->setYAxisId($yAxis);
+		if ($index >= 0)
+			$histogram2dNode->setIndex($index);
+		$this->addChild($histogram2dNode);
+		return $histogram2dNode;
+	}
+
 	public function addOrbitSerie($yAxis, $colorSerieId = -1)
 	{
 		$orbitSerieNode = new RequestOutputPlotOrbitSerieNodeClass();