CDPP / AMDA_Integration

Commit 1627a2dd97740e4567436efa29c41bceb693319a

Authored by Benjamin Renard
1 parent 71eaac9b
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

Add status bar definition in get param plot init request

Showing 2 changed files with 21 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/ParamInfo/IHMInputOutputParamInfoClass.php
  Diff comments   View file @1627a2d
@@ -220,8 +220,13 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface @@ -220,8 +220,13 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface
220 220
221 switch ($mainDrawNode->getName()) { 221 switch ($mainDrawNode->getName()) {
222 case 'serie' : 222 case 'serie' :
223 - $result_data['type'] = 'serie';  
224 - $this->unmarshallBaseSerieData($mainDrawNode, $result_data); 223 + if ($plotNode->getName() == 'statusPlot') {
  224 + $result_data['type'] = 'status-bar';
  225 + }
  226 + else {
  227 + $result_data['type'] = 'serie';
  228 + $this->unmarshallBaseSerieData($mainDrawNode, $result_data);
  229 + }
225 //if (array_key_exists('colorserie', $otherDrawNodes)) 230 //if (array_key_exists('colorserie', $otherDrawNodes))
226 // $this->unmarshallColorSerieData($mainDrawNode, $result_data); 231 // $this->unmarshallColorSerieData($mainDrawNode, $result_data);
227 break; 232 break;
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotAxesNodeClass.php
  Diff comments   View file @1627a2d
@@ -42,6 +42,10 @@ class RequestOutputPlotAxesNodeClass extends NodeClass @@ -42,6 +42,10 @@ class RequestOutputPlotAxesNodeClass extends NodeClass
42 return NULL; 42 return NULL;
43 43
44 $axisNode = $this->getChildInstanceByName($axisType); 44 $axisNode = $this->getChildInstanceByName($axisType);
  45 +
  46 + if (!isset($axisNode))
  47 + return NULL;
  48 +
45 //add digital axis 49 //add digital axis
46 $digitalAxisNode = new RequestOutputPlotDigitalAxisNodeClass(); 50 $digitalAxisNode = new RequestOutputPlotDigitalAxisNodeClass();
47 $digitalAxisNode->setId($id); 51 $digitalAxisNode->setId($id);
@@ -55,6 +59,10 @@ class RequestOutputPlotAxesNodeClass extends NodeClass @@ -55,6 +59,10 @@ class RequestOutputPlotAxesNodeClass extends NodeClass
55 return NULL; 59 return NULL;
56 60
57 $axisNode = $this->getChildInstanceByName($axisType); 61 $axisNode = $this->getChildInstanceByName($axisType);
  62 +
  63 + if (!isset($axisNode))
  64 + return NULL;
  65 +
58 $digitalAxisNodes = $axisNode->getChildrenByName(REQUESTOUTPUTPLOTDIGITALAXIS_NAME); 66 $digitalAxisNodes = $axisNode->getChildrenByName(REQUESTOUTPUTPLOTDIGITALAXIS_NAME);
59 foreach ($digitalAxisNodes as $digitalAxisNode) 67 foreach ($digitalAxisNodes as $digitalAxisNode)
60 if ($digitalAxisNode->getId() == $id) 68 if ($digitalAxisNode->getId() == $id)
@@ -66,6 +74,8 @@ class RequestOutputPlotAxesNodeClass extends NodeClass @@ -66,6 +74,8 @@ class RequestOutputPlotAxesNodeClass extends NodeClass
66 public function getTimeAxis() 74 public function getTimeAxis()
67 { 75 {
68 $axisNode = $this->getChildInstanceByName(RequestOutputPlotAxisTypeEnum::XAXIS); 76 $axisNode = $this->getChildInstanceByName(RequestOutputPlotAxisTypeEnum::XAXIS);
  77 + if (!isset($axisNode))
  78 + return NULL;
69 $timeAxisNode = $axisNode->getFirstChildByName(REQUESTOUTPUTPLOTTIMEAXIS_NAME); 79 $timeAxisNode = $axisNode->getFirstChildByName(REQUESTOUTPUTPLOTTIMEAXIS_NAME);
70 if (!isset($timeAxisNode)) 80 if (!isset($timeAxisNode))
71 { 81 {
@@ -79,6 +89,8 @@ class RequestOutputPlotAxesNodeClass extends NodeClass @@ -79,6 +89,8 @@ class RequestOutputPlotAxesNodeClass extends NodeClass
79 public function getEpochAxis() 89 public function getEpochAxis()
80 { 90 {
81 $axisNode = $this->getChildInstanceByName(RequestOutputPlotAxisTypeEnum::XAXIS); 91 $axisNode = $this->getChildInstanceByName(RequestOutputPlotAxisTypeEnum::XAXIS);
  92 + if (!isset($axisNode))
  93 + return NULL;
82 $epochAxisNode = $axisNode->getFirstChildByName(REQUESTOUTPUTPLOTEPOCHAXIS_NAME); 94 $epochAxisNode = $axisNode->getFirstChildByName(REQUESTOUTPUTPLOTEPOCHAXIS_NAME);
83 if (!isset($epochAxisNode)) 95 if (!isset($epochAxisNode))
84 { 96 {
@@ -92,6 +104,8 @@ class RequestOutputPlotAxesNodeClass extends NodeClass @@ -92,6 +104,8 @@ class RequestOutputPlotAxesNodeClass extends NodeClass
92 public function getColorAxis() 104 public function getColorAxis()
93 { 105 {
94 $axisNode = $this->getChildInstanceByName(RequestOutputPlotAxisTypeEnum::ZAXIS); 106 $axisNode = $this->getChildInstanceByName(RequestOutputPlotAxisTypeEnum::ZAXIS);
  107 + if (!isset($axisNode))
  108 + return NULL;
95 $colorAxisNode = $axisNode->getFirstChildByName(REQUESTOUTPUTPLOTCOLORAXIS_NAME); 109 $colorAxisNode = $axisNode->getFirstChildByName(REQUESTOUTPUTPLOTCOLORAXIS_NAME);
96 if (!isset($colorAxisNode)) 110 if (!isset($colorAxisNode))
97 { 111 {