Fix instant plot

Benjamin Renard
1 parent 419a700b
Showing 1 changed file with 7 additions and 29 deletions Show diff stats
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
@@ -1762,23 +1762,9 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 	private function unmarshallInstant($input, $plotInput)
 	{
-		//Find current tab
-		$crtTab = NULL;
-		foreach ($plotInput->{'tabs'} as $tab)
-		{
-			if ($input->{'tabId'} == PLOT_RESULT_FILE_KEY."_".$tab->{'id'})
-			{
-				$crtTab = $tab;
-				break;
-			}
-		}
-	
-		if (!$crtTab)
-			throw new Exception('Cannot retrieve plot tab for instant plot.');
-	
 		//Find current panel
 		$crtPanel = NULL;
-		foreach ($crtTab->{'panels'} as $panel)
+		foreach ($plotInput->{'panels'} as $panel)
 		{
 			if ($input->{'panelId'} == $panel->{'id'})
 			{
@@ -1843,20 +1829,15 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 			"file-format" => "PNG",
 			"file-output" => "INTERACTIVE",
 			"file-prefix" => "instant",
-			"last-plotted-tab"=> 1,
 			"timesrc" => "Interval",
 			"startDate" => date("Y-m-dTH:i:s", $timeStamp - 3600),
 			"stopDate" => date("Y-m-dTH:i:s", $timeStamp + 3600),
-			"tabs" => array()
-		);
-		
-		$instantTab = (Object)array(
 			"id" => 1,
-			"page-margins-activated" => $crtTab->{"page-margins-activated"},
-			"page-margin-x" => $crtTab->{"page-margin-x"},
-			"page-margin-y" => $crtTab->{"page-margin-y"},
-			"page-orientation" => $crtTab->{"page-orientation"},
-			"page-dimension" => $crtTab->{"page-dimension"},
+			"page-margins-activated" => $plotInput->{"page-margins-activated"},
+			"page-margin-x" => $plotInput->{"page-margin-x"},
+			"page-margin-y" => $plotInput->{"page-margin-y"},
+			"page-orientation" => $plotInput->{"page-orientation"},
+			"page-dimension" => $plotInput->{"page-dimension"},
 			"page-layout-type" => "vertical",
 			"page-layout-object" => (Object)array(
 				"layout-expand" => true,
@@ -1905,10 +1886,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
 		);
 		$instantPanel->{"params"}[] = $instantParam;
-		$instantTab->{"panels"}[] = $instantPanel;
-		
-		$instantPlotInput->{"tabs"}[] = $instantTab;
-		
+		$instantPlotInput->{"panels"}[] = $instantPanel;
 		return $instantPlotInput;
 	}