CDPP / AMDA_Integration

Commit ba483e8ec28b87e35e632dca3cb30cda3109e392

Authored by Benjamin Renard
2 parents d733eb83 b302ab2c
Exists in master and in 54 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, rm_6912, rm_7926, rm_8932, save-other-requests, test-merge, ws_get_catalog

Merge branch 'master' into expression-parser-bre

Showing 10 changed files with 69 additions and 4 deletions   Show diff stats
Inline Side-by-side
config/kernel/plotConfig.xml
  Diff comments   View file @ba483e8
@@ -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 @ba483e8
@@ -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 @ba483e8
@@ -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 @ba483e8
@@ -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 @ba483e8
@@ -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 @ba483e8
@@ -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 @ba483e8
@@ -351,7 +351,7 @@ class IHMParamManagerClass @@ -351,7 +351,7 @@ class IHMParamManagerClass
351 $res["param"]["info"]["viId"], $res["param"]["info"]["realVar"], 351 $res["param"]["info"]["viId"], $res["param"]["info"]["realVar"],
352 $res["param"]["info"]["minSampling"], $res["param"]["info"]["maxSampling"], 352 $res["param"]["info"]["minSampling"], $res["param"]["info"]["maxSampling"],
353 $res["param"]["info"]["type"],$res["param"]["info"]["size"], 353 $res["param"]["info"]["type"],$res["param"]["info"]["size"],
354 - $res["param"]["dateModif"],true); 354 + NULL,$res["param"]["dateModif"],true);
355 355
356 $newParamNode->getInfo()->setName($res["param"]["info"]['name']); 356 $newParamNode->getInfo()->setName($res["param"]["info"]['name']);
357 $newParamNode->getInfo()->setShortName($res["param"]["info"]['name']); 357 $newParamNode->getInfo()->setShortName($res["param"]["info"]['name']);
@@ -425,7 +425,7 @@ class IHMParamManagerClass @@ -425,7 +425,7 @@ class IHMParamManagerClass
425 $res["param"]["info"]["viId"], $res["param"]["info"]["realVar"], 425 $res["param"]["info"]["viId"], $res["param"]["info"]["realVar"],
426 $res["param"]["info"]["minSampling"], $res["param"]["info"]["maxSampling"], 426 $res["param"]["info"]["minSampling"], $res["param"]["info"]["maxSampling"],
427 $res["param"]["info"]["type"],$res["param"]["info"]["size"], 427 $res["param"]["info"]["type"],$res["param"]["info"]["size"],
428 - $res["param"]["dateModif"]); 428 + $res["param"]["info"]["fillValue"],$res["param"]["dateModif"]);
429 429
430 if (!empty($res["param"]["info"]["yTitle"])) { 430 if (!empty($res["param"]["info"]["yTitle"])) {
431 $newParamNode->getInfo()->setName($res["param"]["info"]['yTitle']); 431 $newParamNode->getInfo()->setName($res["param"]["info"]['yTitle']);
src/InputOutput/IHMImpl/Tools/IHMUserParamManagerClass.php
  Diff comments   View file @ba483e8
@@ -41,6 +41,7 @@ class IHMUserParamManagerClass @@ -41,6 +41,7 @@ class IHMUserParamManagerClass
41 private static $infoUploadedTypeNode = 'type'; 41 private static $infoUploadedTypeNode = 'type';
42 private static $infoUploadedSizeNode = 'size'; 42 private static $infoUploadedSizeNode = 'size';
43 private static $infoUploadedVIIdNode = 'vi'; 43 private static $infoUploadedVIIdNode = 'vi';
  44 + private static $infoUploadedFillValNode = 'fillvalue';
44 private static $infoUploadedPlotTypeNode = 'plottype'; 45 private static $infoUploadedPlotTypeNode = 'plottype';
45 private static $infoUploadedTableDefNode = 'tableDef'; 46 private static $infoUploadedTableDefNode = 'tableDef';
46 private static $infoUploadedUnitsNode = 'units'; 47 private static $infoUploadedUnitsNode = 'units';
@@ -377,6 +378,12 @@ class IHMUserParamManagerClass @@ -377,6 +378,12 @@ class IHMUserParamManagerClass
377 $plotTypeNodes = $dom->getElementsByTagName(self::$infoUploadedPlotTypeNode); 378 $plotTypeNodes = $dom->getElementsByTagName(self::$infoUploadedPlotTypeNode);
378 if ($plotTypeNodes->length > 0) 379 if ($plotTypeNodes->length > 0)
379 $result["plotType"] = $plotTypeNodes->item(0)->nodeValue; 380 $result["plotType"] = $plotTypeNodes->item(0)->nodeValue;
  381 +
  382 + //get parameter fil value
  383 + $result["fillValue"] = NULL;
  384 + $fillValueNodes = $dom->getElementsByTagName(self::$infoUploadedFillValNode);
  385 + if (($fillValueNodes->length > 0) && ($fillValueNodes->item(0)->nodeValue != ''))
  386 + $result["fillValue"] = $fillValueNodes->item(0)->nodeValue;
380 387
381 //get parameter y units 388 //get parameter y units
382 $unitsNodes = $dom->getElementsByTagName(self::$infoUploadedUnitsNode); 389 $unitsNodes = $dom->getElementsByTagName(self::$infoUploadedUnitsNode);
src/Request/Config/KernelConfigClass.php
  Diff comments   View file @ba483e8
@@ -220,6 +220,9 @@ class KernelConfigClass @@ -220,6 +220,9 @@ class KernelConfigClass
220 foreach (self::$libArray as $lib) 220 foreach (self::$libArray as $lib)
221 $appProperties["app.process.LIB"] .= ("-l".$lib." "); 221 $appProperties["app.process.LIB"] .= ("-l".$lib." ");
222 222
  223 + $appProperties["app.process.DYNAMIC_LOADING"] = "false";
  224 + $appProperties["app.process.plugins.xml"] = KERNEL_CONFIG_DIR.'/plugins.xml';
  225 +
223 $appProperties["app.plot.configfile"] = KERNEL_CONFIG_DIR.'/'.self::$plotConfigFile; 226 $appProperties["app.plot.configfile"] = KERNEL_CONFIG_DIR.'/'.self::$plotConfigFile;
224 227
225 $appProperties["app.param.gapthreshold"] = self::$defaultGapThreshold; 228 $appProperties["app.param.gapthreshold"] = self::$defaultGapThreshold;
src/Request/ParamsRequestImpl/ParamsRequestDataClass.php
  Diff comments   View file @ba483e8
@@ -213,12 +213,15 @@ class ParamsRequestDataClass extends ProcessRequestDataClass @@ -213,12 +213,15 @@ class ParamsRequestDataClass extends ProcessRequestDataClass
213 return $this->localParamsToCreateAndCopy; 213 return $this->localParamsToCreateAndCopy;
214 } 214 }
215 215
216 - public function addLocalParamToCreate($paramId, $viId, $realVarId, $minSampling, $maxSampling, $type, $size, $dateModif, $isImpex = false) 216 + public function addLocalParamToCreate($paramId, $viId, $realVarId, $minSampling, $maxSampling, $type, $size, $fillValue, $dateModif, $isImpex = false)
217 { 217 {
218 $newParam = new ParamNodeClass(); 218 $newParam = new ParamNodeClass();
219 $newParam->setId($paramId); 219 $newParam->setId($paramId);
220 220
221 - $newParam->getInfo(); 221 + $infoNode = $newParam->getInfo();
  222 + if (isset($fillValue)) {
  223 + $infoNode->setFillVal($fillValue);
  224 + }
222 225
223 $localParamNode = $newParam->addParamGet(ParamGetTypeEnum::LOCALBASE); 226 $localParamNode = $newParam->addParamGet(ParamGetTypeEnum::LOCALBASE);
224 $localParamNode->setVIId($viId); 227 $localParamNode->setVIId($viId);