Commit 5f1233ba5e1208b7b5013e52581b6176a771e723
Exists in
master
and in
12 other branches
Merge branch 'FER_7618' into amdadev
Showing
1 changed file
with
4 additions
and
1 deletions
Show diff stats
src/InputOutput/IHMImpl/Tools/IHMPlotContextFileClass.php
@@ -113,6 +113,8 @@ class IHMPlotContextFileClass | @@ -113,6 +113,8 @@ class IHMPlotContextFileClass | ||
113 | $panelContext['plotArea']['y'] = $pageContext['height'] - intval($plotAreaNode->getAttribute('y')) - $panelContext['plotArea']['height']; | 113 | $panelContext['plotArea']['y'] = $pageContext['height'] - intval($plotAreaNode->getAttribute('y')) - $panelContext['plotArea']['height']; |
114 | $panelContext['plotArea']['width'] = intval($plotAreaNode->getAttribute('width')); | 114 | $panelContext['plotArea']['width'] = intval($plotAreaNode->getAttribute('width')); |
115 | } | 115 | } |
116 | + //BG COLOR | ||
117 | + $panelContext['plotArea']['plotAreaBackgroundColor'] = ($plotAreaNode->getAttribute('plotAreaBackgroundColor')); | ||
116 | 118 | ||
117 | //hasSpectro | 119 | //hasSpectro |
118 | $panelContext['plotArea']['hasSpectro'] = ($plotAreaNode->getAttribute('hasSpectro') == "true"); | 120 | $panelContext['plotArea']['hasSpectro'] = ($plotAreaNode->getAttribute('hasSpectro') == "true"); |
@@ -127,7 +129,8 @@ class IHMPlotContextFileClass | @@ -127,7 +129,8 @@ class IHMPlotContextFileClass | ||
127 | 'id' => $axisNode->getAttribute('id'), | 129 | 'id' => $axisNode->getAttribute('id'), |
128 | 'logarithmic' => ($axisNode->getAttribute('logarithmic') == "true"), | 130 | 'logarithmic' => ($axisNode->getAttribute('logarithmic') == "true"), |
129 | 'min' => floatval($axisNode->getAttribute('min')), | 131 | 'min' => floatval($axisNode->getAttribute('min')), |
130 | - 'max' => floatval($axisNode->getAttribute('max')) | 132 | + 'max' => floatval($axisNode->getAttribute('max')), |
133 | + 'colorsList' => $axisNode->getAttribute('colorsList') | ||
131 | ); | 134 | ); |
132 | 135 | ||
133 | $panelContext['plotArea']['axes'][] = $axisContext; | 136 | $panelContext['plotArea']['axes'][] = $axisContext; |