diff --git a/src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php b/src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php index 27df14a..e501f4d 100644 --- a/src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php +++ b/src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php @@ -949,7 +949,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass protected function unmarshallSpectro($paramDrawingData, $plotNode, $paramNode, $indexes) { - $spectroNode = $paramNode->addSpectro($paramDrawingData->{'spectro-yaxis'}, empty($paramDrawingData->{'spectro-resolution'}) ? NULL : $paramDrawingData->{'spectro-resolution'}, count($indexes) > 0 ? $indexes[0] : NULL, $paramDrawingData->{'spectro-value-min'}, $paramDrawingData->{'spectro-value-max'}, isset($paramDrawingData->{'spectro-log0-as-min'}) ? $paramDrawingData->{'spectro-log0-as-min'} : false, empty($paramDrawingData->{'spectro-normalisation'}) ? NULL: $paramDrawingData->{'spectro-normalisation'}); + $spectroNode = $paramNode->addSpectro($paramDrawingData->{'spectro-yaxis'}, empty($paramDrawingData->{'spectro-resolution'}) ? NULL : $paramDrawingData->{'spectro-resolution'}, count($indexes) > 0 ? $indexes[0] : NULL, $paramDrawingData->{'spectro-value-min'}, $paramDrawingData->{'spectro-value-max'}, isset($paramDrawingData->{'spectro-log0-as-min'}) ? $paramDrawingData->{'spectro-log0-as-min'} : false, empty($paramDrawingData->{'spectro-normalization'}) ? NULL: $paramDrawingData->{'spectro-normalization'}); } protected function unmarshallInstantSpectro($paramDrawingData, $plotNode, $paramNode, $indexes) diff --git a/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotParamsNodeClass.php b/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotParamsNodeClass.php index 8b10a57..5d78a6f 100644 --- a/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotParamsNodeClass.php +++ b/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotParamsNodeClass.php @@ -26,7 +26,7 @@ define ("REQUESTOUTPUTPLOTSPECTRO_INDEX", "index"); define ("REQUESTOUTPUTPLOTSPECTRO_MIN", "min"); define ("REQUESTOUTPUTPLOTSPECTRO_MAX", "max"); define ("REQUESTOUTPUTPLOTSPECTRO_USELOG0ASMIN", "uselog0asmin"); -define ("REQUESTOUTPUTPLOTSPECTRO_NORMALISATION", "normalisation"); +define ("REQUESTOUTPUTPLOTSPECTRO_NORMALISATION", "normalization"); define ("REQUESTOUTPUTPLOTSPECTRO_RESOLUTION", "resolution"); define ("REQUESTOUTPUTPLOTINSTANTSPECTRO_NAME", "ispectro"); @@ -107,15 +107,15 @@ class RequestOutputPlotParamNodeClass extends NodeClass return $iserieNode; } - public function addSpectro($yAxis = "", $resolution="", $index = NULL, $min = NULL, $max = NULL, $uselog0asmin = FALSE, $normalisation = NULL) + public function addSpectro($yAxis = "", $resolution="", $index = NULL, $min = NULL, $max = NULL, $uselog0asmin = FALSE, $normalization = NULL) { $spectroNode = new NodeClass(REQUESTOUTPUTPLOTSPECTRO_NAME); $spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_YAXIS, $yAxis); $spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_USELOG0ASMIN, $uselog0asmin ? "true" : "false"); if (isset($resolution)) $spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_RESOLUTION, $resolution); - if (isset($normalisation)) - $spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_NORMALISATION, $normalisation); + if (isset($normalization)) + $spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_NORMALISATION, $normalization); if (isset($index)) $spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_INDEX, $index); if (isset($min)) -- libgit2 0.21.2