CDPP / AMDA_Integration

Commit c654ced340dde7cfe5193899fe8d8767a4f488e7

Authored by Benjamin Renard
1 parent 4f9a8e36
Exists in master and in 66 other branches 10098, 4797, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 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, akka-scatter-multi-xparams, amdadev, anr_tempete, cu2022, density_maps, develop, evol-6371, expression-parser-bre, frames-transformation, install-rework, livraison-akka, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, plot-tt-catalog, rm_5357, rm_6595, rm_6912, rm_7926, rm_8932, save-other-requests, shared-objects-updater, sum-components-indexes, test-merge, webservice, ws_get_catalog

Archive name

Showing 1 changed file with 26 additions and 14 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
  Diff comments   View file @c654ced
... ... @@ -48,23 +48,35 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
48 48 {
49 49 if (isset($activeTab))
50 50 {
51   - if ($activeTab->{'multi-plot-linked'} && !$tab->{'multi-plot-linked'})
  51 + if ($this->isInteractiveRequest)
52 52 {
53   - ++$tabRequestIndex;
54   - //Tab is not linked to the Multi Plot Mode
55   - continue;
56   - }
57   - else if (!$activeTab->{'multi-plot-linked'} && ($tab->{'id'} != $activeTab->{'id'}))
58   - {
59   - ++$tabRequestIndex;
60   - //Plot only current active tab
61   - continue;
  53 + if ($activeTab->{'multi-plot-linked'} && !$tab->{'multi-plot-linked'})
  54 + {
  55 + ++$tabRequestIndex;
  56 + //Tab is not linked to the Multi Plot Mode
  57 + continue;
  58 + }
  59 + else if (!$activeTab->{'multi-plot-linked'} && ($tab->{'id'} != $activeTab->{'id'}))
  60 + {
  61 + ++$tabRequestIndex;
  62 + //Plot only current active tab
  63 + continue;
  64 + }
  65 + else if (isset($input->{'force-single-replot'}) && $input->{'force-single-replot'} && ($tab->{'id'} != $activeTab->{'id'}))
  66 + {
  67 + ++$tabRequestIndex;
  68 + //Plot only current active tab when 'force-single-replot' is active
  69 + continue;
  70 + }
62 71 }
63   - else if (isset($input->{'force-single-replot'}) && $input->{'force-single-replot'} && ($tab->{'id'} != $activeTab->{'id'}))
  72 + else
64 73 {
65   - ++$tabRequestIndex;
66   - //Plot only current active tab when 'force-single-replot' is active
67   - continue;
  74 + if ($tab->{'id'} != $activeTab->{'id'})
  75 + {
  76 + ++$tabRequestIndex;
  77 + //In no interactive request, plot only active tab
  78 + continue;
  79 + }
68 80 }
69 81 }
70 82  
... ...