Commit 86756f46bbaee9222f21afeb7df852568e735f2e
1 parent
ac583d4b
Exists in
master
and in
55 other branches
Remove multi plot synchronization
Showing
1 changed file
with
1 additions
and
60 deletions
Show diff stats
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
... | ... | @@ -42,16 +42,6 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass |
42 | 42 | $this->saveIHMRequest($input); |
43 | 43 | } |
44 | 44 | |
45 | - //Get active tab | |
46 | - $activeTab = NULL; | |
47 | - foreach ($input->tabs as $tab) | |
48 | - { | |
49 | - if ($tab->{'id'} == $input->{'last-plotted-tab'}) | |
50 | - { | |
51 | - $activeTab = $tab; | |
52 | - } | |
53 | - } | |
54 | - | |
55 | 45 | //Request |
56 | 46 | $requestIndexInParamData = 0; |
57 | 47 | $tabRequestIndex = 0; |
... | ... | @@ -1540,22 +1530,11 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass |
1540 | 1530 | private function unmarshallActionRequest($input) |
1541 | 1531 | { |
1542 | 1532 | $actionInput = $input->{'action'}; |
1543 | - $multiPlotState = $input->{'multiPlotState'}; | |
1544 | 1533 | |
1545 | 1534 | $plotInput = $this->loadIHMRequest(); |
1546 | 1535 | |
1547 | 1536 | if (!isset($plotInput)) |
1548 | - throw new Exception('Cannot retrieve request input for inetractive action.'); | |
1549 | - | |
1550 | - //Set interactive Multi Plot state | |
1551 | - foreach ($multiPlotState as $key => $value) | |
1552 | - { | |
1553 | - foreach ($plotInput->{'tabs'} as $tab) | |
1554 | - { | |
1555 | - if (PLOT_RESULT_FILE_KEY."_".$tab->{'id'} == $key) | |
1556 | - $tab->{'multi-plot-linked'} = $value; | |
1557 | - } | |
1558 | - } | |
1537 | + throw new Exception('Cannot retrieve request input for interactive action.'); | |
1559 | 1538 | |
1560 | 1539 | switch ($actionInput->{'action'}) |
1561 | 1540 | { |
... | ... | @@ -1570,8 +1549,6 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass |
1570 | 1549 | return $this->unmarshallNavigation($actionInput, $plotInput); |
1571 | 1550 | case 'goto' : |
1572 | 1551 | return $this->unmarshallTTGoto($actionInput, $plotInput); |
1573 | - case 'synchronize' : | |
1574 | - return $this->unmarshallSynchronize($actionInput, $plotInput); | |
1575 | 1552 | case 'instant' : |
1576 | 1553 | return $this->unmarshallInstant($actionInput, $plotInput); |
1577 | 1554 | case 'undozoom' : |
... | ... | @@ -1948,42 +1925,6 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass |
1948 | 1925 | return $plotInput; |
1949 | 1926 | } |
1950 | 1927 | |
1951 | - private function unmarshallSynchronize($input, $plotInput) | |
1952 | - { | |
1953 | - //Find current tab | |
1954 | - $crtTab = NULL; | |
1955 | - foreach ($plotInput->{'tabs'} as $tab) | |
1956 | - { | |
1957 | - if ($input->{'tabId'} == PLOT_RESULT_FILE_KEY."_".$tab->{'id'}) | |
1958 | - { | |
1959 | - $crtTab = $tab; | |
1960 | - break; | |
1961 | - } | |
1962 | - } | |
1963 | - | |
1964 | - if (!$crtTab) | |
1965 | - throw new Exception('Cannot retrieve plot tab for synchronize action.'); | |
1966 | - | |
1967 | - if ($crtTab->{'multi-plot-linked'}) | |
1968 | - { | |
1969 | - | |
1970 | - } | |
1971 | - else | |
1972 | - { | |
1973 | - $plotInput->{'last-plotted-tab'} = $crtTab->{'id'}; | |
1974 | - $crtTab->{'ttFileIndex'} = $plotInput->{'ttFileIndex'}; | |
1975 | - $crtTab->{'intIndex'} = $plotInput->{'intIndex'}; | |
1976 | - $crtTab->{'timesrc'} = $plotInput->{'timesrc'}; | |
1977 | - $crtTab->{'timeTables'} = $plotInput->{'timeTables'}; | |
1978 | - $crtTab->{'startDate'} = $plotInput->{'startDate'}; | |
1979 | - $crtTab->{'stopDate'} = $plotInput->{'stopDate'}; | |
1980 | - } | |
1981 | - | |
1982 | - $plotInput->{'force-time-zoom-reset'} = true; | |
1983 | - $this->saveIHMRequest($plotInput); | |
1984 | - return $plotInput; | |
1985 | - } | |
1986 | - | |
1987 | 1928 | private function unmarshallInstant($input, $plotInput) |
1988 | 1929 | { |
1989 | 1930 | //Find current tab | ... | ... |