CDPP / AMDA_Integration

Commit 7fc87ded0a670c093f37748707a96010b72955d4

Authored by Menouard AZIB
Committed by Benjamin Renard
1 parent 63aaa18d
Exists in master and in 16 other branches FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6951, FER_7618, FER_9629, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_11362, SpeasyGet, amdadev

Corriger le multi-panels bug

Showing 2 changed files with 9 additions and 12 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
  Diff comments   View file @7fc87de
... ... @@ -1978,13 +1978,8 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
1978 1978 private function unmarshallPlotFunction($input, $plotInput)
1979 1979 {
1980 1980 date_default_timezone_set('UTC');
1981   - $timeStamp = strtotime($input->starttime);
1982   - $DATE_TYPE = "Y-m-d\TH:i:s";
1983   - $start_time_plotfunction = date($DATE_TYPE, $timeStamp);
1984   - $timestamp_stop_plotfunction = strtotime($input->stoptime);
1985   - $stop_time_plotfunction = date($DATE_TYPE, $timestamp_stop_plotfunction);
1986   - $plotInput->{"startDate"} = $start_time_plotfunction;
1987   - $plotInput->{"stopDate"} = $stop_time_plotfunction;
  1981 + $plotInput->{"startDate"} =$input->starttime;
  1982 + $plotInput->{"stopDate"} = $input->stoptime;
1988 1983 $plotInput->{"file-prefix"} = RequestOutPutPlotElementPlotFunctionNodeClass::REQUESTOUTPUTPLOTELEMENT_PLOTFUNCTION_NAME;
1989 1984 $plotInput->{"interactive-preview"} = true;
1990 1985 $plotInput->{"file-format"} = "PNG";
... ... @@ -1996,10 +1991,11 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
1996 1991 "layout-panel-spacing" => 0.05
1997 1992 );
1998 1993  
1999   -
  1994 + $panels = [];
2000 1995  
2001   - foreach ($plotInput->{'panels'} as $panel) {
2002   - if ($input->{'panelId'} == $panel->{'id'}) {
  1996 + foreach ($plotInput->{'panels'} as $input_panel) {
  1997 + if ($input->{'panelId'} == $input_panel->{'id'}) {
  1998 + $panel = $input_panel;
2003 1999 if ($panel->{'panel-plot-type'} !== 'timePlot')
2004 2000 throw new Exception('Plot Function action only available for Time plot.');
2005 2001  
... ... @@ -2137,10 +2133,11 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
2137 2133 $panel->{RequestOutPutPlotElementPlotFunctionNodeClass::PLOT_FUNCTION_SCALE_ABSCISSE} = $scale_abscisse;
2138 2134 $panel->{RequestOutPutPlotElementPlotFunctionNodeClass::PLOT_FUNCTION_SCALE_ORDONNEE} = $scale_ordonnee;
2139 2135  
  2136 + $panels[]= $panel;
2140 2137 break;
2141 2138 }
2142 2139 }
2143   -
  2140 + $plotInput->{'panels'} = $panels;
2144 2141 return $plotInput;
2145 2142 }
2146 2143  
... ...
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutPutPlotElementPlotFunctionNodeClass.php
  Diff comments   View file @7fc87de
... ... @@ -50,7 +50,7 @@ class RequestOutPutPlotElementPlotFunctionNodeClass extends RequestOutputPlotEle
50 50 */
51 51 public static function getTextLegend($abscisse)
52 52 {
53   - return $abscisse === RequestOutPutPlotElementPlotFunctionNodeClass::PLOT_FUNCTION_FREQUNECY ? "Freq, Hz" : "Period, S";
  53 + return $abscisse === RequestOutPutPlotElementPlotFunctionNodeClass::PLOT_FUNCTION_FREQUNECY ? "Frequency (Hz)" : "Period (S)";
54 54 }
55 55  
56 56 public function getXAxis()
... ...