equal
deleted
inserted
replaced
86 TInt isFilterPresent = 0; |
86 TInt isFilterPresent = 0; |
87 TBool isEntryRequested = EFalse; |
87 TBool isEntryRequested = EFalse; |
88 TInt i; |
88 TInt i; |
89 if(contExtInfo!=NULL) |
89 if(contExtInfo!=NULL) |
90 { |
90 { |
91 if((isFilterPresent>0 && isEntryRequested && iHystRadiusArray.Count()>0) || (iHystRadiusArray.Count()>0 && isFilterPresent==0 )) |
91 if( iHystRadiusArray.Count()>0) |
92 { |
92 { |
93 isFilterPresent++; |
93 isFilterPresent++; |
94 isEntryRequested=EFalse; |
94 isEntryRequested=EFalse; |
95 for(i=0;i<iHystRadiusArray.Count();i++) |
95 for(i=0;i<iHystRadiusArray.Count();i++) |
96 { |
96 { |
102 |
102 |
103 } |
103 } |
104 } |
104 } |
105 |
105 |
106 |
106 |
107 if((isFilterPresent>0 && isEntryRequested && iTriggerFiredArray.Count()>0) || (iTriggerFiredArray.Count()>0 && isFilterPresent==0 )) |
107 if((isFilterPresent>0 && isEntryRequested ) || isFilterPresent==0 ) |
108 { |
108 { |
|
109 if(iTriggerFiredArray.Count()>0) |
|
110 { |
109 isFilterPresent++; |
111 isFilterPresent++; |
110 isEntryRequested=EFalse; |
112 isEntryRequested=EFalse; |
111 for(i=0;i<iTriggerFiredArray.Count();i++) |
113 for(i=0;i<iTriggerFiredArray.Count();i++) |
112 { |
114 { |
113 if(contExtInfo->IsTriggerFired()==iTriggerFiredArray[i]) |
115 if(contExtInfo->IsTriggerFired()==iTriggerFiredArray[i]) |
115 isEntryRequested=ETrue; |
117 isEntryRequested=ETrue; |
116 |
118 |
117 } |
119 } |
118 } |
120 } |
119 } |
121 } |
|
122 } |
120 |
123 |
121 if((isFilterPresent>0 && isEntryRequested && iSidArray.Count()>0) || (iSidArray.Count()>0 && isFilterPresent==0 )) |
124 if((isFilterPresent>0 && isEntryRequested && iSidArray.Count()>0) || (iSidArray.Count()>0 && isFilterPresent==0 )) |
122 { |
125 { |
123 isFilterPresent++; |
126 isFilterPresent++; |
124 isEntryRequested=EFalse; |
127 isEntryRequested=EFalse; |