ForkMaster/netgenplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge V9_dev branch into master

Browse Source
This commit is contained in:
rnv 2018-06-07 15:44:06 +03:00
commit d0f1a65f28
42 changed files with 62 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/salome/examples/netgendemo.py
View File

@ -4,11 +4,11 @@ import salome
salome.salome_init()
import GEOM
from salome.geom import geomBuilder
geompy = geomBuilder.New(salome.myStudy)
geompy = geomBuilder.New()
import SMESH, SALOMEDS
from salome.smesh import smeshBuilder
smesh = smeshBuilder.New(salome.myStudy)
smesh = smeshBuilder.New()
# create a box
box = geompy.MakeBoxDXDYDZ(10., 10., 10.)

5
src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
View File

@ -838,10 +838,9 @@ void NETGENPluginGUI_HypothesisCreator::onSetSizeFile()
GeomSelectionTools* NETGENPluginGUI_HypothesisCreator::getGeomSelectionTools()
{
_PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
if (myGeomSelectionTools == NULL || myGeomSelectionTools->getMyStudy() != aStudy) {
if (myGeomSelectionTools == NULL) {
delete myGeomSelectionTools;
myGeomSelectionTools = new GeomSelectionTools(aStudy);
myGeomSelectionTools = new GeomSelectionTools();
}
return myGeomSelectionTools;
}

2
src/NETGENPlugin/NETGENPluginBuilder.py
View File

@ -105,7 +105,7 @@ class NETGEN_Algorithm(Mesh_Algorithm):
# if it is @c 0 (default), the algorithm is assigned to the main shape
def __init__(self, mesh, geom=0):
Mesh_Algorithm.__init__(self)
if noNETGENPlugin: print "Warning: NETGENPlugin module unavailable"
if noNETGENPlugin: print("Warning: NETGENPlugin module unavailable")
if not mesh.GetMesh().HasShapeToMesh() and \
self.meshMethod == "Triangle": # create a 2D remesher
self.Create(mesh, geom, "NETGEN_Remesher_2D", LIBRARY)

5
src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx
View File

@ -40,9 +40,10 @@ using namespace std;
*
*/
//=============================================================================
NETGENPlugin_Hypothesis::NETGENPlugin_Hypothesis (int hypId, int studyId,
NETGENPlugin_Hypothesis::NETGENPlugin_Hypothesis (int hypId,
SMESH_Gen * gen)
: SMESH_Hypothesis(hypId, studyId, gen),
: SMESH_Hypothesis(hypId, gen),
_maxSize (GetDefaultMaxSize()),
_minSize (0),
_growthRate (GetDefaultGrowthRate()),

2
src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx
View File

@ -45,7 +45,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Hypothesis: public SMESH_Hypothesis
{
public:
NETGENPlugin_Hypothesis(int hypId, int studyId, SMESH_Gen * gen);
NETGENPlugin_Hypothesis(int hypId, SMESH_Gen * gen);
void SetMaxSize(double theSize);
double GetMaxSize() const { return _maxSize; }

8
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx
View File

@ -36,9 +36,9 @@ using namespace std;
*
*/
//=============================================================================
NETGENPlugin_Hypothesis_2D::NETGENPlugin_Hypothesis_2D (int hypId, int studyId,
NETGENPlugin_Hypothesis_2D::NETGENPlugin_Hypothesis_2D (int hypId,
SMESH_Gen * gen)
: NETGENPlugin_Hypothesis(hypId, studyId, gen)/*,
: NETGENPlugin_Hypothesis(hypId, gen)/*,
_quadAllowed (GetDefaultQuadAllowed())*/
{
_name = "NETGEN_Parameters_2D";
@ -51,8 +51,8 @@ NETGENPlugin_Hypothesis_2D::NETGENPlugin_Hypothesis_2D (int hypId, int studyId,
*/
//=============================================================================
NETGENPlugin_RemesherHypothesis_2D::
NETGENPlugin_RemesherHypothesis_2D (int hypId, int studyId, SMESH_Gen * gen)
: NETGENPlugin_Hypothesis(hypId, studyId, gen)
NETGENPlugin_RemesherHypothesis_2D (int hypId, SMESH_Gen * gen)
: NETGENPlugin_Hypothesis(hypId, gen)
{
_name = "NETGEN_RemesherParameters_2D";
_param_algo_dim = 2;

4
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx
View File

@ -43,7 +43,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Hypothesis_2D: public NETGENPlugin_Hypot
{
public:
NETGENPlugin_Hypothesis_2D(int hypId, int studyId, SMESH_Gen * gen);
NETGENPlugin_Hypothesis_2D(int hypId, SMESH_Gen * gen);
// void SetQuadAllowed(bool theVal);
// bool GetQuadAllowed() const { return _quadAllowed; }
@ -65,7 +65,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_RemesherHypothesis_2D: public NETGENPlugi
{
public:
NETGENPlugin_RemesherHypothesis_2D(int hypId, int studyId, SMESH_Gen * gen);
NETGENPlugin_RemesherHypothesis_2D(int hypId, SMESH_Gen * gen);
void SetRidgeAngle( double angle );
double GetRidgeAngle() const;

4
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.cxx
View File

@ -38,14 +38,12 @@
//=============================================================================
NETGENPlugin_Hypothesis_2D_ONLY_i::
NETGENPlugin_Hypothesis_2D_ONLY_i (PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl)
: SALOME::GenericObj_i( thePOA ),
SMESH_Hypothesis_i( thePOA ),
NETGENPlugin_Hypothesis_2D_i( thePOA, theStudyId, theGenImpl )
NETGENPlugin_Hypothesis_2D_i( thePOA, theGenImpl )
{
myBaseImpl = new ::NETGENPlugin_Hypothesis_2D (theGenImpl->GetANewId(),
theStudyId,
theGenImpl);
}

1
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.hxx
View File

@ -46,7 +46,6 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Hypothesis_2D_ONLY_i:
public:
// Constructor
NETGENPlugin_Hypothesis_2D_ONLY_i (PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl);
// Destructor
virtual ~NETGENPlugin_Hypothesis_2D_ONLY_i();

8
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx
View File

@ -40,16 +40,14 @@
//=============================================================================
NETGENPlugin_Hypothesis_2D_i::
NETGENPlugin_Hypothesis_2D_i (PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl)
: SALOME::GenericObj_i( thePOA ),
SMESH_Hypothesis_i( thePOA ),
NETGENPlugin_Hypothesis_i( thePOA, theStudyId, theGenImpl )
NETGENPlugin_Hypothesis_i( thePOA, theGenImpl )
{
if (myBaseImpl)
delete (::NETGENPlugin_Hypothesis*)myBaseImpl;
myBaseImpl = new ::NETGENPlugin_Hypothesis_2D (theGenImpl->GetANewId(),
theStudyId,
theGenImpl);
}
@ -100,14 +98,12 @@ CORBA::Boolean NETGENPlugin_Hypothesis_2D_i::IsDimSupported( SMESH::Dimension ty
//=============================================================================
NETGENPlugin_RemesherHypothesis_2D_i::
NETGENPlugin_RemesherHypothesis_2D_i (PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl)
: SALOME::GenericObj_i( thePOA ),
SMESH_Hypothesis_i( thePOA ),
NETGENPlugin_Hypothesis_2D_i( thePOA, theStudyId, theGenImpl )
NETGENPlugin_Hypothesis_2D_i( thePOA, theGenImpl )
{
myBaseImpl = new ::NETGENPlugin_RemesherHypothesis_2D (theGenImpl->GetANewId(),
theStudyId,
theGenImpl);
}

2
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.hxx
View File

@ -49,7 +49,6 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Hypothesis_2D_i:
public:
// Constructor
NETGENPlugin_Hypothesis_2D_i (PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl);
// Destructor
virtual ~NETGENPlugin_Hypothesis_2D_i();
@ -79,7 +78,6 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_RemesherHypothesis_2D_i:
public:
// Constructor
NETGENPlugin_RemesherHypothesis_2D_i( PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl);
void SetRidgeAngle( CORBA::Double angle );

3
src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.cxx
View File

@ -40,11 +40,10 @@ using namespace std;
//=============================================================================
NETGENPlugin_Hypothesis_3D_i::
NETGENPlugin_Hypothesis_3D_i (PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl)
: SALOME::GenericObj_i( thePOA ),
SMESH_Hypothesis_i( thePOA ),
NETGENPlugin_Hypothesis_i( thePOA, theStudyId, theGenImpl )
NETGENPlugin_Hypothesis_i( thePOA, theGenImpl )
{
//MESSAGE( "NETGENPlugin_Hypothesis_3D_i::NETGENPlugin_Hypothesis_3D_i" );
}

1
src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.hxx
View File

@ -46,7 +46,6 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Hypothesis_3D_i:
public:
// Constructor
NETGENPlugin_Hypothesis_3D_i (PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl);
// Get type name of hypothesis

2
src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx
View File

@ -59,14 +59,12 @@ bool NETGENPlugin_Hypothesis_i::isToSetParameter<double>(double curValue,
//=============================================================================
NETGENPlugin_Hypothesis_i::
NETGENPlugin_Hypothesis_i (PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl)
: SALOME::GenericObj_i( thePOA ),
SMESH_Hypothesis_i( thePOA ),
mySetMethodFlags(0)
{
myBaseImpl = new ::NETGENPlugin_Hypothesis (theGenImpl->GetANewId(),
theStudyId,
theGenImpl);
}

1
src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx
View File

@ -50,7 +50,6 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Hypothesis_i:
public:
// Constructor
NETGENPlugin_Hypothesis_i (PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl);
// Destructor
virtual ~NETGENPlugin_Hypothesis_i();

46
src/NETGENPlugin/NETGENPlugin_Mesher.cxx
View File

@ -310,28 +310,22 @@ void NETGENPlugin_Mesher::SetParameters(const NETGENPlugin_Hypothesis* hyp)
const NETGENPlugin_Hypothesis::TLocalSize& localSizes = hyp->GetLocalSizesAndEntries();
if ( !localSizes.empty() )
{
SMESH_Gen_i* smeshGen_i = SMESH_Gen_i::GetSMESHGen();
CORBA::Object_var anObject = smeshGen_i->GetNS()->Resolve("/myStudyManager");
SALOMEDS::StudyManager_var aStudyMgr = SALOMEDS::StudyManager::_narrow(anObject);
SALOMEDS::Study_var myStudy = aStudyMgr->GetStudyByID(hyp->GetStudyId());
if ( !myStudy->_is_nil() )
SMESH_Gen_i* smeshGen_i = SMESH_Gen_i::GetSMESHGen();
NETGENPlugin_Hypothesis::TLocalSize::const_iterator it = localSizes.begin();
for ( ; it != localSizes.end() ; it++)
{
NETGENPlugin_Hypothesis::TLocalSize::const_iterator it = localSizes.begin();
for ( ; it != localSizes.end() ; it++)
{
std::string entry = (*it).first;
double val = (*it).second;
// --
GEOM::GEOM_Object_var aGeomObj;
SALOMEDS::SObject_var aSObj = myStudy->FindObjectID( entry.c_str() );
if ( !aSObj->_is_nil() ) {
CORBA::Object_var obj = aSObj->GetObject();
aGeomObj = GEOM::GEOM_Object::_narrow(obj);
aSObj->UnRegister();
}
TopoDS_Shape S = smeshGen_i->GeomObjectToShape( aGeomObj.in() );
::SetLocalSize(S, val);
std::string entry = (*it).first;
double val = (*it).second;
// --
GEOM::GEOM_Object_var aGeomObj;
SALOMEDS::SObject_var aSObj = SMESH_Gen_i::getStudyServant()->FindObjectID( entry.c_str() );
if ( !aSObj->_is_nil() ) {
CORBA::Object_var obj = aSObj->GetObject();
aGeomObj = GEOM::GEOM_Object::_narrow(obj);
aSObj->UnRegister();
}
TopoDS_Shape S = smeshGen_i->GeomObjectToShape( aGeomObj.in() );
::SetLocalSize(S, val);
}
}
}
@ -1899,7 +1893,7 @@ void NETGENPlugin_Mesher::AddIntVerticesInSolids(const netgen::OCCGeometry&
ofstream py(DUMP_TRIANGLES_SCRIPT);
py << "import SMESH"<< endl
<< "from salome.smesh import smeshBuilder"<<endl
<< "smesh = smeshBuilder.New(salome.myStudy)"<<endl
<< "smesh = smeshBuilder.New()"<<endl
<< "m = smesh.Mesh(name='triangles')" << endl;
#endif
if ((int) nodeVec.size() < ngMesh.GetNP() )
@ -3798,7 +3792,7 @@ void NETGENPlugin_Mesher::toPython( const netgen::Mesh* ngMesh )
outfile << "import salome, SMESH" << endl
<< "from salome.smesh import smeshBuilder" << endl
<< "smesh = smeshBuilder.New(salome.myStudy)" << endl
<< "smesh = smeshBuilder.New()" << endl
<< "mesh = smesh.Mesh()" << endl << endl;
using namespace netgen;
@ -4409,10 +4403,10 @@ void NETGENPlugin_NetgenLibWrapper::removeOutputFile()
}
string tmpDir = SALOMEDS_Tool::GetDirFromPath ( _outputFileName );
string aFileName = SALOMEDS_Tool::GetNameFromPath( _outputFileName ) + ".out";
SALOMEDS::ListOfFileNames_var aFiles = new SALOMEDS::ListOfFileNames;
aFiles->length(1);
aFiles[0] = aFileName.c_str();
SALOMEDS_Tool::ListOfFiles aFiles;
aFiles.reserve(1);
aFiles.push_back(aFileName.c_str());
SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.c_str(), aFiles.in(), true );
SALOMEDS_Tool::RemoveTemporaryFiles( tmpDir.c_str(), aFiles, true );
}
}

4
src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx
View File

@ -54,9 +54,9 @@ using namespace std;
*/
//=============================================================================
NETGENPlugin_NETGEN_2D::NETGENPlugin_NETGEN_2D(int hypId, int studyId,
NETGENPlugin_NETGEN_2D::NETGENPlugin_NETGEN_2D(int hypId,
SMESH_Gen* gen)
: SMESH_2D_Algo(hypId, studyId, gen)
: SMESH_2D_Algo(hypId, gen)
{
_name = "NETGEN_2D";
_shapeType = (1 << TopAbs_FACE); // 1 bit /shape type

2
src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx
View File

@ -40,7 +40,7 @@ class NETGENPlugin_Mesher;
class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_2D: public SMESH_2D_Algo
{
public:
NETGENPlugin_NETGEN_2D(int hypId, int studyId, SMESH_Gen* gen);
NETGENPlugin_NETGEN_2D(int hypId, SMESH_Gen* gen);
virtual ~NETGENPlugin_NETGEN_2D();
virtual bool CheckHypothesis(SMESH_Mesh& aMesh,

4
src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx
View File

@ -55,9 +55,9 @@ using namespace std;
*/
//=============================================================================
NETGENPlugin_NETGEN_2D3D::NETGENPlugin_NETGEN_2D3D(int hypId, int studyId,
NETGENPlugin_NETGEN_2D3D::NETGENPlugin_NETGEN_2D3D(int hypId,
SMESH_Gen* gen)
: SMESH_3D_Algo(hypId, studyId, gen)
: SMESH_3D_Algo(hypId, gen)
{
//MESSAGE("NETGENPlugin_NETGEN_2D3D::NETGENPlugin_NETGEN_2D3D");
_name = "NETGEN_2D3D";

2
src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx
View File

@ -40,7 +40,7 @@ class StdMeshers_ViscousLayers;
class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_2D3D: public SMESH_3D_Algo
{
public:
NETGENPlugin_NETGEN_2D3D(int hypId, int studyId, SMESH_Gen* gen);
NETGENPlugin_NETGEN_2D3D(int hypId, SMESH_Gen* gen);
virtual ~NETGENPlugin_NETGEN_2D3D();
virtual bool CheckHypothesis(SMESH_Mesh& aMesh,

2
src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx
View File

@ -43,7 +43,6 @@ using namespace std;
//=============================================================================
NETGENPlugin_NETGEN_2D3D_i::NETGENPlugin_NETGEN_2D3D_i( PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl )
: SALOME::GenericObj_i( thePOA ),
SMESH_Hypothesis_i( thePOA ),
@ -52,7 +51,6 @@ NETGENPlugin_NETGEN_2D3D_i::NETGENPlugin_NETGEN_2D3D_i( PortableServer::POA_ptr
{
//MESSAGE( "NETGENPlugin_NETGEN_2D3D_i::NETGENPlugin_NETGEN_2D3D_i" );
myBaseImpl = new ::NETGENPlugin_NETGEN_2D3D( theGenImpl->GetANewId(),
theStudyId,
theGenImpl );
}

1
src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx
View File

@ -47,7 +47,6 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_2D3D_i:
public:
// Constructor
NETGENPlugin_NETGEN_2D3D_i( PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl );
// Destructor
virtual ~NETGENPlugin_NETGEN_2D3D_i();

3
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
View File

@ -86,9 +86,8 @@ using namespace nglib;
//=============================================================================
NETGENPlugin_NETGEN_2D_ONLY::NETGENPlugin_NETGEN_2D_ONLY(int hypId,
int studyId,
SMESH_Gen* gen)
: SMESH_2D_Algo(hypId, studyId, gen)
: SMESH_2D_Algo(hypId, gen)
{
_name = "NETGEN_2D_ONLY";

2
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx
View File

@ -42,7 +42,7 @@ class NETGENPlugin_Hypothesis_2D;
class NETGENPlugin_NETGEN_2D_ONLY: public SMESH_2D_Algo
{
public:
NETGENPlugin_NETGEN_2D_ONLY(int hypId, int studyId, SMESH_Gen* gen);
NETGENPlugin_NETGEN_2D_ONLY(int hypId, SMESH_Gen* gen);
virtual ~NETGENPlugin_NETGEN_2D_ONLY();
virtual bool CheckHypothesis(SMESH_Mesh& aMesh,

4
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx
View File

@ -36,15 +36,13 @@
//=============================================================================
NETGENPlugin_NETGEN_2D_ONLY_i::NETGENPlugin_NETGEN_2D_ONLY_i( PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl )
::SMESH_Gen* theGenImpl )
: SALOME::GenericObj_i( thePOA ),
SMESH_Hypothesis_i( thePOA ),
SMESH_Algo_i( thePOA ),
SMESH_2D_Algo_i( thePOA )
{
myBaseImpl = new ::NETGENPlugin_NETGEN_2D_ONLY( theGenImpl->GetANewId(),
theStudyId,
theGenImpl );
}

1
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx
View File

@ -41,7 +41,6 @@ class NETGENPlugin_NETGEN_2D_ONLY_i:
public:
// Constructor
NETGENPlugin_NETGEN_2D_ONLY_i( PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl );
// Destructor
virtual ~NETGENPlugin_NETGEN_2D_ONLY_i();

4
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx
View File

@ -39,7 +39,6 @@
//=============================================================================
NETGENPlugin_NETGEN_2D_i::NETGENPlugin_NETGEN_2D_i( PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl )
: SALOME::GenericObj_i( thePOA ),
SMESH_Hypothesis_i( thePOA ),
@ -47,7 +46,6 @@ NETGENPlugin_NETGEN_2D_i::NETGENPlugin_NETGEN_2D_i( PortableServer::POA_ptr theP
SMESH_2D_Algo_i( thePOA )
{
myBaseImpl = new ::NETGENPlugin_NETGEN_2D( theGenImpl->GetANewId(),
theStudyId,
theGenImpl );
}
@ -87,7 +85,6 @@ NETGENPlugin_NETGEN_2D_i::~NETGENPlugin_NETGEN_2D_i()
//=============================================================================
NETGENPlugin_Remesher_2D_i::NETGENPlugin_Remesher_2D_i( PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl )
: SALOME::GenericObj_i( thePOA ),
SMESH_Hypothesis_i( thePOA ),
@ -95,7 +92,6 @@ NETGENPlugin_Remesher_2D_i::NETGENPlugin_Remesher_2D_i( PortableServer::POA_ptr
SMESH_2D_Algo_i( thePOA )
{
myBaseImpl = new ::NETGENPlugin_Remesher_2D( theGenImpl->GetANewId(),
theStudyId,
theGenImpl );
}

2
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx
View File

@ -47,7 +47,6 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_2D_i:
public:
// Constructor
NETGENPlugin_NETGEN_2D_i( PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl );
// Destructor
virtual ~NETGENPlugin_NETGEN_2D_i();
@ -66,7 +65,6 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Remesher_2D_i:
public:
// Constructor
NETGENPlugin_Remesher_2D_i( PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl );
// Destructor
virtual ~NETGENPlugin_Remesher_2D_i();

5
src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
View File

@ -99,9 +99,8 @@ using namespace std;
*/
//=============================================================================
NETGENPlugin_NETGEN_3D::NETGENPlugin_NETGEN_3D(int hypId, int studyId,
SMESH_Gen* gen)
: SMESH_3D_Algo(hypId, studyId, gen)
NETGENPlugin_NETGEN_3D::NETGENPlugin_NETGEN_3D(int hypId, SMESH_Gen* gen)
: SMESH_3D_Algo(hypId, gen)
{
_name = "NETGEN_3D";
_shapeType = (1 << TopAbs_SHELL) | (1 << TopAbs_SOLID);// 1 bit /shape type

2
src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
View File

@ -44,7 +44,7 @@ class NETGENPlugin_Hypothesis;
class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D: public SMESH_3D_Algo
{
public:
NETGENPlugin_NETGEN_3D(int hypId, int studyId, SMESH_Gen* gen);
NETGENPlugin_NETGEN_3D(int hypId, SMESH_Gen* gen);
virtual ~NETGENPlugin_NETGEN_3D();
virtual bool CheckHypothesis(SMESH_Mesh& aMesh,

6
src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx
View File

@ -44,16 +44,14 @@ using namespace std;
//=============================================================================
NETGENPlugin_NETGEN_3D_i::NETGENPlugin_NETGEN_3D_i( PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl )
::SMESH_Gen* theGenImpl )
: SALOME::GenericObj_i( thePOA ),
SMESH_Hypothesis_i( thePOA ),
SMESH_Algo_i( thePOA ),
SMESH_3D_Algo_i( thePOA )
{
myBaseImpl = new ::NETGENPlugin_NETGEN_3D( theGenImpl->GetANewId(),
theStudyId,
theGenImpl );
theGenImpl );
}
//=============================================================================

3
src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx
View File

@ -48,8 +48,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D_i:
public:
// Constructor
NETGENPlugin_NETGEN_3D_i( PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl );
::SMESH_Gen* theGenImpl );
// Destructor
virtual ~NETGENPlugin_NETGEN_3D_i();

4
src/NETGENPlugin/NETGENPlugin_Remesher_2D.cxx
View File

@ -463,8 +463,8 @@ namespace
*/
//=============================================================================
NETGENPlugin_Remesher_2D::NETGENPlugin_Remesher_2D(int hypId, int studyId, SMESH_Gen* gen)
: SMESH_2D_Algo(hypId, studyId, gen)
NETGENPlugin_Remesher_2D::NETGENPlugin_Remesher_2D(int hypId, SMESH_Gen* gen)
: SMESH_2D_Algo(hypId, gen)
{
_name = "NETGEN_Remesher_2D";
_shapeType = (1 << TopAbs_FACE); // 1 bit /shape type

2
src/NETGENPlugin/NETGENPlugin_Remesher_2D.hxx
View File

@ -35,7 +35,7 @@
class NETGENPLUGIN_EXPORT NETGENPlugin_Remesher_2D: public SMESH_2D_Algo
{
public:
NETGENPlugin_Remesher_2D(int hypId, int studyId, SMESH_Gen* gen);
NETGENPlugin_Remesher_2D(int hypId, SMESH_Gen* gen);
virtual bool CheckHypothesis(SMESH_Mesh& theMesh,
const TopoDS_Shape& theShape,

3
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx
View File

@ -43,9 +43,8 @@ using namespace std;
*/
//=============================================================================
NETGENPlugin_SimpleHypothesis_2D::NETGENPlugin_SimpleHypothesis_2D (int hypId,
int studyId,
SMESH_Gen * gen)
: SMESH_Hypothesis(hypId, studyId, gen),
: SMESH_Hypothesis(hypId, gen),
_nbSegments ((int)NETGENPlugin_Hypothesis::GetDefaultNbSegPerEdge()),
_segmentLength(0),
_area (0.),

2
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx
View File

@ -40,7 +40,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_SimpleHypothesis_2D: public SMESH_Hypothe
{
public:
NETGENPlugin_SimpleHypothesis_2D(int hypId, int studyId, SMESH_Gen * gen);
NETGENPlugin_SimpleHypothesis_2D(int hypId, SMESH_Gen * gen);
/*!
* Sets <number of segments> value

2
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx
View File

@ -45,14 +45,12 @@ using namespace std;
//=============================================================================
NETGENPlugin_SimpleHypothesis_2D_i::
NETGENPlugin_SimpleHypothesis_2D_i (PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl)
: SALOME::GenericObj_i( thePOA ),
SMESH_Hypothesis_i( thePOA )
{
//MESSAGE( "NETGENPlugin_SimpleHypothesis_2D_i::NETGENPlugin_SimpleHypothesis_2D_i" );
myBaseImpl = new ::NETGENPlugin_SimpleHypothesis_2D (theGenImpl->GetANewId(),
theStudyId,
theGenImpl);
}

1
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx
View File

@ -45,7 +45,6 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_SimpleHypothesis_2D_i:
public:
// Constructor
NETGENPlugin_SimpleHypothesis_2D_i (PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl);
// Destructor
virtual ~NETGENPlugin_SimpleHypothesis_2D_i();

3
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx
View File

@ -45,9 +45,8 @@ using namespace std;
*/
//=============================================================================
NETGENPlugin_SimpleHypothesis_3D::NETGENPlugin_SimpleHypothesis_3D (int hypId,
int studyId,
SMESH_Gen * gen)
: NETGENPlugin_SimpleHypothesis_2D(hypId, studyId, gen),
: NETGENPlugin_SimpleHypothesis_2D(hypId, gen),
_volume(0)
{
_name = "NETGEN_SimpleParameters_3D";

2
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx
View File

@ -40,7 +40,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_SimpleHypothesis_3D: public NETGENPlugin_
{
public:
NETGENPlugin_SimpleHypothesis_3D(int hypId, int studyId, SMESH_Gen * gen);
NETGENPlugin_SimpleHypothesis_3D(int hypId, SMESH_Gen * gen);
void LengthFromFaces();

4
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx
View File

@ -43,17 +43,15 @@ using namespace std;
//=============================================================================
NETGENPlugin_SimpleHypothesis_3D_i::
NETGENPlugin_SimpleHypothesis_3D_i (PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl)
: SALOME::GenericObj_i( thePOA ),
SMESH_Hypothesis_i( thePOA ),
NETGENPlugin_SimpleHypothesis_2D_i( thePOA,theStudyId,theGenImpl )
NETGENPlugin_SimpleHypothesis_2D_i( thePOA,theGenImpl )
{
//MESSAGE( "NETGENPlugin_SimpleHypothesis_3D_i::NETGENPlugin_SimpleHypothesis_3D_i" );
if ( myBaseImpl )
delete myBaseImpl;
myBaseImpl = new ::NETGENPlugin_SimpleHypothesis_3D (theGenImpl->GetANewId(),
theStudyId,
theGenImpl);
}

1
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.hxx
View File

@ -44,7 +44,6 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_SimpleHypothesis_3D_i:
public:
// Constructor
NETGENPlugin_SimpleHypothesis_3D_i (PortableServer::POA_ptr thePOA,
int theStudyId,
::SMESH_Gen* theGenImpl);
// Destructor
virtual ~NETGENPlugin_SimpleHypothesis_3D_i();