CDPP / AMDA_Integration

Commit e8ff4ba753f9e12e281465af1be9d09b42a56d87

Authored by Elena.Budnik
1 parent 443f9d6b
Exists in master and in 66 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, akka-scatter-multi-xparams, amdadev, anr_tempete, cu2022, density_maps, develop, evol-6371, expression-parser-bre, frames-transformation, install-rework, livraison-akka, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, plot-tt-catalog, rm_5357, rm_6595, rm_6912, rm_7926, rm_8932, save-other-requests, shared-objects-updater, sum-components-indexes, test-merge, webservice, ws_get_catalog

integration of ascii mydata params

Showing 4 changed files with 24 additions and 4 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Tools/IHMParamManagerClass.php
  Diff comments   View file @e8ff4ba
... ... @@ -202,7 +202,9 @@ class IHMParamManagerClass
202 202 $newParamNode = $paramsData->addLocalParamToCreate($res["param"]["id"],
203 203 $res["param"]["info"]["viId"], $res["param"]["info"]["realVar"],
204 204 $res["param"]["info"]["minSampling"], $res["param"]["info"]["maxSampling"],
  205 + $res["param"]["info"]["type"],$res["param"]["info"]["size"],
205 206 $res["param"]["dateModif"]);
  207 +
206 208  
207 209 $tableDef = $res["param"]["info"]["tableDef"];
208 210 if (isset($tableDef) && array_key_exists('tableDefType', $tableDef) && ($tableDef['tableDefType'] != 'NONE'))
... ...
src/Request/ParamsRequestImpl/Nodes/Params/ParamGetLocalBaseNodeClass.php
  Diff comments   View file @e8ff4ba
... ... @@ -32,13 +32,15 @@ class ParamGetLocalBaseNodeClass extends NodeClass
32 32 return NULL;
33 33 }
34 34  
35   - public function addLocalParam($id = "", $minSampling = "", $maxSampling = "")
  35 + public function addLocalParam($id = "", $minSampling = "", $maxSampling = "", $parameterType = "", $parameterSize = "")
36 36 {
37 37 $paramNode = new ParamGetLocalBaseParamNodeClass();
38 38  
39 39 $paramNode->setId($id);
40 40 $paramNode->setMinSampling($minSampling);
41 41 $paramNode->setMaxSampling($maxSampling);
  42 + $paramNode->setParameterType($parameterType);
  43 + $paramNode->setParameterSize($parameterSize);
42 44  
43 45 $this->addChild($paramNode);
44 46  
... ...
src/Request/ParamsRequestImpl/Nodes/Params/ParamGetLocalBaseParamNodeClass.php
  Diff comments   View file @e8ff4ba
... ... @@ -4,6 +4,8 @@ define ("PARAMGETLOCALBASEPARAM_NAME", "param");
4 4 define ("PARAMGETLOCALBASEPARAM_ID", "id");
5 5 define ("PARAMGETLOCALBASEPARAM_MINSAMPLING", "minSampling");
6 6 define ("PARAMGETLOCALBASEPARAM_MAXSAMPLING", "maxSampling");
  7 +define ("PARAMGETLOCALBASEPARAM_TYPE", "type");
  8 +define ("PARAMGETLOCALBASEPARAM_SIZE", "size");
7 9 define ("PARAMGETLOCALBASEPARAM_CALIB", "clb");
8 10 define ("PARAMGETLOCALBASEPARAM_CALIBNAME", "name");
9 11  
... ... @@ -40,6 +42,16 @@ class ParamGetLocalBaseParamNodeClass extends NodeClass
40 42 $this->setAttribute(PARAMGETLOCALBASEPARAM_MAXSAMPLING, $maxSampling);
41 43 }
42 44  
  45 + public function setParameterType($parameterType)
  46 + {
  47 + $this->setAttribute(PARAMGETLOCALBASEPARAM_TYPE, strtolower($parameterType));
  48 + }
  49 +
  50 + public function setParameterSize($parameterSize)
  51 + {
  52 + $this->setAttribute(PARAMGETLOCALBASEPARAM_SIZE, $parameterSize);
  53 + }
  54 +
43 55 public function addCalibInfo($calibInfo = "")
44 56 {
45 57 if ($this->calibInfoExist($calibInfo))
... ... @@ -70,7 +82,11 @@ class ParamGetLocalBaseParamNodeClass extends NodeClass
70 82 $this->setMinSampling($this->getXmlNodeAttribute($xmlNode, PARAMGETLOCALBASEPARAM_MINSAMPLING));
71 83  
72 84 $this->setMaxSampling($this->getXmlNodeAttribute($xmlNode, PARAMGETLOCALBASEPARAM_MAXSAMPLING));
73   -
  85 +
  86 + $this->setParameterType($this->getXmlNodeAttribute($xmlNode, PARAMGETLOCALBASEPARAM_TYPE));
  87 +
  88 + $this->setParameterSize($this->getXmlNodeAttribute($xmlNode, PARAMGETLOCALBASEPARAM_SIZE));
  89 +
74 90 foreach ($this->getXmlNodeChildrenByTagName($xmlNode, PARAMGETLOCALBASEPARAM_CALIB) as $calibXmlNode) {
75 91 $this->addCalibInfo($this->getXmlNodeAttribute($xmlNode, PARAMGETLOCALBASEPARAM_CALIBNAME));
76 92 }
... ...
src/Request/ParamsRequestImpl/ParamsRequestDataClass.php
  Diff comments   View file @e8ff4ba
... ... @@ -141,7 +141,7 @@ class ParamsRequestDataClass extends ProcessRequestDataClass
141 141 return $this->localParamsToCreate;
142 142 }
143 143  
144   - public function addLocalParamToCreate($paramId, $viId, $realVarId, $minSampling, $maxSampling, $dateModif)
  144 + public function addLocalParamToCreate($paramId, $viId, $realVarId, $minSampling, $maxSampling, $type, $size, $dateModif)
145 145 {
146 146 $newParam = new ParamNodeClass();
147 147 $newParam->setId($paramId);
... ... @@ -151,7 +151,7 @@ class ParamsRequestDataClass extends ProcessRequestDataClass
151 151 $localParamNode = $newParam->addParamGet(ParamGetTypeEnum::LOCALBASE);
152 152 $localParamNode->setVIId($viId);
153 153  
154   - $localParamNode->addLocalParam($realVarId, $minSampling, $maxSampling);
  154 + $localParamNode->addLocalParam($realVarId, $minSampling, $maxSampling, $type, $size);
155 155  
156 156 $newParam->setProcess("");
157 157 $newParam->setOutput();
... ...