CDPP / AMDA_Integration

Commit e925e4090eece1b6751dacf027840fb107234ee6

Authored by Hacene SI HADJ MOHAND
1 parent 8d0b7234
Exists in master and in 46 other branches 10098, 5390, 7616, 8528, 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, master_vge, mlplasmas, rm_6912, rm_8932, test-merge, ws_get_catalog

templating ok pour component

Showing 1 changed file with 19 additions and 5 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Tools/IHMParamManagerClass.php
  Diff comments   View file @e925e40
... ... @@ -541,24 +541,38 @@ class IHMParamManagerClass
541 541 }
542 542  
543 543 public function applyFilter($paramsData, $paramData, &$paramInfo) {
544   - $filter = (isset($paramData->{'filter_spikes'}) && ($paramData->{'filter_spikes'}=="true"));
545   - if(! $filter){
  544 + $filter = (isset($paramData->{'filter_spikes'}) && ($paramData->{'filter_spikes'}))? true:false;
  545 + if(!$filter){
546 546 return;
547 547 }
  548 + $my_type= $paramData->{'type'};
  549 +
548 550 switch ($paramData->{'type'}) {
549 551 case 0:
  552 + break;
  553 + case 1:
  554 + // vector
  555 + $dim1_index = ($dim1_is_range || !isset($paramData->{'dim1-index'}) || ($paramData->{'dim1-index'} == '')) ? '*' : $paramData->{'dim1-index'};
  556 + $dim2_index = ($dim2_is_range || !isset($paramData->{'dim2-index'}) || ($paramData->{'dim2-index'} == '')) ? '*' : $paramData->{'dim2-index'};
550 557 $factor = !empty($paramData->{'filter_spikes_factor'}) ? $paramData->{'filter_spikes_factor'} : 5;
551 558 $nPoints = !empty($paramData->{'filter_spikes_nPoints'}) ? $paramData->{'filter_spikes_nPoints'} : 100;
  559 + if($dim1_index != '*'){
552 560 $template_args = array(
553 561 'paramid' => $paramInfo['id'],
554 562 'factor' => $factor,
555 563 'nPoints' => $nPoints,
  564 + 'index' => $dim1_index
  565 + );
  566 + $paramInfo = $this->addExistingParam('filter_spikes_component', $paramsData, $template_args);
  567 + }else{
  568 + $template_args = array(
  569 + 'paramid' => $paramInfo['id'],
  570 + 'factor' => $factor,
  571 + 'nPoints' => $nPoints,
556 572 );
557 573 $paramInfo = $this->addExistingParam('filter_spikes', $paramsData, $template_args);
  574 + }
558 575 break;
559   - case 1:
560   - return array('success' => FALSE, 'message' => '1D Table filtering not implémented yet');
561   -
562 576 case 2:
563 577 return array('success' => FALSE, 'message' => '2D Table filtering not implémented yet');
564 578  
... ...