Merge branch 'DAS2' into FER_TFCat

Benjamin Renard
2 parents 85c7d958 5ac7ca99
Showing 5 changed files with 139 additions and 11 deletions Show diff stats
src/InputOutput/IHMImpl/ParamInfo/IHMInputOutputParamInfoClass.php
src/InputOutput/IHMImpl/Params/IHMInputOutputParamsAbstractClass.php
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
src/Request/ParamInfoRequestClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotColorAxisNodeClass.php
@@ -368,6 +368,9 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface
 			if (isset($colorAxis)) {
 				$result_data['axes']['color'] = array();
 				$this->unmarshallAxisData($colorAxis, $result_data['axes']['color']);
+				$colorMapIndex = $colorAxis->getColorMapIndex();
+				if (!empty($colorMapIndex))
+					$result_data['axes']['color']['axis-color-map'] = $colorAxis->getColorMapIndex();
 			}
  
 			$xAxis = $axesNode->getDigitalAxis(RequestOutputPlotAxisTypeEnum::XAXIS, 'xaxis_id');
@@ -67,13 +67,18 @@ abstract class IHMInputOutputParamsAbstractClass implements InputOutputInterface
 		$requestNodes = $this->paramsData->getRequestNodes();
 		$timesNode = $requestNodes[$requestIndex]->getTimesNode();
  
+		
+
 		switch ($input->timesrc)
 		{
 			case "TimeTable" :
-				if (($ttFileIndex >= 0) && ($ttFileIndex >= count($input->timeTables)))
-				        $ttFileIndex = 0;
-                                if($ttFileIndex < 0)
-                                        $ttFileIndex =  count($input->timeTables) -1; 
+				if ($ttIntIndex >= 0) {
+					if (($ttFileIndex >= 0) && ($ttFileIndex >= count($input->timeTables)))
+							$ttFileIndex = 0;
+					if($ttFileIndex < 0)
+							$ttFileIndex =  count($input->timeTables) -1; 
+				}
+
 				$crtIndex = 0;
 				foreach ($input->timeTables as $tt)
 				{
@@ -343,7 +343,6 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 				$statusPlotNode->setColorMap($panelData->{'panel-status-colormap'});
 			}
 		}
-
 		//Axes
 		foreach ($panelData->{'axes'} as $axisData)
 			$this->unmarshallAxis($axisData, $panelData->{'constants'}, $plotNode);
@@ -2039,12 +2038,119 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		$axis->{"axis-legend-font-bold"} = TRUE;
 	}
  
+	private function setPanelTitleStyle($panel){
+		$panel->{"panel-title-font-activated"} = TRUE;
+		$panel->{"panel-title-font-size"} = 12;
+		$panel->{"panel-title-font-bold"} = TRUE;
+	}
+
+	private function setHistoXAxis($crtXAxis,  $input)
+	{
+		$crtXAxis->{"id"} = 'xaxis_id';
+		$crtXAxis->{"axis-type"} = "x";
+		$crtXAxis->{'axis-range-max'} = $input->{'histo1d-xmax'};
+		$crtXAxis->{'axis-range-min'} = $input->{'histo1d-xmin'};
+		$crtXAxis->{"axis-scale"} =  $input->scale_abscisse;
+	}
+
+
+	private function unmarshallPlotFunctionHisto($input, $plotInput)
+	{
+		$panels = [];
+
+		foreach ($plotInput->{'panels'} as $input_panel) {
+			if ($input->{'panelId'} == $input_panel->{'id'}) {
+				// Clone the input panel to avoid modifying the original object
+				$panel = clone ($input_panel);
+
+				// Set the panel type to 'histoPlot'
+				$panel->{'panel-plot-type'} = 'histoPlot';
+
+				// Apply panel title style
+				$this->setPanelTitleStyle($panel);
+
+				// Initialize 'params' as an empty array
+				$panel->{"params"} = [];
+
+				foreach ($input_panel->{'params'} as $param) {
+					$crtParam = clone ($param);
+
+					// Check if 'spectro-yaxis' exists, if so, throw an exception
+					if (isset($crtParam->{'param-drawing-object'}->{'spectro-yaxis'})) {
+						throw new Exception('Cannot apply Histogram 1D on Spectro.');
+					} else {
+						// If not, set 'histo1d-color' based on 'serie-lines-color'
+						$crtParam->{'param-drawing-object'}->{'histo1d-color'} = $param->{'param-drawing-object'}->{'serie-lines-color'};
+					}
+
+					// Set other parameters
+					$crtParam->{'param-drawing-type'} = 'histogram1d';
+					$crtParam->{'param-drawing-object'}->{'histo1d-xbinnumber'} = $input->{'histo1d-xbinnumber'};
+					$crtParam->{'param-drawing-object'}->{'histo1d-function'} = $input->{'histo1d-function'};
+
+					// Add the modified parameter to the 'params' array
+					$panel->{"params"}[] = $crtParam;
+				}
+
+				// Find and clone the X-axis
+				$crtXAxis = NULL;
+				foreach ($panel->{'axes'} as $axis) {
+					if ("time" == $axis->{'id'}) {
+						$crtXAxis = clone ($axis);
+						$this->setHistoXAxis($crtXAxis, $input);
+						break;
+					}
+				}
+
+				// Find and clone the Y-axis
+				$firstParam = $panel->{"params"}[0];
+				$crtYAxis = NULL;
+				foreach ($panel->{'axes'} as $axis) {
+					if ($firstParam->{'param-drawing-object'}->{'serie-yaxis'} == $axis->{'id'}) {
+						$crtYAxis = clone ($axis);
+						$crtYAxis->{"axis-scale"} =  $input->scale_ordonnee;
+						break;
+					}
+				}
+
+				// Throw an exception if Y-axis is not found
+				if (!$crtYAxis) {
+					throw new Exception('Cannot retrieve y Axis for Plot Function/Histogram.');
+				}
+
+				// Find and clone the color Z-axis
+				$crtColorAxis = NULL;
+				foreach ($panel->{'axes'} as $axis) {
+					if ($axis->{'id'} == 'color') {
+						$crtColorAxis = clone ($axis);
+						break;
+					}
+				}
+
+				// Assign the axes to the panel
+				$panel->{"axes"} = [];
+				$panel->{"axes"}[] = $crtXAxis;
+				$panel->{"axes"}[] = $crtYAxis;
+				$panel->{"axes"}[] = $crtColorAxis;
+
+				// Add the modified panel to the panels array
+				$panels[] = $panel;
+				break; // Exit the loop after finding the matching panel
+			}
+		}
+
+		// Update the panels in the plotInput object
+		$plotInput->{'panels'} = $panels;
+
+		return $plotInput;
+	}
+
 	private function unmarshallPlotFunction($input, $plotInput)
 	{
+		$histoPlotName = "histoPlot";
 		date_default_timezone_set('UTC');
 		$plotInput->{"startDate"} =$input->starttime;
 		$plotInput->{"stopDate"} = $input->stoptime;
-		$plotInput->{"file-prefix"}  = RequestOutPutPlotElementPlotFunctionNodeClass::REQUESTOUTPUTPLOTELEMENT_PLOTFUNCTION_NAME;
 		$plotInput->{"interactive-preview"} = true;
 		$plotInput->{"file-format"} = "PNG";
 		$plotInput->{"file-output"} = "INTERACTIVE";
@@ -2055,6 +2161,15 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			"layout-panel-spacing" => 0.05
 		);
  
+		$plotInput->{"file-prefix"}  = RequestOutPutPlotElementPlotFunctionNodeClass::REQUESTOUTPUTPLOTELEMENT_PLOTFUNCTION_NAME;
+		if ($input->type == $histoPlotName){
+			//$plotInput->{"file-prefix"}  = $histoPlotName;
+			return 	$this->unmarshallPlotFunctionHisto($input, $plotInput);
+		}/*else{
+			$plotInput->{"file-prefix"}  = RequestOutPutPlotElementPlotFunctionNodeClass::REQUESTOUTPUTPLOTELEMENT_PLOTFUNCTION_NAME;
+		}*/
+
+
 		$panels = 	[];	
  
 		foreach ($plotInput->{'panels'} as $input_panel) {
@@ -2068,9 +2183,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 				$scale_abscisse = $input->scale_abscisse;
 				$scale_ordonnee = $input->scale_ordonnee;
 				$panel->{'panel-plot-type'} = RequestOutPutPlotElementPlotFunctionNodeClass::REQUESTOUTPUTPLOTELEMENT_PLOTFUNCTION_NAME;
-				$panel->{"panel-title-font-activated"} = TRUE;
-				$panel->{"panel-title-font-size"} = 12;
-				$panel->{"panel-title-font-bold"} = TRUE;
+				$this->setPanelTitleStyle($panel);
  
 				/**
 				 * @var object $crtParam
@@ -2204,5 +2317,4 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		$plotInput->{'panels'} = $panels;
 		return $plotInput;
 	}
-
 }
@@ -155,6 +155,9 @@ class ParamInfoRequestClass extends RequestAbstractClass
 						'channels' => array(),
 						'minmax' => array()
 				);
+				if ($tableNode->getAttribute("mainDim") === "true") {
+					$tableResult['mainDim'] = TRUE;
+				}
  
 				if (!$tableResult['variable']) {
 					$channelNodes = $tableNode->getElementsByTagName("channel");
@@ -26,6 +26,11 @@ class RequestOutputPlotColorAxisNodeClass extends RequestOutputPlotAxisElementNo
 	{
 		$this->setAttribute(REQUESTOUTPUTPLOTCOLORAXIS_MAPINDEX, $mapIndex);
 	}
+
+	public function getColorMapIndex()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTCOLORAXIS_MAPINDEX);
+	}
  
 	public function setMinValColor($minValColor)
 	{
@@ -56,4 +61,4 @@ class RequestOutputPlotColorAxisNodeClass extends RequestOutputPlotAxisElementNo
 	}
 }
  
-?>
 \ No newline at end of file
+?>