Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' branch into 'V9_dev' branch.
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_QuadFromMedialAxis_1D2D.cxx
diff --git
a/src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cxx
b/src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cxx
index 094784908ecec53c054022ea8ff4d7dd3db383ef..2043f1ea7df1e96c198611b04af88afa1392d201 100644
(file)
--- a/
src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cxx
+++ b/
src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cxx
@@
-71,8
+71,8
@@
using namespace std;
class StdMeshers_QuadFromMedialAxis_1D2D::Algo1D : public StdMeshers_Regular_1D
{
public:
class StdMeshers_QuadFromMedialAxis_1D2D::Algo1D : public StdMeshers_Regular_1D
{
public:
- Algo1D(
int studyId,
SMESH_Gen* gen):
- StdMeshers_Regular_1D( gen->GetANewId(),
studyId,
gen )
+ Algo1D(SMESH_Gen* gen):
+ StdMeshers_Regular_1D( gen->GetANewId(), gen )
{
}
void SetSegmentLength( double len )
{
}
void SetSegmentLength( double len )
@@
-152,9
+152,8
@@
public:
//================================================================================
StdMeshers_QuadFromMedialAxis_1D2D::StdMeshers_QuadFromMedialAxis_1D2D(int hypId,
//================================================================================
StdMeshers_QuadFromMedialAxis_1D2D::StdMeshers_QuadFromMedialAxis_1D2D(int hypId,
- int studyId,
SMESH_Gen* gen)
SMESH_Gen* gen)
- : StdMeshers_Quadrangle_2D(hypId,
studyId,
gen),
+ : StdMeshers_Quadrangle_2D(hypId, gen),
_regular1D( 0 )
{
_name = "QuadFromMedialAxis_1D2D";
_regular1D( 0 )
{
_name = "QuadFromMedialAxis_1D2D";
@@
-741,7
+740,7
@@
namespace
}
// cout << "from salome.geom import geomBuilder" << endl;
}
// cout << "from salome.geom import geomBuilder" << endl;
- // cout << "geompy = geomBuilder.New(
salome.myStudy
)" << endl;
+ // cout << "geompy = geomBuilder.New()" << endl;
Handle(TColgp_HArray1OfPnt) points = new TColgp_HArray1OfPnt(1, pnt.size());
for ( size_t i = 0; i < pnt.size(); ++i )
{
Handle(TColgp_HArray1OfPnt) points = new TColgp_HArray1OfPnt(1, pnt.size());
for ( size_t i = 0; i < pnt.size(); ++i )
{
@@
-2166,7
+2165,7
@@
bool StdMeshers_QuadFromMedialAxis_1D2D::Compute(SMESH_Mesh& theMesh,
SMESH_MAT2d::MedialAxis ma( F, sinuFace._sinuEdges, minSegLen, /*ignoreCorners=*/true );
if ( !_regular1D )
SMESH_MAT2d::MedialAxis ma( F, sinuFace._sinuEdges, minSegLen, /*ignoreCorners=*/true );
if ( !_regular1D )
- _regular1D = new Algo1D( _
studyId, _
gen );
+ _regular1D = new Algo1D( _gen );
_regular1D->SetSegmentLength( minSegLen );
vector<double> maParams;
_regular1D->SetSegmentLength( minSegLen );
vector<double> maParams;