Add the possibility to define a resolution for each parameters of a plot request (#4784)

Benjamin Renard
1 parent fb7f73aa
Showing 3 changed files with 16 additions and 61 deletions Show diff stats
config/plotConfig.xml
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotYSerieNodeClass.php
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-	<default>
-		<page dimension="ISO A4" orientation="landscape" mode="color" dpi="90">
-			<font name="sans-serif" size="8" />
-			<margin x="5" y="5" /> <!-- in mm -->
-		</page>
-		<panel resolution="3000" backgroundColor="[255,255,255]"> <!-- charSizeUnits defines space to set all around plot area -->
-			<title position="top" align="center" />
-			<timeAxis id="timeAxis" format="dd/mm/yy" reverse="false" color="[0,0,0]" position="bottom" thickness="1">
-				<legend text="Time, UT" />
-			</timeAxis>
-			<epochAxis id="epochAxis" format="dd/mm/yy" reverse="false" color="[0,0,0]" position="bottom" thickness="1">
-				<legend text="Relative Time" />
-			</epochAxis>
-			<colorAxis id="colorAxis" scale="linear" color="[0,0,0]" reverse="false" position="right" />
-			<xAxis scale="linear" reverse="false" color="[0,0,0]" position="bottom" thickness="1" />
-			<yAxis scale="linear" reverse="false" color="[0,0,0]" position="left" thickness="1" />
-			<timePlot xAxis="timeAxis" zAxis="colorAxis">
-				<line type="line" style="plain" width="1" />
-				<symbol type="no" size="4" />
-			</timePlot>
-			<epochPlot xAxis="epochAxis" zAxis="colorAxis">
-				<line type="line" style="plain" width="1" />
-				<symbol type="no" size="4" color="[0,0,255]" />
-			</epochPlot>
-			<xyPlot zAxis="colorAxis">
-				<line type="no" style="plain" width="1" />
-				<symbol type="dot" size="4"  />
-				<resampling type="auto"/>
-				<timeTick step="0" number="0" minor="0" color="[0,0,0]">
-					<font name="sans-serif" size="5" style="upright" weight="medium" />
-					<firstSymbol type="triangle" size="5" color="[120,0,0]" />
-					<symbol type="circle" size="5" color="[120,120,0]" />
-				</timeTick>
-			</xyPlot>
-			<instantPlot zAxis="colorAxis">
-				<line type="no" style="plain" color="[255,0,0]" width="1" />
-				<symbol type="dot" size="4" color="[0,0,255]" />
-			</instantPlot>
-		</panel>
-	</default>
-	<colormap path="plplot/">
-		<grayscale default="0"> <!-- default is map index used for auto line color generation -->
-			<file index="0">cmap0_black_on_white.pal</file>
-			<file index="1">cmap1_gray.pal</file>
-		</grayscale>
-		<color default="0">
-			<file index="0">cmap0_default.pal</file>
-			<file index="1">cmap1_default.pal</file>
-			<file index="2">cmap0_test.pal</file>
-		</color>
-		<coloraxis default="0">
-			<file index="0">cmap1_default.pal</file>
-			<file index="1">cmap1_blue_red.pal</file>
-			<file index="2">cmap1_blue_yellow.pal</file>
-			<file index="3">cmap1_gray.pal</file>
-		</coloraxis>
-	</colormap>
-</root>
@@ -387,7 +387,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		//Panel background color
 		if (($panelData->{'panel-background-color'} != 'none') && ($panelData->{'panel-background-color'} != ''))
 			$panelNode->setBackgroundColor($this->hexColor2KernelColor($panelData->{'panel-background-color'}));
-		
+
 		//Panel font
 		$this->unmarshallFont($panelData, 'panel-font', $panelNode->getFont());
  
@@ -767,6 +767,8 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			{
 				$serieNode = $paramNode->addYSerie($paramData->{'param-drawing-object'}->{'serie-yaxis'}, -1, $xId, $colorSerieId, $paramData->{'param-drawing-object'}->{'serie-value-min'}, $paramData->{'param-drawing-object'}->{'serie-value-max'});
 				$serieNode->setId($paramData->{'id'});
+				if (!empty($paramData->{'param-drawing-object'}->{'serie-resolution'}))
+					$serieNode->setResolution($paramData->{'param-drawing-object'}->{'serie-resolution'});
 				$serieNodes[] = $serieNode;
 			}
 			foreach ($indexes as $index)
@@ -774,6 +776,8 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 				$serieNode = $paramNode->addYSerie($paramData->{'param-drawing-object'}->{'serie-yaxis'}, $index, $xId, $colorSerieId, $paramData->{'param-drawing-object'}->{'serie-value-min'}, $paramData->{'param-drawing-object'}->{'serie-value-max'});
 				if (count($indexes) == 1)
 					$serieNode->setId($paramData->{'id'});
+				if (!empty($paramData->{'param-drawing-object'}->{'serie-resolution'}))
+					$serieNode->setResolution($paramData->{'param-drawing-object'}->{'serie-resolution'});
 				$serieNodes[] = $serieNode;
 			}
 		}
@@ -8,6 +8,7 @@ define (&quot;REQUESTOUTPUTPLOTYSERIE_TIMEPLOT_NAME&quot;, &quot;serie&quot;);
  
 define ("REQUESTOUTPUTPLOTYSERIE_XID", "xId");
 define ("REQUESTOUTPUTPLOTYSERIE_INDEX", "index");
+define ("REQUESTOUTPUTPLOTYSERIE_RESOLUTION", "resolution");
 define ("REQUESTOUTPUTPLOTYSERIE_RESAMPLING", "resampling");
 define ("REQUESTOUTPUTPLOTYSERIE_ERRORBAR", "errorBar");
  
@@ -33,6 +34,16 @@ class RequestOutputPlotYSerieNodeClass extends RequestOutputPlotBaseSerieNodeCla
 		return $this->getAttribute(REQUESTOUTPUTPLOTYSERIE_INDEX);
 	}
  
+	public function setResolution($resolution)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTYSERIE_RESOLUTION, $resolution);
+	}
+
+	public function getResolution()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTYSERIE_RESOLUTION);
+	}
+
 	public function setXId($xId)
 	{
 		$this->setAttribute(REQUESTOUTPUTPLOTYSERIE_XID, $xId);