diff --git a/src/InputOutput/IHMImpl/Tools/IHMUserParamLoaderClass.php b/src/InputOutput/IHMImpl/Tools/IHMUserParamLoaderClass.php index 4ae62bf..76eac7d 100644 --- a/src/InputOutput/IHMImpl/Tools/IHMUserParamLoaderClass.php +++ b/src/InputOutput/IHMImpl/Tools/IHMUserParamLoaderClass.php @@ -183,7 +183,7 @@ class IHMUserParamLoaderClass $derivedNodes = $dom->getElementsByTagName(self::$mgrDerivedNode); $derivedParams = array(); - if (count($derivedNodes) > 0) + if ($derivedNodes->length > 0) { $derivedParamNodes = $derivedNodes->item(0)->getElementsByTagName(self::$mgrDerivedParamNode); foreach ($derivedParamNodes as $derivedParamNode) @@ -220,7 +220,7 @@ class IHMUserParamLoaderClass $uploadedNodes = $dom->getElementsByTagName(self::$mgrUploadedNode); $uploadedParams = array(); - if (count($uploadedNodes) > 0) + if ($uploadedNodes->length > 0) { $uploadedParamNodes = $uploadedNodes->item(0)->getElementsByTagName(self::$mgrUploadedParamNode); foreach ($uploadedParamNodes as $uploadedParamNode) @@ -272,7 +272,7 @@ class IHMUserParamLoaderClass //get parameter units $unitsNodes = $dom->getElementsByTagName(self::$infoDerivedUnitsNode); - if (count($unitsNodes) > 0) { + if ($unitsNodes->length > 0) { $result["units"] = $unitsNodes->item(0)->nodeValue; if ($result["units"] == self::$infoDerivedUndefined) { $result["units"] = ""; @@ -281,7 +281,7 @@ class IHMUserParamLoaderClass //get parameter y title $yTitleNodes = $dom->getElementsByTagName(self::$infoDerivedYTitleNode); - if (count($yTitleNodes) > 0) { + if ($yTitleNodes->length > 0) { $result["yTitle"] = $yTitleNodes->item(0)->nodeValue; if ($result["yTitle"] == self::$infoDerivedUndefined) { $result["yTitle"] = ""; @@ -290,7 +290,7 @@ class IHMUserParamLoaderClass //get parameter description $descNodes = $dom->getElementsByTagName(self::$infoDerivedDescriptionNode); - if (count($descNodes) > 0) + if ($descNodes->length > 0) $result["description"] = $descNodes->item(0)->nodeValue; return $result; @@ -316,52 +316,54 @@ class IHMUserParamLoaderClass //get parameter min sampling $minSamplingNodes = $dom->getElementsByTagName(self::$infoUploadedMinSamplingNode); - if (count($minSamplingNodes) > 0) + if ($minSamplingNodes->length > 0) $result["minSampling"] = $minSamplingNodes->item(0)->nodeValue; //get parameter max sampling $maxSamplingNodes = $dom->getElementsByTagName(self::$infoUploadedMaxSamplingNode); - if (count($maxSamplingNodes) > 0) + if ($maxSamplingNodes->length > 0) $result["maxSampling"] = $maxSamplingNodes->item(0)->nodeValue; + else + $result["maxSampling"] = $result["minSampling"]; //get parameter real var $realVarNodes = $dom->getElementsByTagName(self::$infoUploadedRealVarNode); - if (count($realVarNodes) > 0) + if ($realVarNodes->length > 0) $result["realVar"] = $realVarNodes->item(0)->nodeValue; //get parameter type $typeNodes = $dom->getElementsByTagName(self::$infoUploadedTypeNode); - if (count($typeNodes) > 0) + if ($typeNodes->length > 0) $result["type"] = $typeNodes->item(0)->nodeValue; //get parameter size $sizeNodes = $dom->getElementsByTagName(self::$infoUploadedSizeNode); - if (count($sizeNodes) > 0) + if ($sizeNodes->length > 0) $result["size"] = $sizeNodes->item(0)->nodeValue; //get parameter VirtualInstrument ID $viIdNodes = $dom->getElementsByTagName(self::$infoUploadedVIIdNode); - if (count($viIdNodes) > 0) + if ($viIdNodes->length > 0) $result["viId"] = $viIdNodes->item(0)->nodeValue; //get parameter plot type $plotTypeNodes = $dom->getElementsByTagName(self::$infoUploadedPlotTypeNode); - if (count($plotTypeNodes) > 0) + if ($plotTypeNodes->length > 0) $result["plotType"] = $plotTypeNodes->item(0)->nodeValue; //get parameter y units $unitsNodes = $dom->getElementsByTagName(self::$infoUploadedUnitsNode); - if (count($unitsNodes) > 0) + if ($unitsNodes->length > 0) $result["units"] = $unitsNodes->item(0)->nodeValue; //get parameter y title $yTitleNodes = $dom->getElementsByTagName(self::$infoUploadedYTitleNode); - if (count($yTitleNodes) > 0) + if ($yTitleNodes->length > 0) $result["yTitle"] = $yTitleNodes->item(0)->nodeValue; //get table definition $tableDefNodes = $dom->getElementsByTagName(self::$infoUploadedTableDefNode); - if (count($tableDefNodes) > 0) + if ($tableDefNodes->length > 0) { $tableDefNode = $tableDefNodes->item(0); $tableDefType = $tableDefNode->getAttribute('tableDefType'); diff --git a/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotPageNodeClass.php b/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotPageNodeClass.php index 3e37984..86f8e58 100644 --- a/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotPageNodeClass.php +++ b/src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotPageNodeClass.php @@ -2,6 +2,9 @@ require_once("RequestOutputPlotPanelNodeClass.php"); require_once("RequestOutputPlotLayoutNodeClass.php"); +require_once("RequestOutputPlotMarginsNodeClass.php"); +require_once("RequestOutputPlotTitleNodeClass.php"); +require_once("RequestOutputPlotFontNodeClass.php"); define ("REQUESTOUTPUTPLOTPAGE_NAME", "page"); define ("REQUESTOUTPUTPLOTPAGE_TITLE", "title"); @@ -259,4 +262,4 @@ class RequestOutputPlotPageNodeClass extends NodeClass } } -?> \ No newline at end of file +?> -- libgit2 0.21.2