removed some bugs (not enough...)

This commit is contained in:
Guido Ranzuglia granzuglia 2011-01-19 14:36:46 +00:00
parent fa36865877
commit c061ee110e
3 changed files with 17 additions and 12 deletions

View File

@ -665,13 +665,17 @@ private:
if(sideB.h->IsSelected())
sideA.h->SetSelect(true);
sideA.h->SetBridged(true);
typename HoleVector::iterator hit;
for(hit=holesManager->holes.begin(); hit!=holesManager->holes.end(); ++hit)
if(&*hit == sideB.h)
{
holesManager->holes.erase(hit);
return;
typename HoleVector::iterator hit = holesManager->holes.begin();
//for(hit=holesManager->holes.begin(); hit!=holesManager->holes.end(); ++hit)
while(hit!=holesManager->holes.end())
{
if(&*hit == sideB.h)
{
holesManager->holes.erase(hit++);
return;
}
else
hit++;
}
};

View File

@ -29,7 +29,8 @@ FillerDialog::FillerDialog(QWidget *parent)
someBridge = false;
ui.setupUi(this);
this->setWidget(ui.frame_main);
ui.bridgeTab->setEnabled(false);
QPoint p=parent->mapToGlobal(QPoint(0,0));
this->setGeometry(p.x()+(parent->width()-width()),p.y()+58,width(),height() );
this->setFloating(true);

View File

@ -179,11 +179,11 @@ public:
}
}
it->ResetFlag();
it = holes.erase(it);
it = holes.erase(it++);
continue;
}
}
it++;
else it++;
}
for(fpit = bridgeF.begin(); fpit != bridgeF.end(); fpit++)
@ -198,7 +198,7 @@ public:
{
(*bit)->ResetFlag();
delete *bit;
bit = bridges.erase(bit);
bit = bridges.erase(bit++);
}
else
bit++;
@ -454,7 +454,7 @@ private:
curPos.NextB();
}while( curPos != hit->p );
}
hit = holes.erase(hit);
hit = holes.erase(hit++);
}
else
hit++;