Rev 697 | Rev 767 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 697 | Rev 753 | ||
|---|---|---|---|
| Line 268... | Line 268... | ||
| 268 | tp->first->remove(); // kill |
268 | tp->first->remove(); // kill |
| 269 | // remove from tree list
|
269 | // remove from tree list
|
| 270 | tp = mTrees.erase(tp); |
270 | tp = mTrees.erase(tp); |
| 271 | n++; |
271 | n++; |
| 272 | } else { |
272 | } else { |
| 273 | tp++; |
- | |
| - | 273 | ++tp; |
|
| 274 | }
|
274 | }
|
| 275 | }
|
275 | }
|
| 276 | } catch(const IException &e) { |
276 | } catch(const IException &e) { |
| 277 | context()->throwError(e.message()); |
277 | context()->throwError(e.message()); |
| 278 | }
|
278 | }
|
| Line 378... | Line 378... | ||
| 378 | QList<QPair<Tree*, double> >::iterator tp=mTrees.begin(); |
378 | QList<QPair<Tree*, double> >::iterator tp=mTrees.begin(); |
| 379 | while (tp!=mTrees.end()) { |
379 | while (tp!=mTrees.end()) { |
| 380 | if (!ids.contains(tp->first->id()) ) |
380 | if (!ids.contains(tp->first->id()) ) |
| 381 | tp = mTrees.erase(tp); |
381 | tp = mTrees.erase(tp); |
| 382 | else
|
382 | else
|
| 383 | tp++; |
- | |
| - | 383 | ++tp; |
|
| 384 | }
|
384 | }
|
| 385 | qDebug() << "Management::filter by id-list:" << mTrees.count(); |
385 | qDebug() << "Management::filter by id-list:" << mTrees.count(); |
| 386 | return mTrees.count(); |
386 | return mTrees.count(); |
| 387 | }
|
387 | }
|
| 388 | 388 | ||
| Line 397... | Line 397... | ||
| 397 | while (tp!=mTrees.end()) { |
397 | while (tp!=mTrees.end()) { |
| 398 | tw.setTree(tp->first); |
398 | tw.setTree(tp->first); |
| 399 | if (expr.calculate(tw)) |
399 | if (expr.calculate(tw)) |
| 400 | tp = mTrees.erase(tp); |
400 | tp = mTrees.erase(tp); |
| 401 | else
|
401 | else
|
| 402 | tp++; |
- | |
| - | 402 | ++tp; |
|
| 403 | }
|
403 | }
|
| 404 | } catch(const IException &e) { |
404 | } catch(const IException &e) { |
| 405 | context()->throwError(e.message()); |
405 | context()->throwError(e.message()); |
| 406 | }
|
406 | }
|
| 407 | 407 | ||