Skip to content

Fix undo clear group bug #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix undo clear group bug #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/Core/Internal/InfoCommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,12 +217,15 @@ void InfoCommand::addGroupInfoEntity(Group::GroupEntity* entity, type t)
TkUtil::AutoMutex autoMutex (&m_mutex);
#ifdef _DEBUG2
std::cout<<"addGroupInfoEntity("<<entity->getName()<<" (id "<<entity->getUniqueId()<<"),"
<<type2String(m_group_entities_info[entity])<<" => "<<type2String(t)
<<")"<<std::endl;
<<type2String(m_group_entities_info[entity])<<" -> "<<type2String(t);
#endif
type old_t = m_group_entities_info[entity];
if (old_t < t)
m_group_entities_info[entity] = t;

#ifdef _DEBUG2
std::cout<<" ==> "<<type2String(m_group_entities_info[entity])<<")"<<std::endl;
#endif
}
/*----------------------------------------------------------------------------*/
void InfoCommand::getGeomInfoEntity(uint ind, Geom::GeomEntity* &entity, type &t)
Expand Down
27 changes: 14 additions & 13 deletions src/Core/Mesh/CommandClearGroupName.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,15 @@ void CommandClearGroupName::internalExecute()
/*----------------------------------------------------------------------------*/
void CommandClearGroupName::internalUndo()
{

getInfoCommand().permCreatedDeleted();

// suppression de ce qui a été ajouté
deleteCreatedMeshEntities();

// permute toutes les propriétés internes avec leur sauvegarde
permInternalsStats();

Group::GroupManager& gm = getContext().getGroupManager();
std::string default_group_name = gm.getDefaultName(m_dim);

Expand Down Expand Up @@ -268,18 +277,18 @@ void CommandClearGroupName::internalUndo()
}
break;
}

}
/*----------------------------------------------------------------------------*/
void CommandClearGroupName::internalRedo()
{
getInfoCommand().permCreatedDeleted();

// suppression de ce qui a été ajouté
deleteCreatedMeshEntities();

// permute toutes les propriétés internes avec leur sauvegarde
permInternalsStats();
}
/*----------------------------------------------------------------------------*/
void CommandClearGroupName::internalRedo()
{

switch(m_dim){
case(0):{
for (std::vector<Geom::GeomEntity*>::iterator iter = m_geom_entities.begin();
Expand Down Expand Up @@ -360,14 +369,6 @@ void CommandClearGroupName::internalRedo()
}
break;
}

getInfoCommand().permCreatedDeleted();

// suppression de ce qui a été ajouté
deleteCreatedMeshEntities();

// permute toutes les propriétés internes avec leur sauvegarde
permInternalsStats();
}
/*----------------------------------------------------------------------------*/
void CommandClearGroupName::
Expand Down