CDPP / AMDA_Integration

Commit 3741e4bb260d862fdb5359ab85f005607b84cf4b

Authored by Hacene SI HADJ MOHAND
1 parent e994cf93
Exists in master and in 56 other branches 10098, 4797, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, anr_tempete, cu2022, density_maps, develop, expression-parser-bre, frames-transformation, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, rm_6912, rm_7926, rm_8932, save-other-requests, test-merge, ws_get_catalog

6954 ok

Showing 2 changed files with 66 additions and 4 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
  Diff comments   View file @3741e4b
... ... @@ -589,10 +589,24 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
589 589 //axis minor and major grid
590 590 if (isset($axisData->{'axis-grid-minor'}))
591 591 $axisNode->getTick()->setMinorGrid($axisData->{'axis-grid-minor'} ? "true" : "false");
  592 +
592 593 if (isset($axisData->{'axis-grid-major'}))
593 594 $axisNode->getTick()->setMajorGrid($axisData->{'axis-grid-major'} ? "true" : "false");
594   -
595   - //legend
  595 +
  596 + if (isset($axisData->{'axis-grid-minor-number'}) && $axisData->{'axis-grid-minor-number'} != 0)
  597 + $axisNode->getTick()->setMinorGridNumber($axisData->{'axis-grid-minor-number'});
  598 +
  599 + if (isset($axisData->{'axis-grid-major-number'}) && $axisData->{'axis-grid-major-number'} != 0)
  600 + $axisNode->getTick()->setMajorGridNumber($axisData->{'axis-grid-major-number'});
  601 +
  602 + if (isset($axisData->{'axis-grid-major-space'}) && $axisData->{'axis-grid-major-space'} != 0)
  603 + $axisNode->getTick()->setMajorGridSpace($axisData->{'axis-grid-major-space'});
  604 +
  605 + if (isset($axisData->{'axis-grid-minor-space'}) && $axisData->{'axis-grid-minor-space'} != 0)
  606 + $axisNode->getTick()->setMinorGridSpace($axisData->{'axis-grid-minor-space'});
  607 +
  608 +
  609 + //legend
596 610 if (isset($axisData->{'axis-legend-text'}) && $axisData->{'axis-legend-text'} != '')
597 611 {
598 612 $axisNode->getLegend()->setText($axisData->{'axis-legend-text'});
... ...
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotAxisElementNodeClass.php
  Diff comments   View file @3741e4b
... ... @@ -20,6 +20,10 @@ define ("REQUESTOUTPUTPLOTAXISELEMENTTICK_NAME", "tick");
20 20 define ("REQUESTOUTPUTPLOTAXISELEMENTTICK_POSITION", "position");
21 21 define ("REQUESTOUTPUTPLOTAXISELEMENTTICK_MINORGRID", "minorGrid");
22 22 define ("REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRID", "majorGrid");
  23 +define ("REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRIDNUMBER", "majorNumber");
  24 +define ("REQUESTOUTPUTPLOTAXISELEMENTTICK_MINORGRIDNUMBER", "minorNumber");
  25 +define ("REQUESTOUTPUTPLOTAXISELEMENTTICK_MINORGRIDSPACE", "minorSpace");
  26 +define ("REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRIDSPACE", "majorSpace");
23 27  
24 28 define ("REQUESTOUTPUTPLOTAXISELEMENTLEGEND_NAME", "legend");
25 29 define ("REQUESTOUTPUTPLOTAXISELEMENTLEGEND_TEXT", "text");
... ... @@ -130,12 +134,56 @@ class RequestOutputPlotAxisElementTickClass extends NodeClass
130 134 {
131 135 return $this->getAttribute(REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRID);
132 136 }
133   -
  137 +
  138 + public function getMajorGridNumber()
  139 + {
  140 + return $this->getAttribute(REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRIDNUMBER);
  141 + }
  142 +
  143 + public function setMajorGridNumber($majorGridNumber)
  144 + {
  145 + $this->setAttribute(REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRIDNUMBER, $majorGridNumber);
  146 + }
  147 +
  148 + public function getMinorGridNumber()
  149 + {
  150 + return $this->getAttribute(REQUESTOUTPUTPLOTAXISELEMENTTICK_MINORGRIDNUMBER);
  151 + }
  152 +
  153 + public function setMinorGridNumber($minorGridNumber)
  154 + {
  155 + $this->setAttribute(REQUESTOUTPUTPLOTAXISELEMENTTICK_MINORGRIDNUMBER, $minorGridNumber);
  156 + }
  157 +
  158 + public function getMajorGridSpace()
  159 + {
  160 + return $this->getAttribute(REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRIDSPACE);
  161 + }
  162 +
  163 + public function setMajorGridSpace($majorGridSpace)
  164 + {
  165 + $this->setAttribute(REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRIDSPACE, $majorGridSpace);
  166 + }
  167 +
  168 + public function getMinorGridSpace()
  169 + {
  170 + return $this->getAttribute(REQUESTOUTPUTPLOTAXISELEMENTTICK_MINORGRIDSPACE);
  171 + }
  172 +
  173 + public function setMinorGridSpace($minorGridSpace)
  174 + {
  175 + $this->setAttribute(REQUESTOUTPUTPLOTAXISELEMENTTICK_MINORGRIDSPACE, $minorGridSpace);
  176 + }
  177 +
134 178 public function loadFromNode($xmlNode)
135 179 {
136 180 $this->setPosition($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTAXISELEMENTTICK_POSITION));
137 181 $this->setMinorGrid($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTAXISELEMENTTICK_MINORGRID));
138 182 $this->setMajorGrid($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRID));
  183 + $this->setMajorGrid($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRIDNUMBER));
  184 + $this->setMajorGrid($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRIDNUMBER));
  185 + $this->setMajorGrid($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTAXISELEMENTTICK_MAJORGRIDSPACE));
  186 + $this->setMajorGrid($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTAXISELEMENTTICK_MINORGRIDSPACE));
139 187 }
140 188 }
141 189  
... ... @@ -327,4 +375,4 @@ class RequestOutputPlotAxisElementNodeClass extends NodeClass
327 375 }
328 376 }
329 377  
330   -?>
331 378 \ No newline at end of file
  379 +?>
... ...