Add integration for epoch plot and layouts definitions

Benjamin Renard
1 parent 17f69bd1
Showing 11 changed files with 477 additions and 15 deletions Show diff stats
install/cat_0.xml
src/InputOutput/IHMImpl/Params/IHMInputOutputParamsAbstractClass.php
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotAxesNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotElementEpochNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotPageNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotPanelBoundsNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotPanelNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotResamplingNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotYSerieNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestTimesNodeClass.php
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<timetable xml:id="cat_0">
+  <name>epoch-plot-test</name>
+  <created>2015-08-25T06:42:17</created>
+  <description>Catalog used to test epoch plot</description>
+  <nbIntervals>2</nbIntervals>
+  <parameters>
+    <parameter id="center_time" name="Event center time" size="1" type="String" unit="" description="Event center time" ucd="time.epoch" utype=""/>
+  </parameters>
+  <intervals>
+    <start>2008-01-01T00:00:00</start>
+    <stop>2008-01-02T00:00:00</stop>
+    <param>2008-01-01T06:00:00</param>
+  </intervals>
+  <intervals>
+    <start>2008-01-03T00:00:00</start>
+    <stop>2008-01-04T00:00:00</stop>
+    <param>2008-01-03T18:00:00</param>
+  </intervals>
+</timetable>
@@ -52,7 +52,7 @@ abstract class IHMInputOutputParamsAbstractClass implements InputOutputInterface
 	/*
 	 * @brief Unmarshall the time definition from the IHM request
 	*/
-	protected function unmarshallTimeDefinition($input, $requestIndex)
+	protected function unmarshallTimeDefinition($input, $requestIndex, $initTTIndex = false)
 	{
 		$timesNode = $this->paramsData->getRequestNodes()[$requestIndex]->getTimesNode();
@@ -66,7 +66,10 @@ abstract class IHMInputOutputParamsAbstractClass implements InputOutputInterface
 					else
 						$ttPath = IHMConfigClass::getUserTTPath();
 					$ttPath .= ($tt->id.".xml");
-					$timesNode->addTimeTable($ttPath);
+					if (strpos($tt->id, "cat_") === 0)
+						$timesNode->addCatalog($ttPath,$initTTIndex ? 0 : -1);
+					else
+						$timesNode->addTimeTable($ttPath,$initTTIndex ? 0 : -1);
 				}
 				break;
 			case "Interval" :
@@ -30,7 +30,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			$paramsNode  = $requestNode->getParamsNode();
 			//unmarshall time definition
-			$this->unmarshallTimeDefinition($input, $requestIndex);
+			$this->unmarshallTimeDefinition($input, $requestIndex, !$tab->{'page-superpose-mode'});
 			$plotOutputNode = $outputsNode->addNewOutput(RequestOutputTypeEnum::PLOT);
@@ -144,7 +144,11 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			if ($tab->{'page-font-activated'})
 				$this->unmarshallFont($tab, 'page', $pageNode->getFont());
-			$pageNode->getLayout()->setType(RequestOutputPlotLayoutTypeEnum::VERTICAL);
+			//Superpose mode
+			$pageNode->setSuperposeMode($tab->{'page-superpose-mode'} ? "true": "false");
+			
+			//Layout
+			$this->unmarshallLayout($tab, $pageNode);
 			foreach ($tab->{'panels'} as $panelData)
 				$this->unmarshallPanel($panelData, $pageNode, $paramsNode);
@@ -184,10 +188,74 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		return $this->paramsData;
 	}
+	protected function unmarshallLayout($tab, $pageNode)
+	{
+		switch ($tab->{'page-layout-type'})
+		{
+			case 'vertical' :
+				$pageNode->getLayout()->setType(RequestOutputPlotLayoutTypeEnum::VERTICAL);
+				$pageNode->getLayout()->setPanelHeight($tab->{'page-layout-object'}->{'layout-panel-height'});
+				$pageNode->getLayout()->setPanelSpacing($tab->{'page-layout-object'}->{'layout-panel-spacing'});
+				$pageNode->getLayout()->setExpand($tab->{'page-layout-object'}->{'layout-expand'} ? "true" : "false");
+				//if ($tab->{'page-layout-object'}->{'layout-timeplot-width'} > 0)
+				//	$pageNode->setDefaultTimePlotWidth($tab->{'page-layout-object'}->{'layout-timeplot-width'});
+				if ($tab->{'page-layout-object'}->{'layout-timeplot-height'} > 0)
+					$pageNode->setDefaultTimePlotHeight($tab->{'page-layout-object'}->{'layout-timeplot-height'});
+				if ($tab->{'page-layout-object'}->{'layout-xyplot-width'} > 0)
+					$pageNode->setDefaultXYPlotWidth($tab->{'page-layout-object'}->{'layout-xyplot-width'});
+				if ($tab->{'page-layout-object'}->{'layout-xyplot-height'} > 0)
+					$pageNode->setDefaultXYPlotHeight($tab->{'page-layout-object'}->{'layout-xyplot-height'});
+				break;
+			case 'auto' :
+				$pageNode->getLayout()->setType(RequestOutputPlotLayoutTypeEnum::AUTO);
+				$pageNode->getLayout()->setPanelHeight($tab->{'page-layout-object'}->{'layout-panel-height'});
+				$pageNode->getLayout()->setPanelSpacing($tab->{'page-layout-object'}->{'layout-panel-spacing'});
+				$pageNode->getLayout()->setExpand($tab->{'page-layout-object'}->{'layout-expand'} ? "true" : "false");
+				break;
+			case 'manual' :
+				$pageNode->getLayout()->setType(RequestOutputPlotLayoutTypeEnum::MANUAL);
+				$timePlotLeftMargin = $tab->{'page-layout-object'}->{'layout-timeplot-margin-left'} ? $tab->{'page-layout-object'}->{'layout-timeplot-margin-left'} : -1;
+				$timePlotRightMargin = $tab->{'page-layout-object'}->{'layout-timeplot-margin-right'} ? $tab->{'page-layout-object'}->{'layout-timeplot-margin-right'} : -1;
+				$pageNode->setDefaultTimePlotXMargin($timePlotLeftMargin, $timePlotRightMargin);
+				$xyPlotLeftMargin = $tab->{'page-layout-object'}->{'layout-xyplot-margin-left'} ? $tab->{'page-layout-object'}->{'layout-xyplot-margin-left'} : -1;
+				$xyPlotRightMargin = $tab->{'page-layout-object'}->{'layout-xyplot-margin-right'} ? $tab->{'page-layout-object'}->{'layout-xyplot-margin-right'} : -1;
+				$pageNode->setDefaultXYPlotXMargin($xyPlotLeftMargin, $xyPlotRightMargin);
+				break;
+			default:
+				throw new Exception('Layout type not implemented.');
+		}
+		
+	}
+		
 	protected function unmarshallPanel($panelData, $pageNode, $paramsNode)
 	{
 		$panelNode = $pageNode->addPanel();
+		
+		switch ($pageNode->getLayout()->getType())
+		{
+			case RequestOutputPlotLayoutTypeEnum::MANUAL :
+				//Panel bounds
+				$panelNode->getBounds()->setX($panelData->{'panel-bounds-x'});
+				$panelNode->getBounds()->setY($panelData->{'panel-bounds-y'});
+				$panelNode->getBounds()->setWidth($panelData->{'panel-bounds-width'});
+				$panelNode->getBounds()->setHeight($panelData->{'panel-bounds-height'});
+				//Panel margins
+				$leftMargin = $panelData->{'panel-margin-left'} ? $panelData->{'panel-margin-left'} : -1;
+				$rightMargin = $panelData->{'panel-margin-right'} ? $panelData->{'panel-margin-right'} : -1;
+				$panelNode->setXMargin($leftMargin, $rightMargin);
+				break;
+			case RequestOutputPlotLayoutTypeEnum::VERTICAL :
+				//Panel prefered dimensions
+				if ($panelData->{'panel-prefered-width'} > 0)
+					$panelNode->setPreferedWidth($panelData->{'panel-prefered-width'});
+				if ($panelData->{'panel-prefered-height'} > 0)
+					$panelNode->setPreferedHeight($panelData->{'panel-prefered-height'});
+				break;
+			default :
+				//Nothing to do
+		}
+		
 		//Panel background color
 		if (($panelData->{'panel-background-color'} != 'none') && ($panelData->{'panel-background-color'} != ''))
 			$panelNode->setBackgroundColor($this->hexColor2KernelColor($panelData->{'panel-background-color'}));
@@ -252,6 +320,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 				break;
 			case 'xyPlot' :
 				$plotNode = $panelNode->addPlotElement(RequestOutputPlotElementTypeEnum::XYPLOT);
+				$plotNode->setIsIsotropic($panelData->{'panel-scatter-isotropic'});
 				break;
 			case 'statusPlot' :
 				$plotNode = $panelNode->addPlotElement(RequestOutputPlotElementTypeEnum::STATUSPLOT);
@@ -271,6 +340,12 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 				if ($panelData->{'panel-tick-format'} != '')
 					$plotNode->setFormat($panelData->{'panel-tick-format'});
 				break;
+			case 'epochPlot' :
+				$plotNode = $panelNode->addPlotElement(RequestOutputPlotElementTypeEnum::EPOCHPLOT);
+				if ($panelData->{'panel-epoch-centertimeid'} == '')
+					throw new Exception('Center Time Id not defined for an Epoch Plot.');
+				$plotNode->setCenterTimeId($panelData->{'panel-epoch-centertimeid'});
+				break;
 			default:
 				throw new Exception('Plot type not implemented.');
 		}
@@ -483,6 +558,19 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		foreach ($serieNodes as $serieNode)
 		{
+			//Resampling
+			if ($plotNode->getName() == REQUESTOUTPUTPLOTELEMENTXY_NAME)
+			{
+				switch ($paramDrawingData->{'serie-resampling-mode'})
+				{
+					case 'yparam' :
+						$serieNode->getResampling()->setType(RequestOutputPlotResamplingTypeEnum::YPARAM);
+						break;
+					case 'xparam' :
+					default :
+						$serieNode->getResampling()->setType(RequestOutputPlotResamplingTypeEnum::XPARAM);
+				}
+			}
 			//Line
 			$this->unmarshallLine($paramDrawingData, 'serie', $serieNode->getLine());
 			//Symbol
 <?php
 require_once("RequestOutputPlotTimeAxisNodeClass.php");
+require_once("RequestOutputPlotEpochAxisNodeClass.php");
 require_once("RequestOutputPlotDigitalAxisNodeClass.php");
 require_once("RequestOutputPlotColorAxisNodeClass.php");
@@ -74,6 +75,19 @@ class RequestOutputPlotAxesNodeClass extends NodeClass
 		return $timeAxisNode;
 	}
+	
+	public function getEpochAxis()
+	{
+		$axisNode = $this->getChildInstanceByName(RequestOutputPlotAxisTypeEnum::XAXIS);
+		$epochAxisNode = $axisNode->getFirstChildByName(REQUESTOUTPUTPLOTEPOCHAXIS_NAME);
+		if (!isset($epochAxisNode))
+		{
+			$epochAxisNode = new RequestOutputPlotEpochAxisNodeClass();
+			$axisNode->addChild($epochAxisNode);
+		}
+	
+		return $epochAxisNode;
+	}
 	public function getColorAxis()
 	{
@@ -0,0 +1,55 @@
+<?php
+
+require_once("RequestOutputPlotElementNodeClass.php");
+
+define ("REQUESTOUTPUTPLOTELEMENTEPOCH_NAME", "epochPlot");
+define ("REQUESTOUTPUTPLOTELEMENTEPOCH_CENTERTIMEID", "centerTimeId");
+
+/**
+ * @class RequestOutputPlotElementEpochNodeClass
+ * @brief Definition of a epoch plot element for a panel of a plot request
+ * @details
+*/
+class RequestOutputPlotElementEpochNodeClass extends RequestOutputPlotElementNodeClass
+{
+	public function __construct()
+	{
+		parent::__construct(REQUESTOUTPUTPLOTELEMENTEPOCH_NAME,true,true,true,false,false,false);
+		//force epoch axis creation
+		$this->getAxes()->getEpochAxis();
+		//force color axis creation
+		$this->getAxes()->getColorAxis();
+	}
+
+	public function getEpochAxis()
+	{
+		return $this->getAxes()->getEpochAxis();
+	}
+
+	public function addYAxis($id)
+	{
+		return $this->getAxes()->addDigitalAxis(RequestOutputPlotAxisTypeEnum::YAXIS,$id);
+	}
+
+	public function getYAxis($id)
+	{
+		return $this->getAxes()->getDigitalAxis(RequestOutputPlotAxisTypeEnum::YAXIS,$id);
+	}
+
+	public function getZAxis()
+	{
+		return $this->getAxes()->getColorAxis();
+	}
+	
+	public function setCenterTimeId($centerTimeId)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTELEMENTEPOCH_CENTERTIMEID, $centerTimeId);
+	}
+	
+	public function getCenterTimeId()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTELEMENTEPOCH_CENTERTIMEID);
+	}
+}
+
+?>
 \ No newline at end of file
@@ -9,6 +9,13 @@ define (&quot;REQUESTOUTPUTPLOTPAGE_FORMAT&quot;, &quot;format&quot;);
 define ("REQUESTOUTPUTPLOTPAGE_DIMENSION", "dimension");
 define ("REQUESTOUTPUTPLOTPAGE_ORIENTATION", "orientation");
 define ("REQUESTOUTPUTPLOTPAGE_MODE", "mode");
+define ("REQUESTOUTPUTPLOTPAGE_SUPERPOSEMODE", "superposeMode");
+define ("REQUESTOUTPUTPLOTPAGE_DEFAULTTIMEPLOTWIDTH", "defaultTimePlotWidth");
+define ("REQUESTOUTPUTPLOTPAGE_DEFAULTTIMEPLOTHEIGHT", "defaultTimePlotHeight");
+define ("REQUESTOUTPUTPLOTPAGE_DEFAULTXYPLOTWIDTH", "defaultXYPlotWidth");
+define ("REQUESTOUTPUTPLOTPAGE_DEFAULTXYPLOTHEIGHT", "defaultXYPlotHeight");
+define ("REQUESTOUTPUTPLOTPAGE_DEFAULTTIMEPLOTXMARGIN", "defaultTimePlotXMargin");
+define ("REQUESTOUTPUTPLOTPAGE_DEFAULTXYPLOTXMARGIN", "defaultXYPlotXMargin");
 abstract class RequestOutputPlotPageFormatEnum
 {
@@ -156,6 +163,66 @@ class RequestOutputPlotPageNodeClass extends NodeClass
 	{
 		return $this->getAttribute(REQUESTOUTPUTPLOTPAGE_MODE);
 	}
+	
+	public function setSuperposeMode($superposeMode)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTPAGE_SUPERPOSEMODE, $superposeMode);
+	}
+	
+	public function getSuperposeMode()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTPAGE_SUPERPOSEMODE);
+	}
+	
+	public function setDefaultTimePlotWidth($width)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTPAGE_DEFAULTTIMEPLOTWIDTH, $width);
+	}
+	
+	public function getDefaultTimePlotWidth()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTPAGE_DEFAULTTIMEPLOTWIDTH);
+	}
+	
+	public function setDefaultTimePlotHeight($height)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTPAGE_DEFAULTTIMEPLOTHEIGHT, $height);
+	}
+	
+	public function getDefaultTimePlotHeight()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTPAGE_DEFAULTTIMEPLOTHEIGHT);
+	}
+	
+	public function setDefaultXYPlotWidth($width)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTPAGE_DEFAULTXYPLOTWIDTH, $width);
+	}
+	
+	public function getDefaultXYPlotWidth()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTPAGE_DEFAULTXYPLOTWIDTH);
+	}
+	
+	public function setDefaultXYPlotHeight($height)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTPAGE_DEFAULTXYPLOTHEIGHT, $height);
+	}
+	
+	public function getDefaultXYPlotHeight()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTPAGE_DEFAULTXYPLOTHEIGHT);
+	}
+	
+	public function setDefaultTimePlotXMargin($left, $right)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTPAGE_DEFAULTTIMEPLOTXMARGIN, "[".$left.",".$right."]");
+	}
+	
+	public function setDefaultXYPlotXMargin($left, $right)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTPAGE_DEFAULTXYPLOTXMARGIN, "[".$left.",".$right."]");
+	}
 }
 ?>
 \ No newline at end of file
@@ -0,0 +1,62 @@
+<?php
+
+define ("REQUESTOUTPUTPLOTPANELBOUNDS_NAME", "bounds");
+define ("REQUESTOUTPUTPLOTPANELBOUNDS_X", "x");
+define ("REQUESTOUTPUTPLOTPANELBOUNDS_Y", "y");
+define ("REQUESTOUTPUTPLOTPANELBOUNDS_WIDTH", "width");
+define ("REQUESTOUTPUTPLOTPANELBOUNDS_HEIGHT", "height");
+
+/**
+ * @class RequestOutputPlotPanelBoundsNodeClass
+ * @brief Definition of panel bounds for a plot request
+ * @details
+*/
+class RequestOutputPlotPanelBoundsNodeClass extends NodeClass
+{
+	public function __construct()
+	{
+		parent::__construct(REQUESTOUTPUTPLOTPANELBOUNDS_NAME);
+	}
+
+	public function setX($x)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTPANELBOUNDS_X, $x);
+	}
+	
+	public function getX()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTPANELBOUNDS_X);
+	}
+	
+	public function setY($y)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTPANELBOUNDS_Y, $y);
+	}
+	
+	public function getY()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTPANELBOUNDS_Y);
+	}
+	
+	public function setWidth($width)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTPANELBOUNDS_WIDTH, $width);
+	}
+	
+	public function getWidth()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTPANELBOUNDS_WIDTH);
+	}
+	
+	public function setHeight($height)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTPANELBOUNDS_HEIGHT, $height);
+	}
+	
+	public function getHeight()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTPANELBOUNDS_HEIGHT);
+	}
+}
+
+?>
 \ No newline at end of file
@@ -8,13 +8,17 @@ require_once(&quot;RequestOutputPlotElementTickNodeClass.php&quot;);
 define ("REQUESTOUTPUTPLOTPANEL_NAME", "panel");
 define ("REQUESTOUTPUTPLOTPANEL_TITLE", "title");
 define ("REQUESTOUTPUTPLOTPANEL_BACKGROUNDCOLOR", "backgroundColor");
+define ("REQUESTOUTPUTPLOTPANEL_XMARGIN", "xMargin");
+define ("REQUESTOUTPUTPLOTPANEL_PREFEREDWIDTH", "preferedWidth");
+define ("REQUESTOUTPUTPLOTPANEL_PREFEREDHEIGHT", "preferedHeight");
 abstract class RequestOutputPlotElementTypeEnum
 {
-	const TIMEPLOT = "TimePlot";
-	const XYPLOT   = "XYPlot";
+	const TIMEPLOT   = "TimePlot";
+	const XYPLOT     = "XYPlot";
 	const STATUSPLOT = "StatusPlot";
-	const TICKPLOT = "TickPlot";
+	const TICKPLOT   = "TickPlot";
+	const EPOCHPLOT  = "EpochPlot";
 }
 /**
@@ -39,7 +43,18 @@ class RequestOutputPlotPanelNodeClass extends NodeClass
 		return $this->getAttribute(REQUESTOUTPUTPLOTPANEL_BACKGROUNDCOLOR);
 	}
-	/* ToDo bounds */
+	public function getBounds()
+	{
+		$node = $this->getFirstChildByName(REQUESTOUTPUTPLOTPANELBOUNDS_NAME);
+	
+		if (!isset($node))
+		{
+			$node = new RequestOutputPlotPanelBoundsNodeClass();
+			$this->addChild($node);
+		}
+	
+		return $node;
+	}
 	public function getFont()
 	{
@@ -83,6 +98,9 @@ class RequestOutputPlotPanelNodeClass extends NodeClass
 			case RequestOutputPlotElementTypeEnum::TICKPLOT :
 				$node = new RequestOutputPlotElementTickNodeClass($noAxes);
 				break;
+			case RequestOutputPlotElementTypeEnum::EPOCHPLOT :
+				$node = new RequestOutputPlotElementEpochNodeClass();
+				break;
 			default :
 				return NULL;
 		}
@@ -90,11 +108,30 @@ class RequestOutputPlotPanelNodeClass extends NodeClass
 		return $node;
 	}
+	public function setPreferedWidth($width)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTPANEL_PREFEREDWIDTH, $width);
+	}
+	
+	public function getPreferedWidth()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTPANEL_PREFEREDWIDTH);
+	}
+	
+	public function setPreferedHeight($height)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTPANEL_PREFEREDHEIGHT, $height);
+	}
+	
+	public function getPreferedHeight()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTPANEL_PREFEREDHEIGHT);
+	}
-
-	/* ToDo prefered size */
-
-	/* ToDo x y margins */
+	public function setXMargin($left, $right)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTPANEL_XMARGIN, "[".$left.",".$right."]");
+	}
 }
 ?>
 \ No newline at end of file
@@ -0,0 +1,47 @@
+<?php
+
+define ("REQUESTOUTPUTPLOTRESAMPLING_TYPE", "type");
+define ("REQUESTOUTPUTPLOTRESAMPLING_VALUE", "value");
+
+abstract class RequestOutputPlotResamplingTypeEnum
+{
+	const AUTO   = "auto";
+	const XPARAM = "xparam";
+	const YPARAM = "yparam";
+	const MANUAL = "manual";
+}
+
+/**
+ * @class RequestOutputPlotLineNodeClass
+ * @brief Definition of a line element for a plot
+ * @details
+ */
+class RequestOutputPlotResamplingNodeClass extends NodeClass
+{
+	public function __construct($name)
+	{
+		parent::__construct($name);
+	}
+	
+	public function setType($type)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTRESAMPLING_TYPE, $type);
+	}
+	
+	public function getType()
+	{
+		$this->getAttribute(REQUESTOUTPUTPLOTRESAMPLING_TYPE);
+	}
+	
+	public function setValue($value)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTRESAMPLING_VALUE, $value);
+	}
+	
+	public function getValue()
+	{
+		$this->getAttribute(REQUESTOUTPUTPLOTRESAMPLING_VALUE);
+	}
+}
+
+?>
 \ No newline at end of file
@@ -7,6 +7,7 @@ define (&quot;REQUESTOUTPUTPLOTYSERIE_YAXIS&quot;, &quot;yAxis&quot;);
 define ("REQUESTOUTPUTPLOTYSERIE_XAXIS", "xAxis");
 define ("REQUESTOUTPUTPLOTYSERIE_INDEX", "index");
 define ("REQUESTOUTPUTPLOTYSERIE_COLORSERIEID", "colorSerieId");
+define ("REQUESTOUTPUTPLOTYSERIE_RESAMPLING", "resampling");
 define ("REQUESTOUTPUTPLOTYSERIE_LINE", "line");
 define ("REQUESTOUTPUTPLOTYSERIE_SYMBOL", "symbol");
@@ -62,6 +63,19 @@ class RequestOutputPlotYSerieNodeClass extends NodeClass
 		return $this->getAttribute(REQUESTOUTPUTPLOTYSERIE_COLORSERIEID);
 	}
+	public function getResampling()
+	{
+		$node = $this->getFirstChildByName(REQUESTOUTPUTPLOTYSERIE_RESAMPLING);
+		
+		if (!isset($node))
+		{
+			$node = new RequestOutputPlotResamplingNodeClass(REQUESTOUTPUTPLOTYSERIE_RESAMPLING);
+			$this->addChild($node);
+		}
+		
+		return $node;
+	}
+	
 	public function getLine()
 	{
 		$node = $this->getFirstChildByName(REQUESTOUTPUTPLOTYSERIE_LINE);
@@ -43,6 +43,7 @@ class RequestTimesIntervalNodeClass extends NodeClass
 define ("REQUESTTIMETABLE_NAME", "timetable");
 define ("REQUESTTIMETABLE_ID", "id");
+define ("REQUESTTIMETABLE_INDEX", "index");
 /**
  * @class RequestTimesTimeTableNodeClass
@@ -65,6 +66,53 @@ class RequestTimesTimeTableNodeClass extends NodeClass
 	{
 		return $this->getAttribute(REQUESTTIMETABLE_ID);
 	}
+	
+	public function setIndex($index)
+	{
+		$this->setAttribute(REQUESTTIMETABLE_INDEX, $index);
+	}
+	
+	public function getIndex()
+	{
+		return $this->getAttribute(REQUESTTIMETABLE_INDEX);
+	}
+}
+
+define ("REQUESTCATALOG_NAME", "catalog");
+define ("REQUESTCATALOG_ID", "id");
+define ("REQUESTCATALOG_INDEX", "index");
+
+/**
+ * @class RequestCatalogNodeClass
+ * @brief Definition of a request catalog node for AMDA_Kernel
+ * @details
+ */
+class RequestCatalogNodeClass extends NodeClass
+{
+	public function __construct()
+	{
+		parent::__construct(REQUESTCATALOG_NAME);
+	}
+
+	public function setId($id)
+	{
+		$this->setAttribute(REQUESTCATALOG_ID, $id);
+	}
+
+	public function getId()
+	{
+		return $this->getAttribute(REQUESTCATALOG_ID);
+	}
+
+	public function setIndex($index)
+	{
+		$this->setAttribute(REQUESTCATALOG_INDEX, $index);
+	}
+
+	public function getIndex()
+	{
+		return $this->getAttribute(REQUESTCATALOG_INDEX);
+	}
 }
 define ("REQUESTTIMES_NAME", "times");
@@ -93,17 +141,24 @@ class RequestTimesNodeClass extends NodeClass
 		return $this->getChildrenByName(REQUESTTIMEINTERVAL_NAME);
 	}
-	public function addTimeTable($id)
+	public function addTimeTable($id, $index = -1)
 	{
 		$timeTable = new RequestTimesTimeTableNodeClass();
 		$timeTable->setId($id);
+		if ($index >= 0)
+			$timeTable->setIndex($index);
 		$this->addChild($timeTable);
 	}
-	public function getTimeTables()
+	public function addCatalog($id, $index = -1)
 	{
-		return $this->getChildrenByName(REQUESTTIMETABLE_NAME);
+		$catalogNode = new RequestCatalogNodeClass();
+		$catalogNode->setId($id);
+		if ($index >= 0)
+			$catalogNode->setIndex($index);
+		$this->addChild($catalogNode);
 	}
+	
 }
 ?>
 \ No newline at end of file