CDPP / AMDA_Integration

Commit 76792c0e2aa688ed01048d411dc248c3b3ef46db

Authored by Benjamin Renard
1 parent 54219b37
Exists in master and in 58 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, amdadev, anr_tempete, cu2022, density_maps, develop, expression-parser-bre, frames-transformation, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, plot-tt-catalog, rm_6912, rm_7926, rm_8932, save-other-requests, sum-components-indexes, test-merge, ws_get_catalog

Sum parameters under components indexes

Showing 1 changed file with 12 additions and 12 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Tools/IHMParamManagerClass.php
  Diff comments   View file @76792c0
... ... @@ -443,15 +443,15 @@ class IHMParamManagerClass
443 443 }
444 444  
445 445 public function applyRangesAndIndexes($paramsData, $paramData, $force_total_2d, &$paramInfo) {
446   - $dim1_is_range = (isset($paramData->{'dim1-type-range'}) && ($paramData->{'dim1-type-range'} > 0));
  446 + $dim1_is_range = (isset($paramData->{'dim1-sum-type'}) && ($paramData->{'dim1-sum-type'} > 0));
447 447 $dim1_index = ($dim1_is_range || !isset($paramData->{'dim1-index'}) || ($paramData->{'dim1-index'} == '')) ? '*' : $paramData->{'dim1-index'};
448   - $dim1_min = (!$dim1_is_range || !isset($paramData->{'dim1-min-range'}) || ($paramData->{'dim1-min-range'} == '')) ? 0 : $paramData->{'dim1-min-range'};
449   - $dim1_max = (!$dim1_is_range || !isset($paramData->{'dim1-max-range'}) || ($paramData->{'dim1-max-range'} == '')) ? 0 : $paramData->{'dim1-max-range'};
  448 + $dim1_min = (!$dim1_is_range || !isset($paramData->{'dim1-sum-min'}) || ($paramData->{'dim1-sum-min'} == '')) ? 0 : $paramData->{'dim1-sum-min'};
  449 + $dim1_max = (!$dim1_is_range || !isset($paramData->{'dim1-sum-max'}) || ($paramData->{'dim1-sum-max'} == '')) ? 0 : $paramData->{'dim1-sum-max'};
450 450  
451   - $dim2_is_range = (isset($paramData->{'dim2-type-range'}) && ($paramData->{'dim2-type-range'} > 0));
  451 + $dim2_is_range = (isset($paramData->{'dim2-sum-type'}) && ($paramData->{'dim2-sum-type'} > 0));
452 452 $dim2_index = ($dim2_is_range || !isset($paramData->{'dim2-index'}) || ($paramData->{'dim2-index'} == '')) ? '*' : $paramData->{'dim2-index'};
453   - $dim2_min = (!$dim2_is_range || !isset($paramData->{'dim2-min-range'}) || ($paramData->{'dim2-min-range'} == '')) ? 0 : $paramData->{'dim2-min-range'};
454   - $dim2_max = (!$dim2_is_range || !isset($paramData->{'dim2-max-range'}) || ($paramData->{'dim2-max-range'} == '')) ? 0 : $paramData->{'dim2-max-range'};
  453 + $dim2_min = (!$dim2_is_range || !isset($paramData->{'dim2-sum-min'}) || ($paramData->{'dim2-sum-min'} == '')) ? 0 : $paramData->{'dim2-sum-min'};
  454 + $dim2_max = (!$dim2_is_range || !isset($paramData->{'dim2-sum-max'}) || ($paramData->{'dim2-sum-max'} == '')) ? 0 : $paramData->{'dim2-sum-max'};
455 455  
456 456 switch ($paramData->{'type'}) {
457 457 case 0:
... ... @@ -466,7 +466,7 @@ class IHMParamManagerClass
466 466 'max' => $dim1_max,
467 467 'relateddim' => 0,
468 468 );
469   - if ($paramData->{'dim1-type-range'} == 2)
  469 + if ($paramData->{'dim1-sum-type'} == 2)
470 470 $paramInfo = $this->addExistingParam('sum_into_table_indexes', $paramsData, $template_args);
471 471 else
472 472 $paramInfo = $this->addExistingParam('sum_into_table_range', $paramsData, $template_args);
... ... @@ -478,7 +478,7 @@ class IHMParamManagerClass
478 478 'max' => $dim2_max,
479 479 'relateddim' => 1,
480 480 );
481   - if ($paramData->{'dim2-type-range'} == 2)
  481 + if ($paramData->{'dim2-sum-type'} == 2)
482 482 $paramInfo = $this->addExistingParam('sum_into_table_indexes', $paramsData, $template_args);
483 483 else
484 484 $paramInfo = $this->addExistingParam('sum_into_table_range', $paramsData, $template_args);
... ... @@ -493,7 +493,7 @@ class IHMParamManagerClass
493 493 case 2:
494 494 //Tab2D
495 495 if ($dim1_is_range && $dim2_is_range) {
496   - if ($paramData->{'dim1-type-range'} != $paramData->{'dim2-type-range'}) {
  496 + if ($paramData->{'dim1-sum-type'} != $paramData->{'dim2-sum-type'}) {
497 497 throw new Exception("Not supported - Dimensions ranges for ".$paramInfo['id']." must have the same type for each dimensions");
498 498 }
499 499 $template_args = array(
... ... @@ -504,7 +504,7 @@ class IHMParamManagerClass
504 504 'min2' => $dim2_min,
505 505 'max2' => $dim2_max,
506 506 );
507   - if ($paramData->{'dim1-type-range'} == 2)
  507 + if ($paramData->{'dim1-sum-type'} == 2)
508 508 $paramInfo = $this->addExistingParam('sum_into_table_indexes_2d', $paramsData, $template_args);
509 509 else
510 510 $paramInfo = $this->addExistingParam('sum_into_table_range_2d', $paramsData, $template_args);
... ... @@ -520,7 +520,7 @@ class IHMParamManagerClass
520 520 'paramid' => $paramInfo['id'],
521 521 'relateddim' => 1,
522 522 );
523   - if ($paramData->{'dim1-type-range'} == 2)
  523 + if ($paramData->{'dim1-sum-type'} == 2)
524 524 $paramInfo = $this->addExistingParam('sum_into_table_indexes', $paramsData, $template_args, $tableLink);
525 525 else
526 526 $paramInfo = $this->addExistingParam('sum_into_table_range', $paramsData, $template_args, $tableLink);
... ... @@ -539,7 +539,7 @@ class IHMParamManagerClass
539 539 'paramid' => $paramInfo['id'],
540 540 'relateddim' => 0,
541 541 );
542   - if ($paramData->{'dim2-type-range'} == 2)
  542 + if ($paramData->{'dim2-sum-type'} == 2)
543 543 $paramInfo = $this->addExistingParam('sum_into_table_indexes', $paramsData, $template_args, $tableLink);
544 544 else
545 545 $paramInfo = $this->addExistingParam('sum_into_table_range', $paramsData, $template_args, $tableLink);
... ...