CDPP / AMDA_Integration

Commit bff90e257f0520180cf6f9a1147234e261653720

Authored by Benjamin Renard
2 parents b3c78975 6fa05913
Exists in master and in 6 other branches FER_11242, FER_11500, FER_6265, FER_9629, SpeasyGet, amdadev

Merge branch 'amdadev'

Showing 4 changed files with 21 additions and 5 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/ParamInfo/IHMInputOutputParamInfoClass.php
  Diff comments   View file @bff90e2
@@ -368,6 +368,9 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface @@ -368,6 +368,9 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface
368 if (isset($colorAxis)) { 368 if (isset($colorAxis)) {
369 $result_data['axes']['color'] = array(); 369 $result_data['axes']['color'] = array();
370 $this->unmarshallAxisData($colorAxis, $result_data['axes']['color']); 370 $this->unmarshallAxisData($colorAxis, $result_data['axes']['color']);
  371 + $colorMapIndex = $colorAxis->getColorMapIndex();
  372 + if (!empty($colorMapIndex))
  373 + $result_data['axes']['color']['axis-color-map'] = $colorAxis->getColorMapIndex();
371 } 374 }
372 375
373 $xAxis = $axesNode->getDigitalAxis(RequestOutputPlotAxisTypeEnum::XAXIS, 'xaxis_id'); 376 $xAxis = $axesNode->getDigitalAxis(RequestOutputPlotAxisTypeEnum::XAXIS, 'xaxis_id');
src/InputOutput/IHMImpl/Params/IHMInputOutputParamsAbstractClass.php
  Diff comments   View file @bff90e2
@@ -67,13 +67,18 @@ abstract class IHMInputOutputParamsAbstractClass implements InputOutputInterface @@ -67,13 +67,18 @@ abstract class IHMInputOutputParamsAbstractClass implements InputOutputInterface
67 $requestNodes = $this->paramsData->getRequestNodes(); 67 $requestNodes = $this->paramsData->getRequestNodes();
68 $timesNode = $requestNodes[$requestIndex]->getTimesNode(); 68 $timesNode = $requestNodes[$requestIndex]->getTimesNode();
69 69
  70 +
  71 +
70 switch ($input->timesrc) 72 switch ($input->timesrc)
71 { 73 {
72 case "TimeTable" : 74 case "TimeTable" :
73 - if (($ttFileIndex >= 0) && ($ttFileIndex >= count($input->timeTables)))  
74 - $ttFileIndex = 0;  
75 - if($ttFileIndex < 0)  
76 - $ttFileIndex = count($input->timeTables) -1; 75 + if ($ttIntIndex >= 0) {
  76 + if (($ttFileIndex >= 0) && ($ttFileIndex >= count($input->timeTables)))
  77 + $ttFileIndex = 0;
  78 + if($ttFileIndex < 0)
  79 + $ttFileIndex = count($input->timeTables) -1;
  80 + }
  81 +
77 $crtIndex = 0; 82 $crtIndex = 0;
78 foreach ($input->timeTables as $tt) 83 foreach ($input->timeTables as $tt)
79 { 84 {
src/Request/ParamInfoRequestClass.php
  Diff comments   View file @bff90e2
@@ -155,6 +155,9 @@ class ParamInfoRequestClass extends RequestAbstractClass @@ -155,6 +155,9 @@ class ParamInfoRequestClass extends RequestAbstractClass
155 'channels' => array(), 155 'channels' => array(),
156 'minmax' => array() 156 'minmax' => array()
157 ); 157 );
  158 + if ($tableNode->getAttribute("mainDim") === "true") {
  159 + $tableResult['mainDim'] = TRUE;
  160 + }
158 161
159 if (!$tableResult['variable']) { 162 if (!$tableResult['variable']) {
160 $channelNodes = $tableNode->getElementsByTagName("channel"); 163 $channelNodes = $tableNode->getElementsByTagName("channel");
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotColorAxisNodeClass.php
  Diff comments   View file @bff90e2
@@ -26,6 +26,11 @@ class RequestOutputPlotColorAxisNodeClass extends RequestOutputPlotAxisElementNo @@ -26,6 +26,11 @@ class RequestOutputPlotColorAxisNodeClass extends RequestOutputPlotAxisElementNo
26 { 26 {
27 $this->setAttribute(REQUESTOUTPUTPLOTCOLORAXIS_MAPINDEX, $mapIndex); 27 $this->setAttribute(REQUESTOUTPUTPLOTCOLORAXIS_MAPINDEX, $mapIndex);
28 } 28 }
  29 +
  30 + public function getColorMapIndex()
  31 + {
  32 + return $this->getAttribute(REQUESTOUTPUTPLOTCOLORAXIS_MAPINDEX);
  33 + }
29 34
30 public function setMinValColor($minValColor) 35 public function setMinValColor($minValColor)
31 { 36 {
@@ -56,4 +61,4 @@ class RequestOutputPlotColorAxisNodeClass extends RequestOutputPlotAxisElementNo @@ -56,4 +61,4 @@ class RequestOutputPlotColorAxisNodeClass extends RequestOutputPlotAxisElementNo
56 } 61 }
57 } 62 }
58 63
59 -?>  
60 \ No newline at end of file 64 \ No newline at end of file
  65 +?>