equal
deleted
inserted
replaced
328 TInt isFilterPresent = 0; |
328 TInt isFilterPresent = 0; |
329 TBool isEntryRequested = EFalse; |
329 TBool isEntryRequested = EFalse; |
330 TInt i; |
330 TInt i; |
331 if(contExtInfo!=NULL) |
331 if(contExtInfo!=NULL) |
332 { |
332 { |
333 if((isFilterPresent>0 && isEntryRequested && iHystRadiusArray.Count()>0) || (iHystRadiusArray.Count()>0 && isFilterPresent==0 )) |
333 if( iHystRadiusArray.Count()>0) |
334 { |
334 { |
335 isFilterPresent++; |
335 isFilterPresent++; |
336 isEntryRequested=EFalse; |
336 isEntryRequested=EFalse; |
337 for(i=0;i<iHystRadiusArray.Count();i++) |
337 for(i=0;i<iHystRadiusArray.Count();i++) |
338 { |
338 { |
344 |
344 |
345 } |
345 } |
346 } |
346 } |
347 |
347 |
348 |
348 |
349 if((isFilterPresent>0 && isEntryRequested && iTriggerFiredArray.Count()>0) || (iTriggerFiredArray.Count()>0 && isFilterPresent==0 )) |
349 if((isFilterPresent>0 && isEntryRequested ) || ( isFilterPresent==0 )) |
350 { |
350 { |
|
351 if(iTriggerFiredArray.Count()>0) |
|
352 { |
351 isFilterPresent++; |
353 isFilterPresent++; |
352 isEntryRequested=EFalse; |
354 isEntryRequested=EFalse; |
353 for(i=0;i<iTriggerFiredArray.Count();i++) |
355 for(i=0;i<iTriggerFiredArray.Count();i++) |
354 { |
356 { |
355 if(contExtInfo->IsTriggerFired()==iTriggerFiredArray[i]) |
357 if(contExtInfo->IsTriggerFired()==iTriggerFiredArray[i]) |
357 isEntryRequested=ETrue; |
359 isEntryRequested=ETrue; |
358 |
360 |
359 } |
361 } |
360 } |
362 } |
361 } |
363 } |
|
364 } |
362 |
365 |
363 if((isFilterPresent>0 && isEntryRequested && iSidArray.Count()>0) || (iSidArray.Count()>0 && isFilterPresent==0 )) |
366 if((isFilterPresent>0 && isEntryRequested && iSidArray.Count()>0) || (iSidArray.Count()>0 && isFilterPresent==0 )) |
364 { |
367 { |
365 isFilterPresent++; |
368 isFilterPresent++; |
366 isEntryRequested=EFalse; |
369 isEntryRequested=EFalse; |