CDPP / AMDA_Integration

Commit 0904976ec3a0470c0e87ba8d8dd1a12bac25e2fb

Authored by Hacene SI HADJ MOHAND
1 parent afd03631
Exists in master and in 50 other branches 10098, 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, master_vge, mlplasmas, rm_6912, rm_7926, rm_8932, save-other-requests, test-merge, ws_get_catalog

evol ok

Showing 2 changed files with 5 additions and 5 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
  Diff comments   View file @0904976
... ... @@ -949,7 +949,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
949 949  
950 950 protected function unmarshallSpectro($paramDrawingData, $plotNode, $paramNode, $indexes)
951 951 {
952   - $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'});
  952 + $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'});
953 953 }
954 954  
955 955 protected function unmarshallInstantSpectro($paramDrawingData, $plotNode, $paramNode, $indexes)
... ...
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotParamsNodeClass.php
  Diff comments   View file @0904976
... ... @@ -26,7 +26,7 @@ define ("REQUESTOUTPUTPLOTSPECTRO_INDEX", "index");
26 26 define ("REQUESTOUTPUTPLOTSPECTRO_MIN", "min");
27 27 define ("REQUESTOUTPUTPLOTSPECTRO_MAX", "max");
28 28 define ("REQUESTOUTPUTPLOTSPECTRO_USELOG0ASMIN", "uselog0asmin");
29   -define ("REQUESTOUTPUTPLOTSPECTRO_NORMALISATION", "normalisation");
  29 +define ("REQUESTOUTPUTPLOTSPECTRO_NORMALISATION", "normalization");
30 30 define ("REQUESTOUTPUTPLOTSPECTRO_RESOLUTION", "resolution");
31 31  
32 32 define ("REQUESTOUTPUTPLOTINSTANTSPECTRO_NAME", "ispectro");
... ... @@ -107,15 +107,15 @@ class RequestOutputPlotParamNodeClass extends NodeClass
107 107 return $iserieNode;
108 108 }
109 109  
110   - public function addSpectro($yAxis = "", $resolution="", $index = NULL, $min = NULL, $max = NULL, $uselog0asmin = FALSE, $normalisation = NULL)
  110 + public function addSpectro($yAxis = "", $resolution="", $index = NULL, $min = NULL, $max = NULL, $uselog0asmin = FALSE, $normalization = NULL)
111 111 {
112 112 $spectroNode = new NodeClass(REQUESTOUTPUTPLOTSPECTRO_NAME);
113 113 $spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_YAXIS, $yAxis);
114 114 $spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_USELOG0ASMIN, $uselog0asmin ? "true" : "false");
115 115 if (isset($resolution))
116 116 $spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_RESOLUTION, $resolution);
117   - if (isset($normalisation))
118   - $spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_NORMALISATION, $normalisation);
  117 + if (isset($normalization))
  118 + $spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_NORMALISATION, $normalization);
119 119 if (isset($index))
120 120 $spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_INDEX, $index);
121 121 if (isset($min))
... ...