Changeset 4389 in ntrip for trunk/BNC/src/bncpppclient.cpp
- Timestamp:
- Jul 5, 2012, 6:45:18 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/bncpppclient.cpp
r4373 r4389 160 160 // -------------------- 161 161 if (obs.satSys == 'G') { 162 if ( (obs. P1 || obs.C1) && (obs.P2 || obs.C2) && obs.l1() && obs.l2() ) {162 if ( (obs.p1() || obs.c1()) && (obs.p2() || obs.c2()) && obs.l1() && obs.l2() ) { 163 163 double f1 = t_CST::freq1; 164 164 double f2 = t_CST::freq2; 165 165 double c1 = f1 * f1 / (f1 * f1 - f2 * f2); 166 166 double c2 = - f2 * f2 / (f1 * f1 - f2 * f2); 167 if (obs. P1) {168 satData->P1 = obs. P1+ (bb ? bb->p1 : 0.0);167 if (obs.p1()) { 168 satData->P1 = obs.p1() + (bb ? bb->p1 : 0.0); 169 169 } 170 170 else { 171 satData->P1 = obs. C1+ (bb ? bb->c1 : 0.0);172 } 173 if (obs. P2) {174 satData->P2 = obs. P2+ (bb ? bb->p2 : 0.0);171 satData->P1 = obs.c1() + (bb ? bb->c1 : 0.0); 172 } 173 if (obs.p2()) { 174 satData->P2 = obs.p2() + (bb ? bb->p2 : 0.0); 175 175 } 176 176 else { 177 satData->P2 = obs. C2;177 satData->P2 = obs.c2(); 178 178 } 179 179 satData->L1 = obs.l1() * t_CST::c / f1; … … 193 193 // ------------------------ 194 194 else if (obs.satSys == 'R') { 195 if ( (obs. P1 || obs.C1) && (obs.P2 || obs.C2) && obs.l1() && obs.l2() ) {195 if ( (obs.p1() || obs.c1()) && (obs.p2() || obs.c2()) && obs.l1() && obs.l2() ) { 196 196 double f1 = t_CST::f1(obs.satSys, obs.slotNum); 197 197 double f2 = t_CST::f2(obs.satSys, obs.slotNum); 198 198 double c1 = f1 * f1 / (f1 * f1 - f2 * f2); 199 199 double c2 = - f2 * f2 / (f1 * f1 - f2 * f2); 200 if (obs. P1) {201 satData->P1 = obs. P1+ (bb ? bb->p1 : 0.0);200 if (obs.p1()) { 201 satData->P1 = obs.p1() + (bb ? bb->p1 : 0.0); 202 202 } 203 203 else { 204 satData->P1 = obs. C1+ (bb ? bb->c1 : 0.0);205 } 206 if (obs. P2) {207 satData->P2 = obs. P2+ (bb ? bb->p2 : 0.0);204 satData->P1 = obs.c1() + (bb ? bb->c1 : 0.0); 205 } 206 if (obs.p2()) { 207 satData->P2 = obs.p2() + (bb ? bb->p2 : 0.0); 208 208 } 209 209 else { 210 satData->P2 = obs. C2;210 satData->P2 = obs.c2(); 211 211 } 212 212 satData->L1 = obs.l1() * t_CST::c / f1; … … 226 226 // ------------------------ 227 227 else if (obs.satSys == 'E') { 228 if ( obs. C1 && obs.C5 && obs.l1() && obs.L5) {228 if ( obs.c1() && obs.c5() && obs.l1() && obs.l5()) { 229 229 double f1 = t_CST::freq1; 230 230 double f5 = t_CST::freq5; … … 232 232 double c5 = - f5 * f5 / (f1 * f1 - f5 * f5); 233 233 234 satData->P1 = obs. C1;235 satData->P5 = obs. C5;234 satData->P1 = obs.c1(); 235 satData->P5 = obs.c5(); 236 236 satData->L1 = obs.l1() * t_CST::c / f1; 237 satData->L5 = obs. L5* t_CST::c / f5;237 satData->L5 = obs.l5() * t_CST::c / f5; 238 238 satData->P3 = c1 * satData->P1 + c5 * satData->P5; 239 239 satData->L3 = c1 * satData->L1 + c5 * satData->L5;
Note:
See TracChangeset
for help on using the changeset viewer.