CDPP / AMDA_Integration

Commit f57e1f21bf54dce346dfd94ca46cccf22bace236

Authored by Benjamin Renard
2 parents 74fd500a 2366956c
Exists in master and in 37 other branches 10098, 5390, 7616, 9016Bis, 9084, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, cu2022, density_maps, develop, mlplasmas

Merge branch '10312' into 'develop' 

10312 - Navigation 1/4 d'intervalle dans la fenêtre intéractive de plot

See merge request !7
Showing 1 changed file with 10 additions and 0 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
  Diff comments   View file @f57e1f2
... ... @@ -1457,8 +1457,10 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
1457 1457 return $this->unmarshallZoom($actionInput, $plotInput);
1458 1458 case 'forward':
1459 1459 case 'halfforward':
  1460 + case 'quarterforward':
1460 1461 case 'backward':
1461 1462 case 'halfbackward':
  1463 + case 'quarterbackward':
1462 1464 case 'extend':
1463 1465 case 'shift':
1464 1466 return $this->unmarshallNavigation($actionInput, $plotInput);
... ... @@ -1651,6 +1653,10 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
1651 1653 $startTimeStamp += ($duration / 2);
1652 1654 $stopTimeStamp += ($duration / 2);
1653 1655 break;
  1656 + case 'quarterforward':
  1657 + $startTimeStamp += ($duration / 4);
  1658 + $stopTimeStamp += ($duration / 4);
  1659 + break;
1654 1660 case 'backward':
1655 1661 $startTimeStamp -= $duration;
1656 1662 $stopTimeStamp -= $duration;
... ... @@ -1659,6 +1665,10 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
1659 1665 $startTimeStamp -= ($duration / 2);
1660 1666 $stopTimeStamp -= ($duration / 2);
1661 1667 break;
  1668 + case 'quarterbackward':
  1669 + $startTimeStamp -= ($duration / 4);
  1670 + $stopTimeStamp -= ($duration / 4);
  1671 + break;
1662 1672 case 'extend':
1663 1673 $startTimeStamp -= $input->{'duration'};
1664 1674 $stopTimeStamp += $input->{'duration'};
... ...