Skip to content

Commit 589dc18

Browse files
lelandaisblelandaisb
committed
Home made container removed
1 parent 468b586 commit 589dc18

File tree

66 files changed

+512
-1112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+512
-1112
lines changed

‎src/Core/Geom/ExportVTKImplementation.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ void ExportVTKImplementation::perform(Internal::InfoCommand* icmd)
5757
"one and only one block", TkUtil::Charset::UTF_8));
5858
}
5959

60-
std::vector<Topo::Block*> topo_blocs;
61-
m_context.getTopoManager().getBlocks(topo_blocs);
60+
std::vector<Topo::Block*> topo_blocs = m_context.getTopoManager().getBlocksObj();
6261

6362
gmds::Mesh& mesh = m_context.getMeshManager().getMesh()->getGMDSMesh();
6463
{

‎src/Core/Internal/Context.cpp‎

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1652,41 +1652,31 @@ void Context::clearSession()
16521652

16531653
// commande de destruction de toutes les entités topologiques qui ont pu être construites
16541654
std::vector<Topo::TopoEntity*> ve;
1655-
std::vector<Topo::Block*> blocks;
1656-
getTopoManager().getBlocks(blocks);
1657-
for (uint i=0; i<blocks.size(); i++)
1658-
ve.push_back(blocks[i]);
1659-
std::vector<Topo::CoFace*> cofaces;
1660-
getTopoManager().getCoFaces(cofaces);
1661-
for (uint i=0; i<cofaces.size(); i++)
1662-
ve.push_back(cofaces[i]);
1663-
std::vector<Topo::CoEdge*> coedges;
1664-
getTopoManager().getCoEdges(coedges);
1665-
for (uint i=0; i<coedges.size(); i++)
1666-
ve.push_back(coedges[i]);
1667-
std::vector<Topo::Vertex*> vertices;
1668-
getTopoManager().getVertices(vertices);
1669-
for (uint i=0; i<vertices.size(); i++)
1670-
ve.push_back(vertices[i]);
1655+
Topo::TopoManager& tm = getTopoManager();
1656+
for (Topo::Block* b : tm.getBlocksObj())
1657+
ve.push_back(b);
1658+
for (Topo::CoFace* cf : tm.getCoFacesObj())
1659+
ve.push_back(cf);
1660+
for (Topo::CoEdge* ce : tm.getCoEdgesObj())
1661+
ve.push_back(ce);
1662+
for (Topo::Vertex* v : tm.getVerticesObj())
1663+
ve.push_back(v);
16711664

16721665
Topo::CommandDestroyTopo* commandTopo = new Topo::CommandDestroyTopo(*this, ve, true);
16731666

16741667
command->addCommand(commandTopo);
16751668

16761669
// commande de destruction de toutes les entités géométriques qui ont pu être construites
16771670
std::vector<Geom::GeomEntity*> entities;
1678-
std::vector<Geom::Volume*> volumes = getGeomManager().getVolumesObj();
1679-
for (uint i=0; i<volumes.size(); i++)
1680-
entities.push_back(volumes[i]);
1681-
std::vector<Geom::Surface*> surfaces = getGeomManager().getSurfacesObj();
1682-
for (uint i=0; i<surfaces.size(); i++)
1683-
entities.push_back(surfaces[i]);
1684-
std::vector<Geom::Curve*> curves = getGeomManager().getCurvesObj();
1685-
for (uint i=0; i<curves.size(); i++)
1686-
entities.push_back(curves[i]);
1687-
std::vector<Geom::Vertex*> vtx = getGeomManager().getVerticesObj();
1688-
for (uint i=0; i<vtx.size(); i++)
1689-
entities.push_back(vtx[i]);
1671+
Geom::GeomManager& gm = getGeomManager();
1672+
for (Geom::Volume* v : gm.getVolumesObj())
1673+
entities.push_back(v);
1674+
for (Geom::Surface* s : gm.getSurfacesObj())
1675+
entities.push_back(s);
1676+
for (Geom::Curve* c : gm.getCurvesObj())
1677+
entities.push_back(c);
1678+
for (Geom::Vertex* v : gm.getVerticesObj())
1679+
entities.push_back(v);
16901680

16911681
Geom::CommandRemove* commandGeom = new Geom::CommandRemove(*this, entities, true);
16921682

‎src/Core/Mesh/Cloud.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ TkUtil::UTF8String & operator << (TkUtil::UTF8String & o, const Cloud & cl)
9999
return o;
100100
}
101101
/*----------------------------------------------------------------------------*/
102-
void Cloud::addCoEdge(Topo::CoEdge* ed)
102+
void Cloud::add(Topo::CoEdge* ed)
103103
{
104104
m_topo_property->getCoEdgeContainer().push_back(ed);
105105
}
106106
/*----------------------------------------------------------------------------*/
107-
void Cloud::removeCoEdge(Topo::CoEdge* ed)
107+
void Cloud::remove(Topo::CoEdge* ed)
108108
{
109109
Utils::remove(ed, m_topo_property->getCoEdgeContainer());
110110
}
@@ -115,12 +115,12 @@ const std::vector<Topo::CoEdge* >& Cloud::getCoEdges() const
115115
return m_topo_property->getCoEdgeContainer();
116116
}
117117
/*----------------------------------------------------------------------------*/
118-
void Cloud::addVertex(Topo::Vertex* vtx)
118+
void Cloud::add(Topo::Vertex* vtx)
119119
{
120120
m_topo_property->getVertexContainer().push_back(vtx);
121121
}
122122
/*----------------------------------------------------------------------------*/
123-
void Cloud::removeVertex(Topo::Vertex* vtx)
123+
void Cloud::remove(Topo::Vertex* vtx)
124124
{
125125
Utils::remove(vtx, m_topo_property->getVertexContainer());
126126
}

‎src/Core/Mesh/CommandAddRemoveGroupName.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -331,15 +331,15 @@ updateMesh(std::vector<Topo::Block*>& blocs, std::string grpName, bool add)
331331
if (blk->isMeshed()){
332332
if (add){
333333
#ifdef _DEBUG_UPDATE
334-
std::cout<<" "<<mvol->getName()<<" addBlock("<<(*iter)->getName()<<")"<<std::endl;
334+
std::cout<<" "<<mvol->getName()<<" add("<<(*iter)->getName()<<")"<<std::endl;
335335
#endif
336-
mvol->addBlock(blk);
336+
mvol->add(blk);
337337
}
338338
else {
339339
#ifdef _DEBUG_UPDATE
340-
std::cout<<" "<<mvol->getName()<<" removeBlock("<<(*iter)->getName()<<")"<<std::endl;
340+
std::cout<<" "<<mvol->getName()<<" remove("<<(*iter)->getName()<<")"<<std::endl;
341341
#endif
342-
mvol->removeBlock(blk);
342+
mvol->remove(blk);
343343
}
344344
}
345345
if (isNewVolume)
@@ -398,15 +398,15 @@ updateMesh(std::vector<Topo::CoFace*>& cofaces, std::string grpName, bool add)
398398
if ((*iter)->isMeshed()){
399399
if (add){
400400
#ifdef _DEBUG_UPDATE
401-
std::cout<<" "<<msurf->getName()<<" addCoFace("<<(*iter)->getName()<<")"<<std::endl;
401+
std::cout<<" "<<msurf->getName()<<" add("<<(*iter)->getName()<<")"<<std::endl;
402402
#endif
403-
msurf->addCoFace(*iter);
403+
msurf->add(*iter);
404404
}
405405
else {
406406
#ifdef _DEBUG_UPDATE
407-
std::cout<<" "<<msurf->getName()<<" removeCoFace("<<(*iter)->getName()<<")"<<std::endl;
407+
std::cout<<" "<<msurf->getName()<<" remove("<<(*iter)->getName()<<")"<<std::endl;
408408
#endif
409-
msurf->removeCoFace(*iter);
409+
msurf->remove(*iter);
410410
}
411411
}
412412
} // end if (is_meshed)
@@ -463,15 +463,15 @@ updateMesh(std::vector<Topo::CoEdge*>& coedges, std::string grpName, bool add)
463463
if ((*iter)->isMeshed()){
464464
if (add){
465465
#ifdef _DEBUG_UPDATE
466-
std::cout<<" "<<mcld->getName()<<" addCoEdge("<<(*iter)->getName()<<")"<<std::endl;
466+
std::cout<<" "<<mcld->getName()<<" add("<<(*iter)->getName()<<")"<<std::endl;
467467
#endif
468-
mcld->addCoEdge(*iter);
468+
mcld->add(*iter);
469469
}
470470
else {
471471
#ifdef _DEBUG_UPDATE
472-
std::cout<<" "<<mcld->getName()<<" removeCoEdge("<<(*iter)->getName()<<")"<<std::endl;
472+
std::cout<<" "<<mcld->getName()<<" remove("<<(*iter)->getName()<<")"<<std::endl;
473473
#endif
474-
mcld->removeCoEdge(*iter);
474+
mcld->remove(*iter);
475475
}
476476
}
477477

@@ -498,15 +498,15 @@ updateMesh(std::vector<Topo::CoEdge*>& coedges, std::string grpName, bool add)
498498
if ((*iter)->isMeshed()){
499499
if (add){
500500
#ifdef _DEBUG_UPDATE
501-
std::cout<<" "<<mln->getName()<<" addCoEdge("<<(*iter)->getName()<<")"<<std::endl;
501+
std::cout<<" "<<mln->getName()<<" add("<<(*iter)->getName()<<")"<<std::endl;
502502
#endif
503-
mln->addCoEdge(*iter);
503+
mln->add(*iter);
504504
}
505505
else {
506506
#ifdef _DEBUG_UPDATE
507-
std::cout<<" "<<mcld->getName()<<" removeCoEdge("<<(*iter)->getName()<<")"<<std::endl;
507+
std::cout<<" "<<mcld->getName()<<" remove("<<(*iter)->getName()<<")"<<std::endl;
508508
#endif
509-
mln->removeCoEdge(*iter);
509+
mln->remove(*iter);
510510
}
511511
}
512512

‎src/Core/Mesh/CommandClearGroupName.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -370,15 +370,15 @@ updateMesh(std::vector<Topo::Block*>& blocs, std::string grpName, bool add)
370370
if ((*iter)->isMeshed()){
371371
if (add){
372372
#ifdef _DEBUG_UPDATE
373-
std::cout<<" "<<mvol->getName()<<" addBlock("<<(*iter)->getName()<<")"<<std::endl;
373+
std::cout<<" "<<mvol->getName()<<" add("<<(*iter)->getName()<<")"<<std::endl;
374374
#endif
375-
mvol->addBlock(*iter);
375+
mvol->add(*iter);
376376
}
377377
else {
378378
#ifdef _DEBUG_UPDATE
379-
std::cout<<" "<<mvol->getName()<<" removeBlock("<<(*iter)->getName()<<")"<<std::endl;
379+
std::cout<<" "<<mvol->getName()<<" remove("<<(*iter)->getName()<<")"<<std::endl;
380380
#endif
381-
mvol->removeBlock(*iter);
381+
mvol->remove(*iter);
382382
}
383383
}
384384
if (isNewVolume)
@@ -437,15 +437,15 @@ updateMesh(std::vector<Topo::CoFace*>& cofaces, std::string grpName, bool add)
437437
if ((*iter)->isMeshed()){
438438
if (add){
439439
#ifdef _DEBUG_UPDATE
440-
std::cout<<" "<<msurf->getName()<<" addCoFace("<<(*iter)->getName()<<")"<<std::endl;
440+
std::cout<<" "<<msurf->getName()<<" add("<<(*iter)->getName()<<")"<<std::endl;
441441
#endif
442-
msurf->addCoFace(*iter);
442+
msurf->add(*iter);
443443
}
444444
else {
445445
#ifdef _DEBUG_UPDATE
446-
std::cout<<" "<<msurf->getName()<<" removeCoFace("<<(*iter)->getName()<<")"<<std::endl;
446+
std::cout<<" "<<msurf->getName()<<" remove("<<(*iter)->getName()<<")"<<std::endl;
447447
#endif
448-
msurf->removeCoFace(*iter);
448+
msurf->remove(*iter);
449449
}
450450
}
451451
} // end if (is_meshed)
@@ -502,15 +502,15 @@ updateMesh(std::vector<Topo::CoEdge*>& coedges, std::string grpName, bool add)
502502
if ((*iter)->isMeshed()){
503503
if (add){
504504
#ifdef _DEBUG_UPDATE
505-
std::cout<<" "<<mcld->getName()<<" addCoEdge("<<(*iter)->getName()<<")"<<std::endl;
505+
std::cout<<" "<<mcld->getName()<<" add("<<(*iter)->getName()<<")"<<std::endl;
506506
#endif
507-
mcld->addCoEdge(*iter);
507+
mcld->add(*iter);
508508
}
509509
else {
510510
#ifdef _DEBUG_UPDATE
511-
std::cout<<" "<<mcld->getName()<<" removeCoEdge("<<(*iter)->getName()<<")"<<std::endl;
511+
std::cout<<" "<<mcld->getName()<<" remove("<<(*iter)->getName()<<")"<<std::endl;
512512
#endif
513-
mcld->removeCoEdge(*iter);
513+
mcld->remove(*iter);
514514
}
515515
}
516516

@@ -537,15 +537,15 @@ updateMesh(std::vector<Topo::CoEdge*>& coedges, std::string grpName, bool add)
537537
if ((*iter)->isMeshed()){
538538
if (add){
539539
#ifdef _DEBUG_UPDATE
540-
std::cout<<" "<<mln->getName()<<" addCoEdge("<<(*iter)->getName()<<")"<<std::endl;
540+
std::cout<<" "<<mln->getName()<<" add("<<(*iter)->getName()<<")"<<std::endl;
541541
#endif
542-
mln->addCoEdge(*iter);
542+
mln->add(*iter);
543543
}
544544
else {
545545
#ifdef _DEBUG_UPDATE
546-
std::cout<<" "<<mcld->getName()<<" removeCoEdge("<<(*iter)->getName()<<")"<<std::endl;
546+
std::cout<<" "<<mcld->getName()<<" remove("<<(*iter)->getName()<<")"<<std::endl;
547547
#endif
548-
mln->removeCoEdge(*iter);
548+
mln->remove(*iter);
549549
}
550550
}
551551

‎src/Core/Mesh/CommandCreateMesh.cpp‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ void CommandCreateMesh::addNewCloud(const std::string& name)
697697

698698
getInfoCommand().addMeshInfoEntity(cl, Internal::InfoCommand::CREATED);
699699
getMeshManager().add(cl);
700-
m_created_clouds.add(cl);
700+
m_created_clouds.push_back(cl);
701701
}
702702
/*----------------------------------------------------------------------------*/
703703
void CommandCreateMesh::addNewLine(const std::string& name)
@@ -710,7 +710,7 @@ void CommandCreateMesh::addNewLine(const std::string& name)
710710

711711
getInfoCommand().addMeshInfoEntity(ln, Internal::InfoCommand::CREATED);
712712
getMeshManager().add(ln);
713-
m_created_lines.add(ln);
713+
m_created_lines.push_back(ln);
714714
}
715715
/*----------------------------------------------------------------------------*/
716716
void CommandCreateMesh::addNewSurface(const std::string& name)
@@ -723,7 +723,7 @@ void CommandCreateMesh::addNewSurface(const std::string& name)
723723

724724
getInfoCommand().addMeshInfoEntity(sf, Internal::InfoCommand::CREATED);
725725
getMeshManager().add(sf);
726-
m_created_surfaces.add(sf);
726+
m_created_surfaces.push_back(sf);
727727
}
728728
/*----------------------------------------------------------------------------*/
729729
void CommandCreateMesh::addNewVolume(const std::string& name)
@@ -736,7 +736,7 @@ void CommandCreateMesh::addNewVolume(const std::string& name)
736736

737737
getInfoCommand().addMeshInfoEntity(vo, Internal::InfoCommand::CREATED);
738738
getMeshManager().add(vo);
739-
m_created_volumes.add(vo);
739+
m_created_volumes.push_back(vo);
740740
}
741741
/*----------------------------------------------------------------------------*/
742742
void CommandCreateMesh::addModifiedCloud(const std::string& name)
@@ -954,27 +954,26 @@ deleteCreatedMeshGroups()
954954
if (m_strategy == MeshManager::MODIFIABLE){
955955

956956
// désenregistrement du MeshManager des groupes créés
957-
for (std::vector<Cloud*>::const_iterator iter = m_created_clouds.get().begin();
958-
iter != m_created_clouds.get().end(); ++iter)
957+
for (std::vector<Cloud*>::const_iterator iter = m_created_clouds.begin();
958+
iter != m_created_clouds.end(); ++iter)
959959
getMeshManager().remove(*iter);
960960

961-
for (std::vector<Line*>::const_iterator iter = m_created_lines.get().begin();
962-
iter != m_created_lines.get().end(); ++iter)
961+
for (std::vector<Line*>::const_iterator iter = m_created_lines.begin();
962+
iter != m_created_lines.end(); ++iter)
963963
getMeshManager().remove(*iter);
964964

965-
for (std::vector<Surface*>::const_iterator iter = m_created_surfaces.get().begin();
966-
iter != m_created_surfaces.get().end(); ++iter)
965+
for (std::vector<Surface*>::const_iterator iter = m_created_surfaces.begin();
966+
iter != m_created_surfaces.end(); ++iter)
967967
getMeshManager().remove(*iter);
968968

969-
for (std::vector<Volume*>::const_iterator iter = m_created_volumes.get().begin();
970-
iter != m_created_volumes.get().end(); ++iter)
969+
for (std::vector<Volume*>::const_iterator iter = m_created_volumes.begin();
970+
iter != m_created_volumes.end(); ++iter)
971971
getMeshManager().remove(*iter);
972972

973-
m_created_clouds.deleteAndClear();
974-
m_created_lines.deleteAndClear();
975-
m_created_surfaces.deleteAndClear();
976-
m_created_volumes.deleteAndClear();
977-
973+
Utils::deleteAndClear(m_created_clouds);
974+
Utils::deleteAndClear(m_created_lines);
975+
Utils::deleteAndClear(m_created_surfaces);
976+
Utils::deleteAndClear(m_created_volumes);
978977
}
979978
}
980979
/*----------------------------------------------------------------------------*/

‎src/Core/Mesh/CommandDestroyMesh.cpp‎

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,15 @@ CommandDestroyMesh::~CommandDestroyMesh()
2828
void CommandDestroyMesh::internalExecute()
2929
{
3030
std::vector<Mesh::MeshEntity*> me;
31-
std::vector<Mesh::Volume*> mvol;
32-
getContext().getMeshManager().getVolumes(mvol);
33-
for (uint i=0; i<mvol.size(); i++)
34-
me.push_back(mvol[i]);
35-
std::vector<Mesh::Surface*> msurf;
36-
getContext().getMeshManager().getSurfaces(msurf);
37-
for (uint i=0; i<msurf.size(); i++)
38-
me.push_back(msurf[i]);
39-
std::vector<Mesh::Line*> mline;
40-
getContext().getMeshManager().getLines(mline);
41-
for (uint i=0; i<mline.size(); i++)
42-
me.push_back(mline[i]);
43-
std::vector<Mesh::Cloud*> mcloud;
44-
getContext().getMeshManager().getClouds(mcloud);
45-
for (uint i=0; i<mcloud.size(); i++)
46-
me.push_back(mcloud[i]);
31+
Mesh::MeshManager& mm = getContext().getMeshManager();
32+
for (Mesh::Volume* v : mm.getVolumesObj())
33+
me.push_back(v);
34+
for (Mesh::Surface* s : mm.getSurfacesObj())
35+
me.push_back(s);
36+
for (Mesh::Line* l : mm.getLinesObj())
37+
me.push_back(l);
38+
for (Mesh::Cloud* c : mm.getCloudsObj())
39+
me.push_back(c);
4740

4841
for (uint i=0; i<me.size(); i++)
4942
getInfoCommand().addMeshInfoEntity(me[i], Internal::InfoCommand::DELETED);
@@ -52,22 +45,15 @@ void CommandDestroyMesh::internalExecute()
5245
gmds_mesh.clear();
5346

5447
// commande de destruction de toutes les entités topologiques qui ont pu être construites
55-
std::vector<Topo::Block*> blocks;
56-
getContext().getTopoManager().getBlocks(blocks);
57-
for (uint i=0; i<blocks.size(); i++)
58-
blocks[i]->getMeshingData()->setMeshed(false);
59-
std::vector<Topo::CoFace*> cofaces;
60-
getContext().getTopoManager().getCoFaces(cofaces);
61-
for (uint i=0; i<cofaces.size(); i++)
62-
cofaces[i]->getMeshingData()->setMeshed(false);
63-
std::vector<Topo::CoEdge*> coedges;
64-
getContext().getTopoManager().getCoEdges(coedges);
65-
for (uint i=0; i<coedges.size(); i++)
66-
coedges[i]->getMeshingData()->setMeshed(false);
67-
std::vector<Topo::Vertex*> vertices;
68-
getContext().getTopoManager().getVertices(vertices);
69-
for (uint i=0; i<vertices.size(); i++)
70-
vertices[i]->getMeshingData()->setMeshed(false);
48+
Topo::TopoManager& tm = getContext().getTopoManager();
49+
for (Topo::Block* b : tm.getBlocksObj())
50+
b->getMeshingData()->setMeshed(false);
51+
for (Topo::CoFace* cf : tm.getCoFacesObj())
52+
cf->getMeshingData()->setMeshed(false);
53+
for (Topo::CoEdge* ce : tm.getCoEdgesObj())
54+
ce->getMeshingData()->setMeshed(false);
55+
for (Topo::Vertex* v : tm.getVerticesObj())
56+
v->getMeshingData()->setMeshed(false);
7157
}
7258
/*----------------------------------------------------------------------------*/
7359
void CommandDestroyMesh::internalUndo()

0 commit comments

Comments
 (0)