diff --git a/src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php b/src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php index a74d1f5..b035eef 100644 --- a/src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php +++ b/src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php @@ -936,15 +936,28 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass protected function unmarshallStatusBar($paramDrawingData, $paramNode, $indexes) { + if ($paramDrawingData->{'statusbar-color'} == "none") { + $color = NULL; + } else { + $color = $this->hexColor2KernelColor($paramDrawingData->{'statusbar-color'}); + } if (count($indexes) == 0) - $paramNode->addStatusBar(-1); - foreach ($indexes as $index) - $paramNode->addStatusBar($index); + $paramNode->addStatusBar(-1, $color); + else { + foreach ($indexes as $index) + $paramNode->addStatusBar($index, $color); + } + } protected function unmarshallIntervals($paramDrawingData, $paramNode) { - $paramNode->addIntervals(); + if ($paramDrawingData->{'intervals-color'} == "none") { + $color = NULL; + } else { + $color = $this->hexColor2KernelColor($paramDrawingData->{'intervals-color'}); + } + $paramNode->addIntervals($color); } protected function unmarshallTickBar($paramDrawingData, $paramNode, $indexes) diff --git a/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotParamsNodeClass.php b/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotParamsNodeClass.php index a91e0b4..685d7dc 100644 --- a/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotParamsNodeClass.php +++ b/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotParamsNodeClass.php @@ -49,11 +49,13 @@ define("REQUESTOUTPUTPLOTINSTANTSPECTRO_DIMONXAXIS", "dimOnXAxis"); define("REQUESTOUTPUTPLOTSTATUSBAR_NAME", "serie"); define("REQUESTOUTPUTPLOTSTATUSBAR_INDEX", "index"); +define("REQUESTOUTPUTPLOTSTATUSBAR_COLOR", "color"); define("REQUESTOUTPUTPLOTTICKBAR_NAME", "serie"); define("REQUESTOUTPUTPLOTTICKBAR_INDEX", "index"); define("REQUESTOUTPUTPLOTINTERVALS_NAME", "intervals"); +define("REQUESTOUTPUTPLOTINTERVALS_COLOR", "color"); /** * @class RequestOutputPlotParamNodeClass @@ -231,11 +233,14 @@ class RequestOutputPlotParamNodeClass extends NodeClass return $colorSerieNode; } - public function addStatusBar($index) + public function addStatusBar($index, $color = NULL) { $statusBarNode = new NodeClass(REQUESTOUTPUTPLOTSTATUSBAR_NAME); if ($index >= 0) $statusBarNode->setAttribute(REQUESTOUTPUTPLOTSTATUSBAR_INDEX, $index); + if ($color != NULL) { + $statusBarNode->setAttribute(REQUESTOUTPUTPLOTSTATUSBAR_COLOR, $color); + } $this->addChild($statusBarNode); return $statusBarNode; } @@ -249,9 +254,12 @@ class RequestOutputPlotParamNodeClass extends NodeClass return $tickBarNode; } - public function addIntervals() + public function addIntervals($color = NULL) { $intervalsNode = new NodeClass(REQUESTOUTPUTPLOTINTERVALS_NAME); + if ($color != NULL) { + $intervalsNode->setAttribute(REQUESTOUTPUTPLOTINTERVALS_COLOR, $color); + } $this->addChild($intervalsNode); return $intervalsNode; } -- libgit2 0.21.2