Min/Max value definition

Benjamin Renard
1 parent 5ae799cc
Showing 3 changed files with 50 additions and 13 deletions Show diff stats
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotBaseSerieNodeClass.php
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotParamsNodeClass.php
@@ -580,9 +580,9 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 					case 'serie' :
 						//Unmarshall x serie
 						if (count($paramXInfo['indexes']) == 0)
-							$xParamNode->addXSerie(REQUESTOUTPUTPLOTELEMENTXY_XAXISID, -1);
+							$xParamNode->addXSerie(REQUESTOUTPUTPLOTELEMENTXY_XAXISID, -1, $paramData->{'param-drawing-object'}->{'serie-xvalue-min'}, $paramData->{'param-drawing-object'}->{'serie-xvalue-max'});
 						else if (count($paramXInfo['indexes']) == 1)
-							$xParamNode->addXSerie(REQUESTOUTPUTPLOTELEMENTXY_XAXISID, $paramXInfo['indexes'][0]);
+							$xParamNode->addXSerie(REQUESTOUTPUTPLOTELEMENTXY_XAXISID, $paramXInfo['indexes'][0], $paramData->{'param-drawing-object'}->{'serie-xvalue-min'}, $paramData->{'param-drawing-object'}->{'serie-xvalue-max'});
 						else
 							throw new Exception('X parameter for serie must be a component.');
 						break;
@@ -689,13 +689,13 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		{
 			if (count($indexes) == 0)
 			{
-				$serieNode = $paramNode->addYSerie($paramData->{'param-drawing-object'}->{'serie-yaxis'}, -1, $useXAxis ? REQUESTOUTPUTPLOTELEMENTXY_XAXISID : '', $colorSerieId);
+				$serieNode = $paramNode->addYSerie($paramData->{'param-drawing-object'}->{'serie-yaxis'}, -1, $useXAxis ? REQUESTOUTPUTPLOTELEMENTXY_XAXISID : '', $colorSerieId, $paramData->{'param-drawing-object'}->{'serie-value-min'}, $paramData->{'param-drawing-object'}->{'serie-value-max'});
 				$serieNode->setId($paramData->{'id'});
 				$serieNodes[] = $serieNode;
 			}
 			foreach ($indexes as $index)
 			{
-				$serieNode = $paramNode->addYSerie($paramData->{'param-drawing-object'}->{'serie-yaxis'}, $index, $useXAxis ? REQUESTOUTPUTPLOTELEMENTXY_XAXISID : '', $colorSerieId);
+				$serieNode = $paramNode->addYSerie($paramData->{'param-drawing-object'}->{'serie-yaxis'}, $index, $useXAxis ? REQUESTOUTPUTPLOTELEMENTXY_XAXISID : '', $colorSerieId, $paramData->{'param-drawing-object'}->{'serie-value-min'}, $paramData->{'param-drawing-object'}->{'serie-value-max'});
 				if (count($indexes) == 1)
 					$serieNode->setId($paramData->{'id'});
 				$serieNodes[] = $serieNode;
@@ -814,17 +814,17 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		switch ($serieData->{'serie-intervaltick-mode'})
 		{
 			case 'symbol-only':
-				$intervalTickNode->setMode(RequestOutputPlotYSerieIntervalTicksModeEnum::SYMBOLONLY);
+				$intervalTickNode->setMode(RequestOutputPlotSerieIntervalTicksModeEnum::SYMBOLONLY);
 				break;
 			case 'interval-index':
-				$intervalTickNode->setMode(RequestOutputPlotYSerieIntervalTicksModeEnum::INTERVALINDEX);
+				$intervalTickNode->setMode(RequestOutputPlotSerieIntervalTicksModeEnum::INTERVALINDEX);
 				break;
 			case 'start-stop-time':
-				$intervalTickNode->setMode(RequestOutputPlotYSerieIntervalTicksModeEnum::STARTSTOPTIME);
+				$intervalTickNode->setMode(RequestOutputPlotSerieIntervalTicksModeEnum::STARTSTOPTIME);
 				break;
 			case 'start-time':
 			default :
-				$intervalTickNode->setMode(RequestOutputPlotYSerieIntervalTicksModeEnum::STARTTIME);
+				$intervalTickNode->setMode(RequestOutputPlotSerieIntervalTicksModeEnum::STARTTIME);
 		}
 		//Color
@@ -909,7 +909,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 	protected function unmarshallSpectro($paramDrawingData, $plotNode, $paramNode, $indexes)
 	{
-		$spectroNode = $paramNode->addSpectro($paramDrawingData->{'spectro-yaxis'});
+		$spectroNode = $paramNode->addSpectro($paramDrawingData->{'spectro-yaxis'}, $paramDrawingData->{'spectro-value-min'}, $paramDrawingData->{'spectro-value-max'});
 	}
 	protected function unmarshallStatusBar($paramDrawingData, $paramNode, $indexes)
@@ -3,6 +3,8 @@
 define ("REQUESTOUTPUTPLOTBASESERIE_YAXIS", "yAxis");
 define ("REQUESTOUTPUTPLOTBASESERIE_XAXIS", "xAxis");
 define ("REQUESTOUTPUTPLOTBASESERIE_COLORSERIEID", "colorSerieId");
+define ("REQUESTOUTPUTPLOTBASESERIE_MIN", "min");
+define ("REQUESTOUTPUTPLOTBASESERIE_MAX", "max");
 define ("REQUESTOUTPUTPLOTBASESERIE_LINE", "line");
 define ("REQUESTOUTPUTPLOTBASESERIE_SYMBOL", "symbol");
 define ("REQUESTOUTPUTPLOTBASESERIE_TIMETICKS", "timeTick");
@@ -41,7 +43,6 @@ class RequestOutputPlotBaseSerieNodeClass extends NodeClass
 		return $this->getAttribute(REQUESTOUTPUTPLOTBASESERIE_XAXIS);
 	}
-
 	public function setColorSerieId($colorSerieId)
 	{
 		$this->setAttribute(REQUESTOUTPUTPLOTBASESERIE_COLORSERIEID, $colorSerieId);
@@ -52,6 +53,26 @@ class RequestOutputPlotBaseSerieNodeClass extends NodeClass
 		return $this->getAttribute(REQUESTOUTPUTPLOTBASESERIE_COLORSERIEID);
 	}
+	public function setMin($min)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTBASESERIE_MIN, $min);
+	}
+	
+	public function getMin()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTBASESERIE_MIN);
+	}
+	
+	public function setMax($max)
+	{
+		$this->setAttribute(REQUESTOUTPUTPLOTBASESERIE_MAX, $max);
+	}
+	
+	public function getMax()
+	{
+		return $this->getAttribute(REQUESTOUTPUTPLOTBASESERIE_MAX);
+	}
+	
 	public function getLine()
 	{
 		$node = $this->getFirstChildByName(REQUESTOUTPUTPLOTBASESERIE_LINE);
@@ -10,6 +10,8 @@ define (&quot;REQUESTOUTPUTPLOTPARAM_ID&quot;, &quot;id&quot;);
 define ("REQUESTOUTPUTPLOTXSERIE_NAME", "xserie");
 define ("REQUESTOUTPUTPLOTXSERIE_XAXIS", "xAxis");
 define ("REQUESTOUTPUTPLOTXSERIE_INDEX", "index");
+define ("REQUESTOUTPUTPLOTXSERIE_MIN", "min");
+define ("REQUESTOUTPUTPLOTXSERIE_MAX", "max");
 define ("REQUESTOUTPUTPLOTCOLORSERIE_NAME", "colorserie");
 define ("REQUESTOUTPUTPLOTCOLORSERIE_ID", "id");
@@ -17,6 +19,8 @@ define (&quot;REQUESTOUTPUTPLOTCOLORSERIE_INDEX&quot;, &quot;index&quot;);
 define ("REQUESTOUTPUTPLOTSPECTRO_NAME", "spectro");
 define ("REQUESTOUTPUTPLOTSPECTRO_YAXIS", "yAxis");
+define ("REQUESTOUTPUTPLOTSPECTRO_MIN", "min");
+define ("REQUESTOUTPUTPLOTSPECTRO_MAX", "max");
 define ("REQUESTOUTPUTPLOTSTATUSBAR_NAME", "serie");
 define ("REQUESTOUTPUTPLOTSTATUSBAR_INDEX", "index");
@@ -42,7 +46,7 @@ class RequestOutputPlotParamNodeClass extends NodeClass
 		return $this->getAttribute(REQUESTOUTPUTPLOTPARAM_ID);
 	}
-	public function addYSerie($yAxis, $index, $xAxis = "", $colorSerieId = -1)
+	public function addYSerie($yAxis, $index, $xAxis = "", $colorSerieId = -1, $min = NULL, $max = NULL)
 	{
 		if ($xAxis != "")
 		{
@@ -52,6 +56,10 @@ class RequestOutputPlotParamNodeClass extends NodeClass
 		else
 			$ySerieNode = new RequestOutputPlotYSerieNodeClass(REQUESTOUTPUTPLOTYSERIE_TIMEPLOT_NAME);
 		$ySerieNode->setYAxisId($yAxis);
+		if (isset($min))
+			$ySerieNode->setMin($min);
+		if (isset($max))
+			$ySerieNode->setMax($max);
 		if ($index >= 0)
 			$ySerieNode->setIndex($index);
 		if ($colorSerieId >= 0)
@@ -80,20 +88,28 @@ class RequestOutputPlotParamNodeClass extends NodeClass
 		return $iserieNode;
 	}
-	public function addSpectro($yAxis)
+	public function addSpectro($yAxis, $min = NULL, $max = NULL)
 	{
 		$spectroNode = new NodeClass(REQUESTOUTPUTPLOTSPECTRO_NAME);
 		$spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_YAXIS, $yAxis);
+		if (isset($min))
+			$spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_MIN, $min);
+		if (isset($max))
+			$spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_MAX, $max);
 		$this->addChild($spectroNode);
 		return $spectroNode;
 	}
-	public function addXSerie($xAxis, $index)
+	public function addXSerie($xAxis, $index, $min = NULL, $max = NULL)
 	{
 		$xSerieNode = new NodeClass(REQUESTOUTPUTPLOTXSERIE_NAME);
 		$xSerieNode->setAttribute(REQUESTOUTPUTPLOTXSERIE_XAXIS, $xAxis);
 		if ($index >= 0)
 			$xSerieNode->setAttribute(REQUESTOUTPUTPLOTXSERIE_INDEX, $index);
+		if (isset($min))
+			$xSerieNode->setAttribute(REQUESTOUTPUTPLOTXSERIE_MIN, $min);
+		if (isset($max))
+			$xSerieNode->setAttribute(REQUESTOUTPUTPLOTXSERIE_MAX, $max);
 		$this->addChild($xSerieNode);
 		return $xSerieNode;
 	}