diff --git a/src/InputOutput/IHMImpl/ParamInfo/IHMInputOutputParamInfoClass.php b/src/InputOutput/IHMImpl/ParamInfo/IHMInputOutputParamInfoClass.php index 9721fff..b79136f 100644 --- a/src/InputOutput/IHMImpl/ParamInfo/IHMInputOutputParamInfoClass.php +++ b/src/InputOutput/IHMImpl/ParamInfo/IHMInputOutputParamInfoClass.php @@ -586,6 +586,11 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface $this->unmarshallSymbolData($drawNode->getIntervalTicks()->getSymbol(), "serie-intervaltick-", $result_array); } + if ($drawNode->getIntervalTicks()->isLastSymbolDefined()) { + $result_array['serie-intervaltick-lastsymbols-activated'] = true; + $this->unmarshallSymbolData($drawNode->getIntervalTicks()->getLastSymbol(), "serie-intervaltick-lastsymbols-", $result_array); + } + if ($drawNode->getIntervalTicks()->isFontDefined()) { $result_array['serie-intervaltick-font-activated'] = true; $this->unmarshallFontData($drawNode->getIntervalTicks()->getFont(), "serie-intervaltick-font-", $result_array); diff --git a/src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php b/src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php index 2884960..b7e5cec 100644 --- a/src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php +++ b/src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php @@ -996,6 +996,10 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass //Symbol $this->unmarshallSymbol($serieData, 'serie-intervaltick-symbols', $intervalTickNode->getSymbol()); + //Last Symbol + if ($serieData->{'serie-intervaltick-lastsymbols-activated'}) + $this->unmarshallSymbol($serieData, 'serie-intervaltick-lastsymbols', $intervalTickNode->getLastSymbol()); + //Font if ($serieData->{'serie-intervaltick-font-activated'}) $this->unmarshallFont($serieData, 'serie-intervaltick-font', $intervalTickNode->getFont()); diff --git a/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotSerieIntervalTicksNodeClass.php b/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotSerieIntervalTicksNodeClass.php index 95f8482..06143b9 100644 --- a/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotSerieIntervalTicksNodeClass.php +++ b/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotSerieIntervalTicksNodeClass.php @@ -3,6 +3,7 @@ define ("REQUESTOUTPUTPLOTSERIEINTERVALTICKS_MODE", "mode"); define ("REQUESTOUTPUTPLOTSERIEINTERVALTICKS_COLOR", "color"); define ("REQUESTOUTPUTPLOTSERIEINTERVALTICKS_SYMBOL", "symbol"); +define ("REQUESTOUTPUTPLOTSERIETIMETICKS_LASTSYMBOL", "lastSymbol"); abstract class RequestOutputPlotSerieIntervalTicksModeEnum { @@ -62,6 +63,25 @@ class RequestOutputPlotSerieIntervalTicksNodeClass extends NodeClass return $node; } + + public function isLastSymbolDefined() + { + $node = $this->getFirstChildByName(REQUESTOUTPUTPLOTSERIETIMETICKS_LASTSYMBOL); + return isset($node); + } + + public function getLastSymbol() + { + $node = $this->getFirstChildByName(REQUESTOUTPUTPLOTSERIETIMETICKS_LASTSYMBOL); + + if (!isset($node)) + { + $node = new RequestOutputPlotSymbolNodeClass(REQUESTOUTPUTPLOTSERIETIMETICKS_LASTSYMBOL); + $this->addChild($node); + } + + return $node; + } public function isFontDefined() { @@ -90,6 +110,10 @@ class RequestOutputPlotSerieIntervalTicksNodeClass extends NodeClass $symbolXmlNode = $this->getXmlNodeChildByTagName($xmlNode, REQUESTOUTPUTPLOTSERIEINTERVALTICKS_SYMBOL); if (isset($symbolXmlNode)) $this->getSymbol()->loadFromNode($symbolXmlNode); + + $lastsymbolXmlNode = $this->getXmlNodeChildByTagName($xmlNode, REQUESTOUTPUTPLOTSERIETIMETICKS_LASTSYMBOL); + if (isset($lastsymbolXmlNode)) + $this->getLastSymbol()->loadFromNode($lastsymbolXmlNode); $fontXmlNode = $this->getXmlNodeChildByTagName($xmlNode, REQUESTOUTPUTPLOTFONT_NODENAME); if (isset($fontXmlNode)) diff --git a/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotSerieTimeTicksNodeClass.php b/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotSerieTimeTicksNodeClass.php index ab19dfe..9e1b80e 100644 --- a/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotSerieTimeTicksNodeClass.php +++ b/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotSerieTimeTicksNodeClass.php @@ -146,6 +146,7 @@ class RequestOutputPlotSerieTimeTicksNodeClass extends NodeClass $firstsymbolXmlNode = $this->getXmlNodeChildByTagName($xmlNode, REQUESTOUTPUTPLOTSERIETIMETICKS_FIRSTSYMBOL); if (isset($firstsymbolXmlNode)) $this->getFirstSymbol()->loadFromNode($firstsymbolXmlNode); + $lastsymbolXmlNode = $this->getXmlNodeChildByTagName($xmlNode, REQUESTOUTPUTPLOTSERIETIMETICKS_LASTSYMBOL); if (isset($lastsymbolXmlNode)) $this->getLastSymbol()->loadFromNode($lastsymbolXmlNode); -- libgit2 0.21.2