Skip to content

Commit 398e929

Browse files
nicolaslgnicolaslg
committed
Revert "Suppress CommandSplitFaces(CoFace*) and add bool project_on_meshing_edge parameter"
This reverts commit 83bc764.
1 parent 8ad28b2 commit 398e929

File tree

6 files changed

+166
-139
lines changed

6 files changed

+166
-139
lines changed

‎src/Core/Topo/CommandSplitFaces.cpp‎

Lines changed: 72 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ namespace Topo {
1717
//#define _DEBUG_SPLIT
1818
/*----------------------------------------------------------------------------*/
1919
CommandSplitFaces::
20-
CommandSplitFaces(Internal::Context& c, std::vector<Topo::CoFace* > &cofaces, CoEdge* arete, double ratio_dec, double ratio_ogrid, bool project_on_meshing_edges)
21-
:CommandEditTopo(c, "Découpage des faces structurées")
20+
CommandSplitFaces(Internal::Context& c, std::vector<Topo::CoFace* > &cofaces, CoEdge* arete, double ratio_dec, double ratio_ogrid)
21+
:CommandEditTopo(c, "Découpage des faces 2D structurées")
2222
, m_arete(arete)
2323
, m_ratio_dec(ratio_dec)
2424
, m_ratio_ogrid(ratio_ogrid)
25-
, m_project_on_meshing_edges(project_on_meshing_edges)
25+
, m_project_on_meshing_edges(true)
2626
{
2727
#ifdef _DEBUG_SPLIT
28-
std::cout<<"CommandSplitFaces::CommandSplitFaces("<<cofaces.size()<<" cofaces, "<<arete->getName()<<", "<<ratio_dec<<", "<<ratio_ogrid<<", "<<project_on_meshing_edges<<")"<<std::endl;
28+
std::cout<<"CommandSplitFaces::CommandSplitFaces("<<cofaces.size()<<" cofaces, "<<arete->getName()<<", "<<ratio_dec<<", "<<ratio_ogrid<<")"<<std::endl;
2929
#endif
30-
init(cofaces);
30+
init2D(cofaces);
3131

3232
TkUtil::UTF8String comments (TkUtil::Charset::UTF_8);
33-
comments << "Découpage des faces structurées";
33+
comments << "Découpage des faces 2D structurées";
3434
for (uint i=0; i<cofaces.size() && i<5; i++)
3535
comments << " " << cofaces[i]->getName();
3636
if (cofaces.size()>5)
@@ -43,22 +43,22 @@ CommandSplitFaces(Internal::Context& c, std::vector<Topo::CoFace* > &cofaces, Co
4343
}
4444
/*----------------------------------------------------------------------------*/
4545
CommandSplitFaces::
46-
CommandSplitFaces(Internal::Context& c, std::vector<Topo::CoFace* > &cofaces, CoEdge* arete, const Utils::Math::Point& pt, double ratio_ogrid, bool project_on_meshing_edges)
47-
:CommandEditTopo(c, "Découpage des faces structurées")
46+
CommandSplitFaces(Internal::Context& c, std::vector<Topo::CoFace* > &cofaces, CoEdge* arete, const Utils::Math::Point& pt, double ratio_ogrid)
47+
:CommandEditTopo(c, "Découpage des faces 2D structurées")
4848
, m_arete(arete)
4949
, m_ratio_dec(0)
5050
, m_ratio_ogrid(ratio_ogrid)
51-
, m_project_on_meshing_edges(project_on_meshing_edges)
51+
, m_project_on_meshing_edges(true)
5252
{
5353
m_ratio_dec = arete->computeRatio(pt);
5454

5555
#ifdef _DEBUG_SPLIT
56-
std::cout<<"CommandSplitFaces::CommandSplitFaces("<<cofaces.size()<<" cofaces, "<<arete->getName()<<", "<<m_ratio_dec<<", "<<ratio_ogrid<<", "<<project_on_meshing_edges<<")"<<std::endl;
56+
std::cout<<"CommandSplitFaces::CommandSplitFaces("<<cofaces.size()<<" cofaces, "<<arete->getName()<<", "<<m_ratio_dec<<", "<<ratio_ogrid<<")"<<std::endl;
5757
#endif
58-
init(cofaces);
58+
init2D(cofaces);
5959

6060
TkUtil::UTF8String comments (TkUtil::Charset::UTF_8);
61-
comments << "Découpage des faces structurées";
61+
comments << "Découpage des faces 2D structurées";
6262
for (uint i=0; i<cofaces.size() && i<5; i++)
6363
comments << " " << cofaces[i]->getName();
6464
if (cofaces.size()>5)
@@ -71,50 +71,87 @@ CommandSplitFaces(Internal::Context& c, std::vector<Topo::CoFace* > &cofaces, Co
7171
}
7272
/*----------------------------------------------------------------------------*/
7373
CommandSplitFaces::
74-
CommandSplitFaces(Internal::Context& c, CoEdge* arete, double ratio_dec, double ratio_ogrid, bool project_on_meshing_edges)
75-
:CommandEditTopo(c, "Découpage de toutes les faces structurées")
74+
CommandSplitFaces(Internal::Context& c, CoEdge* arete, double ratio_dec, double ratio_ogrid)
75+
:CommandEditTopo(c, "Découpage de toutes les faces 2D structurées")
7676
, m_arete(arete)
7777
, m_ratio_dec(ratio_dec)
7878
, m_ratio_ogrid(ratio_ogrid)
79-
, m_project_on_meshing_edges(project_on_meshing_edges)
79+
, m_project_on_meshing_edges(true)
8080
{
8181
#ifdef _DEBUG_SPLIT
82-
std::cout<<"CommandSplitFaces::CommandSplitFaces("<<arete->getName()<<", "<<ratio_dec<<", "<<ratio_ogrid<<", "<<project_on_meshing_edges<<")"<<std::endl;
82+
std::cout<<"CommandSplitFaces::CommandSplitFaces("<<arete->getName()<<", "<<ratio_dec<<", "<<ratio_ogrid<<")"<<std::endl;
8383
#endif
8484
std::vector<Topo::CoFace* > cofaces;
8585
getContext().getTopoManager().getCoFaces(cofaces);
86-
init(cofaces);
86+
init2D(cofaces);
8787
}
8888
/*----------------------------------------------------------------------------*/
8989
CommandSplitFaces::
90-
CommandSplitFaces(Internal::Context& c, CoEdge* arete, const Point& pt, double ratio_ogrid, bool project_on_meshing_edges)
91-
:CommandEditTopo(c, "Découpage de toutes les faces structurées")
90+
CommandSplitFaces(Internal::Context& c, CoEdge* arete, const Point& pt, double ratio_ogrid)
91+
:CommandEditTopo(c, "Découpage de toutes les faces 2D structurées")
9292
, m_arete(arete)
9393
, m_ratio_dec(0)
9494
, m_ratio_ogrid(ratio_ogrid)
95-
, m_project_on_meshing_edges(project_on_meshing_edges)
95+
, m_project_on_meshing_edges(true)
9696
{
9797
m_ratio_dec = arete->computeRatio(pt);
9898
#ifdef _DEBUG_SPLIT
99-
std::cout<<"CommandSplitFaces::CommandSplitFaces("<<arete->getName()<<", "<<m_ratio_dec<<", "<<ratio_ogrid<<", "<<project_on_meshing_edges<<")"<<std::endl;
99+
std::cout<<"CommandSplitFaces::CommandSplitFaces("<<arete->getName()<<", "<<m_ratio_dec<<", "<<ratio_ogrid<<")"<<std::endl;
100100
#endif
101101
std::vector<Topo::CoFace* > cofaces;
102102
getContext().getTopoManager().getCoFaces(cofaces);
103-
init(cofaces);
103+
init2D(cofaces);
104+
}
105+
/*----------------------------------------------------------------------------*/
106+
CommandSplitFaces::
107+
CommandSplitFaces(Internal::Context& c, CoFace* coface, CoEdge* coedge, double ratio_dec, bool project_on_meshing_edges)
108+
:CommandEditTopo(c, "Découpage de la face "+coface->getName())
109+
, m_arete(coedge)
110+
, m_ratio_dec(ratio_dec)
111+
, m_ratio_ogrid(0.0)
112+
, m_project_on_meshing_edges(project_on_meshing_edges)
113+
{
114+
if (!coface->isStructured())
115+
throw TkUtil::Exception (TkUtil::UTF8String ("Le découpage d'une face n'est possible que si elle est structurée", TkUtil::Charset::UTF_8));
116+
117+
m_cofaces.push_back(coface);
118+
#ifdef _DEBUG_SPLIT
119+
std::cout<<"CommandSplitFaces::CommandSplitFaces("<<coface->getName()<<", "<<coedge->getName()<<", "<<ratio_dec<<")"<<std::endl;
120+
#endif
121+
}
122+
/*----------------------------------------------------------------------------*/
123+
CommandSplitFaces::
124+
CommandSplitFaces(Internal::Context& c, CoFace* coface, CoEdge* coedge, const Point& pt, bool project_on_meshing_edges)
125+
:CommandEditTopo(c, "Découpage de la face "+coface->getName())
126+
, m_arete(coedge)
127+
, m_ratio_dec(0)
128+
, m_ratio_ogrid(0.0)
129+
, m_project_on_meshing_edges(project_on_meshing_edges)
130+
{
131+
if (!coface->isStructured())
132+
throw TkUtil::Exception (TkUtil::UTF8String ("Le découpage d'une face n'est possible que si elle est structurée", TkUtil::Charset::UTF_8));
133+
134+
m_ratio_dec = coedge->computeRatio(pt);
135+
136+
m_cofaces.push_back(coface);
137+
138+
#ifdef _DEBUG_SPLIT
139+
std::cout<<"CommandSplitFaces::CommandSplitFaces("<<coface->getName()<<", "<<coedge->getName()<<", "<<m_ratio_dec<<")"<<std::endl;
140+
#endif
104141
}
105142
/*----------------------------------------------------------------------------*/
106-
void CommandSplitFaces::init(std::vector<Topo::CoFace* > &cofaces)
143+
void CommandSplitFaces::init2D(std::vector<Topo::CoFace* > &cofaces)
107144
{
108145
#ifdef _DEBUG_SPLIT
109-
std::cout<<"init avec "<<cofaces.size() <<" cofaces"<<std::endl;
146+
std::cout<<"init2D avec "<<cofaces.size() <<" cofaces"<<std::endl;
110147
#endif
111-
// on ne conserve que les faces structurées
148+
// on ne concerve que les faces 2D structurées
112149
for (std::vector<Topo::CoFace* >::iterator iter = cofaces.begin();
113150
iter != cofaces.end(); ++iter){
114151
Topo::CoFace* hcf = *iter;
115-
116-
if (hcf->isStructured()){
117-
m_cofaces.push_back(hcf);
152+
m_cofaces.push_back(hcf);
153+
154+
if (!hcf->getNbFaces() && hcf->isStructured()){
118155
verif(hcf);
119156
#ifdef _DEBUG_SPLIT
120157
std::cout<< hcf->getName()<<" est retenue"<<std::endl;
@@ -353,6 +390,13 @@ internalExecute()
353390
throw TkUtil::Exception(exc);
354391
}
355392

393+
394+
395+
// les Edges qui coupent les faces en deux
396+
//std::vector<Edge* > splitingEdges;
397+
// découpage des faces sans chercher à boucler
398+
//TopoHelper::splitFaces(m_cofaces, m_arete, m_ratio_dec, m_ratio_ogrid, false, false, splitingEdges, &getInfoCommand());
399+
356400
// on replace les sommets en fonction de m_ratio_dec
357401
if (!m_project_on_meshing_edges)
358402
for (uint i=0; i<splitingEdges.size(); i++){

‎src/Core/Topo/TopoHelper.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -859,6 +859,7 @@ void TopoHelper::splitFaces(std::vector<CoFace* > cofaces,
859859
InfoSplit* is = cofaceInfoSplit[coface->getUniqueId()];
860860

861861
if (is == 0){
862+
std::cout<<"name = "<<coface->getName()<<std::endl;
862863
if (coface->getNbEdges() == 3 && ind_edge_dep != 1 && !boucleDemandee){
863864
// cas où on arrive sur face dégénérée par un côté autre que celui qui fait face à la dégénérescence
864865
#ifdef _DEBUG_SPLIT

‎src/Core/Topo/TopoManager.cpp‎

Lines changed: 21 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2576,17 +2576,17 @@ Mgx3D::Internal::M3DCommandResult* TopoManager::splitFacesWithOgrid(std::vector<
25762576
return cmdResult;
25772577
}
25782578
/*----------------------------------------------------------------------------*/
2579-
Mgx3D::Internal::M3DCommandResult* TopoManager::splitFaces(std::vector<std::string> &cofaces_names, std::string narete, const double& ratio_dec, const double& ratio_ogrid, bool project_on_meshing_edges)
2579+
Mgx3D::Internal::M3DCommandResult* TopoManager::splitFaces(std::vector<std::string> &cofaces_names, std::string narete, const double& ratio_dec, const double& ratio_ogrid)
25802580
{
25812581
std::vector<Topo::CoFace* > cofaces;
25822582
for (std::vector<std::string>::iterator iter = cofaces_names.begin();
25832583
iter != cofaces_names.end(); ++iter){
25842584
cofaces.push_back(getCoFace(*iter));
25852585
}
2586-
return splitFaces(cofaces, getCoEdge(narete), ratio_dec, ratio_ogrid, project_on_meshing_edges);
2586+
return splitFaces(cofaces, getCoEdge(narete), ratio_dec, ratio_ogrid);
25872587
}
25882588
/*----------------------------------------------------------------------------*/
2589-
Mgx3D::Internal::M3DCommandResult* TopoManager::splitFaces(std::vector<Topo::CoFace* > &cofaces, CoEdge* arete, const double& ratio_dec, const double& ratio_ogrid, bool project_on_meshing_edges)
2589+
Mgx3D::Internal::M3DCommandResult* TopoManager::splitFaces(std::vector<Topo::CoFace* > &cofaces, CoEdge* arete, const double& ratio_dec, const double& ratio_ogrid)
25902590
{
25912591
CHECK_ENTITIES_LIST(cofaces)
25922592
TkUtil::UTF8String message (TkUtil::Charset::UTF_8);
@@ -2599,16 +2599,12 @@ Mgx3D::Internal::M3DCommandResult* TopoManager::splitFaces(std::vector<Topo::CoF
25992599
message <<"],"<<arete->getName()<<","<<Utils::Math::MgxNumeric::userRepresentation (ratio_dec)<<","<<Utils::Math::MgxNumeric::userRepresentation (ratio_ogrid)<<")";
26002600
log (TkUtil::TraceLog (message, TkUtil::Log::TRACE_4));
26012601

2602-
Topo::CommandSplitFaces* command = new Topo::CommandSplitFaces(getContext(), cofaces, arete, ratio_dec, ratio_ogrid, project_on_meshing_edges);
2602+
Topo::CommandSplitFaces* command = new Topo::CommandSplitFaces(getContext(), cofaces, arete, ratio_dec, ratio_ogrid);
26032603

26042604
// trace dans le script
26052605
TkUtil::UTF8String cmd (TkUtil::Charset::UTF_8);
26062606
cmd << getContextAlias ( ) << ".getTopoManager().splitFaces (" << Internal::entitiesToPythonList<CoFace> (cofaces) << ", \"";
2607-
cmd << arete->getName() <<"\", "<<Utils::Math::MgxNumeric::userRepresentation (ratio_dec)<<", "<<Utils::Math::MgxNumeric::userRepresentation (ratio_ogrid);
2608-
if (project_on_meshing_edges)
2609-
cmd << ", True)";
2610-
else
2611-
cmd << ", False)";
2607+
cmd << arete->getName() <<"\", "<<Utils::Math::MgxNumeric::userRepresentation (ratio_dec)<<", "<<Utils::Math::MgxNumeric::userRepresentation (ratio_ogrid)<<")";
26122608
command->setScriptCommand(cmd);
26132609

26142610
getCommandManager().addCommand(command, Utils::Command::DO);
@@ -2618,17 +2614,17 @@ Mgx3D::Internal::M3DCommandResult* TopoManager::splitFaces(std::vector<Topo::CoF
26182614
return cmdResult;
26192615
}
26202616
/*----------------------------------------------------------------------------*/
2621-
Mgx3D::Internal::M3DCommandResult* TopoManager::splitFaces(std::vector<std::string> &cofaces_names, std::string narete, const Point& pt, const double& ratio_ogrid, bool project_on_meshing_edges)
2617+
Mgx3D::Internal::M3DCommandResult* TopoManager::splitFaces(std::vector<std::string> &cofaces_names, std::string narete, const Point& pt, const double& ratio_ogrid)
26222618
{
26232619
std::vector<Topo::CoFace* > cofaces;
26242620
for (std::vector<std::string>::iterator iter = cofaces_names.begin();
26252621
iter != cofaces_names.end(); ++iter){
26262622
cofaces.push_back(getCoFace(*iter));
26272623
}
2628-
return splitFaces(cofaces, getCoEdge(narete), pt, ratio_ogrid, project_on_meshing_edges);
2624+
return splitFaces(cofaces, getCoEdge(narete), pt, ratio_ogrid);
26292625
}
26302626
/*----------------------------------------------------------------------------*/
2631-
Mgx3D::Internal::M3DCommandResult* TopoManager::splitFaces(std::vector<Topo::CoFace* > &cofaces, CoEdge* arete, const Point& pt, const double& ratio_ogrid, bool project_on_meshing_edges)
2627+
Mgx3D::Internal::M3DCommandResult* TopoManager::splitFaces(std::vector<Topo::CoFace* > &cofaces, CoEdge* arete, const Point& pt, const double& ratio_ogrid)
26322628
{
26332629
CHECK_ENTITIES_LIST(cofaces)
26342630
TkUtil::UTF8String message (TkUtil::Charset::UTF_8);
@@ -2641,16 +2637,12 @@ Mgx3D::Internal::M3DCommandResult* TopoManager::splitFaces(std::vector<Topo::CoF
26412637
message <<"],"<<arete->getName()<<","<<pt<<","<<Utils::Math::MgxNumeric::userRepresentation (ratio_ogrid)<<")";
26422638
log (TkUtil::TraceLog (message, TkUtil::Log::TRACE_4));
26432639

2644-
Topo::CommandSplitFaces* command = new Topo::CommandSplitFaces(getContext(), cofaces, arete, pt, ratio_ogrid, project_on_meshing_edges);
2640+
Topo::CommandSplitFaces* command = new Topo::CommandSplitFaces(getContext(), cofaces, arete, pt, ratio_ogrid);
26452641

26462642
// trace dans le script
26472643
TkUtil::UTF8String cmd (TkUtil::Charset::UTF_8);
26482644
cmd << getContextAlias ( ) << ".getTopoManager().splitFaces (" << Internal::entitiesToPythonList<CoFace> (cofaces) << ", \"";
2649-
cmd << arete->getName() <<"\", "<<pt.getScriptCommand()<<", "<<Utils::Math::MgxNumeric::userRepresentation (ratio_ogrid);
2650-
if (project_on_meshing_edges)
2651-
cmd << ", True)";
2652-
else
2653-
cmd << ", False)";
2645+
cmd << arete->getName() <<"\", "<<pt.getScriptCommand()<<", "<<Utils::Math::MgxNumeric::userRepresentation (ratio_ogrid)<<")";
26542646
command->setScriptCommand(cmd);
26552647

26562648
getCommandManager().addCommand(command, Utils::Command::DO);
@@ -2672,8 +2664,7 @@ Mgx3D::Internal::M3DCommandResult* TopoManager::splitFace(Topo::CoFace* coface,
26722664
message <<"TopoManager::splitFace("<<coface->getName()<<", "<< coedge->getName() <<", "<< ratio_dec<<")";
26732665
log (TkUtil::TraceLog (message, TkUtil::Log::TRACE_4));
26742666

2675-
std::vector<Topo::CoFace* > cofaces = {coface};
2676-
Topo::CommandSplitFaces* command = new Topo::CommandSplitFaces(getContext(), cofaces, coedge, ratio_dec, 0, project_on_meshing_edges);
2667+
Topo::CommandSplitFaces* command = new Topo::CommandSplitFaces(getContext(), coface, coedge, ratio_dec, project_on_meshing_edges);
26772668

26782669
// trace dans le script
26792670
TkUtil::UTF8String cmd (TkUtil::Charset::UTF_8);
@@ -2704,8 +2695,7 @@ Mgx3D::Internal::M3DCommandResult* TopoManager::splitFace(Topo::CoFace* coface,
27042695
message <<"TopoManager::splitFace("<<coface->getName()<<", "<< coedge->getName() <<", "<< pt<<")";
27052696
log (TkUtil::TraceLog (message, TkUtil::Log::TRACE_4));
27062697

2707-
std::vector<Topo::CoFace* > cofaces = {coface};
2708-
Topo::CommandSplitFaces* command = new Topo::CommandSplitFaces(getContext(), cofaces, coedge, pt, 0, project_on_meshing_edges);
2698+
Topo::CommandSplitFaces* command = new Topo::CommandSplitFaces(getContext(), coface, coedge, pt, project_on_meshing_edges);
27092699

27102700
// trace dans le script
27112701
TkUtil::UTF8String cmd (TkUtil::Charset::UTF_8);
@@ -2754,29 +2744,24 @@ TopoManager::extendSplitFace(Topo::CoFace* coface, Vertex* vertex)
27542744
return cmdResult;
27552745
}
27562746
/*----------------------------------------------------------------------------*/
2757-
Mgx3D::Internal::M3DCommandResult* TopoManager::splitAllFaces(std::string narete, const double& ratio_dec, const double& ratio_ogrid, bool project_on_meshing_edges)
2747+
Mgx3D::Internal::M3DCommandResult* TopoManager::splitAllFaces(std::string narete, const double& ratio_dec, const double& ratio_ogrid)
27582748
{
2759-
return splitAllFaces(getCoEdge(narete), ratio_dec, ratio_ogrid, project_on_meshing_edges);
2749+
return splitAllFaces(getCoEdge(narete), ratio_dec, ratio_ogrid);
27602750
}
27612751
/*----------------------------------------------------------------------------*/
2762-
Mgx3D::Internal::M3DCommandResult* TopoManager::splitAllFaces(CoEdge* coedge, const double& ratio_dec, const double& ratio_ogrid, bool project_on_meshing_edges)
2752+
Mgx3D::Internal::M3DCommandResult* TopoManager::splitAllFaces(CoEdge* coedge, const double& ratio_dec, const double& ratio_ogrid)
27632753
{
27642754
TkUtil::UTF8String message (TkUtil::Charset::UTF_8);
27652755
message <<"TopoManager::splitAllFaces(";
27662756
message <<coedge->getName()<<","<<Utils::Math::MgxNumeric::userRepresentation (ratio_dec)<<","<<Utils::Math::MgxNumeric::userRepresentation (ratio_ogrid)<<")";
27672757
log (TkUtil::TraceLog (message, TkUtil::Log::TRACE_4));
27682758

2769-
Topo::CommandSplitFaces* command = new Topo::CommandSplitFaces(getContext(), coedge, ratio_dec, ratio_ogrid, project_on_meshing_edges);
2759+
Topo::CommandSplitFaces* command = new Topo::CommandSplitFaces(getContext(), coedge, ratio_dec, ratio_ogrid);
27702760

27712761
// trace dans le script
27722762
TkUtil::UTF8String cmd (TkUtil::Charset::UTF_8);
27732763
cmd << getContextAlias() << "." << "getTopoManager().splitAllFaces (\"";
2774-
cmd << coedge->getName() <<"\", "<<Utils::Math::MgxNumeric::userRepresentation (ratio_dec)<<", ";
2775-
cmd << Utils::Math::MgxNumeric::userRepresentation (ratio_ogrid);
2776-
if (project_on_meshing_edges)
2777-
cmd << ", True)";
2778-
else
2779-
cmd << ", False)";
2764+
cmd << coedge->getName() <<"\", "<<Utils::Math::MgxNumeric::userRepresentation (ratio_dec)<<", "<<Utils::Math::MgxNumeric::userRepresentation (ratio_ogrid)<<")";
27802765
command->setScriptCommand(cmd);
27812766

27822767
getCommandManager().addCommand(command, Utils::Command::DO);
@@ -2786,12 +2771,12 @@ Mgx3D::Internal::M3DCommandResult* TopoManager::splitAllFaces(CoEdge* coedge, co
27862771
return cmdResult;
27872772
}
27882773
/*----------------------------------------------------------------------------*/
2789-
Mgx3D::Internal::M3DCommandResult* TopoManager::splitAllFaces(std::string narete, const Point& pt, const double& ratio_ogrid, bool project_on_meshing_edges)
2774+
Mgx3D::Internal::M3DCommandResult* TopoManager::splitAllFaces(std::string narete, const Point& pt, const double& ratio_ogrid)
27902775
{
2791-
return splitAllFaces(getCoEdge(narete), pt, ratio_ogrid, project_on_meshing_edges);
2776+
return splitAllFaces(getCoEdge(narete), pt, ratio_ogrid);
27922777
}
27932778
/*----------------------------------------------------------------------------*/
2794-
Mgx3D::Internal::M3DCommandResult* TopoManager::splitAllFaces(CoEdge* coedge, const Point& pt, const double& ratio_ogrid, bool project_on_meshing_edges)
2779+
Mgx3D::Internal::M3DCommandResult* TopoManager::splitAllFaces(CoEdge* coedge, const Point& pt, const double& ratio_ogrid)
27952780
{
27962781
TkUtil::UTF8String message (TkUtil::Charset::UTF_8);
27972782
message <<"TopoManager::splitAllFaces(";
@@ -2803,11 +2788,7 @@ Mgx3D::Internal::M3DCommandResult* TopoManager::splitAllFaces(CoEdge* coedge, co
28032788
// trace dans le script
28042789
TkUtil::UTF8String cmd (TkUtil::Charset::UTF_8);
28052790
cmd << getContextAlias() << "." << "getTopoManager().splitAllFaces (\"";
2806-
cmd << coedge->getName() <<"\", "<<pt.getScriptCommand()<<", "<<Utils::Math::MgxNumeric::userRepresentation (ratio_ogrid);
2807-
if (project_on_meshing_edges)
2808-
cmd << ", True)";
2809-
else
2810-
cmd << ", False)";
2791+
cmd << coedge->getName() <<"\", "<<pt.getScriptCommand()<<", "<<Utils::Math::MgxNumeric::userRepresentation (ratio_ogrid)<<")";
28112792
command->setScriptCommand(cmd);
28122793

28132794
getCommandManager().addCommand(command, Utils::Command::DO);

0 commit comments

Comments
 (0)