#11372 - Integration part for new histo1D functions - Done

Furkan
1 parent fa465d7a
Showing 2 changed files with 38 additions and 2 deletions Show diff stats
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotHistogram1DSerieNodeClass.php
@@ -651,7 +651,11 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 					break;	
 				case 'histogram1d':
 					$paramNode = $plotNode->getParams()->getParamById($paramInfo['id']);
-					$this->unmarshallHistogram1D($paramData, $requestParamsNode, $plotNode, $paramNode, $paramInfo['indexes']);
+					if(!empty($paramData->{'param-drawing-object'}->{'histotype-param'}))
+						$paramYInfo = $this->paramManager->addExistingParam($paramData->{'param-drawing-object'}->{'histotype-param'}, $this->paramsData);
+					else
+						$paramYInfo = NULL;
+					$this->unmarshallHistogram1D($paramData, $requestParamsNode, $plotNode, $paramNode, $paramInfo['indexes'],$paramYInfo);
 					break;
 				case 'orbit-serie':
 					$paramNode = $plotNode->getParams()->getParamById($paramInfo['id']);
@@ -790,7 +794,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		}
 	}
-	protected function unmarshallHistogram1D($paramData, $requestParamsNode, $plotNode, $paramNode, $indexes)
+	protected function unmarshallHistogram1D($paramData, $requestParamsNode, $plotNode, $paramNode, $indexes, $paramYInfo)
 	{
 		$histogram1DNodes = array();
 		if ($paramData->{'param-drawing-object'}->{'histo1d-color'} == "none") {
@@ -823,7 +827,23 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			// histotype, function
 			$histogram1DNode->getHistotype()->set1DFunction($paramData->{'param-drawing-object'}->{'histo1d-function'});
+			if(($paramData->{'param-drawing-object'}->{'histo1d-function'} != "density") && 
+				($paramData->{'param-drawing-object'}->{'histo1d-function'} != "normdensity")){
+				// paramId
+				if (empty($paramYInfo['id'])) {
+					throw new Exception('Y parameter must be defined to apply function.');
+				}
+				$requestParamsNode->addParam($paramYInfo['id']);
+				$histogram1DNode->getHistotype()->setParamId($paramYInfo['id']);
+				// index
+				if (count($paramYInfo['indexes']) == 0)
+					$histogram1DNode->getHistotype()->setIndex(-1);
+				else if (count($paramYInfo['indexes']) == 1)
+					$histogram1DNode->getHistotype()->setIndex($paramYInfo['indexes'][0]);
+				else
+					throw new Exception('Y parameter for serie must be a component.');
+			}
 		}
 	}
@@ -14,6 +14,8 @@ define (&quot;REQUESTOUTPUTPLOTBINS_STAIRS&quot;, &quot;stairs&quot;);
 define ("REQUESTOUTPUTPLOTHISTOTYPE_NAME", "histotype");
 define ("REQUESTOUTPUTPLOTHISTOTYPE_FUNCTION", "type");
+define ("REQUESTOUTPUTPLOTHISTOTYPE_PARAMID", "paramId");
+define ("REQUESTOUTPUTPLOTHISTOTYPE_INDEX", "index");
 /**
  * @class RequestOutputPlotHistogram1DSerieNodeClass
  * @brief Definition of a histogram1D for a plot of a plot request
@@ -57,6 +59,20 @@ class RequestOutputPlotHistotype1DNodeClass extends NodeClass
 	public function get1DFunction(){
 		return $this->getAttribute(REQUESTOUTPUTPLOTHISTOTYPE_FUNCTION);
 	}
+
+	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 RequestOutputPlotHistogram1DSerieNodeClass extends RequestOutputPlotBaseSerieNodeClass