From 21751dbc5f2a831d3e4f7b8ffc8fe54668df4ad4 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Fri, 30 Nov 2012 08:00:22 +0000 Subject: [PATCH] Changed the default value of the busy semaphor for document. Now it is false (e.g. when starting the empty doc is not busy) Refactored the advanceto next layer function --- src/common/meshmodel.h | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/common/meshmodel.h b/src/common/meshmodel.h index 00289ab27..6667673f4 100644 --- a/src/common/meshmodel.h +++ b/src/common/meshmodel.h @@ -493,7 +493,7 @@ public: rasterIdCounter=0; currentMesh = 0; currentRaster = 0; - busy=true; + busy=false; } //deletes each meshModel @@ -523,18 +523,9 @@ public: template void advanceCurrentElement(QList& elemList, LayerElement* curr, int pos) { - typename QList::iterator mi; - for(mi=elemList.begin(); mi!=elemList.end();++mi) - if(*mi == curr) break; - - assert(mi!=elemList.end()); - while(pos>0) - { - pos--; - mi++; - if(mi==elemList.end()) mi=elemList.begin(); - } - setCurrent((*mi)); + assert(!elemList.empty() && elemList.contains(curr)); + int currPos = elemList.indexOf(curr); + setCurrent(elemList.at((currPos+pos)%elemList.size())); } MeshModel *mm() {