CDPP / AMDA_Integration

Commit e076e2738329c84e0d2b3d8867d1aff392a93916

Authored by Erdogan Furkan
1 parent 5ac7ca99
Exists in master and in 9 other branches FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_9629, Histo1D2D, SpeasyGet, amdadev

#11376 - Done.

Showing 2 changed files with 5 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
  Diff comments   View file @e076e27
... ... @@ -818,7 +818,8 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
818 818 foreach ($histogram1DNodes as $histogram1DNode) {
819 819  
820 820 // xBinNumber
821   - $histogram1DNode->getBins()->addManual1DBins($paramData->{'param-drawing-object'}->{'histo1d-xbinnumber'});
  821 + $histogram1DNode->getBins()->addManual1DBins($paramData->{'param-drawing-object'}->{'histo1d-xbinnumber'},
  822 + ($paramData->{'param-drawing-object'}->{'histo1d-style'} == "stares") ? FALSE:TRUE);
822 823  
823 824 // histotype, function
824 825 $histogram1DNode->getHistotype()->set1DFunction($paramData->{'param-drawing-object'}->{'histo1d-function'});
... ...
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotHistogram1DSerieNodeClass.php
  Diff comments   View file @e076e27
... ... @@ -10,6 +10,7 @@ define ("REQUESTOUTPUTPLOTHISTOGRAM1DSERIE_COLOR", "color");
10 10 define ("REQUESTOUTPUTPLOTBINS_NAME", "bins");
11 11 define ("REQUESTOUTPUTPLOTBINS_MANUAL", "manual");
12 12 define ("REQUESTOUTPUTPLOTBINS_XBINNUMBER", "xbinnumber");
  13 +define ("REQUESTOUTPUTPLOTBINS_STARES", "stares");
13 14  
14 15 define ("REQUESTOUTPUTPLOTHISTOTYPE_NAME", "histotype");
15 16 define ("REQUESTOUTPUTPLOTHISTOTYPE_FUNCTION", "type");
... ... @@ -26,7 +27,7 @@ class RequestOutputPlotBins1DNodeClass extends NodeClass
26 27 parent::__construct($name);
27 28 }
28 29  
29   - public function addManual1DBins($xBinNumber)
  30 + public function addManual1DBins($xBinNumber, $stares)
30 31 {
31 32 $node = $this->getFirstChildByName(REQUESTOUTPUTPLOTBINS_MANUAL);
32 33  
... ... @@ -37,6 +38,7 @@ class RequestOutputPlotBins1DNodeClass extends NodeClass
37 38 }
38 39  
39 40 $node->setAttribute(REQUESTOUTPUTPLOTBINS_XBINNUMBER, $xBinNumber);
  41 + $node->setAttribute(REQUESTOUTPUTPLOTBINS_STARES, $stares);
40 42 return $node;
41 43 }
42 44  
... ...