Fill plot type in plot manager for My Data parameters (#4903)

Benjamin Renard
1 parent 2c0e1b9a
Showing 5 changed files with 87 additions and 37 deletions Show diff stats
src/InputOutput/IHMImpl/ParamInfo/IHMInputOutputParamInfoClass.php
src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php
src/InputOutput/IHMImpl/Tools/IHMParamManagerClass.php
src/Request/ParamInfoRequestClass.php
src/Request/ParamInfoRequestDataClass.php
@@ -8,8 +8,9 @@
 class IHMInputOutputParamInfoClass implements InputOutputInterface
 {
 	private $paramInfoData        = null;
+	private $paramMgr             = null;
 	private $paramTemplateMgr     = null;
-	private $paramImpexMgr     = null;
+	private $paramImpexMgr        = null;
  
 	/*
 	 * @brief Constructor
@@ -17,6 +18,7 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface
 	function __construct()
 	{
 		$this->paramTemplateMgr = new IHMParamTemplateClass();
+		$this->paramMgr = new IHMParamManagerClass();
 	}
  
 	/*
@@ -33,20 +35,44 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface
  
 				if (!isset($input->paramId) || empty($input->paramId))
 					throw new Exception("Param info request need a param id as argument");
-				
-				if ($this->paramTemplateMgr->isTemplatedParam($input->paramId))
+
+				if ($this->paramMgr->isUploadedParam($input->paramId)) {
+					$userParameterLoader = new IHMUserParamLoaderClass();
+
+					//get uploaded parameter info
+					$info = $userParameterLoader->getUploadedParameterFromName($input->paramId);
+					if ($info['success'] && ($info["param"]["info"]["plotType"] == 'Spectra')) {
+						$plot_init = array(
+							'panel' => array(
+								'plotType' => 'timePlot',
+							),
+							'draw' => array(
+								'type' => 'spectro',
+								'spectro-yaxis' => 'y-left',
+							),
+						);
+						$this->paramInfoData->setInternalPlotInit($plot_init);
+					}
+				}
+				else if ($this->paramTemplateMgr->isTemplatedParam($input->paramId)) {
 					//Use param template file
 					$paramFilePath = $this->paramTemplateMgr->getTemplatePath($input->paramId);
-				else
-				    $paramFilePath = IHMConfigClass::getLocalParamDBPath().$input->paramId.".xml";
-			
-				if (!file_exists("$paramFilePath"))
-					throw new Exception("Cannot find parameter definition file");
+					if (!file_exists($paramFilePath))
+						throw new Exception("Cannot find parameter definition file");
+
+					$this->paramInfoData->setFilePath($paramFilePath);
+				}
+				else {
+					//Direct access to the parameter file
+					$paramFilePath = IHMConfigClass::getLocalParamDBPath().$input->paramId.".xml";
+					if (!file_exists($paramFilePath))
+						throw new Exception("Cannot find parameter definition file");
  
-				$this->paramInfoData->setFilePath($paramFilePath);
+					$this->paramInfoData->setFilePath($paramFilePath);
+				}
 				break;
  
-				case 'impex_plot_init' :
+			case 'impex_plot_init' :
  
 				$this->paramInfoData->setType(ParamInfoTypeEnumClass::IMPEXPLOTINIT);
  
@@ -159,7 +185,14 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface
 	}
  
 	private function getOutputPlotInit($data, &$result) {
-		if (($data->getResult() != NULL) && ($data->getResult()->getName() == "plot") && (count($data->getResult()->getChildren()) >= 1)) {
+		$internal_info = $data->getInternalPlotInit();
+		if (isset($internal_info)) {
+			$result = array(
+				"success" => true,
+				"data" => $internal_info
+			);
+		}
+		else if (($data->getResult() != NULL) && ($data->getResult()->getName() == "plot") && (count($data->getResult()->getChildren()) >= 1)) {
 			$result_data = array();
  
 			$panelNodes = $data->getResult()->getChildren();
@@ -510,4 +543,4 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface
 	}
 }
  
-?>
 \ No newline at end of file
+?>
@@ -458,7 +458,6 @@ class IHMJobsManagerClass {
 			$resPath = glob(USERWORKINGDIR . $job->getAttribute('folder') . '/' . $job->getAttribute('result') . '*')[0];
  
 			if($job->getAttribute('jobType') == 'condition') {
-				error_log('resPath: ' . $resPath);
 				$resXml = new DomDocument();
 				$resXml->load($resPath);
 				$infos['nb intervals'] = $resXml->getElementsByTagName('nbIntervals')->item(0)->nodeValue;
@@ -66,7 +66,7 @@ class IHMParamManagerClass
 	/*
 	 * @brief Detect if it's a uploaded parameter
 	*/
-	private function isUploadedParam($param)
+	public function isUploadedParam($param)
 	{
 		return preg_match("#^wsd_#",$param);
 	}
@@ -13,7 +13,7 @@ class ParamInfoRequestClass extends RequestAbstractClass
 	{
 		if (!isset($this->requestData))
 			return false;
-		
+
 		if ($this->requestData->getType() == ParamInfoTypeEnumClass::PLOTINIT
 			|| $this->requestData->getType() == ParamInfoTypeEnumClass::IMPEXPLOTINIT) {
 			//Force load of node files to init the NodeFactory
@@ -30,7 +30,6 @@ class ParamInfoRequestClass extends RequestAbstractClass
 	 */
 	public function run()
 	{
-	
 		if ($this->requestData->getType() == ParamInfoTypeEnumClass::IMPEXINFO)
 		{
 		   $this->requestData->setSuccess(true);
@@ -44,30 +43,38 @@ class ParamInfoRequestClass extends RequestAbstractClass
 		   $this->requestData->setResult($result);
 		   return $this->requestData->getSuccess();
 		}
+
+		$filePath = $this->requestData->getFilePath();
+		if (!empty($filePath)) {
+			//Load info from a XML file
+			$dom = new DOMDocument("1.0","UTF-8");
+			$dom->preserveWhiteSpace = false;
+			$dom->formatOutput = true;
  
-		$dom = new DOMDocument("1.0","UTF-8");
-		$dom->preserveWhiteSpace = false;
-		$dom->formatOutput = true;
-		
-		$res = @$dom->load($this->requestData->getFilePath());
+			$res = @$dom->load($this->requestData->getFilePath());
  
-		$this->requestData->setSuccess(false);
+			$this->requestData->setSuccess(false);
  
-		if (!$res) {
-			$this->requestData->setLastErrorMessage("Cannot load file".$this->requestData->getFilePath());
-			return false;
-		}
+			if (!$res) {
+				$this->requestData->setLastErrorMessage("Cannot load file".$this->requestData->getFilePath());
+				return false;
+			}
  
-		switch ($this->requestData->getType()) {
-			case ParamInfoTypeEnumClass::IMPEXPLOTINIT :
-			case ParamInfoTypeEnumClass::PLOTINIT :	
-				$this->runFromParamFile($dom);
-				break;			
-			case ParamInfoTypeEnumClass::PARAMINFO :
-				$this->runFromParamInfoFile($dom);
-				break;
-			default :
-				$this->requestData->setLastErrorMessage("Unknown ParamInfo type ");
+			switch ($this->requestData->getType()) {
+				case ParamInfoTypeEnumClass::IMPEXPLOTINIT :
+				case ParamInfoTypeEnumClass::PLOTINIT :	
+					$this->runFromParamFile($dom);
+					break;			
+				case ParamInfoTypeEnumClass::PARAMINFO :
+					$this->runFromParamInfoFile($dom);
+					break;
+				default :
+					$this->requestData->setLastErrorMessage("Unknown ParamInfo type ");
+			}
+		}
+		else {
+			//Use some internal info - Nothing to do
+			$this->requestData->setSuccess(true);
 		}
  
 		return $this->requestData->getSuccess();
@@ -26,6 +26,7 @@ class ParamInfoRequestDataClass extends RequestDataClass
 	private $templateInfo = NULL;
 	private $type    = ParamInfoTypeEnumClass::UNKNOWN;
 	private $result = NULL;
+	private $internalPlotInit = NULL;
  
 	public function getFilePath()
 	{
@@ -37,6 +38,16 @@ class ParamInfoRequestDataClass extends RequestDataClass
 		$this->filePath = $filePath;
 	}
  
+	public function setInternalPlotInit($plotInit)
+	{
+		$this->internalPlotInit = $plotInit;
+	}
+
+	public function getInternalPlotInit()
+	{
+		return $this->internalPlotInit;
+	}
+
 	public function getType()
 	{
 		return $this->type;
@@ -78,4 +89,4 @@ class ParamInfoRequestDataClass extends RequestDataClass
 	}
 }
  
-?>
 \ No newline at end of file
+?>