Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_Integration

Benjamin Renard
2 parents a0d6e953 eb14afd2
Showing 2 changed files with 69 additions and 4 deletions Show diff stats
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotAxisElementNodeClass.php
@@ -589,10 +589,27 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		//axis minor and major grid
 		if (isset($axisData->{'axis-grid-minor'}))
 			$axisNode->getTick()->setMinorGrid($axisData->{'axis-grid-minor'} ? "true" : "false");
+
 		if (isset($axisData->{'axis-grid-major'}))
 			$axisNode->getTick()->setMajorGrid($axisData->{'axis-grid-major'} ? "true" : "false");
-		
-		//legend
+                if ( $axisData->{'axis-grid-specify-ticks-number'}){
+                  
+                   if (isset($axisData->{'axis-grid-minor-number'}) && $axisData->{'axis-grid-minor-number'} != 0)
+                        $axisNode->getTick()->setMinorGridNumber($axisData->{'axis-grid-minor-number'});
+	
+		   if (isset($axisData->{'axis-grid-major-number'}) && $axisData->{'axis-grid-major-number'} != 0)
+                        $axisNode->getTick()->setMajorGridNumber($axisData->{'axis-grid-major-number'});
+                }elseif($axisData->{'axis-grid-specify-ticks-spacing'}){
+
+		   if (isset($axisData->{'axis-grid-major-space'}) && $axisData->{'axis-grid-major-space'} != 0)
+                        $axisNode->getTick()->setMajorGridSpace($axisData->{'axis-grid-major-space'});
+               
+                   if (isset($axisData->{'axis-grid-minor-space'}) && $axisData->{'axis-grid-minor-space'} != 0)
+                        $axisNode->getTick()->setMinorGridSpace($axisData->{'axis-grid-minor-space'});
+                }
+
+
+                //legend
 		if (isset($axisData->{'axis-legend-text'}) && $axisData->{'axis-legend-text'} != '')
 		{
 			$axisNode->getLegend()->setText($axisData->{'axis-legend-text'});
@@ -20,6 +20,10 @@ define (&quot;REQUESTOUTPUTPLOTAXISELEMENTTICK_NAME&quot;, &quot;tick&quot;);
 define ("REQUESTOUTPUTPLOTAXISELEMENTTICK_POSITION", "position");
 define ("REQUESTOUTPUTPLOTAXISELEMENTTICK_MINORGRID", "minorGrid");
 define ("REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRID", "majorGrid");
+define ("REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRIDNUMBER", "majorNumber");
+define ("REQUESTOUTPUTPLOTAXISELEMENTTICK_MINORGRIDNUMBER", "minorNumber");
+define ("REQUESTOUTPUTPLOTAXISELEMENTTICK_MINORGRIDSPACE", "minorSpace");
+define ("REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRIDSPACE", "majorSpace");
 define ("REQUESTOUTPUTPLOTAXISELEMENTLEGEND_NAME", "legend");
 define ("REQUESTOUTPUTPLOTAXISELEMENTLEGEND_TEXT", "text");
@@ -130,12 +134,56 @@ class RequestOutputPlotAxisElementTickClass extends NodeClass
 	{
 		return $this->getAttribute(REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRID);
 	}
-	
+
+        public function getMajorGridNumber()
+        {
+                return $this->getAttribute(REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRIDNUMBER);
+        }
+
+        public function setMajorGridNumber($majorGridNumber)
+        {
+                $this->setAttribute(REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRIDNUMBER, $majorGridNumber);
+        }
+
+	public function getMinorGridNumber()
+        {
+                return $this->getAttribute(REQUESTOUTPUTPLOTAXISELEMENTTICK_MINORGRIDNUMBER);
+        }
+
+        public function setMinorGridNumber($minorGridNumber)
+        {
+                $this->setAttribute(REQUESTOUTPUTPLOTAXISELEMENTTICK_MINORGRIDNUMBER, $minorGridNumber);
+        }
+
+        public function getMajorGridSpace()
+        {
+                return $this->getAttribute(REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRIDSPACE);
+        }
+
+        public function setMajorGridSpace($majorGridSpace)
+        {
+                $this->setAttribute(REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRIDSPACE, $majorGridSpace);
+        }
+
+        public function getMinorGridSpace()
+        {
+                return $this->getAttribute(REQUESTOUTPUTPLOTAXISELEMENTTICK_MINORGRIDSPACE);
+        }
+        
+        public function setMinorGridSpace($minorGridSpace)
+        {
+                $this->setAttribute(REQUESTOUTPUTPLOTAXISELEMENTTICK_MINORGRIDSPACE, $minorGridSpace);
+        }
+
 	public function loadFromNode($xmlNode)
 	{
 		$this->setPosition($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTAXISELEMENTTICK_POSITION));
 		$this->setMinorGrid($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTAXISELEMENTTICK_MINORGRID));
 		$this->setMajorGrid($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRID));
+		$this->setMajorGrid($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRIDNUMBER));
+		$this->setMajorGrid($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRIDNUMBER));
+		$this->setMajorGrid($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRIDSPACE));
+		$this->setMajorGrid($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTAXISELEMENTTICK_MINORGRIDSPACE));
 	}
 }
@@ -327,4 +375,4 @@ class RequestOutputPlotAxisElementNodeClass extends NodeClass
 	}
 }
-?>
 \ No newline at end of file
+?>