CDPP / AMDA_Integration

Commit 2c99863f1c82b84309c2302415f9f32e0a6a08e3

Authored by Erdogan Furkan
1 parent c3160d51
Exists in master and in 22 other branches FER_10400, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_11362, MAZ_FIX_9016, SpeasyGet, amdadev, density_maps, develop

Minor fix

Showing 1 changed file with 5 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
  Diff comments   View file @2c99863
... ... @@ -621,7 +621,10 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
621 621 break;
622 622 case 'histogram2d':
623 623 $paramNode = $plotNode->getParams()->getParamById($paramInfo['id']);
624   - $paramZInfo = $this->paramManager->addExistingParam($paramData->{'param-drawing-object'}->{'histotype-param'}, $this->paramsData);
  624 + if(!empty($paramData->{'param-drawing-object'}->{'histotype-param'}))
  625 + $paramZInfo = $this->paramManager->addExistingParam($paramData->{'param-drawing-object'}->{'histotype-param'}, $this->paramsData);
  626 + else
  627 + $paramZInfo = NULL;
625 628 $this->unmarshallHistogram2D($paramData, $requestParamsNode, $plotNode, $paramNode, $paramInfo['indexes'], $xId, $paramZInfo,$axesData);
626 629 break;
627 630 case 'orbit-serie':
... ... @@ -759,7 +762,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
759 762 $histogram2DNode->getHistotype()->setFunction($paramData->{'param-drawing-object'}->{'histo2d-function'});
760 763 //smoothfactor
761 764 $histogram2DNode->getHistotype()->setSmoothFactor($paramData->{'param-drawing-object'}->{'histo2d-smoothfactor'});
762   -
  765 +
763 766 if($paramData->{'param-drawing-object'}->{'histo2d-function'} != "density"){
764 767 // paramId
765 768 $requestParamsNode->addParam($paramZInfo['id']);
... ...