CDPP / AMDA_Integration

Commit 10a74d7da998a15dc81612dede9cf9e09c63c963

Authored by Benjamin Renard
2 parents 574d7ed3 88e3aa1b
Exists in master and in 55 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, rm_6912, rm_7926, rm_8932, save-other-requests, test-merge, ws_get_catalog

Merge branch 'master' into new-save-plot-request

Showing 9 changed files with 66 additions and 4 deletions   Show diff stats
Inline Side-by-side
config/kernel/plotConfig.xml
  Diff comments   View file @10a74d7
@@ -55,6 +55,11 @@ @@ -55,6 +55,11 @@
55 <file index="1">cmap1_blue_red.pal</file> 55 <file index="1">cmap1_blue_red.pal</file>
56 <file index="2">cmap1_blue_yellow.pal</file> 56 <file index="2">cmap1_blue_yellow.pal</file>
57 <file index="3">cmap1_gray.pal</file> 57 <file index="3">cmap1_gray.pal</file>
  58 + <file index="4">cmap1_amda_default.pal</file>
  59 + <file index="5">cmap1_geowhite.pal</file>
  60 + <file index="6">cmap1_geoblack.pal</file>
  61 + <file index="7">cmap1_dark_violet_yellow.pal</file>
  62 + <file index="8">cmap1_red_blue.pal</file>
58 </coloraxis> 63 </coloraxis>
59 </colormap> 64 </colormap>
60 </root> 65 </root>
config/kernel/plplot/cmap1_amda_default.pal 0 → 100644
  Diff comments   View file @10a74d7
@@ -0,0 +1,10 @@ @@ -0,0 +1,10 @@
  1 +v2 rgb
  2 +7
  3 +0.0 0.0 0.0 0.4 1.0 0
  4 +0.15 0.0 0.0 0.75 1.0 0
  5 +0.3 0.0 0.40 0.85 1.0 0
  6 +0.45 0.0 0.7 0.0 1.0 0
  7 +0.66 0.8 0.8 0.0 1.0 0
  8 +0.87 1.0 0.45 0.0 1.0 0
  9 +1.0 0.8 0.0 0.0 1.0 0
  10 +
config/kernel/plplot/cmap1_dark_violet_yellow.pal 0 → 100644
  Diff comments   View file @10a74d7
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +v2 rgb
  2 +6
  3 +0 0 0 0.3000 1 0
  4 +0.2000 0 0 1.0000 1 0
  5 +0.4000 0.8500 0 1.0000 1 0
  6 +0.6000 1.0000 0.5000 0 1 0
  7 +0.8000 1.0000 0.9000 0 1 0
  8 +1.0000 1.0000 1.0000 0.9000 1 0
  9 +
config/kernel/plplot/cmap1_geoblack.pal 0 → 100644
  Diff comments   View file @10a74d7
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
  1 +v2 rgb
  2 +9
  3 +0.0000 0.0000 0.0000 0.0000 1 0
  4 +0.0039 0.9606 0.7717 1.0000 1 0
  5 +0.2353 0.1929 0.2008 1.0000 1 0
  6 +0.4000 0.0669 0.9764 1.0000 1 0
  7 +0.4863 0.0000 1.0000 0.5157 1 0
  8 +0.5765 0.0236 1.0000 0.0157 1 0
  9 +0.6750 0.8750 1.0000 0.0157 1 0
  10 +0.7529 1.0000 0.9921 0.0394 1 0
  11 +1.0000 1.0000 0.0000 0.0354 1 0
config/kernel/plplot/cmap1_geowhite.pal 0 → 100644
  Diff comments   View file @10a74d7
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
  1 +v2 rgb
  2 +9
  3 +0.0000 1.0000 1.0000 1.0000 1 0
  4 +0.0039 0.9606 0.7717 1.0000 1 0
  5 +0.2353 0.1929 0.2008 1.0000 1 0
  6 +0.4000 0.0669 0.9764 1.0000 1 0
  7 +0.4863 0.0000 1.0000 0.5157 1 0
  8 +0.5765 0.0236 1.0000 0.0157 1 0
  9 +0.6750 0.8750 1.0000 0.0157 1 0
  10 +0.7529 1.0000 0.9921 0.0394 1 0
  11 +1.0000 1.0000 0.0000 0.0354 1 0
config/kernel/plplot/cmap1_red_blue.pal 0 → 100644
  Diff comments   View file @10a74d7
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
  1 +v2 rgb
  2 +4
  3 +0.0000 0.0000 0.0000 1.0000 1 0
  4 +0.4950 0.0000 1.0000 1.0000 1 0
  5 +0.5050 1.0000 1.0000 0.0000 1 0
  6 +1.0000 1.0000 0.0000 0.0000 1 0
src/InputOutput/IHMImpl/Tools/IHMParamManagerClass.php
  Diff comments   View file @10a74d7
@@ -333,7 +333,7 @@ class IHMParamManagerClass @@ -333,7 +333,7 @@ class IHMParamManagerClass
333 $res["param"]["info"]["viId"], $res["param"]["info"]["realVar"], 333 $res["param"]["info"]["viId"], $res["param"]["info"]["realVar"],
334 $res["param"]["info"]["minSampling"], $res["param"]["info"]["maxSampling"], 334 $res["param"]["info"]["minSampling"], $res["param"]["info"]["maxSampling"],
335 $res["param"]["info"]["type"],$res["param"]["info"]["size"], 335 $res["param"]["info"]["type"],$res["param"]["info"]["size"],
336 - $res["param"]["dateModif"],true); 336 + NULL,$res["param"]["dateModif"],true);
337 337
338 $newParamNode->getInfo()->setName($res["param"]["info"]['name']); 338 $newParamNode->getInfo()->setName($res["param"]["info"]['name']);
339 $newParamNode->getInfo()->setShortName($res["param"]["info"]['name']); 339 $newParamNode->getInfo()->setShortName($res["param"]["info"]['name']);
@@ -407,7 +407,7 @@ class IHMParamManagerClass @@ -407,7 +407,7 @@ class IHMParamManagerClass
407 $res["param"]["info"]["viId"], $res["param"]["info"]["realVar"], 407 $res["param"]["info"]["viId"], $res["param"]["info"]["realVar"],
408 $res["param"]["info"]["minSampling"], $res["param"]["info"]["maxSampling"], 408 $res["param"]["info"]["minSampling"], $res["param"]["info"]["maxSampling"],
409 $res["param"]["info"]["type"],$res["param"]["info"]["size"], 409 $res["param"]["info"]["type"],$res["param"]["info"]["size"],
410 - $res["param"]["dateModif"]); 410 + $res["param"]["info"]["fillValue"],$res["param"]["dateModif"]);
411 411
412 if (!empty($res["param"]["info"]["yTitle"])) { 412 if (!empty($res["param"]["info"]["yTitle"])) {
413 $newParamNode->getInfo()->setName($res["param"]["info"]['yTitle']); 413 $newParamNode->getInfo()->setName($res["param"]["info"]['yTitle']);
src/InputOutput/IHMImpl/Tools/IHMUserParamLoaderClass.php
  Diff comments   View file @10a74d7
@@ -37,6 +37,7 @@ class IHMUserParamLoaderClass @@ -37,6 +37,7 @@ class IHMUserParamLoaderClass
37 private static $infoUploadedTypeNode = 'type'; 37 private static $infoUploadedTypeNode = 'type';
38 private static $infoUploadedSizeNode = 'size'; 38 private static $infoUploadedSizeNode = 'size';
39 private static $infoUploadedVIIdNode = 'vi'; 39 private static $infoUploadedVIIdNode = 'vi';
  40 + private static $infoUploadedFillValNode = 'fillvalue';
40 private static $infoUploadedPlotTypeNode = 'plottype'; 41 private static $infoUploadedPlotTypeNode = 'plottype';
41 private static $infoUploadedTableDefNode = 'tableDef'; 42 private static $infoUploadedTableDefNode = 'tableDef';
42 private static $infoUploadedUnitsNode = 'units'; 43 private static $infoUploadedUnitsNode = 'units';
@@ -350,6 +351,12 @@ class IHMUserParamLoaderClass @@ -350,6 +351,12 @@ class IHMUserParamLoaderClass
350 $plotTypeNodes = $dom->getElementsByTagName(self::$infoUploadedPlotTypeNode); 351 $plotTypeNodes = $dom->getElementsByTagName(self::$infoUploadedPlotTypeNode);
351 if ($plotTypeNodes->length > 0) 352 if ($plotTypeNodes->length > 0)
352 $result["plotType"] = $plotTypeNodes->item(0)->nodeValue; 353 $result["plotType"] = $plotTypeNodes->item(0)->nodeValue;
  354 +
  355 + //get parameter fil value
  356 + $result["fillValue"] = NULL;
  357 + $fillValueNodes = $dom->getElementsByTagName(self::$infoUploadedFillValNode);
  358 + if (($fillValueNodes->length > 0) && ($fillValueNodes->item(0)->nodeValue != ''))
  359 + $result["fillValue"] = $fillValueNodes->item(0)->nodeValue;
353 360
354 //get parameter y units 361 //get parameter y units
355 $unitsNodes = $dom->getElementsByTagName(self::$infoUploadedUnitsNode); 362 $unitsNodes = $dom->getElementsByTagName(self::$infoUploadedUnitsNode);
src/Request/ParamsRequestImpl/ParamsRequestDataClass.php
  Diff comments   View file @10a74d7
@@ -224,12 +224,15 @@ class ParamsRequestDataClass extends ProcessRequestDataClass @@ -224,12 +224,15 @@ class ParamsRequestDataClass extends ProcessRequestDataClass
224 return $this->localParamsToCreateAndCopy; 224 return $this->localParamsToCreateAndCopy;
225 } 225 }
226 226
227 - public function addLocalParamToCreate($paramId, $viId, $realVarId, $minSampling, $maxSampling, $type, $size, $dateModif, $isImpex = false) 227 + public function addLocalParamToCreate($paramId, $viId, $realVarId, $minSampling, $maxSampling, $type, $size, $fillValue, $dateModif, $isImpex = false)
228 { 228 {
229 $newParam = new ParamNodeClass(); 229 $newParam = new ParamNodeClass();
230 $newParam->setId($paramId); 230 $newParam->setId($paramId);
231 231
232 - $newParam->getInfo(); 232 + $infoNode = $newParam->getInfo();
  233 + if (isset($fillValue)) {
  234 + $infoNode->setFillVal($fillValue);
  235 + }
233 236
234 $localParamNode = $newParam->addParamGet(ParamGetTypeEnum::LOCALBASE); 237 $localParamNode = $newParam->addParamGet(ParamGetTypeEnum::LOCALBASE);
235 $localParamNode->setVIId($viId); 238 $localParamNode->setVIId($viId);