Implements multiplot (#8314)

Benjamin Renard
1 parent 7d14181a
Showing 3 changed files with 63 additions and 4 deletions Show diff stats
src/InputOutput/IHMImpl/IHMInputOutputClass.php
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsMultiPlotClass.php
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
@@ -49,6 +49,12 @@ class IHMInputOutputClass implements InputOutputInterface
 						}
 						$this->inputOutput = new IHMInputOutputParamsPlotClass();
 						break;
+					case 'multiplot' :
+						//multiplot
+						$this->inputOutput = new IHMInputOutputParamsMultiPlotClass();
+						//set working dir for interactive plot
+						$requestId = "Plot";
+						break;
 					case 'statistics' :
 						//catalog generation
 						$this->inputOutput = new IHMInputOutputParamsStatisticsClass();
@@ -70,7 +76,12 @@ class IHMInputOutputClass implements InputOutputInterface
                                 $requestId = "ParamInfoGen";
                                 break;
 			case FunctionTypeEnumClass::ACTION :
-				$this->inputOutput = new IHMInputOutputParamsPlotClass();
+				if (!$input->action->multiplot) {
+					$this->inputOutput = new IHMInputOutputParamsPlotClass();
+				}
+				else {
+					$this->inputOutput = new IHMInputOutputParamsMultiPlotClass();
+				}
 				$requestId = "Plot";
 				break;
 			case FunctionTypeEnumClass::PROCESSDELETE :
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @class IHMInputOutputParamsMultiPlotClass
+ * @brief Class that's implement an IHMInputOutputParamsPlotClass used to treat input/output of a "multiplot" request
+ * @details
+ */
+class IHMInputOutputParamsMultiPlotClass extends IHMInputOutputParamsPlotClass
+{
+	/*
+	 * @brief method to unmarshall a plot request
+	 */
+	public function unmarshallRequest($input) {
+		$this->isMultiPlot = TRUE;
+
+		$isAction = isset($input->{'action'});
+
+		if ($isAction) {
+			$multiplotInput = $this->loadIHMRequest('multiplot');
+		}
+		else {
+			$multiplotInput = $input;
+		}
+
+		foreach ($multiplotInput->plots as $index => $plot) {
+			if ($isAction) {
+				$request = clone $input;
+				$request->action->interactiveId = PLOT_RESULT_FILE_KEY."_".$plot->{'tab-index'};
+				parent::unmarshallRequest($request);
+			}
+			else {
+                        	$plot->{'file-output'} = 'INTERACTIVE';
+				$plot->timesrc = $multiplotInput->timesrc;
+				$plot->timeTables = $multiplotInput->timeTables;
+				$plot->startDate = $multiplotInput->startDate;
+				$plot->stopDate  = $multiplotInput->stopDate;
+                        	parent::unmarshallRequest($plot);
+			}
+		}
+
+		$this->saveIHMRequest('multiplot', $multiplotInput);
+	}
+}
+
+?>
@@ -20,6 +20,8 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
         private $interactivePlotIndex = array();
 	private $interactiveCrtTTFileIndex = -1;
 	private $interactivePreview = false;
+
+	protected $isMultiPlot = FALSE;
 	/*
 	 * @brief method to unmarshall a plot request
@@ -44,7 +46,6 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		//Request
 		$this->isInteractiveRequest = ($input->{'file-output'} == 'INTERACTIVE');
 		$this->isFromWS = ($input->{'file-output'} == 'WS');
-		$postProcessCmd = "";
 		if ($resetZoom || $forceTimeZoomReset)
 			$this->resetZoomList(PLOT_RESULT_FILE_KEY."_".$input->{'tab-index'}, $forceTimeZoomReset);
@@ -215,6 +216,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		}
 		//Post process command to apply to the result file
+		$postProcessCmd = $this->paramsData->getPostCmd();
 		if ($postProcessCmd != "")
 			$postProcessCmd .= " | ";
 		$postProcessCmd .= "mv ".$resultFile." ".$waitingResultFile;
@@ -1419,6 +1421,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 						"context" => IHMPlotContextFileClass::parse($this->getWorkingPath().$contextResult),
 						"plot" => $waitingResult,
 						"exectime" => $data->getExecTime(),
+						"multiplot" => $this->isMultiPlot,
 					);
 				}
@@ -1450,7 +1453,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		return "[".$r.",".$g.",".$b."]";
 	}
-	private function saveIHMRequest($interactiveId, $input)
+	protected function saveIHMRequest($interactiveId, $input)
 	{
 		$path = $this->getWorkingPath()."ihm.request.".$interactiveId;
 		if (!is_dir($this->getWorkingPath()))
@@ -1460,7 +1463,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		fclose($file);
 	}
-	private function loadIHMRequest($interactiveId)
+	protected function loadIHMRequest($interactiveId)
 	{
 		$path = $this->getWorkingPath()."ihm.request.".$interactiveId;
 		if (!file_exists($path))