Merge branch 'master' into multiplot

Benjamin Renard
2 parents ec574794 8a35f1e6
Showing 5 changed files with 69 additions and 19 deletions Show diff stats
src/InputOutput/IHMImpl/ParamInfo/IHMInputOutputParamInfoClass.php
src/InputOutput/IHMImpl/Params/IHMInputOutputParamsAbstractClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotBaseSerieNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotLineNodeClass.php
src/Request/ParamsRequestImpl/ParamsRequestClass.php
@@ -226,8 +226,8 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface
 					$plotNode = $crtNode;
 					break;
 				}
-		
-				if (isset($plotNode)) {
+                       
+ 				if (isset($plotNode)) {
 					$result_data['panel'] = array();
 					switch ($plotNode->getName()) {
 						case 'timePlot' :
@@ -292,6 +292,7 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface
 	}
  
 	private function unmarshallDrawData($plotNode, $paramId) {
+                
 		$result_data = array();
  
 		if (!isset($plotNode))
@@ -301,7 +302,6 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface
  
 		if (!isset($paramsNode))
 			return $result_data;
-		
 		if ($this->paramMgr->getTemplateParamsManager()->isTemplatedParam($paramId))
 			//Use templated parameter
 			$realParamId = $this->paramMgr->getTemplateParamsManager()->getTemplateFileName($paramId);
@@ -309,13 +309,13 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface
 			$realParamId = $paramId;
  
 		$paramNode = $paramsNode->getParamById($realParamId);
-		
+                 
+	
 		if (!isset($paramNode) || (count($paramNode->getChildren()) < 1))
 			return $result_data;
  
 		$mainDrawNode = NULL;
 		$otherDrawNodes = array();
-		
 		foreach ($paramNode->getChildren() as $crtDrawNode) {
 			if (in_array($crtDrawNode->getName(), array('serie', 'spectro', 'yserie', 'orbitserie')))
 				$mainDrawNode = $crtDrawNode;
@@ -325,7 +325,6 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface
  
 		if (!isset($mainDrawNode))
 			return $result_data;
-		
 		switch ($mainDrawNode->getName()) {
 			case 'serie' :
 				if ($plotNode->getName() == 'statusPlot') {
@@ -400,14 +399,24 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface
 		$scale = $axisNode->getScale();
 		if (isset($scale))
 			$result_array['axis-scale'] = $scale;
+
+                $showLegend = $axisNode->getShowLegend();
+                if (!empty($showLegend))
+              		$result_array['axis-legend-activated'] = ($showLegend == "true");
+
 		$rangeNode = $axisNode->getRange();
 		if (isset($rangeNode)) {
 			$rangeMin = $rangeNode->getMin();
-			if (isset($rangeMin))
+			if (!empty($rangeMin))
 				$result_array['axis-range-min'] = $rangeMin;
+
 			$rangeMax = $rangeNode->getMax();
-			if (isset($rangeMax))
+			if (!empty($rangeMax))
 				$result_array['axis-range-max'] = $rangeMax;
+                        $extend = $rangeNode->getExtend();
+                        if (!empty($extend))
+                                $result_array['axis-range-extend'] = ($extend == "true");
+
 		}
 	}
  
@@ -430,6 +439,11 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface
 		$uselog0asmin = $drawNode->getAttribute(REQUESTOUTPUTPLOTSPECTRO_USELOG0ASMIN);
 		if (!empty($uselog0asmin))
 			$result_array['spectro-log0-as-min'] = (strtolower($uselog0asmin) == "true");
+
+
+		$resolution = $drawNode->getAttribute(REQUESTOUTPUTPLOTSPECTRO_RESOLUTION);
+		if (!empty($resolution))
+			$result_array['spectro-resolution'] = $resolution;
 	}
  
 	private function unmarshallAdditionalObjectsData($plotNode) {
@@ -472,14 +486,29 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface
 	private function unmarshallBaseSerieData($drawNode, &$result_array) {
 		if (!isset($drawNode))
 			return;
-		
+	
 		$result_array['serie-id'] = $drawNode->getId();
  
 		$result_array['serie-yaxis'] = $drawNode->getYAxisId();
-		
+
+                $resolution = $drawNode->getResolution();
+                if (!empty($resolution))
+                        $result_array['serie-resolution'] = $resolution;
+
+                $colorSerieId = $drawNode->getColorSerieId();
+                if (!empty($colorSerieId))
+                        $result_array['serie-colored-param'] = $colorSerieId;
+                
 		if ($drawNode->isLineDefined()) {
+                        $lineNode = $drawNode->getLine();
+                        $lineType = $lineNode->getType(); 
+                        if($lineType == RequestOutputPlotLineTypeEnum::NO){
+                        $result_array['serie-lines-activated'] = false;
+                        }
+                        else{
 			$result_array['serie-lines-activated'] = true;
 			$this->unmarshallLineData($drawNode->getLine(), "serie-lines-", $result_array);
+                        }
 		}
  
 		if ($drawNode->isSymbolDefined()) {
@@ -540,9 +569,17 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface
 	}
  
 	private function unmarshallLineData($lineNode, $prefix, &$result_array) {
-		$result_array[$prefix.'style'] = $lineNode->getStyle();
-		$result_array[$prefix.'width'] = $lineNode->getWidth();
-		$result_array[$prefix.'color'] = $this->toHexColor($lineNode->getColor());
+                $lineStyle = $lineNode->getStyle();
+                if(!empty($lineStyle))
+		    $result_array[$prefix.'style'] = $lineStyle;
+                
+                $lineWidth = $lineNode->getWidth();
+                if(!empty($lineWidth))
+	           $result_array[$prefix.'width'] = $lineWidth;
+
+                $lineColor = $lineNode->getColor();
+                if(!empty($lineColor))
+		   $result_array[$prefix.'color'] = $this->toHexColor($lineColor);
 	}
  
 	private function unmarshallSymbolData($symbolNode, $prefix, &$result_array) {
@@ -267,14 +267,14 @@ abstract class IHMInputOutputParamsAbstractClass implements InputOutputInterface
 			if (isset($datasetNode)) {
 				$crtNode = $datasetNode;
 				do {
-					if ($crtNode->hasAttribute("group") && !empty($crtNode->getAttribute("group"))) {
+					if ($crtNode->hasAttribute("group") && ($crtNode->getAttribute("group") != "")) {
 						$inGroup = TRUE;
 					}
 					$crtNode = $crtNode->parentNode;
 				} while(isset($crtNode) && ($crtNode != $xml->documentElement) && !$inGroup);
 			}
 			if ($inGroup) {
-				if ($datasetNode->hasAttribute("timeRestriction") && !empty($datasetNode->getAttribute("timeRestriction"))) {
+				if ($datasetNode->hasAttribute("timeRestriction") && ($datasetNode->getAttribute("timeRestriction") != "")) {
 					$timeRestriction = $datasetNode->getAttribute("timeRestriction");
 					$this->paramsData->addParamTimeRestriction($key, $timeRestriction);
 				}
@@ -7,6 +7,7 @@ require_once &quot;RequestOutputPlotSerieIntervalTicksNodeClass.php&quot;;
  
 define ("REQUESTOUTPUTPLOTBASESERIE_XAXIS", "xAxis");
 define ("REQUESTOUTPUTPLOTBASESERIE_YAXIS", "yAxis");
+define ("REQUESTOUTPUTPLOTBASESERIE_RESOLUTION", "resolution");
 define ("REQUESTOUTPUTPLOTBASESERIE_COLORSERIEID", "colorSerieId");
 define ("REQUESTOUTPUTPLOTBASESERIE_MIN", "min");
 define ("REQUESTOUTPUTPLOTBASESERIE_MAX", "max");
@@ -48,6 +49,16 @@ class RequestOutputPlotBaseSerieNodeClass extends NodeClass
 		return $this->getAttribute(REQUESTOUTPUTPLOTBASESERIE_YAXIS);
 	}
  
+	public function setResolution($resolution)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTBASESERIE_RESOLUTION, $resolution);
+	}
+
+	public function getResolution()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTBASESERIE_RESOLUTION);
+	}
+
 	public function setColorSerieId($colorSerieId)
 	{
 		$this->setAttribute(REQUESTOUTPUTPLOTBASESERIE_COLORSERIEID, $colorSerieId);
@@ -171,8 +182,9 @@ class RequestOutputPlotBaseSerieNodeClass extends NodeClass
 		$this->setColorSerieId($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTBASESERIE_COLORSERIEID));
 		$this->setMin($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTBASESERIE_MIN));
 		$this->setMax($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTBASESERIE_MAX));
+		$this->setResolution($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTBASESERIE_RESOLUTION));
  
-		$lineXmlNode = $this->getXmlNodeChildByTagName($xmlNode, REQUESTOUTPUTPLOTBASESERIE_LINE);
+                $lineXmlNode = $this->getXmlNodeChildByTagName($xmlNode, REQUESTOUTPUTPLOTBASESERIE_LINE);
 		if (isset($lineXmlNode))
 			$this->getLine()->loadFromNode($lineXmlNode);
  
@@ -6,6 +6,7 @@ abstract class RequestOutputPlotLineTypeEnum
 {
 	const NO   = "no";
 	const LINE = "line";
+	const YES = "yes";
 }
  
 /**
@@ -27,7 +28,7 @@ class RequestOutputPlotLineNodeClass extends RequestOutputPlotCurveNodeClass
  
 	public function getType()
 	{
-		$this->getAttribute(REQUESTOUTPUTPLOTLINE_TYPE);
+		return $this->getAttribute(REQUESTOUTPUTPLOTLINE_TYPE);
 	}
  
 	public function loadFromNode($xmlNode)
@@ -37,4 +38,4 @@ class RequestOutputPlotLineNodeClass extends RequestOutputPlotCurveNodeClass
 	}
 }
  
-?>
 \ No newline at end of file
+?>
@@ -66,7 +66,7 @@ class ParamsRequestClass extends ProcessRequestClass
 			foreach ($this->requestData->getRequestNodes() as $request_index => $requestNode)
 			{
 				//inject time restriction
-				if (!empty($this->requestData->getParamsTimeRestrictions())) {
+				if (count($this->requestData->getParamsTimeRestrictions()) > 0) {
 					//Here
 					foreach ($this->requestData->getParamsTimeRestrictions() as $paramId => $timeRestriction)
 					{