diff --git a/src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php b/src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php index 19fd822..d00e4e8 100644 --- a/src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php +++ b/src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php @@ -544,10 +544,10 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass if (isset($axisData->{'axis-legend-text'}) && $axisData->{'axis-legend-text'} != '') { $axisNode->getLegend()->setText($axisData->{'axis-legend-text'}); - $axisNode->getLegend()->setColor($this->hexColor2KernelColor($axisData->{'axis-legend-color'})); - $this->unmarshallLabel($axisData, "axis-legend", $axisNode->getLegend()); } - + $axisNode->getLegend()->setColor($this->hexColor2KernelColor($axisData->{'axis-legend-color'})); + $this->unmarshallLabel($axisData, "axis-legend", $axisNode->getLegend()); + //Show legend if (isset($axisData->{'axis-legend-activated'})) $axisNode->setShowLegend($axisData->{'axis-legend-activated'} ? "true" : "false"); @@ -1224,35 +1224,35 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass if ($inputData->{$keyPrefix.'-text'} != '') { $titleNode->setText($inputData->{$keyPrefix.'-text'}); + } - switch ($inputData->{$keyPrefix.'-position'}) - { - case 'top' : - $titleNode->setPosition(RequestOutputPlotTitlePosition::TOP); - break; - case 'bottom' : - $titleNode->setPosition(RequestOutputPlotTitlePosition::BOTTOM); - break; - } - - switch ($inputData->{$keyPrefix.'-alignment'}) - { - case 'center' : - $titleNode->setAlign(RequestOutputPlotTitleAlign::CENTER); - break; - case 'left' : - $titleNode->setAlign(RequestOutputPlotTitleAlign::LEFT); - break; - case 'right' : - $titleNode->setAlign(RequestOutputPlotTitleAlign::RIGHT); - break; - } - - if ($inputData->{$keyPrefix.'-color'} != '') - $titleNode->setColor($this->hexColor2KernelColor($inputData->{$keyPrefix.'-color'})); + switch ($inputData->{$keyPrefix.'-position'}) + { + case 'top' : + $titleNode->setPosition(RequestOutputPlotTitlePosition::TOP); + break; + case 'bottom' : + $titleNode->setPosition(RequestOutputPlotTitlePosition::BOTTOM); + break; + } - $this->unmarshallLabel($inputData, $keyPrefix, $titleNode); + switch ($inputData->{$keyPrefix.'-alignment'}) + { + case 'center' : + $titleNode->setAlign(RequestOutputPlotTitleAlign::CENTER); + break; + case 'left' : + $titleNode->setAlign(RequestOutputPlotTitleAlign::LEFT); + break; + case 'right' : + $titleNode->setAlign(RequestOutputPlotTitleAlign::RIGHT); + break; } + + if ($inputData->{$keyPrefix.'-color'} != '') + $titleNode->setColor($this->hexColor2KernelColor($inputData->{$keyPrefix.'-color'})); + + $this->unmarshallLabel($inputData, $keyPrefix, $titleNode); } protected function unmarshallLabel($inputData, $keyPrefix, $labelNode) @@ -1857,6 +1857,9 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass "id" => "1", "panel-plot-type" => "instantPlot", "panel-instant-time" => $input->time, + "panel-title-font-activated" => TRUE, + "panel-title-font-size" => 12, + "panel-title-font-bold" => TRUE, "axes" => array(), "params" => array(), @@ -1866,14 +1869,26 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass "id" => "xaxis_id", "axis-type" => "x", "axis-scale" => $crtYAxis->{"axis-scale"}, - "axis-thickness" => 1 + "axis-thickness" => 1, + "axis-legend-font-activated" => TRUE, + "axis-legend-font-size" => 12, + "axis-legend-font-bold" => TRUE, + "axis-range-min" => $crtYAxis->{"axis-range-min"}, + "axis-range-max" => $crtYAxis->{"axis-range-max"}, + "axis-reverse" => $crtYAxis->{"axis-reverse"}, ); $instantYAxis = (Object)array( "id" => "y-left", "axis-type" => "y-left", "axis-scale" => $crtColorAxis->{"axis-scale"}, - "axis-thickness" => 1 + "axis-thickness" => 1, + "axis-legend-font-activated" => TRUE, + "axis-legend-font-size" => 12, + "axis-legend-font-bold" => TRUE, + "axis-range-min" => $crtColorAxis->{"axis-range-min"}, + "axis-range-max" => $crtColorAxis->{"axis-range-max"}, + "axis-reverse" => $crtColorAxis->{"axis-reverse"}, ); $instantPanel->{"axes"}[] = $instantXAxis; $instantPanel->{"axes"}[] = $instantYAxis; @@ -1887,8 +1902,8 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass "iserie-tableonx" => true, "iserie-lines-activated" => true, "iserie-lines-style" => "plain", - "iserie-lines-width" => 1, - "iserie-lines-color" => "auto" + "iserie-lines-width" => 3, + "iserie-lines-color" => "#0000ff" ), "dim1-index" => $crtParam->{'dim1-index'}, "dim1-sum-type" => $crtParam->{'dim1-sum-type'}, -- libgit2 0.21.2