Commit dde4b5980001c0314ab8a6fbea44009ee827ec1b
1 parent
f27db60a
Exists in
master
and in
11 other branches
Fix
Showing
3 changed files
with
12 additions
and
1 deletions
Show diff stats
src/InputOutput/IHMImpl/ParamInfo/IHMInputOutputParamInfoClass.php
@@ -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/Request/ParamInfoRequestClass.php
@@ -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
@@ -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 | +?> |