Commit eb0ae5580d9ab7aba49c55636a0afe3133e63fe3
1 parent
0904976e
Exists in
8928
and in
1 other branch
integration ok
Showing
1 changed file
with
18 additions
and
10 deletions
Show diff stats
src/InputOutput/IHMImpl/Tools/IHMParamManagerClass.php
| @@ -547,6 +547,8 @@ class IHMParamManagerClass | @@ -547,6 +547,8 @@ class IHMParamManagerClass | ||
| 547 | $dim2_max = 0; | 547 | $dim2_max = 0; |
| 548 | 548 | ||
| 549 | $dim1_is_range = (isset($paramData->{'dim1-sum-type'}) && ($paramData->{'dim1-sum-type'} > 0)); | 549 | $dim1_is_range = (isset($paramData->{'dim1-sum-type'}) && ($paramData->{'dim1-sum-type'} > 0)); |
| 550 | + $processType1 = !empty($paramData->{'dim1-process-type'}) ? $paramData->{'dim1-process-type'} : ''; | ||
| 551 | + $processType2 = !empty($paramData->{'dim2-process-type'}) ? $paramData->{'dim1-process-type'} : ''; | ||
| 550 | $dim1_index = ($dim1_is_range || !isset($paramData->{'dim1-index'}) || ($paramData->{'dim1-index'} == '')) ? '*' : $paramData->{'dim1-index'}; | 552 | $dim1_index = ($dim1_is_range || !isset($paramData->{'dim1-index'}) || ($paramData->{'dim1-index'} == '')) ? '*' : $paramData->{'dim1-index'}; |
| 551 | if ($dim1_is_range) { | 553 | if ($dim1_is_range) { |
| 552 | switch ($paramData->{'dim1-sum-type'}) { | 554 | switch ($paramData->{'dim1-sum-type'}) { |
| @@ -592,11 +594,12 @@ class IHMParamManagerClass | @@ -592,11 +594,12 @@ class IHMParamManagerClass | ||
| 592 | 'min' => $dim1_min, | 594 | 'min' => $dim1_min, |
| 593 | 'max' => $dim1_max, | 595 | 'max' => $dim1_max, |
| 594 | 'relateddim' => 0, | 596 | 'relateddim' => 0, |
| 597 | + 'processType' => $processType1, | ||
| 595 | ); | 598 | ); |
| 596 | if ($paramData->{'dim1-sum-type'} == 2) | 599 | if ($paramData->{'dim1-sum-type'} == 2) |
| 597 | - $paramInfo = $this->addExistingParam('sum_into_table_indexes', $paramsData, $template_args); | 600 | + $paramInfo = $this->addExistingParam('table_indexes', $paramsData, $template_args); |
| 598 | else | 601 | else |
| 599 | - $paramInfo = $this->addExistingParam('sum_into_table_range', $paramsData, $template_args); | 602 | + $paramInfo = $this->addExistingParam('table_range', $paramsData, $template_args); |
| 600 | } | 603 | } |
| 601 | else if ($dim2_is_range) { | 604 | else if ($dim2_is_range) { |
| 602 | $template_args = array( | 605 | $template_args = array( |
| @@ -604,11 +607,12 @@ class IHMParamManagerClass | @@ -604,11 +607,12 @@ class IHMParamManagerClass | ||
| 604 | 'min' => $dim2_min, | 607 | 'min' => $dim2_min, |
| 605 | 'max' => $dim2_max, | 608 | 'max' => $dim2_max, |
| 606 | 'relateddim' => 1, | 609 | 'relateddim' => 1, |
| 610 | + 'processType' => $processType2, | ||
| 607 | ); | 611 | ); |
| 608 | if ($paramData->{'dim2-sum-type'} == 2) | 612 | if ($paramData->{'dim2-sum-type'} == 2) |
| 609 | - $paramInfo = $this->addExistingParam('sum_into_table_indexes', $paramsData, $template_args); | 613 | + $paramInfo = $this->addExistingParam('table_indexes', $paramsData, $template_args); |
| 610 | else | 614 | else |
| 611 | - $paramInfo = $this->addExistingParam('sum_into_table_range', $paramsData, $template_args); | 615 | + $paramInfo = $this->addExistingParam('table_range', $paramsData, $template_args); |
| 612 | } | 616 | } |
| 613 | else if ($dim1_index != '*') { | 617 | else if ($dim1_index != '*') { |
| 614 | $paramInfo['indexes'][] = $dim1_index; | 618 | $paramInfo['indexes'][] = $dim1_index; |
| @@ -627,14 +631,16 @@ class IHMParamManagerClass | @@ -627,14 +631,16 @@ class IHMParamManagerClass | ||
| 627 | 'paramid' => $paramInfo['id'], | 631 | 'paramid' => $paramInfo['id'], |
| 628 | 'min1' => $dim1_min, | 632 | 'min1' => $dim1_min, |
| 629 | 'max1' => $dim1_max, | 633 | 'max1' => $dim1_max, |
| 634 | + 'processType1' => $processType1, | ||
| 630 | 'relateddim1' => 0, | 635 | 'relateddim1' => 0, |
| 631 | 'min2' => $dim2_min, | 636 | 'min2' => $dim2_min, |
| 632 | 'max2' => $dim2_max, | 637 | 'max2' => $dim2_max, |
| 638 | + 'processType2' => $processType2, | ||
| 633 | ); | 639 | ); |
| 634 | if ($paramData->{'dim1-sum-type'} == 2) | 640 | if ($paramData->{'dim1-sum-type'} == 2) |
| 635 | - $paramInfo = $this->addExistingParam('sum_into_table_indexes_2d', $paramsData, $template_args); | 641 | + $paramInfo = $this->addExistingParam('table_indexes_2d', $paramsData, $template_args); |
| 636 | else | 642 | else |
| 637 | - $paramInfo = $this->addExistingParam('sum_into_table_range_2d', $paramsData, $template_args); | 643 | + $paramInfo = $this->addExistingParam('table_range_2d', $paramsData, $template_args); |
| 638 | } | 644 | } |
| 639 | else if ($dim1_is_range) { | 645 | else if ($dim1_is_range) { |
| 640 | $template_args = array( | 646 | $template_args = array( |
| @@ -642,15 +648,16 @@ class IHMParamManagerClass | @@ -642,15 +648,16 @@ class IHMParamManagerClass | ||
| 642 | 'min' => $dim1_min, | 648 | 'min' => $dim1_min, |
| 643 | 'max' => $dim1_max, | 649 | 'max' => $dim1_max, |
| 644 | 'relateddim' => 0, | 650 | 'relateddim' => 0, |
| 651 | + 'processType' => $processType1, | ||
| 645 | ); | 652 | ); |
| 646 | $tableLink = array( | 653 | $tableLink = array( |
| 647 | 'paramid' => $paramInfo['id'], | 654 | 'paramid' => $paramInfo['id'], |
| 648 | 'relateddim' => 1, | 655 | 'relateddim' => 1, |
| 649 | ); | 656 | ); |
| 650 | if ($paramData->{'dim1-sum-type'} == 2) | 657 | if ($paramData->{'dim1-sum-type'} == 2) |
| 651 | - $paramInfo = $this->addExistingParam('sum_into_table_indexes', $paramsData, $template_args, $tableLink); | 658 | + $paramInfo = $this->addExistingParam('table_indexes', $paramsData, $template_args, $tableLink); |
| 652 | else | 659 | else |
| 653 | - $paramInfo = $this->addExistingParam('sum_into_table_range', $paramsData, $template_args, $tableLink); | 660 | + $paramInfo = $this->addExistingParam('table_range', $paramsData, $template_args, $tableLink); |
| 654 | if ($dim2_index != '*') { | 661 | if ($dim2_index != '*') { |
| 655 | $paramInfo['indexes'][] = $dim2_index; | 662 | $paramInfo['indexes'][] = $dim2_index; |
| 656 | } | 663 | } |
| @@ -661,15 +668,16 @@ class IHMParamManagerClass | @@ -661,15 +668,16 @@ class IHMParamManagerClass | ||
| 661 | 'min' => $dim2_min, | 668 | 'min' => $dim2_min, |
| 662 | 'max' => $dim2_max, | 669 | 'max' => $dim2_max, |
| 663 | 'relateddim' => 1, | 670 | 'relateddim' => 1, |
| 671 | + 'processType' => $processType2, | ||
| 664 | ); | 672 | ); |
| 665 | $tableLink = array( | 673 | $tableLink = array( |
| 666 | 'paramid' => $paramInfo['id'], | 674 | 'paramid' => $paramInfo['id'], |
| 667 | 'relateddim' => 0, | 675 | 'relateddim' => 0, |
| 668 | ); | 676 | ); |
| 669 | if ($paramData->{'dim2-sum-type'} == 2) | 677 | if ($paramData->{'dim2-sum-type'} == 2) |
| 670 | - $paramInfo = $this->addExistingParam('sum_into_table_indexes', $paramsData, $template_args, $tableLink); | 678 | + $paramInfo = $this->addExistingParam('table_indexes', $paramsData, $template_args, $tableLink); |
| 671 | else | 679 | else |
| 672 | - $paramInfo = $this->addExistingParam('sum_into_table_range', $paramsData, $template_args, $tableLink); | 680 | + $paramInfo = $this->addExistingParam('table_range', $paramsData, $template_args, $tableLink); |
| 673 | if ($dim1_index != '*') { | 681 | if ($dim1_index != '*') { |
| 674 | $paramInfo['indexes'][] = $dim1_index; | 682 | $paramInfo['indexes'][] = $dim1_index; |
| 675 | } | 683 | } |