CDPP / AMDA_Integration

Commit db7ea5056f4e40d620f0f72eaed0422c40926d79

Authored by Benjamin Renard
1 parent 76792c0e
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

Fix min max range for sum

Showing 1 changed file with 33 additions and 4 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Tools/IHMParamManagerClass.php
  Diff comments   View file @db7ea50
... ... @@ -443,15 +443,44 @@ class IHMParamManagerClass
443 443 }
444 444  
445 445 public function applyRangesAndIndexes($paramsData, $paramData, $force_total_2d, &$paramInfo) {
  446 + $dim1_min = 0;
  447 + $dim1_max = 0;
  448 + $dim2_min = 0;
  449 + $dim2_max = 0;
  450 +
446 451 $dim1_is_range = (isset($paramData->{'dim1-sum-type'}) && ($paramData->{'dim1-sum-type'} > 0));
447 452 $dim1_index = ($dim1_is_range || !isset($paramData->{'dim1-index'}) || ($paramData->{'dim1-index'} == '')) ? '*' : $paramData->{'dim1-index'};
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'};
  453 + if ($dim1_is_range) {
  454 + switch ($paramData->{'dim1-sum-type'}) {
  455 + case 1:
  456 + //Sum between a range of value
  457 + $dim1_min = !empty($paramData->{'dim1-min-value'}) ? $paramData->{'dim1-min-value'} : 0;
  458 + $dim1_max = !empty($paramData->{'dim1-max-value'}) ? $paramData->{'dim1-max-value'} : 0;
  459 + break;
  460 + case 2:
  461 + //Sum between indexes
  462 + $dim1_min = !empty($paramData->{'dim1-min-index'}) ? $paramData->{'dim1-min-index'} : 0;
  463 + $dim1_max = !empty($paramData->{'dim1-max-index'}) ? $paramData->{'dim1-max-index'} : 0;
  464 + break;
  465 + }
  466 + }
450 467  
451 468 $dim2_is_range = (isset($paramData->{'dim2-sum-type'}) && ($paramData->{'dim2-sum-type'} > 0));
452 469 $dim2_index = ($dim2_is_range || !isset($paramData->{'dim2-index'}) || ($paramData->{'dim2-index'} == '')) ? '*' : $paramData->{'dim2-index'};
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'};
  470 + if ($dim2_is_range) {
  471 + switch ($paramData->{'dim2-sum-type'}) {
  472 + case 1:
  473 + //Sum between a range of value
  474 + $dim2_min = !empty($paramData->{'dim2-min-value'}) ? $paramData->{'dim2-min-value'} : 0;
  475 + $dim2_max = !empty($paramData->{'dim2-max-value'}) ? $paramData->{'dim2-max-value'} : 0;
  476 + break;
  477 + case 2:
  478 + //Sum between indexes
  479 + $dim2_min = !empty($paramData->{'dim2-min-index'}) ? $paramData->{'dim2-min-index'} : 0;
  480 + $dim2_max = !empty($paramData->{'dim2-max-index'}) ? $paramData->{'dim2-max-index'} : 0;
  481 + break;
  482 + }
  483 + }
455 484  
456 485 switch ($paramData->{'type'}) {
457 486 case 0:
... ...