diff --git a/src/InputOutput/IHMImpl/ParamInfo/IHMInputOutputParamInfoClass.php b/src/InputOutput/IHMImpl/ParamInfo/IHMInputOutputParamInfoClass.php index 6480729..4573797 100644 --- a/src/InputOutput/IHMImpl/ParamInfo/IHMInputOutputParamInfoClass.php +++ b/src/InputOutput/IHMImpl/ParamInfo/IHMInputOutputParamInfoClass.php @@ -93,7 +93,8 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface if (($data->getResult() != NULL) && ($data->getResult()->getName() == "plot") && (count($data->getResult()->getChildren()) >= 1)) { $result_data = array(); - $panelNode = $data->getResult()->getChildren()[0]; + $panelNodes = $data->getResult()->getChildren(); + $panelNode = $panelNodes[0]; $plotNode = NULL; if (count($panelNode->getChildren()) >= 1) { @@ -234,14 +235,17 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface if (!isset($drawNode)) return; - if (!empty($drawNode->getAttribute(REQUESTOUTPUTPLOTSPECTRO_YAXIS))) - $result_array['spectro-yaxis'] = $drawNode->getAttribute(REQUESTOUTPUTPLOTSPECTRO_YAXIS); + $yAxis = $drawNode->getAttribute(REQUESTOUTPUTPLOTSPECTRO_YAXIS); + if (!empty($yAxis)) + $result_array['spectro-yaxis'] = $yAxis; - if (!empty($drawNode->getAttribute(REQUESTOUTPUTPLOTSPECTRO_MIN))) - $result_array['spectro-value-min'] = $drawNode->getAttribute(REQUESTOUTPUTPLOTSPECTRO_MIN); + $min = $drawNode->getAttribute(REQUESTOUTPUTPLOTSPECTRO_MIN); + if (!empty($min)) + $result_array['spectro-value-min'] = $min; - if (!empty($drawNode->getAttribute(REQUESTOUTPUTPLOTSPECTRO_MAX))) - $result_array['spectro-value-max'] = $drawNode->getAttribute(REQUESTOUTPUTPLOTSPECTRO_MAX); + $max = $drawNode->getAttribute(REQUESTOUTPUTPLOTSPECTRO_MAX); + if (!empty($max)) + $result_array['spectro-value-max'] = $max; } private function unmarshallAdditionalObjectsData($plotNode) { @@ -299,7 +303,8 @@ class IHMInputOutputParamInfoClass implements InputOutputInterface $this->unmarshallSymbolData($drawNode->getSymbol(), "serie-symbols-", $result_array); } - if (!empty($drawNode->getColorSerieId())) { + $colorSerieId = $drawNode->getColorSerieId(); + if (!empty($colorSerieId)) { //ToDo } diff --git a/src/InputOutput/IHMImpl/Params/IHMInputOutputParamsAbstractClass.php b/src/InputOutput/IHMImpl/Params/IHMInputOutputParamsAbstractClass.php index be3d888..1d027b3 100644 --- a/src/InputOutput/IHMImpl/Params/IHMInputOutputParamsAbstractClass.php +++ b/src/InputOutput/IHMImpl/Params/IHMInputOutputParamsAbstractClass.php @@ -54,7 +54,8 @@ abstract class IHMInputOutputParamsAbstractClass implements InputOutputInterface */ protected function unmarshallTimeDefinition($input, $requestIndex, $ttFileIndex = -1, $ttIntIndex = -1) { - $timesNode = $this->paramsData->getRequestNodes()[$requestIndex]->getTimesNode(); + $requestNodes = $this->paramsData->getRequestNodes(); + $timesNode = $requestNodes[$requestIndex]->getTimesNode(); switch ($input->timesrc) { diff --git a/src/Request/ParamsRequestImpl/Nodes/Params/ParamNodeClass.php b/src/Request/ParamsRequestImpl/Nodes/Params/ParamNodeClass.php index a51d9ce..e02a574 100644 --- a/src/Request/ParamsRequestImpl/Nodes/Params/ParamNodeClass.php +++ b/src/Request/ParamsRequestImpl/Nodes/Params/ParamNodeClass.php @@ -101,8 +101,10 @@ class ParamNodeClass extends NodeClass $getNode = $this->getChildInstanceByName(PARAM_GET, false); if (!$getNode) return NULL; - if (count($getNode->getChildren()) > 0) - return $getNode->getChildren()[0]; + if (count($getNode->getChildren()) > 0) { + $getNodes = $getNode->getChildren(); + return $getNodes[0]; + } return NULL; } diff --git a/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotPanelNodeClass.php b/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotPanelNodeClass.php index 294a338..deb58bf 100644 --- a/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotPanelNodeClass.php +++ b/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotPanelNodeClass.php @@ -6,6 +6,7 @@ require_once("RequestOutputPlotElementStatusNodeClass.php"); require_once("RequestOutputPlotElementTickNodeClass.php"); require_once "RequestOutputPlotElementEpochNodeClass.php"; require_once "RequestOutputPlotElementInstantNodeClass.php"; +require_once "RequestOutputPlotFontNodeClass.php"; define ("REQUESTOUTPUTPLOTPANEL_NAME", "panel"); define ("REQUESTOUTPUTPLOTPANEL_TITLE", "title"); -- libgit2 0.21.2