use of vtk in SMDS

diff --git a/src/GHS3DPlugin_GHS3D.cxx b/src/GHS3DPlugin_GHS3D.cxx
index 28ee3aa9bff3b2a521c960c69f4d59e92aad9eeb..245022113dd22acc6ac58c0c7daa701b61f2e20a 100644 (file)
--- a/src/GHS3DPlugin_GHS3D.cxx
+++ b/src/GHS3DPlugin_GHS3D.cxx
@@ -553,7 +553,7 @@ static bool writePoints (ofstream &                       theFile,
   {
     node = it->next();
     if ( node->GetPosition()->GetTypeOfPosition() == SMDS_TOP_EDGE &&
-         theHelper.IsDegenShape( node->GetPosition()->GetShapeId() )) // Issue 020674
+         theHelper.IsDegenShape( node->getshapeId() )) // Issue 020674
       continue;
 
     theSmdsToGhs3dIdMap.insert( make_pair( node->GetID(), aGhs3dID ));
@@ -792,8 +792,8 @@ static int findShapeID(SMESH_Mesh&          mesh,
   {
     // find UV of i-th node on geomFace
     const SMDS_MeshNode* nNotOnSeamEdge = 0;
-    if ( helper.IsSeamShape( nodes[i]->GetPosition()->GetShapeId() ))
-      if ( helper.IsSeamShape( nodes[(i+1)%3]->GetPosition()->GetShapeId() ))
+    if ( helper.IsSeamShape( nodes[i]->getshapeId() ))
+      if ( helper.IsSeamShape( nodes[(i+1)%3]->getshapeId() ))
         nNotOnSeamEdge = nodes[(i+2)%3];
       else
         nNotOnSeamEdge = nodes[(i+1)%3];
@@ -1032,9 +1032,9 @@ static bool readResultFile(const int                       fileOpen,
       for ( int i=0; i<4 && shapeID==0; i++ ) {
         if ( nodeAssigne[ nodeID[i] ] == 1 &&
              node[i]->GetPosition()->GetTypeOfPosition() == SMDS_TOP_3DSPACE &&
-             node[i]->GetPosition()->GetShapeId() > 1 )
+             node[i]->getshapeId() > 1 )
         {
-          shapeID = node[i]->GetPosition()->GetShapeId();
+          shapeID = node[i]->getshapeId();
         }
       }
       if ( shapeID==0 ) {
@@ -2069,7 +2069,7 @@ const SMDS_MeshElement* _Ghs2smdsConvertor::getElement(const vector<int>& ghsNod
   if ( nbNodes == 2 ) {
     const SMDS_MeshElement* edge= SMDS_Mesh::FindEdge( nodes[0], nodes[1] );
     if ( !edge )
-      edge = new SMDS_MeshEdge( nodes[0], nodes[1] );
+      edge = new SMDS_LinearEdge( nodes[0], nodes[1] );
     return edge;
   }
   if ( nbNodes == 3 ) {

diff --git a/src/Makefile.am b/src/Makefile.am
index 44ae6d1ac6f05f14832b47e79f7ca0dd9f229461..81307640ef2a538849c268fcb6c7a572fb1b1a5c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,6 +55,7 @@ libGHS3DEngine_la_CPPFLAGS =  \
        $(GEOM_CXXFLAGS)      \
        $(MED_CXXFLAGS)       \
        $(SMESH_CXXFLAGS)     \
+       $(VTK_INCLUDES) \
        $(BOOST_CPPFLAGS)     \
        $(CORBA_CXXFLAGS)     \
        $(CORBA_INCLUDES)     \