updated interation way in map
This commit is contained in:
parent
d387a0d352
commit
449eb7e3af
3 changed files with 11 additions and 9 deletions
|
|
@ -112,9 +112,11 @@ void ParameterWidget::end()
|
|||
|
||||
void ParameterWidget::connectWidget()
|
||||
{
|
||||
for(entry_map_t::iterator it = entries.begin(); it != entries.end(); it++) {
|
||||
for(entry_map_t::iterator it = entries.begin(); it != entries.end();) {
|
||||
if(!(*it).second->set){
|
||||
entries.erase((*it).first);
|
||||
it=entries.erase(it);
|
||||
}else{
|
||||
it++;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -141,19 +143,18 @@ if(groupMap.find("Global")!=groupMap.end()){
|
|||
groupMap["Global"].parameterVector.clear();
|
||||
}
|
||||
|
||||
for(group_map::iterator it = groupMap.begin(); it != groupMap.end(); it++) {
|
||||
for(group_map::iterator it = groupMap.begin(); it != groupMap.end(); ) {
|
||||
vector<string> gr;
|
||||
gr=it->second.parameterVector;
|
||||
if(gr.empty()|| it->first=="Hidden"){
|
||||
groupMap.erase((*it).first);
|
||||
it=groupMap.erase(it);
|
||||
}
|
||||
}
|
||||
|
||||
for(group_map::iterator it = groupMap.begin(); it != groupMap.end(); it++) {
|
||||
else{
|
||||
|
||||
it->second.parameterVector.insert( it->second.parameterVector.end(), global.begin(), global.end() );
|
||||
|
||||
it++;
|
||||
}
|
||||
}
|
||||
|
||||
begin();
|
||||
for(group_map::iterator it = groupMap.begin(); it != groupMap.end(); it++) {
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ void GroupWidget::onclicked(const bool checked){
|
|||
}else{
|
||||
*(this->show)=false;
|
||||
}
|
||||
this->animationDuration=300;
|
||||
}
|
||||
|
||||
void GroupWidget::setContentLayout(QLayout & contentLayout) {
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ private:
|
|||
bool *show;
|
||||
public:
|
||||
groupInst groupinst;
|
||||
explicit GroupWidget(bool &show,const QString & title = "", const int animationDuration = 0.05, QWidget *parent = 0);
|
||||
explicit GroupWidget(bool &show,const QString & title = "", const int animationDuration = 300, QWidget *parent = 0);
|
||||
void setContentLayout(QLayout & contentLayout);
|
||||
|
||||
private slots:
|
||||
|
|
|
|||
Loading…
Reference in a new issue