Rebase with main

Author: lelandaisb

src/Core/Geom/Curve.cpp

@@ -634,80 +634,6 @@ bool Curve::isA(const std::string& name)
     return (name.compare(0,getTinyName().size(),getTinyName()) == 0);
 }
 /*----------------------------------------------------------------------------*/
-<<<<<<< HEAD
-void Curve::add(Group::Group1D* grp)
-{
-    //std::cout<<"Curve::add("<<grp->getName()<<") à "<<getName()<<std::endl;
-    m_groups.push_back(grp);
-    
-    TkUtil::Color	color (0, 0, 0);
-    std::vector<Group::GroupEntity*>	groups	= Internal::groupsFromTypedGroups (m_groups);
-    if (true == getContext ( ).getGroupColor (groups, color))
-    {
-		getDisplayProperties ( ).setCloudColor (color);
-		getDisplayProperties ( ).setWireColor (color);
-		getDisplayProperties ( ).setSurfacicColor (color);
-		getDisplayProperties ( ).setFontColor (color);
-	}	// if (true == getContext ( ).getGroupColor (groups, color))
-}
-/*----------------------------------------------------------------------------*/
-void Curve::remove(Group::Group1D* grp)
-{
-    uint i = 0;
-    for (; i<m_groups.size() && grp != m_groups[i]; ++i)
-        ;
-
-    if (i!=m_groups.size())
-        m_groups.erase(m_groups.begin()+i);
-    else
-        throw TkUtil::Exception(TkUtil::UTF8String ("Erreur interne (pas de groupe), avec Curve::remove", TkUtil::Charset::UTF_8));
-}
-/*----------------------------------------------------------------------------*/
-bool Curve::find(Group::Group1D* grp)
-{
-    uint i = 0;
-    for (; i<m_groups.size() && grp != m_groups[i]; ++i)
-        ;
-
-    return (i!=m_groups.size());
-}
-/*----------------------------------------------------------------------------*/
-void Curve::getGroupsName (std::vector<std::string>& gn) const
-{
-    gn.clear();
-    for (uint i = 0; i<m_groups.size(); ++i)
-        gn.push_back(m_groups[i]->getName());
-}
-/*----------------------------------------------------------------------------*/
-void Curve::getGroups(std::vector<Group::GroupEntity*>& grp) const
-{
-    grp.insert(grp.end(), m_groups.begin(), m_groups.end());
-}
-/*----------------------------------------------------------------------------*/
-int Curve::getNbGroups() const
-{
-    return m_groups.size();
-}
-/*----------------------------------------------------------------------------*/
-void Curve::setDestroyed(bool b)
-{
-    if (isDestroyed() == b)
-        return;
-
-    // supprime la relation du groupe vers la courbe en cas de destruction
-    if (b)
-        for (uint i = 0; i<m_groups.size(); ++i)
-            m_groups[i]->remove(this);
-    else
-        // et inversement en cas de ressurection
-        for (uint i = 0; i<m_groups.size(); ++i)
-            m_groups[i]->add(this);
-
-    Entity::setDestroyed(b);
-}
-/*----------------------------------------------------------------------------*/
-=======
->>>>>>> 3e32643 (Reduce dependencencies Geom --> Group)
 bool Curve::isLinear() const
 {
 	if (m_occ_edges.size() == 1)

src/Core/Group/GroupHelperForCommand.cpp

@@ -36,6 +36,7 @@ addToGroup(const std::string& group_name, Geom::GeomEntity* e)
     if (! (m_group_manager.getGroupsFor(e).size() > 0 && group->isDefaultGroup())) {
         group->add(e);
         m_group_manager.addGroupFor(e, group);
+        m_info_command.addGeomInfoEntity (e, Internal::InfoCommand::DISPMODIFIED);
         m_info_command.addGroupInfoEntity(group, Internal::InfoCommand::DISPMODIFIED);	
     }
 

src/Core/Group/GroupManager.cpp

@@ -1920,18 +1920,27 @@ const std::vector<GroupEntity*>& GroupManager::getGroupsFor(const Geom::GeomEnti
     return m_entities_groups[e];
 }
 /*----------------------------------------------------------------------------*/
-void GroupManager::addGroupFor(const Geom::GeomEntity* e, GroupEntity* g)
+void GroupManager::addGroupFor(Geom::GeomEntity* e, GroupEntity* g)
 {
     if (e->getDim() != g->getDim()) {
         TkUtil::UTF8String messErr (TkUtil::Charset::UTF_8);
         messErr << e->getName() << " doit être de même dimension que " << g->getName();
         throw TkUtil::Exception(messErr);
     }
-    if (!hasGroupFor(e, g))
+    if (!hasGroupFor(e, g)) {
         m_entities_groups[e].push_back(g);
+
+        TkUtil::Color	color (0, 0, 0);
+        if (true == getContext().getGroupColor(m_entities_groups[e], color)) {
+    		e->getDisplayProperties().setCloudColor(color);
+            e->getDisplayProperties().setWireColor(color);
+    		e->getDisplayProperties().setSurfacicColor(color);
+        	e->getDisplayProperties().setFontColor(color);
+    	}	// if (true == getContext ( ).getGroupColor (groups, color))
+    }
 }
 /*----------------------------------------------------------------------------*/
-void GroupManager::setGroupsFor(const Geom::GeomEntity* e, const std::vector<GroupEntity*>& gs)
+void GroupManager::setGroupsFor(Geom::GeomEntity* e, const std::vector<GroupEntity*>& gs)
 {
     m_entities_groups[e].clear();
     for (GroupEntity* g : gs) addGroupFor(e, g);

src/Core/Topo/CommandSplitFaces.cpp

@@ -114,7 +114,7 @@ void CommandSplitFaces::init(std::vector<Topo::CoFace* > &cofaces)
     for (Topo::CoFace* hcf : cofaces){
 
         if (hcf->isStructured()){
-			if (hcf->getNbFaces()) {
+			if (hcf->getFaces().size() > 0) {
 				// si hcf est 2D, elle n'a pas de face
 				// et si au moins une coface est 3D, le cas est 3D
 				m_cas_2D = false;